summaryrefslogtreecommitdiff
path: root/indra/newview/llagentui.h
diff options
context:
space:
mode:
authorRoxanne Skelly <roxie@lindenlab.com>2009-07-09 20:56:23 +0000
committerRoxanne Skelly <roxie@lindenlab.com>2009-07-09 20:56:23 +0000
commit7a64aad1def1b0612addbf2e66c66db061d7e182 (patch)
tree2e011e8b58933e692c0cae738a4382a37e3e222b /indra/newview/llagentui.h
parent311aaf7ffd8f7dc95dba84f10fcae97bc93901bb (diff)
DEV-34822 - merge 1.23
merge -r119443 - basic slurl handling ignore dead branch
Diffstat (limited to 'indra/newview/llagentui.h')
-rw-r--r--indra/newview/llagentui.h3
1 files changed, 2 insertions, 1 deletions
diff --git a/indra/newview/llagentui.h b/indra/newview/llagentui.h
index 3478793e38..9d10bc7322 100644
--- a/indra/newview/llagentui.h
+++ b/indra/newview/llagentui.h
@@ -32,6 +32,7 @@
#ifndef LLAGENTUI_H
#define LLAGENTUI_H
+#include "llslurl.h"
class LLAgentUI
{
@@ -48,7 +49,7 @@ public:
static void buildName(std::string& name);
static void buildFullname(std::string &name);
- static std::string buildSLURL(const bool escaped = true);
+ static LLSLURL buildSLURL(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.