Second Life viewer sources 1.19.0.0

1 files changed, 5 insertions, 9 deletions

diff --git a/linden/indra/newview/llfloaterreporter.cpp b/linden/indra/newview/llfloaterreporter.cpp
index 7ab0aca..f0af5d0 100644
--- a/linden/indra/newview/llfloaterreporter.cpp
+++ b/linden/indra/newview/llfloaterreporter.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,
@@ -131,12 +131,7 @@ LLFloaterReporter::LLFloaterReporter(
                 gUICtrlFactory->buildFloater(this, "floater_report_abuse.xml");
         }
 
-        LLViewerRegion *regionp = gAgent.getRegion();
-        if (regionp)
-        {
-                childSetText("sim_field", regionp->getName() );
-                childSetText("abuse_location_edit", regionp->getName() );
-        }
+        childSetText("abuse_location_edit", gAgent.getSLURL() );
 
         LLButton* pick_btn = LLUICtrlFactory::getButtonByName(this, "pick_btn");
         if (pick_btn)
@@ -163,6 +158,7 @@ LLFloaterReporter::LLFloaterReporter(
 
         // convert the position to a string
         LLVector3d pos = gAgent.getPositionGlobal();
+        LLViewerRegion *regionp = gAgent.getRegion();
         if (regionp)
         {
                 pos -= regionp->getOriginGlobal();
@@ -669,7 +665,7 @@ LLSD LLFloaterReporter::gatherReport()
         LLComboBox* combo = LLUICtrlFactory::getComboBoxByName(this, "category_combo");
         if (combo)
         {
-                category_name = combo->getSimpleSelectedItem(); // want label, not value
+                category_name = combo->getSelectedItemLabel(); // want label, not value
         }
 
 #if LL_WINDOWS