diff options
| author | Roxie Linden <roxie@lindenlab.com> | 2010-03-08 21:39:38 -0800 |
|---|---|---|
| committer | Roxie Linden <roxie@lindenlab.com> | 2010-03-08 21:39:38 -0800 |
| commit | 20379fecd9aea4d3450bcda815ad63f0ce9c729f (patch) | |
| tree | 21ef1bddf49efc133b9ec74e572345125fb62175 /indra/newview/llfloaterworldmap.h | |
| parent | 78abe4f5ffb02e14cd98f049b8100d20a82f3b1c (diff) | |
| parent | 8bd5a3bca38b0ba663d3563029e54da057020424 (diff) | |
automated merge
Diffstat (limited to 'indra/newview/llfloaterworldmap.h')
| -rw-r--r-- | indra/newview/llfloaterworldmap.h | 3 |
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; |