Singularity-Viewer/SingularityViewer
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

-Enabled multi-processor compiling with Visual Studio

Browse Source 
-Fixed refrences to secondlife-bin.exe in build scripts
-Added ability to blacklist sounds through Sound Explorer floater.
-Added a missing color to the silver skin
This commit is contained in:
unknown
2010-09-30 00:45:34 -05:00
parent 40af53fddc
commit 7b409eb7ab
13 changed files with 330 additions and 130 deletions
Download Patch File Download Diff File Expand all files Collapse all files

27
indra/newview/skins/default/xui/en-us/floater_blacklist.xml
View File

@@ -1,17 +1,22 @@
<?xml version="1.0" encoding="utf-8" standalone="yes" ?>
<floater can_close="true" can_drag_on_left="false" can_minimize="true"
can_resize="false" width="320" min_width="320" height="320" min_height="320"
name="floater_blacklist" title="Asset Blacklist" rect_control="FloaterVFSRect">
can_resize="true" width="750" min_width="650" height="320" min_height="320"
name="floater_blacklist" title="Asset Blacklist" rect_control="FloaterBlacklistRect">
<button name="add_btn" follows="left|top" width="100" bottom="-45" left="10" height="20" label="Add..."/>
<button name="clear_btn" follows="left|top" width="100" left_delta="100" bottom_delta="0" height="20" label="Clear"/>
<line_editor name="id_edit" enable="true" follows="left|bottom|right" bottom_delta="-23" left="10" width="300" height="20"/>
<scroll_list bottom="30" can_resize="true" column_padding="0" draw_heading="true"
follows="left|top|bottom|right" left="10" multi_select="true"
name="file_list" right="-10" search_column="0" top="-70">
<column dynamicwidth="true" name="asset_id" label="Asset ID" />
<button name="remove_btn" follows="left|top" width="100" left_delta="110" bottom_delta="0" height="20" label="Remove"/>
<combo_box name="asset_combo" follows="left|top" width="100" left_delta="110" bottom_delta="0" height="20" label="Asset Type"/>
<line_editor name="id_edit" label="Asset UUID goes here." enable="true" follows="left|top|right" bottom_delta="-30" left="10" right="-10" width="300" height="20"/>
<line_editor name="name_edit" label="Entry name goes here." enable="true" follows="left|top|right" bottom_delta="-23" left="10" right="-10" width="300" height="20"/>
<scroll_list top="-100" bottom="35" can_resize="true" column_padding="0" draw_heading="true"
follows="left|top|bottom|right" left="10" multi_select="true" name="file_list" right="-10" search_column="0">
<column dynamicwidth="false" name="asset_id" label="Asset ID" width ="00" />
<column dynamicwidth="true" name="entry_name" label="Name" />
<column dynamicwidth="false" name="entry_type" label="Type" width="110" />
<column dynamicwidth="false" name="entry_agent" label="Blacklisted by" width="170" />
<column dynamicwidth="false" name="entry_date" label="Date" width="130"/>
</scroll_list>
<button name="copy_uuid_btn" follows="left|bottom" width="75" bottom_delta="-23" left="10" height="20" label="Copy UUID"/>
<button name="remove_btn" follows="left|bottom" width="75" bottom_delta="0" left_delta="75" height="20" label="Remove"/>
<button name="save_btn" follows="left|bottom" width="75" bottom_delta="0" left_delta="75" height="20" label="Save XML"/>
<button name="save_btn" follows="left|bottom" width="75" bottom_delta="-23" left="10" height="20" label="Save XML"/>
<button name="load_btn" follows="left|bottom" width="75" bottom_delta="0" left_delta="75" height="20" label="Load XML"/>
<button name="clear_btn" follows="left|bottom" width="75" bottom_delta="0" left_delta="75" height="20" label="Clear"/>
<button name="copy_uuid_btn" follows="left|bottom" width="75" bottom_delta="0" left_delta="75" height="20" label="Copy UUID"/>
</floater>

19
indra/newview/skins/default/xui/en-us/floater_explore_sounds.xml
View File

@@ -24,7 +24,7 @@
label="Show Repeats" control_name="FloaterSoundsLogRepeats" />
<check_box follows="top|left" bottom_delta="0" left_delta="110" width="80" name="pause_chk"
label="Pause Log" initial_value="false"/>
<scroll_list bottom="30" can_resize="true" column_padding="0" draw_heading="true"
<scroll_list bottom="56" can_resize="true" column_padding="0" draw_heading="true"
follows="left|top|bottom|right" left="10" multi_select="true"
name="sound_list" search_column="0" top="-60" right="-10">
<column width="20" tool_tip="Type" name="type" />
@@ -32,10 +32,17 @@
<column dynamicwidth="true" width="150" label="Owner" name="owner" />
<column width="80" label="Sound" name="sound" />
</scroll_list>
<button bottom="6" follows="bottom|left" height="20" label="Stop" name="stop_btn"
left="10" width="95"/>
<button bottom_delta="0" follows="bottom|left" height="20" label="Look At" name="look_at_btn"
left_delta="100" width="95"/>
<button bottom="31" follows="bottom|left" height="20" label="Look At" name="look_at_btn"
left="10" width="95"/>
<button bottom_delta="0" follows="bottom|left" height="20" label="Play Locally" name="play_locally_btn"
left_delta="100" width="95"/>
left_delta="100" width="95"/>
<button bottom_delta="0" follows="bottom|left" height="20" label="Play In World" name="play_ambient_btn"
left_delta="100" width="95"/>
<button bottom="6" follows="bottom|left" height="20" label="Stop" name="stop_btn"
left="10" width="95"/>
<button bottom_delta="0" follows="bottom|left" height="20" label="Add To Blacklist" name="bl_btn"
left_delta="100" width="195"/>
</floater>

1
indra/newview/skins/silver/colors_base.xml
View File

@@ -193,6 +193,7 @@
<ConsoleBackground value="0, 0, 0, 255" />
<FolderViewLoadingMessageTextColor value="240, 165, 90, 255"/>
<InventoryBackgroundColor value="255, 255, 255, 80"/>
<ComboBoxBg value="255, 255, 255, 255"/>
<!-- Alert box colors -->
<AlertBoxColor value="165, 180, 200, 245"/>