merge -r 73391:74133 maint-ui-3 -> release

1 files changed, 2 insertions, 6 deletions

diff --git a/indra/newview/llfloaterreporter.cpp b/indra/newview/llfloaterreporter.cpp
index bd5438e10f..9170e70ccd 100644
--- a/indra/newview/llfloaterreporter.cpp
+++ b/indra/newview/llfloaterreporter.cpp
@@ -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();