diff options
| author | McCabe Maxsted | 2009-09-07 15:52:35 -0700 |
|---|---|---|
| committer | McCabe Maxsted | 2009-09-07 15:52:35 -0700 |
| commit | 493b1aeed58303fa5fe7a9602c368640e4bb4e63 (patch) | |
| tree | 5aa75e4ac0897337624a32d47d6c846e3d5d07e7 /linden/indra/newview/llviewermenu.cpp | |
| parent | Fixed ground sit menu entry missing check (diff) | |
| parent | Fixed tree/grass label not hiding (diff) | |
| download | meta-impy-493b1aeed58303fa5fe7a9602c368640e4bb4e63.zip meta-impy-493b1aeed58303fa5fe7a9602c368640e4bb4e63.tar.gz meta-impy-493b1aeed58303fa5fe7a9602c368640e4bb4e63.tar.bz2 meta-impy-493b1aeed58303fa5fe7a9602c368640e4bb4e63.tar.xz | |
Merge branch '1.2.0-toolslayout' into 1.2.0-emerald
Diffstat (limited to 'linden/indra/newview/llviewermenu.cpp')
| -rw-r--r-- | linden/indra/newview/llviewermenu.cpp | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/linden/indra/newview/llviewermenu.cpp b/linden/indra/newview/llviewermenu.cpp index cfc9a14..36ffc21 100644 --- a/linden/indra/newview/llviewermenu.cpp +++ b/linden/indra/newview/llviewermenu.cpp | |||
| @@ -5417,7 +5417,6 @@ class LLLandEdit : public view_listener_t | |||
| 5417 | 5417 | ||
| 5418 | LLViewerParcelMgr::getInstance()->selectParcelAt( LLToolPie::getInstance()->getPick().mPosGlobal ); | 5418 | LLViewerParcelMgr::getInstance()->selectParcelAt( LLToolPie::getInstance()->getPick().mPosGlobal ); |
| 5419 | 5419 | ||
| 5420 | gFloaterTools->showMore(TRUE); | ||
| 5421 | gFloaterView->bringToFront( gFloaterTools ); | 5420 | gFloaterView->bringToFront( gFloaterTools ); |
| 5422 | 5421 | ||
| 5423 | // Switch to land edit toolset | 5422 | // Switch to land edit toolset |