diff options
| author | Vadim Savchuk <vsavchuk@productengine.com> | 2010-04-02 17:18:36 +0300 |
|---|---|---|
| committer | Vadim Savchuk <vsavchuk@productengine.com> | 2010-04-02 17:18:36 +0300 |
| commit | 7d38dd51c2a59d173bee9c04737002313f4b9dec (patch) | |
| tree | 4ba43c9a6d4c15ac6f3bd2979558498a43fbcfd1 /indra/newview/llagentui.h | |
| parent | f6b48339d9423399ccd1c93709de978ccc7f5a8c (diff) | |
| parent | a7085418df1ada6e19b94b6df772ed21e663d119 (diff) | |
Manual merge from default branch.
Resolved a conflict in indra/llui/llurlentry.cpp. That broke the fix for EXT-6357.
--HG--
branch : product-engine
Diffstat (limited to 'indra/newview/llagentui.h')
| -rw-r--r-- | indra/newview/llagentui.h | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/indra/newview/llagentui.h b/indra/newview/llagentui.h index 3478793e38..577b752fbe 100644 --- a/indra/newview/llagentui.h +++ b/indra/newview/llagentui.h @@ -33,6 +33,8 @@ #ifndef LLAGENTUI_H #define LLAGENTUI_H +class LLSLURL; + class LLAgentUI { public: @@ -48,7 +50,7 @@ public: static void buildName(std::string& name); static void buildFullname(std::string &name); - static std::string buildSLURL(const bool escaped = true); + static void buildSLURL(LLSLURL& slurl, const bool escaped = true); //build location string using the current position of gAgent. static BOOL buildLocationString(std::string& str, ELocationFormat fmt = LOCATION_FORMAT_LANDMARK); //build location string using a region position of the avatar. |