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.h8
1 files changed, 8 insertions, 0 deletions
diff --git a/linden/indra/newview/llworldmap.h b/linden/indra/newview/llworldmap.h
index 6ce66ff..b7089f3 100644
--- a/linden/indra/newview/llworldmap.h
+++ b/linden/indra/newview/llworldmap.h
@@ -76,6 +76,8 @@ public:
76 LLSimInfo(); 76 LLSimInfo();
77 77
78 LLVector3d getGlobalPos(LLVector3 local_pos) const; 78 LLVector3d getGlobalPos(LLVector3 local_pos) const;
79 // Get the world coordinates of the SW corner of that region
80 LLVector3d getGlobalOrigin() const;
79 81
80public: 82public:
81 U64 mHandle; 83 U64 mHandle;
@@ -164,6 +166,10 @@ public:
164 static void processMapBlockReply(LLMessageSystem*, void**); 166 static void processMapBlockReply(LLMessageSystem*, void**);
165 static void processMapItemReply(LLMessageSystem*, void**); 167 static void processMapItemReply(LLMessageSystem*, void**);
166 168
169 static void gotMapServerURL(bool flag) { sGotMapURL = flag; }
170 static bool useWebMapTiles();
171 static LLPointer<LLViewerImage> loadObjectsTile(U32 grid_x, U32 grid_y);
172
167 void dump(); 173 void dump();
168 174
169 // Extend the bounding box of the list of simulators. Returns true 175 // Extend the bounding box of the list of simulators. Returns true
@@ -226,6 +232,8 @@ private:
226 std::string mSLURL; 232 std::string mSLURL;
227 url_callback_t mSLURLCallback; 233 url_callback_t mSLURLCallback;
228 bool mSLURLTeleport; 234 bool mSLURLTeleport;
235
236 static bool sGotMapURL;
229}; 237};
230 238
231#endif 239#endif