diff options
| author | Steven Bennetts <steve@lindenlab.com> | 2008-06-26 00:39:00 +0000 |
|---|---|---|
| committer | Steven Bennetts <steve@lindenlab.com> | 2008-06-26 00:39:00 +0000 |
| commit | 25c10ed028da5c547b11f1f461916897272b0e6d (patch) | |
| tree | 350a5858f8970b6e28b2dc395625d74d8bd597b2 /indra/newview/llviewervisualparam.h | |
| parent | 6dd125d375b38455997a0c4b8747659f4c2351aa (diff) | |
QAR-628 merge string-cleanup-5 -r 90476:90508 -> release
dataserver-is-deprecated
Diffstat (limited to 'indra/newview/llviewervisualparam.h')
| -rw-r--r-- | indra/newview/llviewervisualparam.h | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/indra/newview/llviewervisualparam.h b/indra/newview/llviewervisualparam.h index b115fecc51..8dc4b16ac2 100644 --- a/indra/newview/llviewervisualparam.h +++ b/indra/newview/llviewervisualparam.h @@ -50,11 +50,11 @@ public: protected: S32 mWearableType; - LLString mEditGroup; + std::string mEditGroup; F32 mCamDist; F32 mCamAngle; // degrees F32 mCamElevation; - LLString mCamTargetName; + std::string mCamTargetName; F32 mEditGroupDisplayOrder; BOOL mShowSimple; // show edit controls when in "simple ui" mode? F32 mSimpleMin; // when in simple UI, apply this minimum, range 0.f to 100.f @@ -91,7 +91,7 @@ public: // interface methods F32 getDisplayOrder() { return getInfo()->mEditGroupDisplayOrder; } S32 getWearableType() const { return getInfo()->mWearableType; } - const LLString& getEditGroup() const { return getInfo()->mEditGroup; } + const std::string& getEditGroup() const { return getInfo()->mEditGroup; } F32 getCameraDistance() const { return getInfo()->mCamDist; } F32 getCameraAngle() const { return getInfo()->mCamAngle; } // degrees |