Henri Beauchamp: use http map if possible. Fixes broken map in SL + http map possible for OS

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:
         LLSimInfo();
 
         LLVector3d getGlobalPos(LLVector3 local_pos) const;
+        // Get the world coordinates of the SW corner of that region
+        LLVector3d getGlobalOrigin() const;
 
 public:
         U64 mHandle;
@@ -164,6 +166,10 @@ public:
         static void processMapBlockReply(LLMessageSystem*, void**);
         static void processMapItemReply(LLMessageSystem*, void**);
 
+        static void gotMapServerURL(bool flag) { sGotMapURL = flag; }
+        static bool useWebMapTiles();
+        static LLPointer<LLViewerImage> loadObjectsTile(U32 grid_x, U32 grid_y);
+
         void dump();
 
         // Extend the bounding box of the list of simulators. Returns true
@@ -226,6 +232,8 @@ private:
         std::string mSLURL;
         url_callback_t mSLURLCallback;
         bool mSLURLTeleport;
+
+        static bool sGotMapURL;
 };
 
 #endif