livie
/
phoenix-firestorm
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

merge

meow-7.2.2
Brad Payne (Vir Linden) 2011-09-15 21:41:03 -04:00
parent 4b269f67ea c1f211cac1
commit 7f10e89ce9
4 changed files with 13 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
.hgtags
View File

@ -184,6 +184,11 @@ f2412ecd6740803ea9452f1d17fd872e263a0df7 3.0.2-start
e5c9af2d7980a99a71650be3a0cf7b2b3c3b897e DRTVWR-86_3.0.2-beta2
e5c9af2d7980a99a71650be3a0cf7b2b3c3b897e 3.0.2-beta2
b95ddac176ac944efdc85cbee94ac2e1eab44c79 3.0.3-start
1778f26b6d0ae762dec3ca37140f66620f2485d9 DRTVWR-78_3.0.0-release
0000000000000000000000000000000000000000 DRTVWR-78_3.0.0-release
1778f26b6d0ae762dec3ca37140f66620f2485d9 DRTVWR-77_3.0.0-release
6694f3f062aa45f64ab391d25a3eb3d5eb1b0871 DRTVWR-85_3.0.3-beta1
586907287be581817b2422b5137971b22d54ea48 3.0.4-start
6694f3f062aa45f64ab391d25a3eb3d5eb1b0871 3.0.3-beta1
61aa7974df089e8621fe9a4c69bcdefdb3cc208a DRTVWR-89_3.0.3-beta2
61aa7974df089e8621fe9a4c69bcdefdb3cc208a 3.0.3-beta2

1
indra/newview/llsidetray.cpp
View File

@ -685,7 +685,6 @@ LLSideTrayTab* LLSideTray::getTab(const std::string& name)
bool LLSideTray::isTabAttached(const std::string& name)
{
LLSideTrayTab* tab = getTab(name);
llassert(tab);
if (!tab) return false;
return std::find(mTabs.begin(), mTabs.end(), tab) != mTabs.end();

10
indra/newview/skins/default/xui/en/floater_preferences_proxy.xml
View File

@ -29,7 +29,7 @@
height="10"
left_delta="23"
layout="topleft"
name="Proxy location"
name="http_proxy_label"
top_pad="10"
width="300">
HTTP Proxy:
@ -81,7 +81,7 @@
height="10"
layout="topleft"
left_delta="23"
name="Proxy location"
name="socks5_proxy_label"
top_pad="10"
width="300">
SOCKS 5 Proxy:
@ -125,7 +125,7 @@
height="10"
layout="topleft"
left="40"
name="Proxy location"
name="socks_auth_label"
top_pad="15"
width="300">
SOCKS Authentication:
@ -163,6 +163,7 @@
height="10"
layout="topleft"
left_delta="20"
name="socks5_username_label"
top_delta="50"
width="200">
Username:
@ -174,6 +175,7 @@
height="10"
left_pad="15"
layout="topleft"
name="socks5_password_label"
width="200">
Password:
</text>
@ -207,7 +209,7 @@
height="10"
layout="topleft"
left="25"
name="Proxy location"
name="other_proxy_label"
top_pad="18"
width="300">
Other HTTP traffic proxy:

3
indra/newview/skins/default/xui/en/panel_navigation_bar.xml
View File

@ -146,7 +146,8 @@
border.highlight_light_color="FocusColor"
border.highlight_dark_color="FocusColor"
border.shadow_light_color="FocusColor"
border.shadow_dark_color="FocusColor"/>
border.shadow_dark_color="FocusColor"
mouse_wheel_opaque="true" />
</search_combo_box>
</panel>
<favorites_bar