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/llfloateranimpreview.h | |
| parent | 6dd125d375b38455997a0c4b8747659f4c2351aa (diff) | |
QAR-628 merge string-cleanup-5 -r 90476:90508 -> release
dataserver-is-deprecated
Diffstat (limited to 'indra/newview/llfloateranimpreview.h')
| -rw-r--r-- | indra/newview/llfloateranimpreview.h | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/indra/newview/llfloateranimpreview.h b/indra/newview/llfloateranimpreview.h index cbfba0c43e..693e3f8fbf 100644 --- a/indra/newview/llfloateranimpreview.h +++ b/indra/newview/llfloateranimpreview.h @@ -70,7 +70,7 @@ protected: class LLFloaterAnimPreview : public LLFloaterNameDesc { public: - LLFloaterAnimPreview(const char* filename); + LLFloaterAnimPreview(const std::string& filename); virtual ~LLFloaterAnimPreview(); BOOL postBuild(); @@ -126,7 +126,7 @@ protected: BOOL mEnabled; LLAnimPauseRequest mPauseRequest; - std::map<LLString, LLUUID> mIDList; + std::map<std::string, LLUUID> mIDList; static S32 sUploadAmount; }; |