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

Merge with lindenlab/viewer-development

meow-7.2.2
Kyle Ambroff 2010-11-16 15:59:39 -08:00
parent ed9af1151f fb32d211ec
commit 669d10a4ee
7 changed files with 149 additions and 67 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
doc/contributions.txt
View File

@ -177,6 +177,7 @@ Boroondas Gupte
SNOW-610
SNOW-624
SNOW-737
STORM-318
VWR-233
VWR-20583
VWR-20891
@ -766,6 +767,8 @@ WolfPup Lowenhar
STORM-102
STORM-103
STORM-143
STORM-535
STORM-544
VWR-20741
VWR-20933
Zai Lynch

7
indra/cmake/TemplateCheck.cmake
View File

@ -7,8 +7,9 @@ macro (check_message_template _target)
TARGET ${_target}
POST_BUILD
COMMAND ${PYTHON_EXECUTABLE}
ARGS ${SCRIPTS_DIR}/template_verifier.py
--mode=development --cache_master
COMMENT "Verifying message template"
ARGS ${SCRIPTS_DIR}/md5check.py
3f19d130400c547de36278a6b6f9b028
${SCRIPTS_DIR}/messages/message_template.msg
COMMENT "Verifying message template - See http://wiki.secondlife.com/wiki/Template_verifier.py"
)
endmacro (check_message_template)

2
indra/newview/llimfloater.cpp
View File

@ -680,8 +680,6 @@ void LLIMFloater::updateMessages()
if (messages.size())
{
// LLUIColor chat_color = LLUIColorTable::instance().getColor("IMChatColor");
LLSD chat_args;
chat_args["use_plain_text_chat_history"] = use_plain_text_chat_history;

3
indra/newview/skins/default/colors.xml
View File

@ -399,9 +399,6 @@
<color
name="HighlightParentColor"
value="0.67 0.83 0.96 1" />
<color
name="IMChatColor"
reference="LtGray" />
<color
name="IMHistoryBgColor"
reference="Unused?" />

42
indra/newview/skins/default/xui/en/menu_viewer.xml
View File

@ -359,6 +359,18 @@
<menu_item_check.on_check
control="NavBarShowParcelProperties" />
</menu_item_check>
<menu_item_separator />
<menu_item_check
label="Advanced Menu"
name="Show Advanced Menu"
shortcut="control|alt|shift|D">
<on_check
function="CheckControl"
parameter="UseDebugMenus" />
<on_click
function="ToggleControl"
parameter="UseDebugMenus" />
</menu_item_check>
</menu>
<menu_item_separator/>
@ -1526,6 +1538,18 @@
<menu_item_call.on_click
function="View.DefaultUISize" />
</menu_item_call>
<!-- This second, alternative shortcut for Show Advanced Menu is for backward compatibility. The main shortcut has been changed so it's Linux-friendly, where the old shortcut is typically eaten by the window manager. -->
<menu_item_check
label="Show Advanced Menu - legacy shortcut"
name="Show Advanced Menu - legacy shortcut"
shortcut="control|alt|D">
<on_check
function="CheckControl"
parameter="UseDebugMenus" />
<on_click
function="ToggleControl"
parameter="UseDebugMenus" />
</menu_item_check>
<menu_item_separator/>
@ -1693,23 +1717,6 @@
<menu_item_call.on_click
function="View.ZoomOut" />
</menu_item_call>
<menu_item_separator
visible="false"/>
<!-- Made invisible to avoid a dissonance: menu item toggles the menu where it is located. EXT-8069.
Can't be removed, to keep shortcut workable.
-->
<menu_item_check
label="Show Advanced Menu"
name="Show Advanced Menu"
shortcut="control|alt|D"
visible="false">
<on_check
function="CheckControl"
parameter="UseDebugMenus" />
<on_click
function="ToggleControl"
parameter="UseDebugMenus" />
</menu_item_check>
</menu> <!--Shortcuts-->
<menu_item_separator/>
@ -1732,7 +1739,6 @@
function="ToggleControl"
parameter="QAMode" />
</menu_item_check>
</menu>
<menu
create_jump_keys="true"

98
indra/newview/skins/default/xui/en/panel_preferences_colors.xml
View File

@ -113,22 +113,22 @@
</text>
<color_swatch
can_apply_immediately="true"
color="LtGray"
color="EmphasisColor_35"
follows="left|top"
height="24"
label_height="0"
label_width="60"
layout="topleft"
left="360"
name="im"
name="objects"
top_pad="-15"
width="44">
<color_swatch.init_callback
function="Pref.getUIColor"
parameter="IMChatColor" />
parameter="ObjectChatColor" />
<color_swatch.commit_callback
function="Pref.applyUIColor"
parameter="IMChatColor" />
parameter="ObjectChatColor" />
</color_swatch>
<text
type="string"
@ -141,7 +141,7 @@
name="text_box3"
top_delta="5"
width="95">
IM
Objects
</text>
<color_swatch
can_apply_immediately="true"
@ -206,37 +206,6 @@
width="95">
Errors
</text>
<color_swatch
can_apply_immediately="true"
color="EmphasisColor_35"
follows="left|top"
height="24"
label_height="0"
layout="topleft"
left="360"
name="objects"
top_pad="-15"
width="44" >
<color_swatch.init_callback
function="Pref.getUIColor"
parameter="ObjectChatColor" />
<color_swatch.commit_callback
function="Pref.applyUIColor"
parameter="ObjectChatColor" />
</color_swatch>
<text
type="string"
length="1"
follows="left|top"
height="10"
layout="topleft"
left_pad="5"
mouse_opaque="false"
name="text_box6"
top_delta="5"
width="95">
Objects
</text>
<color_swatch
can_apply_immediately="true"
color="LtYellow"
@ -305,7 +274,7 @@
left="30"
height="12"
name="bubble_chat"
top_pad="28"
top_pad="20"
width="120"
>
Bubble chat:
@ -336,11 +305,58 @@
height="16"
increment="0.05"
initial_value="1"
label="Opacity"
label="Opacity:"
layout="topleft"
left_pad="15"
label_width="56"
left_pad="10"
label_width="70"
name="bubble_chat_opacity"
top_delta = "6"
width="347" />
width="378" />
<text
follows="left|top"
layout="topleft"
left="30"
height="12"
name="bubble_chat"
top_pad="15"
width="120"
>
Floater Opacity:
</text>
<slider
can_edit_text="false"
control_name="ActiveFloaterTransparency"
decimal_digits="2"
follows="left|top"
height="16"
increment="0.01"
initial_value="0.8"
layout="topleft"
label_width="115"
label="Active :"
left="50"
max_val="1.00"
min_val="0.00"
name="active"
show_text="true"
top_pad="5"
width="415" />
<slider
can_edit_text="false"
control_name="InactiveFloaterTransparency"
decimal_digits="2"
follows="left|top"
height="16"
increment="0.01"
initial_value="0.5"
layout="topleft"
label_width="115"
label="Inctive :"
left="50"
max_val="1.00"
min_val="0.00"
name="active"
show_text="true"
top_pad="5"
width="415" />
</panel>

61
scripts/md5check.py Executable file
View File

@ -0,0 +1,61 @@
#!/usr/bin/python
"""\
@file md5check.py
@brief Replacement for message template compatibility verifier.
$LicenseInfo:firstyear=20i10&license=viewergpl$
Copyright (c) 2010, Linden Research, Inc.
Second Life Viewer Source Code
The source code in this file ("Source Code") is provided by Linden Lab
to you under the terms of the GNU General Public License, version 2.0
("GPL"), unless you have obtained a separate licensing agreement
("Other License"), formally executed by you and Linden Lab. Terms of
the GPL can be found in doc/GPL-license.txt in this distribution, or
online at http://secondlifegrid.net/programs/open_source/licensing/gplv2
There are special exceptions to the terms and conditions of the GPL as
it is applied to this Source Code. View the full text of the exception
in the file doc/FLOSS-exception.txt in this software distribution, or
online at
http://secondlifegrid.net/programs/open_source/licensing/flossexception
By copying, modifying or distributing this software, you acknowledge
that you have read and understood your obligations described above,
and agree to abide by those obligations.
ALL LINDEN LAB SOURCE CODE IS PROVIDED "AS IS." LINDEN LAB MAKES NO
WARRANTIES, EXPRESS, IMPLIED OR OTHERWISE, REGARDING ITS ACCURACY,
COMPLETENESS OR PERFORMANCE.
$/LicenseInfo$
"""
import sys
import hashlib
if len(sys.argv) != 3:
print """Usage: %s --create|<hash-digest> <file>
Creates an md5sum hash digest of the specified file content
and compares it with the given hash digest.
If --create is used instead of a hash digest, it will simply
print out the hash digest of specified file content.
""" % sys.argv[0]
sys.exit(1)
if sys.argv[2] == '-':
fh = sys.stdin
filename = "<stdin>"
else:
filename = sys.argv[2]
fh = open(filename)
hexdigest = hashlib.md5(fh.read()).hexdigest()
if sys.argv[1] == '--create':
print hexdigest
elif hexdigest == sys.argv[1]:
print "md5sum check passed:", filename
else:
print "md5sum check FAILED:", filename
sys.exit(1)