diff options
author | Bryan O'Sullivan <bos@lindenlab.com> | 2009-09-08 14:28:31 -0700 |
---|---|---|
committer | Bryan O'Sullivan <bos@lindenlab.com> | 2009-09-08 14:28:31 -0700 |
commit | 76001ce3f0b53391c674f315855017b78a3a2873 (patch) | |
tree | a2c74f15dcf8c611ce87c4cb6c3a5751e9b8d9e3 /indra/newview/lltoolmgr.cpp | |
parent | 40743eaf99c9cbfee08f0bb44bc7c614bc660f34 (diff) | |
parent | 2ed83382a1dd84575536c16e248a602ba96755cd (diff) |
Merge
Diffstat (limited to 'indra/newview/lltoolmgr.cpp')
-rw-r--r-- | indra/newview/lltoolmgr.cpp | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/indra/newview/lltoolmgr.cpp b/indra/newview/lltoolmgr.cpp index d52e0b4b80..ded83debad 100644 --- a/indra/newview/lltoolmgr.cpp +++ b/indra/newview/lltoolmgr.cpp @@ -317,7 +317,6 @@ bool LLToolMgr::inBuildMode() // cameraMouselook() actually starts returning true. Also, appearance edit // sets build mode to true, so let's exclude that. bool b=(inEdit() - && gSavedSettings.getBOOL("BuildBtnState") && !gAgent.cameraMouselook() && mCurrentToolset != gFaceEditToolset); |