Second Life viewer sources 1.21.0-RC

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:
         LLSimInfo* simInfoFromPosGlobal(const LLVector3d& pos_global);
 
         // Returns simulator information for named sim, or NULL if non-existent
-        LLSimInfo* simInfoFromName(const LLString& sim_name);
+        LLSimInfo* simInfoFromName(const std::string& sim_name);
 
         // Gets simulator name for a global position, returns true if it was found
-        bool simNameFromPosGlobal(const LLVector3d& pos_global, LLString & outSimName );
+        bool simNameFromPosGlobal(const LLVector3d& pos_global, std::string& outSimName );
 
         // Sets the current layer
         void setCurrentLayer(S32 layer, bool request_layer = false);
@@ -192,7 +192,6 @@ public:
         item_info_list_t mPGEvents;
         item_info_list_t mMatureEvents;
         item_info_list_t mLandForSale;
-        item_info_list_t mClassifieds;
 
         std::map<U64,S32> mNumAgents;