Second Life viewer sources 1.21.0-RC

1 files changed, 3 insertions, 3 deletions

diff --git a/linden/indra/newview/llfloateropenobject.cpp b/linden/indra/newview/llfloateropenobject.cpp
index 13230a9..753c254 100644
--- a/linden/indra/newview/llfloateropenobject.cpp
+++ b/linden/indra/newview/llfloateropenobject.cpp
@@ -57,7 +57,7 @@
 LLFloaterOpenObject* LLFloaterOpenObject::sInstance = NULL;
 
 LLFloaterOpenObject::LLFloaterOpenObject()
-:       LLFloater("object_contents"),
+:       LLFloater(std::string("object_contents")),
         mPanelInventory(NULL),
         mDirty(TRUE)
 {
@@ -67,7 +67,7 @@ LLFloaterOpenObject::LLFloaterOpenObject()
 
         childSetAction("copy_to_inventory_button", onClickMoveToInventory, this);
         childSetAction("copy_and_wear_button", onClickMoveAndWear, this);
-        childSetTextArg("object_name", "[DESC]", LLString("Object") ); // *Note: probably do not want to translate this
+        childSetTextArg("object_name", "[DESC]", std::string("Object") ); // *Note: probably do not want to translate this
 }
 
 LLFloaterOpenObject::~LLFloaterOpenObject()
@@ -215,6 +215,6 @@ void LLFloaterOpenObject::onClickMoveAndWear(void* data)
 void* LLFloaterOpenObject::createPanelInventory(void* data)
 {
         LLFloaterOpenObject* floater = (LLFloaterOpenObject*)data;
-        floater->mPanelInventory = new LLPanelInventory("Object Contents", LLRect());
+        floater->mPanelInventory = new LLPanelInventory(std::string("Object Contents"), LLRect());
         return floater->mPanelInventory;
 }