summaryrefslogtreecommitdiff
path: root/indra/newview/llfloatertelehub.h
diff options
context:
space:
mode:
authorSteven Bennetts <steve@lindenlab.com>2008-06-26 00:39:00 +0000
committerSteven Bennetts <steve@lindenlab.com>2008-06-26 00:39:00 +0000
commit25c10ed028da5c547b11f1f461916897272b0e6d (patch)
tree350a5858f8970b6e28b2dc395625d74d8bd597b2 /indra/newview/llfloatertelehub.h
parent6dd125d375b38455997a0c4b8747659f4c2351aa (diff)
QAR-628 merge string-cleanup-5 -r 90476:90508 -> release
dataserver-is-deprecated
Diffstat (limited to 'indra/newview/llfloatertelehub.h')
-rw-r--r--indra/newview/llfloatertelehub.h2
1 files changed, 1 insertions, 1 deletions
diff --git a/indra/newview/llfloatertelehub.h b/indra/newview/llfloatertelehub.h
index dd7631f6dd..9957d60ec9 100644
--- a/indra/newview/llfloatertelehub.h
+++ b/indra/newview/llfloatertelehub.h
@@ -68,7 +68,7 @@ private:
private:
LLUUID mTelehubObjectID; // null if no telehub
- LLString mTelehubObjectName;
+ std::string mTelehubObjectName;
LLVector3 mTelehubPos; // region local, fallback if viewer can't see the object
LLQuaternion mTelehubRot;