summaryrefslogtreecommitdiff
path: root/indra/newview
diff options
context:
space:
mode:
authorAustin Doupnik <austin@lindenlab.com>2009-07-09 22:40:15 +0000
committerAustin Doupnik <austin@lindenlab.com>2009-07-09 22:40:15 +0000
commitd5211482b2506798212a462becfb298c54bc2bfc (patch)
treeefabefce5f98ba67b05e7e8041658c534686d4a0 /indra/newview
parentb742355130decb1b39d6f95871d4fb575cdd3d65 (diff)
Oops, commented out lines slipped through my commit.
Diffstat (limited to 'indra/newview')
-rw-r--r--indra/newview/llviewerwindow.cpp8
1 files changed, 4 insertions, 4 deletions
diff --git a/indra/newview/llviewerwindow.cpp b/indra/newview/llviewerwindow.cpp
index 1ee5877085..e690ae5f6f 100644
--- a/indra/newview/llviewerwindow.cpp
+++ b/indra/newview/llviewerwindow.cpp
@@ -2868,10 +2868,10 @@ void LLViewerWindow::updateKeyboardFocus()
}
// last ditch force of edit menu to selection manager
-// if (LLEditMenuHandler::gEditMenuHandler == NULL && LLSelectMgr::getInstance()->getSelection()->getObjectCount())
-// {
-// LLEditMenuHandler::gEditMenuHandler = LLSelectMgr::getInstance();
-// }
+ if (LLEditMenuHandler::gEditMenuHandler == NULL && LLSelectMgr::getInstance()->getSelection()->getObjectCount())
+ {
+ LLEditMenuHandler::gEditMenuHandler = LLSelectMgr::getInstance();
+ }
if (gFloaterView->getCycleMode())
{