diff options
author | Tofu Linden <tofu.linden@lindenlab.com> | 2010-01-26 12:52:44 -0800 |
---|---|---|
committer | Tofu Linden <tofu.linden@lindenlab.com> | 2010-01-26 12:52:44 -0800 |
commit | 2795661869e3dbbfe1e6becec1d6bb3635eafd3b (patch) | |
tree | c5f090db2907c0904bb6436b894761e82b10349d /indra/newview/llfloaterreporter.cpp | |
parent | 22bcd0e0eaeda849fbb1a8ecd78eeee7a219c614 (diff) | |
parent | 92f5e24c58f4a33e237c327c5266bb5fab6f9531 (diff) |
Merge from viewer2 trunk.
Diffstat (limited to 'indra/newview/llfloaterreporter.cpp')
-rw-r--r-- | indra/newview/llfloaterreporter.cpp | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/indra/newview/llfloaterreporter.cpp b/indra/newview/llfloaterreporter.cpp index 2efae0c8db..4a1eb51dbe 100644 --- a/indra/newview/llfloaterreporter.cpp +++ b/indra/newview/llfloaterreporter.cpp @@ -324,7 +324,7 @@ void LLFloaterReporter::setFromAvatar(const LLUUID& avatar_id, const std::string std::string avatar_link = LLSLURL::buildCommand("agent", mObjectID, "inspect"); childSetText("owner_name", avatar_link); - childSetText("object_name", avatar_name); // name + childSetText("object_name", avatar_name); childSetText("abuser_name_edit", avatar_name); } |