aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/linden/indra/newview/llworldmap.h
diff options
context:
space:
mode:
Diffstat (limited to 'linden/indra/newview/llworldmap.h')
-rw-r--r--linden/indra/newview/llworldmap.h5
1 files changed, 2 insertions, 3 deletions
diff --git a/linden/indra/newview/llworldmap.h b/linden/indra/newview/llworldmap.h
index 3f3a8e9..e522acc 100644
--- a/linden/indra/newview/llworldmap.h
+++ b/linden/indra/newview/llworldmap.h
@@ -138,10 +138,10 @@ public:
138 LLSimInfo* simInfoFromPosGlobal(const LLVector3d& pos_global); 138 LLSimInfo* simInfoFromPosGlobal(const LLVector3d& pos_global);
139 139
140 // Returns simulator information for named sim, or NULL if non-existent 140 // Returns simulator information for named sim, or NULL if non-existent
141 LLSimInfo* simInfoFromName(const LLString& sim_name); 141 LLSimInfo* simInfoFromName(const std::string& sim_name);
142 142
143 // Gets simulator name for a global position, returns true if it was found 143 // Gets simulator name for a global position, returns true if it was found
144 bool simNameFromPosGlobal(const LLVector3d& pos_global, LLString & outSimName ); 144 bool simNameFromPosGlobal(const LLVector3d& pos_global, std::string& outSimName );
145 145
146 // Sets the current layer 146 // Sets the current layer
147 void setCurrentLayer(S32 layer, bool request_layer = false); 147 void setCurrentLayer(S32 layer, bool request_layer = false);
@@ -192,7 +192,6 @@ public:
192 item_info_list_t mPGEvents; 192 item_info_list_t mPGEvents;
193 item_info_list_t mMatureEvents; 193 item_info_list_t mMatureEvents;
194 item_info_list_t mLandForSale; 194 item_info_list_t mLandForSale;
195 item_info_list_t mClassifieds;
196 195
197 std::map<U64,S32> mNumAgents; 196 std::map<U64,S32> mNumAgents;
198 197