Second Life viewer sources 1.21.0-RC

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 @@
 #include "llvoavatar.h"
 
 LLFloaterAvatarTextures::LLFloaterAvatarTextures(const LLUUID& id) : 
-        LLFloater("avatar_texture_debug"),
+        LLFloater(std::string("avatar_texture_debug")),
         mID(id)
 {
 }
@@ -110,7 +110,7 @@ static void update_texture_ctrl(LLVOAvatar* avatarp,
         if (id == IMG_DEFAULT_AVATAR)
         {
                 ctrl->setImageAssetID(LLUUID::null);
-                ctrl->setToolTip(LLString("IMG_DEFAULT_AVATAR"));
+                ctrl->setToolTip(std::string("IMG_DEFAULT_AVATAR"));
         }
         else
         {