Second Life viewer sources 1.18.4.0-RC

1 files changed, 8 insertions, 5 deletions

diff --git a/linden/indra/newview/llfloaterreporter.cpp b/linden/indra/newview/llfloaterreporter.cpp
index f37f8a0..a7cd211 100644
--- a/linden/indra/newview/llfloaterreporter.cpp
+++ b/linden/indra/newview/llfloaterreporter.cpp
@@ -2,6 +2,8 @@
  * @file llfloaterreporter.cpp
  * @brief Bug and abuse reports.
  *
+ * $LicenseInfo:firstyear=2002&license=viewergpl$
+ * 
  * Copyright (c) 2002-2007, Linden Research, Inc.
  * 
  * Second Life Viewer Source Code
@@ -24,6 +26,7 @@
  * ALL LINDEN LAB SOURCE CODE IS PROVIDED "AS IS." LINDEN LAB MAKES NO
  * WARRANTIES, EXPRESS, IMPLIED OR OTHERWISE, REGARDING ITS ACCURACY,
  * COMPLETENESS OR PERFORMANCE.
+ * $/LicenseInfo$
  */
 
 #include "llviewerprecompiledheaders.h"
@@ -174,8 +177,8 @@ LLFloaterReporter::LLFloaterReporter(
         setVisible(TRUE);
 
         // Default text to be blank
-        childSetText("object_name", "");
-        childSetText("owner_name", "");
+        childSetText("object_name", LLString::null);
+        childSetText("owner_name", LLString::null);
 
         childSetFocus("summary_edit");
 
@@ -458,8 +461,8 @@ void LLFloaterReporter::onClickObjPicker(void *userdata)
         gToolObjPicker->setExitCallback(LLFloaterReporter::closePickTool, self);
         gToolMgr->setTransientTool(gToolObjPicker);
         self->mPicking = TRUE;
-        self->childSetText("object_name", "");
-        self->childSetText("owner_name", "");
+        self->childSetText("object_name", LLString::null);
+        self->childSetText("owner_name", LLString::null);
         LLButton* pick_btn = LLUICtrlFactory::getButtonByName(self, "pick_btn");
         if (pick_btn) pick_btn->setToggleState(TRUE);
 }
@@ -578,7 +581,7 @@ LLFloaterReporter* LLFloaterReporter::createNewBugReporter()
         
 
 
-void LLFloaterReporter::setPickedObjectProperties(const char *object_name, const char *owner_name, const LLUUID owner_id)
+void LLFloaterReporter::setPickedObjectProperties(const LLString& object_name, const LLString& owner_name, const LLUUID owner_id)
 {
         childSetText("object_name", object_name);
         childSetText("owner_name", owner_name);