diff options
| author | Josh Bell <josh@lindenlab.com> | 2008-03-14 19:27:38 +0000 |
|---|---|---|
| committer | Josh Bell <josh@lindenlab.com> | 2008-03-14 19:27:38 +0000 |
| commit | 133a7b5fe2bcaaec8389b209cb5bd774ebc2ab63 (patch) | |
| tree | d7a8f7846af7dc948d9e11c5a75dd830fb12465c /indra/newview/llworldmap.h | |
| parent | a1cde743e755d826c86aeb006d2027ad2e5c8ce3 (diff) | |
svn merge -r 82272:82277 svn+ssh://svn.lindenlab.com/svn/linden/branches/maint-ui-9-merge-2 --> release
QAR-364 - merge of maint-ui-9
Diffstat (limited to 'indra/newview/llworldmap.h')
| -rw-r--r-- | indra/newview/llworldmap.h | 5 |
1 files changed, 5 insertions, 0 deletions
diff --git a/indra/newview/llworldmap.h b/indra/newview/llworldmap.h index b0c6f352b0..3c9dc781fa 100644 --- a/indra/newview/llworldmap.h +++ b/indra/newview/llworldmap.h @@ -153,6 +153,10 @@ public: url_callback_t callback, const std::string& callback_url, bool teleport); + void sendHandleRegionRequest(U64 region_handle, + url_callback_t callback, + const std::string& callback_url, + bool teleport); void sendItemRequest(U32 type, U64 handle = 0); static void processMapLayerReply(LLMessageSystem*, void**); @@ -217,6 +221,7 @@ private: // search for named region for url processing std::string mSLURLRegionName; + U64 mSLURLRegionHandle; std::string mSLURL; url_callback_t mSLURLCallback; bool mSLURLTeleport; |