diff options
| author | Geenz <geenz@geenzo.com> | 2013-01-24 16:36:31 -0500 |
|---|---|---|
| committer | Geenz <geenz@geenzo.com> | 2013-01-24 16:36:31 -0500 |
| commit | f39532c407229403f6d67312638bf5dc3514687d (patch) | |
| tree | de0f376b3bbe03d585f989adf02c3eadb01347f2 /indra/newview/llpanelplaces.cpp | |
| parent | a82ff3fcb7556bd810ec37c0b74c565b42e92250 (diff) | |
| parent | a30a2c492d06c9ef843a43c0ff0be6f2826d6d0b (diff) | |
Merged with latest viewer-dev.
Diffstat (limited to 'indra/newview/llpanelplaces.cpp')
| -rw-r--r-- | indra/newview/llpanelplaces.cpp | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/indra/newview/llpanelplaces.cpp b/indra/newview/llpanelplaces.cpp index 6d321d4716..6c2a01fc82 100644 --- a/indra/newview/llpanelplaces.cpp +++ b/indra/newview/llpanelplaces.cpp @@ -366,6 +366,7 @@ void LLPanelPlaces::onOpen(const LLSD& key) if (key.size() != 0) { + isLandmarkEditModeOn = false; std::string key_type = key["type"].asString(); if (key_type == LANDMARK_TAB_INFO_TYPE) { @@ -392,7 +393,6 @@ void LLPanelPlaces::onOpen(const LLSD& key) mPlaceInfoType = key_type; mPosGlobal.setZero(); mItem = NULL; - isLandmarkEditModeOn = false; togglePlaceInfoPanel(TRUE); if (mPlaceInfoType == AGENT_INFO_TYPE) |