diff options
| author | Merov Linden <merov@lindenlab.com> | 2011-01-10 15:10:11 -0800 |
|---|---|---|
| committer | Merov Linden <merov@lindenlab.com> | 2011-01-10 15:10:11 -0800 |
| commit | 8e3c9b127373bb39c248ae7abf2003e684dbc6ba (patch) | |
| tree | 846650967778530da382f9df36db56baf89991cf | |
| parent | 964e981458234aed37252a7b484f6f6765fff50d (diff) | |
| parent | c3fe256ef3e46393e41f20d7110083f1cb66436c (diff) | |
pull from viewer-beta
| -rw-r--r-- | indra/newview/llpanelme.cpp | 24 |
1 files changed, 13 insertions, 11 deletions
diff --git a/indra/newview/llpanelme.cpp b/indra/newview/llpanelme.cpp index 5ea94e0611..d3c9c3e131 100644 --- a/indra/newview/llpanelme.cpp +++ b/indra/newview/llpanelme.cpp @@ -76,17 +76,19 @@ void LLPanelMe::onOpen(const LLSD& key) { LLPanelProfile::onOpen(key); - // Force Edit My Profile if this is the first time when user is opening Me Panel (EXT-5068) - bool opened = gSavedSettings.getBOOL("MePanelOpened"); - // In some cases Side Tray my call onOpen() twice, check getCollapsed() to be sure this - // is the last time onOpen() is called - if( !opened && !LLSideTray::getInstance()->getCollapsed() ) - { - buildEditPanel(); - openPanel(mEditPanel, getAvatarId()); - - gSavedSettings.setBOOL("MePanelOpened", true); - } + // Removed this action as per SOCIAL-431 The first time a new resident opens the profile tab + // in the sidebar, they see the old profile editing panel + // + //// Force Edit My Profile if this is the first time when user is opening Me Panel (EXT-5068) + //bool opened = gSavedSettings.getBOOL("MePanelOpened"); + //// In some cases Side Tray my call onOpen() twice, check getCollapsed() to be sure this + //// is the last time onOpen() is called + //if( !opened && !LLSideTray::getInstance()->getCollapsed() ) + //{ + // buildEditPanel(); + // openPanel(mEditPanel, getAvatarId()); + // gSavedSettings.setBOOL("MePanelOpened", true); + //} } bool LLPanelMe::notifyChildren(const LLSD& info) |