Merge branch '0.5' of gitorious.org:mana/mana

Conflicts:
	src/being.cpp
	src/client.cpp
	src/commandhandler.cpp
	src/gui/setup_video.cpp
	src/gui/socialwindow.cpp
	src/gui/viewport.cpp
	src/gui/widgets/browserbox.cpp
	src/gui/widgets/itemcontainer.cpp
	src/imageparticle.cpp
	src/localplayer.cpp
	src/localplayer.h
	src/map.cpp
	src/net/tmwa/beinghandler.cpp
	src/particle.cpp
	src/particle.h
	src/player.cpp
	src/player.h

1 files changed, 9 insertions, 1 deletions

diff --git a/src/localplayer.h b/src/localplayer.h
index 41fc84a8..0580ef89 100644
--- a/src/localplayer.h
+++ b/src/localplayer.h
@@ -164,6 +164,12 @@ class LocalPlayer : public Being
          */
         void pickedUp(const ItemInfo &itemInfo, int amount);
 
+        void setShowIp(bool show)
+        { mShowIp = show; }
+
+        bool getShowIp() const
+        { return mShowIp; }
+
         /** Tells that the path has been set by mouse. */
         void pathSetByMouse()
         { mPathSetByMouse = true; }
@@ -183,7 +189,7 @@ class LocalPlayer : public Being
         void event(const std::string &channel, const Mana::Event &event);
 
         /**
-         * Tells the engine whether to check
+         * Tells the engine wether to check
          * if the Player Name is to be displayed.
          */
         void setCheckNameSetting(bool checked) { mUpdateName = checked; }
@@ -224,6 +230,8 @@ class LocalPlayer : public Being
         /** Queued messages*/
         std::list<MessagePair> mMessages;
         int mMessageTime;
+
+        bool mShowIp;
 };
 
 extern LocalPlayer *player_node;