diff options
Diffstat (limited to 'linden/indra/newview/llfloateravatartextures.cpp')
-rw-r--r-- | linden/indra/newview/llfloateravatartextures.cpp | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/linden/indra/newview/llfloateravatartextures.cpp b/linden/indra/newview/llfloateravatartextures.cpp index 0b529b7..a5df51b 100644 --- a/linden/indra/newview/llfloateravatartextures.cpp +++ b/linden/indra/newview/llfloateravatartextures.cpp | |||
@@ -40,7 +40,7 @@ | |||
40 | #include "llvoavatar.h" | 40 | #include "llvoavatar.h" |
41 | 41 | ||
42 | LLFloaterAvatarTextures::LLFloaterAvatarTextures(const LLUUID& id) : | 42 | LLFloaterAvatarTextures::LLFloaterAvatarTextures(const LLUUID& id) : |
43 | LLFloater("avatar_texture_debug"), | 43 | LLFloater(std::string("avatar_texture_debug")), |
44 | mID(id) | 44 | mID(id) |
45 | { | 45 | { |
46 | } | 46 | } |
@@ -110,7 +110,7 @@ static void update_texture_ctrl(LLVOAvatar* avatarp, | |||
110 | if (id == IMG_DEFAULT_AVATAR) | 110 | if (id == IMG_DEFAULT_AVATAR) |
111 | { | 111 | { |
112 | ctrl->setImageAssetID(LLUUID::null); | 112 | ctrl->setImageAssetID(LLUUID::null); |
113 | ctrl->setToolTip(LLString("IMG_DEFAULT_AVATAR")); | 113 | ctrl->setToolTip(std::string("IMG_DEFAULT_AVATAR")); |
114 | } | 114 | } |
115 | else | 115 | else |
116 | { | 116 | { |