aboutsummaryrefslogtreecommitdiffstatshomepage
diff options
context:
space:
mode:
-rw-r--r--ChangeLog.txt7
-rw-r--r--linden/indra/newview/app_settings/settings.xml2
-rw-r--r--linden/indra/newview/llviewerthrottle.cpp2
-rw-r--r--linden/indra/newview/skins/default/xui/en-us/panel_preferences_network.xml4
4 files changed, 11 insertions, 4 deletions
diff --git a/ChangeLog.txt b/ChangeLog.txt
index e4dd45d..60d3534 100644
--- a/ChangeLog.txt
+++ b/ChangeLog.txt
@@ -31,6 +31,13 @@
31 modified: linden/indra/newview/skins/default/xui/en-us/floater_snapshot.xml 31 modified: linden/indra/newview/skins/default/xui/en-us/floater_snapshot.xml
32 32
33 33
34 * Upped the max bandwidth setting to 5000kbps (default 1000kbps).
35
36 modified: linden/indra/newview/llviewerthrottle.cpp
37 modified: linden/indra/newview/skins/default/xui/en-us/panel_preferences_network.xml
38 modified: linden/indra/newview/app_settings/settings.xml
39
40
342009-09-10 McCabe Maxsted <hakushakukun@gmail.com> 412009-09-10 McCabe Maxsted <hakushakukun@gmail.com>
35 42
36 * Created new toolbar control for windlight presets and options. 43 * Created new toolbar control for windlight presets and options.
diff --git a/linden/indra/newview/app_settings/settings.xml b/linden/indra/newview/app_settings/settings.xml
index 088631b..cd3af0b 100644
--- a/linden/indra/newview/app_settings/settings.xml
+++ b/linden/indra/newview/app_settings/settings.xml
@@ -7962,7 +7962,7 @@
7962 <key>Type</key> 7962 <key>Type</key>
7963 <string>F32</string> 7963 <string>F32</string>
7964 <key>Value</key> 7964 <key>Value</key>
7965 <real>500.0</real> 7965 <real>1000.0</real>
7966 </map> 7966 </map>
7967 <key>ToolHelpRect</key> 7967 <key>ToolHelpRect</key>
7968 <map> 7968 <map>
diff --git a/linden/indra/newview/llviewerthrottle.cpp b/linden/indra/newview/llviewerthrottle.cpp
index 72a8a80..95c6ae2 100644
--- a/linden/indra/newview/llviewerthrottle.cpp
+++ b/linden/indra/newview/llviewerthrottle.cpp
@@ -49,7 +49,7 @@ const F32 MAX_FRACTIONAL = 1.5f;
49const F32 MIN_FRACTIONAL = 0.2f; 49const F32 MIN_FRACTIONAL = 0.2f;
50 50
51const F32 MIN_BANDWIDTH = 50.f; 51const F32 MIN_BANDWIDTH = 50.f;
52const F32 MAX_BANDWIDTH = 1500.f; 52const F32 MAX_BANDWIDTH = 5000.f;
53const F32 STEP_FRACTIONAL = 0.1f; 53const F32 STEP_FRACTIONAL = 0.1f;
54const F32 TIGHTEN_THROTTLE_THRESHOLD = 3.0f; // packet loss % per s 54const F32 TIGHTEN_THROTTLE_THRESHOLD = 3.0f; // packet loss % per s
55const F32 EASE_THROTTLE_THRESHOLD = 0.5f; // packet loss % per s 55const F32 EASE_THROTTLE_THRESHOLD = 0.5f; // packet loss % per s
diff --git a/linden/indra/newview/skins/default/xui/en-us/panel_preferences_network.xml b/linden/indra/newview/skins/default/xui/en-us/panel_preferences_network.xml
index 48da432..d4ec307 100644
--- a/linden/indra/newview/skins/default/xui/en-us/panel_preferences_network.xml
+++ b/linden/indra/newview/skins/default/xui/en-us/panel_preferences_network.xml
@@ -10,8 +10,8 @@
10 </text> 10 </text>
11 <slider bottom_delta="-25" can_edit_text="true" 11 <slider bottom_delta="-25" can_edit_text="true"
12 decimal_digits="0" enabled="true" follows="left|top" height="15" 12 decimal_digits="0" enabled="true" follows="left|top" height="15"
13 increment="10" initial_val="50" left_delta="0" max_val="1500" min_val="50" 13 increment="10" initial_val="1000" left_delta="0" max_val="5000" min_val="50"
14 mouse_opaque="true" name="max_bandwidth" show_text="true" value="500" 14 mouse_opaque="true" name="max_bandwidth" show_text="true" value="1000"
15 width="180" /> 15 width="180" />
16 <text type="string" length="1" bg_visible="false" border_drop_shadow_visible="false" border_visible="false" 16 <text type="string" length="1" bg_visible="false" border_drop_shadow_visible="false" border_visible="false"
17 bottom_delta="4" drop_shadow_visible="true" enabled="true" 17 bottom_delta="4" drop_shadow_visible="true" enabled="true"