diff options
| author | Roxie Linden <roxie@lindenlab.com> | 2010-02-25 21:20:45 -0800 |
|---|---|---|
| committer | Roxie Linden <roxie@lindenlab.com> | 2010-02-25 21:20:45 -0800 |
| commit | 5c73a908353cdd7210e3148f7162d30afab7873a (patch) | |
| tree | 3ff858042b69b20a9eb3062b7cabd0c390e1b5cf /indra/newview/llfloaterreporter.cpp | |
| parent | 9b05fecbf6b3d65dae5a010fc35821dc116a44d0 (diff) | |
| parent | 5eee046bb7d62e24df6c35018b3c5383f87ab587 (diff) | |
automated merge
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 99ecd88dcb..86fe877d14 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 @@ -277,7 +278,7 @@ void LLFloaterReporter::getObjectInfo(const LLUUID& object_id) { object_owner.append("Unknown"); } - setFromAvatar(object_id, object_owner); + setFromAvatar(mObjectID, object_owner); } else { |