summaryrefslogtreecommitdiff
path: root/indra/newview/llfloaterworldmap.h
diff options
context:
space:
mode:
authorIgor Borovkov <iborovkov@productengine.com>2010-04-02 17:24:44 +0300
committerIgor Borovkov <iborovkov@productengine.com>2010-04-02 17:24:44 +0300
commit16b22d4abe99f8b43628db9db8142d65f431b062 (patch)
tree079db718f06c6ed35267db5fe35b1dbd7f2de28f /indra/newview/llfloaterworldmap.h
parentf4f05ad4dfc1ae47ffad0c9e2d26c4123d7f42c1 (diff)
parent7d38dd51c2a59d173bee9c04737002313f4b9dec (diff)
merge
--HG-- branch : product-engine
Diffstat (limited to 'indra/newview/llfloaterworldmap.h')
-rw-r--r--indra/newview/llfloaterworldmap.h3
1 files changed, 2 insertions, 1 deletions
diff --git a/indra/newview/llfloaterworldmap.h b/indra/newview/llfloaterworldmap.h
index 00f5e788fb..52809ff830 100644
--- a/indra/newview/llfloaterworldmap.h
+++ b/indra/newview/llfloaterworldmap.h
@@ -43,6 +43,7 @@
#include "llhudtext.h"
#include "llmapimagetype.h"
#include "lltracker.h"
+#include "llslurl.h"
class LLEventInfo;
class LLFriendObserver;
@@ -183,7 +184,7 @@ private:
LLTracker::ETrackingStatus mTrackedStatus;
std::string mTrackedSimName;
std::string mTrackedAvatarName;
- std::string mSLURL;
+ LLSLURL mSLURL;
};
extern LLFloaterWorldMap* gFloaterWorldMap;