summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorTofu Buzzard <no-email>2011-02-11 09:53:00 -0800
committerTofu Buzzard <no-email>2011-02-11 09:53:00 -0800
commit2bc74123de522281955804db63c7806cc4ece415 (patch)
tree76d89fd2c1bf13e1b157fe86ce94cd5cd4b06919
parent5151f02566ddf708d4d5f5cc3a20954bc3a3a48f (diff)
parent23f64494b06d2dcf2aabbcb94f24696d6d7f5e4d (diff)
merge
-rw-r--r--indra/newview/llfloaterpreference.cpp7
-rw-r--r--indra/newview/llviewermedia.cpp2
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"