summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
Diffstat
-rw-r--r--indra/media_plugins/webkit/media_plugin_webkit.cpp2
-rw-r--r--indra/newview/app_settings/settings.xml23
-rw-r--r--indra/newview/llstartup.cpp9
-rw-r--r--indra/newview/llworld.cpp1
-rw-r--r--indra/newview/skins/default/xui/en/floater_preferences.xml2
-rw-r--r--indra/newview/skins/default/xui/en/notifications.xml6
-rw-r--r--indra/newview/skins/default/xui/en/panel_main_inventory.xml2
-rw-r--r--indra/newview/skins/default/xui/en/panel_preferences_alerts.xml4
-rw-r--r--indra/newview/skins/default/xui/en/sidepanel_appearance.xml5
-rw-r--r--indra/newview/skins/default/xui/en/strings.xml2
-rw-r--r--indra/test_apps/llplugintest/llmediaplugintest.cpp20
11 files changed, 57 insertions, 19 deletions
diff --git a/indra/media_plugins/webkit/media_plugin_webkit.cpp b/indra/media_plugins/webkit/media_plugin_webkit.cpp
index 1ead310754..276ad39dfb 100644
--- a/indra/media_plugins/webkit/media_plugin_webkit.cpp
+++ b/indra/media_plugins/webkit/media_plugin_webkit.cpp
@@ -577,7 +577,7 @@ MediaPluginWebKit::~MediaPluginWebKit()
void MediaPluginWebKit::receiveMessage(const char *message_string)
{
- std::cerr << "MediaPluginWebKit::receiveMessage: received message: \"" << message_string << "\"" << std::endl;
+// std::cerr << "MediaPluginWebKit::receiveMessage: received message: \"" << message_string << "\"" << std::endl;
LLPluginMessage message_in;
if(message_in.parse(message_string) >= 0)
diff --git a/indra/newview/app_settings/settings.xml b/indra/newview/app_settings/settings.xml
index c43032a3cf..80a3977d02 100644
--- a/indra/newview/app_settings/settings.xml
+++ b/indra/newview/app_settings/settings.xml
@@ -4974,7 +4974,6 @@
<key>Value</key>
<integer>1</integer>
</map>
- <key>StartUpToastLifeTime</key>
<key>NearbyToastFadingTime</key>
<map>
<key>Comment</key>
@@ -9911,6 +9910,28 @@
<key>Value</key>
<integer>0</integer>
</map>
+ <key>UseCircuitCodeMaxRetries</key>
+ <map>
+ <key>Comment</key>
+ <string>Max timeout count for the initial UseCircuitCode message</string>
+ <key>Persist</key>
+ <integer>0</integer>
+ <key>Type</key>
+ <string>S32</string>
+ <key>Value</key>
+ <real>3</real>
+ </map>
+ <key>UseCircuitCodeTimeout</key>
+ <map>
+ <key>Comment</key>
+ <string>Timeout duration in seconds for the initial UseCircuitCode message</string>
+ <key>Persist</key>
+ <integer>0</integer>
+ <key>Type</key>
+ <string>F32</string>
+ <key>Value</key>
+ <real>5.0</real>
+ </map>
<key>UseDebugLogin</key>
<map>
<key>Comment</key>
diff --git a/indra/newview/llstartup.cpp b/indra/newview/llstartup.cpp
index f3d161ce1e..d8d1760c38 100644
--- a/indra/newview/llstartup.cpp
+++ b/indra/newview/llstartup.cpp
@@ -369,8 +369,6 @@ bool idle_startup()
LLMemType mt1(LLMemType::MTYPE_STARTUP);
const F32 PRECACHING_DELAY = gSavedSettings.getF32("PrecachingDelay");
- const F32 TIMEOUT_SECONDS = 5.f;
- const S32 MAX_TIMEOUT_COUNT = 3;
static LLTimer timeout;
static S32 timeout_count = 0;
@@ -1438,9 +1436,9 @@ bool idle_startup()
msg->addUUIDFast(_PREHASH_ID, gAgent.getID());
msg->sendReliable(
gFirstSim,
- MAX_TIMEOUT_COUNT,
+ gSavedSettings.getS32("UseCircuitCodeMaxRetries"),
FALSE,
- TIMEOUT_SECONDS,
+ gSavedSettings.getF32("UseCircuitCodeTimeout"),
use_circuit_callback,
NULL);
@@ -2741,6 +2739,9 @@ void LLStartUp::postStartupState()
void reset_login()
{
+ gAgent.cleanup();
+ LLWorld::getInstance()->destroyClass();
+
LLStartUp::setStartupState( STATE_LOGIN_SHOW );
if ( gViewerWindow )
diff --git a/indra/newview/llworld.cpp b/indra/newview/llworld.cpp
index 5c6fc2cf21..118d7f8d08 100644
--- a/indra/newview/llworld.cpp
+++ b/indra/newview/llworld.cpp
@@ -118,6 +118,7 @@ LLWorld::LLWorld() :
void LLWorld::destroyClass()
{
+ mHoleWaterObjects.clear();
gObjectList.destroy();
for(region_list_t::iterator region_it = mRegionList.begin(); region_it != mRegionList.end(); )
{
diff --git a/indra/newview/skins/default/xui/en/floater_preferences.xml b/indra/newview/skins/default/xui/en/floater_preferences.xml
index d182cdc6bb..15655a920e 100644
--- a/indra/newview/skins/default/xui/en/floater_preferences.xml
+++ b/indra/newview/skins/default/xui/en/floater_preferences.xml
@@ -86,7 +86,7 @@
<panel
class="panel_preference"
filename="panel_preferences_alerts.xml"
- label="Alerts"
+ label="Notifications"
layout="topleft"
help_topic="preferences_msgs_tab"
name="msgs" />
diff --git a/indra/newview/skins/default/xui/en/notifications.xml b/indra/newview/skins/default/xui/en/notifications.xml
index a07b23d0c3..3659db230c 100644
--- a/indra/newview/skins/default/xui/en/notifications.xml
+++ b/indra/newview/skins/default/xui/en/notifications.xml
@@ -100,11 +100,11 @@
functor="GenericAcknowledge"
icon="alertmodal.tga"
name="MissingAlert"
- label="Unknown Alert Message"
+ label="Unknown Notification Message"
type="alertmodal">
-Your version of [APP_NAME] does not know how to display the alert it just received. Please verify that you have the latest Viewer installed.
+Your version of [APP_NAME] does not know how to display the notification it just received. Please verify that you have the latest Viewer installed.
-Error details: The alert called &apos;[_NAME]&apos; was not found in notifications.xml.
+Error details: The notification called &apos;[_NAME]&apos; was not found in notifications.xml.
<usetemplate
name="okbutton"
yestext="OK"/>
diff --git a/indra/newview/skins/default/xui/en/panel_main_inventory.xml b/indra/newview/skins/default/xui/en/panel_main_inventory.xml
index 812801abc9..9990215dfd 100644
--- a/indra/newview/skins/default/xui/en/panel_main_inventory.xml
+++ b/indra/newview/skins/default/xui/en/panel_main_inventory.xml
@@ -31,10 +31,8 @@ halign="center"
layout="topleft"
left_delta="-4"
name="inventory filter tabs"
- tab_min_width="70"
tab_height="30"
tab_position="top"
- tab_height="30"
tab_min_width="100"
top_pad="4"
width="305">
diff --git a/indra/newview/skins/default/xui/en/panel_preferences_alerts.xml b/indra/newview/skins/default/xui/en/panel_preferences_alerts.xml
index d4f4053dad..18d0f8acab 100644
--- a/indra/newview/skins/default/xui/en/panel_preferences_alerts.xml
+++ b/indra/newview/skins/default/xui/en/panel_preferences_alerts.xml
@@ -50,7 +50,7 @@
name="show_label"
top_pad="14"
width="450">
- Always show these alerts:
+ Always show these notifications:
</text>
<scroll_list
follows="top|left"
@@ -107,7 +107,7 @@
name="dont_show_label"
top_pad="10"
width="450">
- Never show these alerts:
+ Never show these notifications:
</text>
<scroll_list
follows="top|left"
diff --git a/indra/newview/skins/default/xui/en/sidepanel_appearance.xml b/indra/newview/skins/default/xui/en/sidepanel_appearance.xml
index c457dcb526..3dac1a9614 100644
--- a/indra/newview/skins/default/xui/en/sidepanel_appearance.xml
+++ b/indra/newview/skins/default/xui/en/sidepanel_appearance.xml
@@ -119,8 +119,8 @@ left="0"
image_disabled="AddItem_Disabled"
layout="topleft"
left_pad="5"
- name="add_btn"
- tool_tip="Add new item"
+ name="newlook_btn"
+ tool_tip="Add new outfit"
width="18" />
<dnd_button
follows="bottom|left"
@@ -150,7 +150,6 @@ left="0"
layout="topleft"
left_pad="5"
right="-10"
- name="newlook_btn"
width="100" />-->
<panel
class="panel_look_info"
diff --git a/indra/newview/skins/default/xui/en/strings.xml b/indra/newview/skins/default/xui/en/strings.xml
index 58aa609bd6..d5022de089 100644
--- a/indra/newview/skins/default/xui/en/strings.xml
+++ b/indra/newview/skins/default/xui/en/strings.xml
@@ -2216,7 +2216,7 @@ If this message persists, restart your computer.
[APP_NAME] appears to have frozen or crashed on the previous run.
Would you like to send a crash report?
</string>
- <string name="MBAlert">Alert</string>
+ <string name="MBAlert">Notification</string>
<string name="MBNoDirectX">
[APP_NAME] is unable to detect DirectX 9.0b or greater.
[APP_NAME] uses DirectX to detect hardware and/or outdated drivers that can cause stability problems, poor performance and crashes. While you can run [APP_NAME] without it, we highly recommend running with DirectX 9.0b.
diff --git a/indra/test_apps/llplugintest/llmediaplugintest.cpp b/indra/test_apps/llplugintest/llmediaplugintest.cpp
index c6df77f9a4..30d338292e 100644
--- a/indra/test_apps/llplugintest/llmediaplugintest.cpp
+++ b/indra/test_apps/llplugintest/llmediaplugintest.cpp
@@ -1531,6 +1531,9 @@ void LLMediaPluginTest::addMediaPanel( std::string url )
#endif
// for this test app, use the cwd as the user data path (ugh).
+#if LL_WINDOWS
+ std::string user_data_path = ".\\";
+#else
char cwd[ FILENAME_MAX ];
if (NULL == getcwd( cwd, FILENAME_MAX - 1 ))
{
@@ -1538,6 +1541,7 @@ void LLMediaPluginTest::addMediaPanel( std::string url )
return;
}
std::string user_data_path = std::string( cwd ) + "/";
+#endif
media_source->init( launcher_name, plugin_name, false, user_data_path );
media_source->setDisableTimeout(mDisableTimeout);
@@ -1762,7 +1766,21 @@ void LLMediaPluginTest::replaceMediaPanel( mediaPanel* panel, std::string url )
#elif LL_WINDOWS
std::string launcher_name( "SLPlugin.exe" );
#endif
- media_source->init( launcher_name, plugin_name );
+
+ // for this test app, use the cwd as the user data path (ugh).
+#if LL_WINDOWS
+ std::string user_data_path = ".\\";
+#else
+ char cwd[ FILENAME_MAX ];
+ if (NULL == getcwd( cwd, FILENAME_MAX - 1 ))
+ {
+ std::cerr << "Couldn't get cwd - probably too long - failing to init." << llendl;
+ return;
+ }
+ std::string user_data_path = std::string( cwd ) + "/";
+#endif
+
+ media_source->init( launcher_name, plugin_name, false, user_data_path );
media_source->setDisableTimeout(mDisableTimeout);
// make a new panel and save parameters
generated by cgit v1.2.3 (git 2.25.1) at 2024-12-03 06:32:22 +0000