summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
Diffstat
-rw-r--r--indra/newview/llfloaterpreference.cpp34
-rw-r--r--indra/newview/llfloaterpreference.h4
-rw-r--r--indra/newview/llstartup.cpp31
-rwxr-xr-xindra/newview/viewer_manifest.py1
4 files changed, 40 insertions, 30 deletions
diff --git a/indra/newview/llfloaterpreference.cpp b/indra/newview/llfloaterpreference.cpp
index b5b3343103..d7717dffc3 100644
--- a/indra/newview/llfloaterpreference.cpp
+++ b/indra/newview/llfloaterpreference.cpp
@@ -32,7 +32,7 @@
#include "llpanelgeneral.h"
#include "llpanelinput.h"
#include "llpanelmsgs.h"
-//#include "llpanelweb.h"
+#include "llpanelweb.h"
#include "llprefschat.h"
#include "llprefsim.h"
#include "llresizehandle.h"
@@ -43,7 +43,6 @@
#include "llviewernetwork.h"
#include "llvieweruictrlfactory.h"
#include "llviewerwindow.h"
-//#include "viewer.h"
#include "llkeyboard.h"
#include "llscrollcontainer.h"
@@ -99,6 +98,12 @@ LLPreferenceCore::LLPreferenceCore(LLTabContainerCommon* tab_container, LLButton
mTabContainer->addTabPanel(mNetworkPanel, mNetworkPanel->getLabel(), FALSE, onTabChanged, mTabContainer);
mNetworkPanel->setDefaultBtn(default_btn);
+ #if LL_LIBXUL_ENABLED
+ mWebPanel = new LLPanelWeb();
+ mTabContainer->addTabPanel(mWebPanel, mWebPanel->getLabel(), FALSE, onTabChanged, mTabContainer);
+ mWebPanel->setDefaultBtn(default_btn);
+ #endif
+
mDisplayPanel = new LLPanelDisplay();
mTabContainer->addTabPanel(mDisplayPanel, mDisplayPanel->getLabel(), FALSE, onTabChanged, mTabContainer);
mDisplayPanel->setDefaultBtn(default_btn);
@@ -129,11 +134,6 @@ LLPreferenceCore::LLPreferenceCore(LLTabContainerCommon* tab_container, LLButton
mMsgPanel->setDefaultBtn(default_btn);
mTabContainer->selectTab(gSavedSettings.getS32("LastPrefTab"));
-
-// Web prefs removed from Loopy build
-// mWebPanel = new LLPanelWeb();
-// gUICtrlFactory->buildPanel(mWebPanel, "panel_settings_web.xml");
-// addTabPanel(mWebPanel, "Web", FALSE, onTabChanged, this);
}
LLPreferenceCore::~LLPreferenceCore()
@@ -188,11 +188,13 @@ LLPreferenceCore::~LLPreferenceCore()
delete mMsgPanel;
mMsgPanel = NULL;
}
- //if (mWebPanel)
- //{
- // delete mWebPanel;
- // mWebPanel = NULL;
- //}
+ #if LL_LIBXUL_ENABLED
+ if (mWebPanel)
+ {
+ delete mWebPanel;
+ mWebPanel = NULL;
+ }
+ #endif
}
@@ -208,7 +210,9 @@ void LLPreferenceCore::apply()
mPrefsChat->apply();
mPrefsIM->apply();
mMsgPanel->apply();
-// mWebPanel->apply();
+ #if LL_LIBXUL_ENABLED
+ mWebPanel->apply();
+ #endif
}
@@ -224,7 +228,9 @@ void LLPreferenceCore::cancel()
mPrefsChat->cancel();
mPrefsIM->cancel();
mMsgPanel->cancel();
-// mWebPanel->cancel();
+ #if LL_LIBXUL_ENABLED
+ mWebPanel->cancel();
+ #endif
}
// static
diff --git a/indra/newview/llfloaterpreference.h b/indra/newview/llfloaterpreference.h
index 50eb938de2..dcfa123137 100644
--- a/indra/newview/llfloaterpreference.h
+++ b/indra/newview/llfloaterpreference.h
@@ -26,11 +26,11 @@ class LLPanelDisplay3;
class LLPanelAudioPrefs;
class LLPanelDebug;
class LLPanelNetwork;
+class LLPanelWeb;
class LLMessageSystem;
class LLPrefsChat;
class LLPrefsIM;
class LLPanelMsgs;
-//class LLPanelWeb; // Web prefs removed from Loopy build
class LLScrollListCtrl;
class LLPreferenceCore
@@ -65,7 +65,7 @@ private:
LLPrefsChat *mPrefsChat;
LLPrefsIM *mPrefsIM;
LLPanelMsgs *mMsgPanel;
-// LLPanelWeb* mWebPanel;
+ LLPanelWeb *mWebPanel;
};
// Floater to control preferences (display, audio, bandwidth, general.
diff --git a/indra/newview/llstartup.cpp b/indra/newview/llstartup.cpp
index 757bb4bae4..5e981b8922 100644
--- a/indra/newview/llstartup.cpp
+++ b/indra/newview/llstartup.cpp
@@ -485,23 +485,23 @@ BOOL idle_startup()
#if LL_DARWIN
// For Mac OS, we store both the shared libraries and the runtime files (chrome/, plugins/, etc) in
// Second Life.app/Contents/MacOS/. This matches the way Firefox is distributed on the Mac.
- std::string profileBaseDir(gDirUtilp->getExecutableDir());
+ std::string componentDir(gDirUtilp->getExecutableDir());
#elif LL_WINDOWS
- std::string profileBaseDir( gDirUtilp->getExpandedFilename( LL_PATH_APP_SETTINGS, "" ) );
- profileBaseDir += gDirUtilp->getDirDelimiter();
+ std::string componentDir( gDirUtilp->getExpandedFilename( LL_PATH_APP_SETTINGS, "" ) );
+ componentDir += gDirUtilp->getDirDelimiter();
#ifdef LL_DEBUG
- profileBaseDir += "mozilla_debug";
+ componentDir += "mozilla_debug";
#else
- profileBaseDir += "mozilla";
+ componentDir += "mozilla";
#endif
- #elif LL_LINUX
- std::string profileBaseDir( gDirUtilp->getExpandedFilename( LL_PATH_APP_SETTINGS, "" ) );
- profileBaseDir += gDirUtilp->getDirDelimiter();
- profileBaseDir += "mozilla-runtime-linux-i686";
- #else
- std::string profileBaseDir( gDirUtilp->getExpandedFilename( LL_PATH_APP_SETTINGS, "" ) );
- profileBaseDir += gDirUtilp->getDirDelimiter();
- profileBaseDir += "mozilla";
+ #elif LL_LINUX
+ std::string componentDir( gDirUtilp->getExpandedFilename( LL_PATH_APP_SETTINGS, "" ) );
+ componentDir += gDirUtilp->getDirDelimiter();
+ componentDir += "mozilla-runtime-linux-i686";
+ #else
+ std::string componentDir( gDirUtilp->getExpandedFilename( LL_PATH_APP_SETTINGS, "" ) );
+ componentDir += gDirUtilp->getDirDelimiter();
+ componentDir += "mozilla";
#endif
#if LL_LINUX
@@ -511,7 +511,10 @@ BOOL idle_startup()
// and crashness. (SL-35450)
std::string saved_locale = setlocale(LC_ALL, NULL);
#endif // LL_LINUX
- LLMozLib::getInstance()->init( profileBaseDir, gDirUtilp->getExpandedFilename( LL_PATH_MOZILLA_PROFILE, "" ) );
+
+ // initialize Mozilla - pass in executable dir, location of extra dirs (chrome/, greprefs/, plugins/ etc.) and path to profile dir)
+ LLMozLib::getInstance()->init( gDirUtilp->getExecutableDir(), componentDir, gDirUtilp->getExpandedFilename( LL_PATH_MOZILLA_PROFILE, "" ) );
+
#if LL_LINUX
setlocale(LC_ALL, saved_locale.c_str() );
#endif // LL_LINUX
diff --git a/indra/newview/viewer_manifest.py b/indra/newview/viewer_manifest.py
index 716f83611c..a708b735db 100755
--- a/indra/newview/viewer_manifest.py
+++ b/indra/newview/viewer_manifest.py
@@ -128,6 +128,7 @@ class WindowsManifest(ViewerManifest):
# Mozilla runtime DLLs (CP)
if self.prefix(src="../../libraries/i686-win32/lib_release", dst=""):
+ self.path("freebl3.dll")
self.path("gksvggdiplus.dll")
self.path("js3250.dll")
self.path("nspr4.dll")
generated by cgit v1.2.3 (git 2.25.1) at 2024-11-22 13:34:53 +0000