summaryrefslogtreecommitdiff
path: root/indra/newview/llfloateravatartextures.cpp
diff options
context:
space:
mode:
Diffstat (limited to 'indra/newview/llfloateravatartextures.cpp')
-rw-r--r--indra/newview/llfloateravatartextures.cpp22
1 files changed, 4 insertions, 18 deletions
diff --git a/indra/newview/llfloateravatartextures.cpp b/indra/newview/llfloateravatartextures.cpp
index e2f13088eb..3976e25ba4 100644
--- a/indra/newview/llfloateravatartextures.cpp
+++ b/indra/newview/llfloateravatartextures.cpp
@@ -42,29 +42,15 @@
using namespace LLVOAvatarDefines;
-LLFloaterAvatarTextures* LLFloaterAvatarTextures::sInstance = NULL;
-LLFloaterAvatarTextures::LLFloaterAvatarTextures(const LLUUID& id)
- : LLFloater(),
- mID(id)
+LLFloaterAvatarTextures::LLFloaterAvatarTextures(const LLSD& id)
+ : LLFloater(id),
+ mID(id.asUUID())
{
- LLUICtrlFactory::getInstance()->buildFloater(this, "floater_avatar_textures.xml");
+// LLUICtrlFactory::getInstance()->buildFloater(this, "floater_avatar_textures.xml");
}
LLFloaterAvatarTextures::~LLFloaterAvatarTextures()
{
- sInstance = NULL;
-}
-
-LLFloaterAvatarTextures* LLFloaterAvatarTextures::show(const LLUUID &id)
-{
- if (!sInstance)
- {
- sInstance = new LLFloaterAvatarTextures(id);
- gFloaterView->addChild(sInstance);
- gFloaterView->adjustToFitScreen(sInstance, FALSE);
- }
- sInstance->openFloater();
- return sInstance;
}
BOOL LLFloaterAvatarTextures::postBuild()