diff options
| author | Richard Nelson <richard@lindenlab.com> | 2009-08-04 01:12:59 +0000 |
|---|---|---|
| committer | Richard Nelson <richard@lindenlab.com> | 2009-08-04 01:12:59 +0000 |
| commit | eb853f55c07ae4a3c3f2aa05fbabcf2e4b4dc115 (patch) | |
| tree | 7707fccb8d0946b6257d5ed7c5dfd3941c53eec0 /indra/newview/llfloateravatartextures.h | |
| parent | db5cda26676f376f18816013c0c5e3fbad5b20d0 (diff) | |
svn merge -r 128442:129343 svn+ssh://svn.lindenlab.com/svn/linden/branches/skinning/skinning-18 into svn+ssh://svn.lindenlab.com/svn/linden/branches/viewer/viewer-2.0.0-3
Diffstat (limited to 'indra/newview/llfloateravatartextures.h')
| -rw-r--r-- | indra/newview/llfloateravatartextures.h | 5 |
1 files changed, 1 insertions, 4 deletions
diff --git a/indra/newview/llfloateravatartextures.h b/indra/newview/llfloateravatartextures.h index 3ec0e7cb03..e27484d26f 100644 --- a/indra/newview/llfloateravatartextures.h +++ b/indra/newview/llfloateravatartextures.h @@ -43,7 +43,7 @@ class LLTextureCtrl; class LLFloaterAvatarTextures : public LLFloater { public: - LLFloaterAvatarTextures(const LLUUID& id); + LLFloaterAvatarTextures(const LLSD& id); virtual ~LLFloaterAvatarTextures(); /*virtual*/ BOOL postBuild(); @@ -51,8 +51,6 @@ public: void refresh(); - static LLFloaterAvatarTextures* show(const LLUUID& id); - private: static void onClickDump(void*); @@ -60,7 +58,6 @@ private: LLUUID mID; std::string mTitle; LLTextureCtrl* mTextures[LLVOAvatarDefines::TEX_NUM_INDICES]; - static LLFloaterAvatarTextures* sInstance; }; #endif |