diff options
| author | Steven Bennetts <steve@lindenlab.com> | 2009-08-14 21:50:02 +0000 |
|---|---|---|
| committer | Steven Bennetts <steve@lindenlab.com> | 2009-08-14 21:50:02 +0000 |
| commit | 73caee4208a4e05f66583de099502012fd8415ea (patch) | |
| tree | ff9fa1b7b010e71fb62f26a32c912b5e266f3b23 /indra/newview/llslurl.h | |
| parent | 1db494f58ad378b8028c1f071196be82af5fe964 (diff) | |
svn merge https://svn.aws.productengine.com/secondlife/export-from-ll/viewer-2-0@1331 https://svn.aws.productengine.com/secondlife/pe/stable-1@1340 -> viewer-2.0.0-3
EXT-269 EXT-274 EXT-276 EXT-277 EXT-282 EXT-296 EXT-342 EXT-370 EXT-379 EXT-394 EXT-398 EXT-405 EXT-407 EXT-410 EXT-413 EXT-414 EXT-450 EXT-456 EXT-477 EXT-482 EXT-496
Diffstat (limited to 'indra/newview/llslurl.h')
| -rw-r--r-- | indra/newview/llslurl.h | 5 |
1 files changed, 5 insertions, 0 deletions
diff --git a/indra/newview/llslurl.h b/indra/newview/llslurl.h index 5c9fea3e96..cb1b8cca9e 100644 --- a/indra/newview/llslurl.h +++ b/indra/newview/llslurl.h @@ -79,6 +79,11 @@ public: static std::string buildUnescapedSLURL(const std::string& regionname, S32 x, S32 y, S32 z); /** + * builds SLURL from global position escaping result url. + */ + static std::string buildSLURLfromPosGlobal(const std::string& regionname, + const LLVector3d& global_pos); + /** * Strip protocol part from the URL. */ static std::string stripProtocol(const std::string& url); |