diff options
author | Loren Shih <seraph@lindenlab.com> | 2009-11-24 22:11:24 -0500 |
---|---|---|
committer | Loren Shih <seraph@lindenlab.com> | 2009-11-24 22:11:24 -0500 |
commit | ccf6cb3f9ba387117720d700b73ac8e05dbf1f75 (patch) | |
tree | 71163fde19389893c8951ebb723ddf9379318518 /indra/newview/llavataractions.cpp | |
parent | 2369fa96c24bafbd032c85b58767502cfd37ebaf (diff) | |
parent | 5b5354c933aa7b1ceeb307853c24fba28d4e31bf (diff) |
viewer-2.0 automated merge
--HG--
branch : avatar-pipeline
Diffstat (limited to 'indra/newview/llavataractions.cpp')
-rw-r--r-- | indra/newview/llavataractions.cpp | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/indra/newview/llavataractions.cpp b/indra/newview/llavataractions.cpp index eb8f069345..b08191ce15 100644 --- a/indra/newview/llavataractions.cpp +++ b/indra/newview/llavataractions.cpp @@ -297,7 +297,7 @@ void LLAvatarActions::showProfile(const LLUUID& id) //Show own profile if(gAgent.getID() == id) { - LLSideTray::getInstance()->showPanel("panel_me_profile", params); + LLSideTray::getInstance()->showPanel("panel_me", params); } //Show other user profile else |