diff options
author | Jacek Antonelli | 2008-08-15 23:45:42 -0500 |
---|---|---|
committer | Jacek Antonelli | 2008-08-15 23:45:42 -0500 |
commit | ce28e056c20bf2723f565bbf464b87781ec248a2 (patch) | |
tree | ef7b0501c4de4b631a916305cbc2a5fdc125e52d /linden/indra/newview/llworldmap.h | |
parent | Second Life viewer sources 1.19.1.4b (diff) | |
download | meta-impy-ce28e056c20bf2723f565bbf464b87781ec248a2.zip meta-impy-ce28e056c20bf2723f565bbf464b87781ec248a2.tar.gz meta-impy-ce28e056c20bf2723f565bbf464b87781ec248a2.tar.bz2 meta-impy-ce28e056c20bf2723f565bbf464b87781ec248a2.tar.xz |
Second Life viewer sources 1.20.2
Diffstat (limited to 'linden/indra/newview/llworldmap.h')
-rw-r--r-- | linden/indra/newview/llworldmap.h | 9 |
1 files changed, 6 insertions, 3 deletions
diff --git a/linden/indra/newview/llworldmap.h b/linden/indra/newview/llworldmap.h index bc8d653..041dfc0 100644 --- a/linden/indra/newview/llworldmap.h +++ b/linden/indra/newview/llworldmap.h | |||
@@ -110,7 +110,7 @@ struct LLWorldMapLayer | |||
110 | }; | 110 | }; |
111 | 111 | ||
112 | 112 | ||
113 | class LLWorldMap | 113 | class LLWorldMap : public LLSingleton<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); | 116 | typedef void(*url_callback_t)(U64 region_handle, const std::string& url, const LLUUID& snapshot_id, bool teleport); |
@@ -153,6 +153,10 @@ public: | |||
153 | url_callback_t callback, | 153 | url_callback_t callback, |
154 | const std::string& callback_url, | 154 | const std::string& callback_url, |
155 | bool teleport); | 155 | bool teleport); |
156 | void sendHandleRegionRequest(U64 region_handle, | ||
157 | url_callback_t callback, | ||
158 | const std::string& callback_url, | ||
159 | bool teleport); | ||
156 | void sendItemRequest(U32 type, U64 handle = 0); | 160 | void sendItemRequest(U32 type, U64 handle = 0); |
157 | 161 | ||
158 | static void processMapLayerReply(LLMessageSystem*, void**); | 162 | static void processMapLayerReply(LLMessageSystem*, void**); |
@@ -217,11 +221,10 @@ private: | |||
217 | 221 | ||
218 | // search for named region for url processing | 222 | // search for named region for url processing |
219 | std::string mSLURLRegionName; | 223 | std::string mSLURLRegionName; |
224 | U64 mSLURLRegionHandle; | ||
220 | std::string mSLURL; | 225 | std::string mSLURL; |
221 | url_callback_t mSLURLCallback; | 226 | url_callback_t mSLURLCallback; |
222 | bool mSLURLTeleport; | 227 | bool mSLURLTeleport; |
223 | }; | 228 | }; |
224 | 229 | ||
225 | extern LLWorldMap* gWorldMap; | ||
226 | |||
227 | #endif | 230 | #endif |