diff options
| author | Steven Bennetts <steve@lindenlab.com> | 2009-08-14 22:40:13 +0000 |
|---|---|---|
| committer | Steven Bennetts <steve@lindenlab.com> | 2009-08-14 22:40:13 +0000 |
| commit | 3b65da1fad46eda2c97681879fce8880f7462082 (patch) | |
| tree | 9c9a5b69ea5f3d90883c39acdd0f856e75105fd1 /indra/newview/lllandmarkactions.h | |
| parent | 73caee4208a4e05f66583de099502012fd8415ea (diff) | |
merge -r 1341-1350 https://svn.aws.productengine.com/secondlife/pe/stable-1 -> viewer-2.0.0-3
EXT-456 EXT-480 EXT-481 EXT-497 EXT-498 EXT-509 EXT-511
Diffstat (limited to 'indra/newview/lllandmarkactions.h')
| -rw-r--r-- | indra/newview/lllandmarkactions.h | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/indra/newview/lllandmarkactions.h b/indra/newview/lllandmarkactions.h index e04d1bf543..12c7398f6a 100644 --- a/indra/newview/lllandmarkactions.h +++ b/indra/newview/lllandmarkactions.h @@ -41,7 +41,7 @@ class LLLandmarkActions { public: - typedef boost::function<void(const LLVector3d& global_pos, std::string& slurl)> slurl_signal_t; + typedef boost::function<void(std::string& slurl)> slurl_callback_t; /** * @brief Fetches landmark LLViewerInventoryItems for the given landmark name. @@ -80,7 +80,7 @@ public: /** * @brief Creates SLURL for given global position. */ - static void getSLURLfromPosGlobal(const LLVector3d& global_pos, slurl_signal_t signal); + static void getSLURLfromPosGlobal(const LLVector3d& global_pos, slurl_callback_t cb); /** * @brief Gets landmark global position specified by inventory LLUUID. @@ -96,7 +96,7 @@ private: LLLandmarkActions(); LLLandmarkActions(const LLLandmarkActions&); - static void onRegionResponse(slurl_signal_t signal, + static void onRegionResponse(slurl_callback_t cb, const LLVector3d& global_pos, U64 region_handle, const std::string& url, |