diff options
Diffstat (limited to 'linden/indra/newview/llworldmap.h')
-rw-r--r-- | linden/indra/newview/llworldmap.h | 12 |
1 files changed, 12 insertions, 0 deletions
diff --git a/linden/indra/newview/llworldmap.h b/linden/indra/newview/llworldmap.h index 5b2b977..b0c6f35 100644 --- a/linden/indra/newview/llworldmap.h +++ b/linden/indra/newview/llworldmap.h | |||
@@ -113,6 +113,8 @@ struct LLWorldMapLayer | |||
113 | class LLWorldMap | 113 | class LLWorldMap |
114 | { | 114 | { |
115 | public: | 115 | public: |
116 | typedef void(*url_callback_t)(U64 region_handle, const std::string& url, const LLUUID& snapshot_id, bool teleport); | ||
117 | |||
116 | LLWorldMap(); | 118 | LLWorldMap(); |
117 | ~LLWorldMap(); | 119 | ~LLWorldMap(); |
118 | 120 | ||
@@ -147,6 +149,10 @@ public: | |||
147 | void sendMapLayerRequest(); | 149 | void sendMapLayerRequest(); |
148 | void sendMapBlockRequest(U16 min_x, U16 min_y, U16 max_x, U16 max_y, bool return_nonexistent = false); | 150 | void sendMapBlockRequest(U16 min_x, U16 min_y, U16 max_x, U16 max_y, bool return_nonexistent = false); |
149 | void sendNamedRegionRequest(std::string region_name); | 151 | void sendNamedRegionRequest(std::string region_name); |
152 | void sendNamedRegionRequest(std::string region_name, | ||
153 | url_callback_t callback, | ||
154 | const std::string& callback_url, | ||
155 | bool teleport); | ||
150 | void sendItemRequest(U32 type, U64 handle = 0); | 156 | void sendItemRequest(U32 type, U64 handle = 0); |
151 | 157 | ||
152 | static void processMapLayerReply(LLMessageSystem*, void**); | 158 | static void processMapLayerReply(LLMessageSystem*, void**); |
@@ -208,6 +214,12 @@ public: | |||
208 | 214 | ||
209 | private: | 215 | private: |
210 | LLTimer mRequestTimer; | 216 | LLTimer mRequestTimer; |
217 | |||
218 | // search for named region for url processing | ||
219 | std::string mSLURLRegionName; | ||
220 | std::string mSLURL; | ||
221 | url_callback_t mSLURLCallback; | ||
222 | bool mSLURLTeleport; | ||
211 | }; | 223 | }; |
212 | 224 | ||
213 | extern LLWorldMap* gWorldMap; | 225 | extern LLWorldMap* gWorldMap; |