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/llfloatertopobjects.h | |
| parent | 6dd125d375b38455997a0c4b8747659f4c2351aa (diff) | |
QAR-628 merge string-cleanup-5 -r 90476:90508 -> release
dataserver-is-deprecated
Diffstat (limited to 'indra/newview/llfloatertopobjects.h')
| -rw-r--r-- | indra/newview/llfloatertopobjects.h | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/indra/newview/llfloatertopobjects.h b/indra/newview/llfloatertopobjects.h index cab99c9792..5b23e737d7 100644 --- a/indra/newview/llfloatertopobjects.h +++ b/indra/newview/llfloatertopobjects.h @@ -84,14 +84,14 @@ private: void showBeacon(); private: - LLString mMethod; + std::string mMethod; LLSD mObjectListData; std::vector<LLUUID> mObjectListIDs; U32 mCurrentMode; U32 mFlags; - LLString mFilter; + std::string mFilter; BOOL mInitialized; |