diff options
| author | Vadim Savchuk <vsavchuk@productengine.com> | 2010-01-29 19:20:33 +0200 |
|---|---|---|
| committer | Vadim Savchuk <vsavchuk@productengine.com> | 2010-01-29 19:20:33 +0200 |
| commit | 09c2f013623797a165a1cccd539a3a86f8a0027f (patch) | |
| tree | 7b56bd5c47720dd3d3a9fab615b19ce3c2d653a8 /indra/newview/llfloaterreporter.cpp | |
| parent | 61216e1fe0c136188e01110d40d6762379e0144a (diff) | |
Fixed bug EXT-4170 ([BSI] Object picker in "Report Abuse" floater fails to identify owner when object is an attachment).
Reason: The floater attempted to render avatar name from the attached object ID. Of course, the attempt failed.
Fix: Changed to use the avatar ID.
--HG--
branch : product-engine
Diffstat (limited to 'indra/newview/llfloaterreporter.cpp')
| -rw-r--r-- | indra/newview/llfloaterreporter.cpp | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/indra/newview/llfloaterreporter.cpp b/indra/newview/llfloaterreporter.cpp index 4a1eb51dbe..0f3c176cea 100644 --- a/indra/newview/llfloaterreporter.cpp +++ b/indra/newview/llfloaterreporter.cpp @@ -248,6 +248,7 @@ void LLFloaterReporter::getObjectInfo(const LLUUID& object_id) if ( objectp->isAttachment() ) { objectp = (LLViewerObject*)objectp->getRoot(); + mObjectID = objectp->getID(); } // correct the region and position information @@ -278,7 +279,7 @@ void LLFloaterReporter::getObjectInfo(const LLUUID& object_id) object_owner.append("Unknown"); } - setFromAvatar(object_id, object_owner); + setFromAvatar(mObjectID, object_owner); } else { |