diff options
| author | Igor Borovkov <iborovkov@productengine.com> | 2010-01-29 15:58:36 +0200 |
|---|---|---|
| committer | Igor Borovkov <iborovkov@productengine.com> | 2010-01-29 15:58:36 +0200 |
| commit | bed3948c4fbeea6d912eb60ab93a24fb7cd7b7b4 (patch) | |
| tree | 980c9369b5c39e9d2fdc92f8054766b72c58c3a5 /indra/newview/llappviewer.cpp | |
| parent | 10cbb9ea27e8e47a235efece1b30365b7f00e038 (diff) | |
| parent | f8bde94b9f9c83202f32268b57539fbe5c7cf271 (diff) | |
merge
--HG--
branch : product-engine
Diffstat (limited to 'indra/newview/llappviewer.cpp')
| -rw-r--r-- | indra/newview/llappviewer.cpp | 2 |
1 files changed, 0 insertions, 2 deletions
diff --git a/indra/newview/llappviewer.cpp b/indra/newview/llappviewer.cpp index 9aa15789ed..9bb0977c1a 100644 --- a/indra/newview/llappviewer.cpp +++ b/indra/newview/llappviewer.cpp @@ -163,7 +163,6 @@ #include "llvotree.h" #include "llvoavatar.h" #include "llfolderview.h" -#include "lltoolbar.h" #include "llagentpilot.h" #include "llvovolume.h" #include "llflexibleobject.h" @@ -414,7 +413,6 @@ static void settings_to_globals() LLVOAvatar::sVisibleInFirstPerson = gSavedSettings.getBOOL("FirstPersonAvatarVisible"); // clamp auto-open time to some minimum usable value LLFolderView::sAutoOpenTime = llmax(0.25f, gSavedSettings.getF32("FolderAutoOpenDelay")); - LLToolBar::sInventoryAutoOpenTime = gSavedSettings.getF32("InventoryAutoOpenDelay"); LLSelectMgr::sRectSelectInclusive = gSavedSettings.getBOOL("RectangleSelectInclusive"); LLSelectMgr::sRenderHiddenSelections = gSavedSettings.getBOOL("RenderHiddenSelections"); LLSelectMgr::sRenderLightRadius = gSavedSettings.getBOOL("RenderLightRadius"); |