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/llagent.h | |
| parent | 6dd125d375b38455997a0c4b8747659f4c2351aa (diff) | |
QAR-628 merge string-cleanup-5 -r 90476:90508 -> release
dataserver-is-deprecated
Diffstat (limited to 'indra/newview/llagent.h')
| -rw-r--r-- | indra/newview/llagent.h | 18 |
1 files changed, 9 insertions, 9 deletions
diff --git a/indra/newview/llagent.h b/indra/newview/llagent.h index 281b2d0c88..45006fef8d 100644 --- a/indra/newview/llagent.h +++ b/indra/newview/llagent.h @@ -331,7 +331,7 @@ public: // of the agent in the absolute frame // BOOL getLookingAtAvatar() const; - void getName(LLString& name); + void getName(std::string& name); const LLColor4 &getEffectColor(); void setEffectColor(const LLColor4 &color); @@ -563,8 +563,8 @@ public: ETeleportState getTeleportState() const { return mTeleportState; } void setTeleportState( ETeleportState state ); - const LLString& getTeleportMessage() const { return mTeleportMessage; } - void setTeleportMessage(const LLString& message) + const std::string& getTeleportMessage() const { return mTeleportMessage; } + void setTeleportMessage(const std::string& message) { mTeleportMessage = message; } @@ -694,8 +694,8 @@ public: U64 mGroupPowers; BOOL mHideGroupTitle; - char mGroupTitle[DB_GROUP_TITLE_BUF_SIZE]; /*Flawfinder: ignore*/ // honorific, like "Sir" - char mGroupName[DB_GROUP_NAME_BUF_SIZE]; /*Flawfinder: ignore*/ + std::string mGroupTitle; // honorific, like "Sir" + std::string mGroupName; LLUUID mGroupID; //LLUUID mGroupInsigniaID; LLUUID mInventoryRootID; @@ -719,12 +719,12 @@ public: BOOL mForceMouselook; - static void parseTeleportMessages(const LLString& xml_filename); + static void parseTeleportMessages(const std::string& xml_filename); //we should really define ERROR and PROGRESS enums here //but I don't really feel like doing that, so I am just going //to expose the mappings....yup - static std::map<LLString, LLString> sTeleportErrorMessages; - static std::map<LLString, LLString> sTeleportProgressMessages; + static std::map<std::string, std::string> sTeleportErrorMessages; + static std::map<std::string, std::string> sTeleportProgressMessages; LLFrameTimer mDoubleTapRunTimer; EDoubleTapRunMode mDoubleTapRunMode; @@ -736,7 +736,7 @@ private: // Access or "maturity" level U8 mAccess; // SIM_ACCESS_MATURE or SIM_ACCESS_PG ETeleportState mTeleportState; - LLString mTeleportMessage; + std::string mTeleportMessage; S32 mControlsTakenCount[TOTAL_CONTROLS]; S32 mControlsTakenPassedOnCount[TOTAL_CONTROLS]; |