Second Life viewer sources 1.19.0.0

1 files changed, 6 insertions, 6 deletions

diff --git a/linden/indra/newview/llfloatertopobjects.cpp b/linden/indra/newview/llfloatertopobjects.cpp
index 7ab17e0..631c92d 100644
--- a/linden/indra/newview/llfloatertopobjects.cpp
+++ b/linden/indra/newview/llfloatertopobjects.cpp
@@ -12,12 +12,12 @@
  * ("GPL"), unless you have obtained a separate licensing agreement
  * ("Other License"), formally executed by you and Linden Lab.  Terms of
  * the GPL can be found in doc/GPL-license.txt in this distribution, or
- * online at http://secondlife.com/developers/opensource/gplv2
+ * online at http://secondlifegrid.net/programs/open_source/licensing/gplv2
  * 
  * There are special exceptions to the terms and conditions of the GPL as
  * it is applied to this Source Code. View the full text of the exception
  * in the file doc/FLOSS-exception.txt in this software distribution, or
- * online at http://secondlife.com/developers/opensource/flossexception
+ * online at http://secondlifegrid.net/programs/open_source/licensing/flossexception
  * 
  * By copying, modifying or distributing this software, you acknowledge
  * that you have read and understood your obligations described above,
@@ -257,8 +257,8 @@ void LLFloaterTopObjects::updateSelectionInfo()
         std::string object_id_string = object_id.asString();
 
         childSetValue("id_editor", LLSD(object_id_string));
-        childSetValue("object_name_editor", list->getFirstSelected()->getColumn(1)->getText());
-        childSetValue("owner_name_editor", list->getFirstSelected()->getColumn(2)->getText());
+        childSetValue("object_name_editor", list->getFirstSelected()->getColumn(1)->getValue().asString());
+        childSetValue("owner_name_editor", list->getFirstSelected()->getColumn(2)->getValue().asString());
 }
 
 // static
@@ -451,8 +451,8 @@ void LLFloaterTopObjects::showBeacon()
         LLScrollListItem* first_selected = list->getFirstSelected();
         if (!first_selected) return;
 
-        LLString name = first_selected->getColumn(1)->getText();
-        LLString pos_string =  first_selected->getColumn(3)->getText();
+        LLString name = first_selected->getColumn(1)->getValue().asString();
+        LLString pos_string =  first_selected->getColumn(3)->getValue().asString();
 
         F32 x, y, z;
         S32 matched = sscanf(pos_string.c_str(), "<%g,%g,%g>", &x, &y, &z);