diff options
| author | Tofu Buzzard <no-email> | 2011-02-11 09:53:10 -0800 |
|---|---|---|
| committer | Tofu Buzzard <no-email> | 2011-02-11 09:53:10 -0800 |
| commit | b58ac2bcca5109103c8368414fed7a5f858d3d11 (patch) | |
| tree | 83a299748eb8b31ef765918a7549a00982d426ab | |
| parent | 533093527ed644467d265c18b9a2a2e18279f1c1 (diff) | |
| parent | 2bc74123de522281955804db63c7806cc4ece415 (diff) | |
merge
| -rw-r--r-- | indra/newview/llfloaterpreference.cpp | 7 | ||||
| -rw-r--r-- | indra/newview/llviewermedia.cpp | 2 |
2 files changed, 1 insertions, 8 deletions
diff --git a/indra/newview/llfloaterpreference.cpp b/indra/newview/llfloaterpreference.cpp index 3673a28163..9562f2d9d2 100644 --- a/indra/newview/llfloaterpreference.cpp +++ b/indra/newview/llfloaterpreference.cpp @@ -656,13 +656,6 @@ void LLFloaterPreference::onOpen(const LLSD& key) getChildView("maturity_desired_combobox")->setVisible( false); } - bool enable_mesh = gSavedSettings.getBOOL("MeshEnabled"); - - getChildView("UseLightShaders")->setVisible(enable_mesh); - getChildView("UseSSAO")->setVisible(enable_mesh); - getChildView("shadows_label")->setVisible(enable_mesh); - getChildView("ShadowDetail")->setVisible(enable_mesh); - if (LLStartUp::getStartupState() == STATE_STARTED) { mFavoritesRecordMayExist = gSavedPerAccountSettings.getBOOL("ShowFavoritesOnLogin"); diff --git a/indra/newview/llviewermedia.cpp b/indra/newview/llviewermedia.cpp index fcd9141269..a8d5c9776c 100644 --- a/indra/newview/llviewermedia.cpp +++ b/indra/newview/llviewermedia.cpp @@ -53,7 +53,7 @@ #include "llwebsharing.h" // For LLWebSharing::setOpenIDCookie(), *TODO: find a better way to do this! #include "llfilepicker.h" #include "llnotifications.h" -#include "lldir_win32.h" +#include "lldir.h" #include "llevent.h" // LLSimpleListener #include "llnotificationsutil.h" #include "lluuid.h" |