diff options
| author | Vadim Savchuk <vsavchuk@productengine.com> | 2010-05-31 16:18:22 +0300 |
|---|---|---|
| committer | Vadim Savchuk <vsavchuk@productengine.com> | 2010-05-31 16:18:22 +0300 |
| commit | 39eb49c5f400f5e99750f48cc4b02ffa56537403 (patch) | |
| tree | d4bd0217776511c42b2f8a8d525099b4b810fda9 /indra/newview/llviewerwindow.cpp | |
| parent | 9f91d436805137cd347601c7657d90fe19fc98b0 (diff) | |
| parent | de52f3ae69f7641966304ea42d399b62f3fc3170 (diff) | |
Manual merge from default branch.
Semi-automatically resolved conflicts in:
* indra/newview/llappearancemgr.cpp
* indra/newview/llappviewer.cpp
* indra/newview/llcofwearables.cpp
* indra/newview/llinventoryfunctions.cpp
* indra/newview/llpaneloutfitedit.cpp
* indra/newview/skins/default/xui/en/strings.xml
* indra/newview/skins/default/xui/ja/strings.xml
--HG--
branch : product-engine
Diffstat (limited to 'indra/newview/llviewerwindow.cpp')
| -rw-r--r-- | indra/newview/llviewerwindow.cpp | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/indra/newview/llviewerwindow.cpp b/indra/newview/llviewerwindow.cpp index 9773275ede..d91f232f0e 100644 --- a/indra/newview/llviewerwindow.cpp +++ b/indra/newview/llviewerwindow.cpp @@ -106,7 +106,6 @@ #include "llfloaterbuildoptions.h" #include "llfloaterbuyland.h" #include "llfloatercamera.h" -#include "llfloatercustomize.h" #include "llfloaterland.h" #include "llfloaterinspect.h" #include "llfloatermap.h" @@ -1433,6 +1432,7 @@ LLViewerWindow::LLViewerWindow( if (LLFeatureManager::getInstance()->isSafe() || (gSavedSettings.getS32("LastFeatureVersion") != LLFeatureManager::getInstance()->getVersion()) + || (gSavedSettings.getS32("LastGPUClass") != LLFeatureManager::getInstance()->getGPUClass()) || (gSavedSettings.getBOOL("ProbeHardwareOnStartup"))) { LLFeatureManager::getInstance()->applyRecommendedSettings(); @@ -4551,7 +4551,7 @@ void LLViewerWindow::restoreGL(const std::string& progress_message) gResizeScreenTexture = TRUE; - if (gFloaterCustomize && gFloaterCustomize->getVisible()) + if (gAgentCamera.cameraCustomizeAvatar()) { LLVisualParamHint::requestHintUpdates(); } |