diff options
| author | Tofu Linden <tofu.linden@lindenlab.com> | 2010-02-04 11:44:11 +0000 |
|---|---|---|
| committer | Tofu Linden <tofu.linden@lindenlab.com> | 2010-02-04 11:44:11 +0000 |
| commit | 05e15ccb82541494bf7145652140de187d838cda (patch) | |
| tree | 59e7772de3cd038bf1e1e222abbb7f0cdf315331 /indra/newview/llpanelme.cpp | |
| parent | 1805369b58d98677c726bb0bcb52618bd66e8fdd (diff) | |
| parent | 56ca1aebb866b7d7e1526e31797dd7e07fcb74a8 (diff) | |
merge from viewer2.
Diffstat (limited to 'indra/newview/llpanelme.cpp')
| -rw-r--r-- | indra/newview/llpanelme.cpp | 14 |
1 files changed, 14 insertions, 0 deletions
diff --git a/indra/newview/llpanelme.cpp b/indra/newview/llpanelme.cpp index ea66ef7d2c..a68552a91e 100644 --- a/indra/newview/llpanelme.cpp +++ b/indra/newview/llpanelme.cpp @@ -69,6 +69,20 @@ BOOL LLPanelMe::postBuild() void LLPanelMe::onOpen(const LLSD& key) { LLPanelProfile::onOpen(key); + + if(key.isUndefined() || key.has("edit_my_profile")) + { + // Open Edit My Profile panel by default (through Side Tray -> My Profile) (EXT-4823) + buildEditPanel(); + openPanel(mEditPanel, getAvatarId()); + } + else if(mEditPanel) + { + // When opening Me Panel through Side Tray LLPanelMe::onOpen() is called twice. + // First time key can be undefined and second time - key may contain some data. + // Lets close Edit Panel if key does contain some data on second call. + closePanel(mEditPanel); + } } bool LLPanelMe::notifyChildren(const LLSD& info) |