diff options
| author | Steven Bennetts <steve@lindenlab.com> | 2007-12-04 16:46:00 +0000 |
|---|---|---|
| committer | Steven Bennetts <steve@lindenlab.com> | 2007-12-04 16:46:00 +0000 |
| commit | f8511d77a70bea452cde7270b47044358e58427c (patch) | |
| tree | 7772dd518136c7f466693f26db437ed1cf23caa6 /indra/newview/llfloaterreporter.cpp | |
| parent | 90aa2ddb2efede12f12011fc163e3007e3ba7104 (diff) | |
EFFECTIVE MERGE: maint-ui-qa3 -r 73391:74133 -> release
ACTUAL MERGE: merge release@74893 maint-ui-3-merge@74902 -> release
Diffstat (limited to 'indra/newview/llfloaterreporter.cpp')
| -rw-r--r-- | indra/newview/llfloaterreporter.cpp | 8 |
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(); |