summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
Diffstat
-rw-r--r--doc/contributions.txt2
-rw-r--r--indra/newview/app_settings/keywords.ini3
-rw-r--r--indra/newview/llvoicevisualizer.cpp2
-rw-r--r--indra/newview/skins/default/xui/en/floater_tools.xml59
-rw-r--r--indra/newview/skins/default/xui/en/mime_types.xml34
5 files changed, 53 insertions, 47 deletions
diff --git a/doc/contributions.txt b/doc/contributions.txt
index 942ba0f0b9..4e3379d21f 100644
--- a/doc/contributions.txt
+++ b/doc/contributions.txt
@@ -139,6 +139,7 @@ Blakar Ogre
blino Nakamura
VWR-17
Boroondas Gupte
+ SNOW-278
VWR-233
WEB-262
Bulli Schumann
@@ -296,6 +297,7 @@ Jacek Antonelli
VWR-2947
VWR-2948
VWR-3605
+ VWR-8617
JB Kraft
VWR-5283
VWR-7802
diff --git a/indra/newview/app_settings/keywords.ini b/indra/newview/app_settings/keywords.ini
index 544f1c598e..5f6fd6e4a7 100644
--- a/indra/newview/app_settings/keywords.ini
+++ b/indra/newview/app_settings/keywords.ini
@@ -560,7 +560,8 @@ STATUS_WHITELIST_FAILED URL failed to pass whitelist
NULL_KEY Indicates an empty key
EOF Indicates the last line of a notecard was read
TEXTURE_BLANK UUID for the "Blank" texture
-TEXTURE_DEFAULT UUID for the "Default Media" texture
+TEXTURE_DEFAULT Alias for TEXTURE_PLYWOOD
+TEXTURE_MEDIA UUID for the "Default Media" texture
TEXTURE_PLYWOOD UUID for the default "Plywood" texture
TEXTURE_TRANSPARENT UUID for the "White - Transparent" texture
diff --git a/indra/newview/llvoicevisualizer.cpp b/indra/newview/llvoicevisualizer.cpp
index 9bafc03a6d..e777d7362f 100644
--- a/indra/newview/llvoicevisualizer.cpp
+++ b/indra/newview/llvoicevisualizer.cpp
@@ -142,7 +142,7 @@ LLVoiceVisualizer::LLVoiceVisualizer( const U8 type )
for (int i=0; i<NUM_VOICE_SYMBOL_WAVES; i++)
{
mSoundSymbol.mWaveFadeOutStartTime [i] = mCurrentTime;
- mSoundSymbol.mTexture [i] = LLViewerTextureManager::getFetchedTextureFromFile(sound_level_img[i], FALSE, TRUE);
+ mSoundSymbol.mTexture [i] = LLViewerTextureManager::getFetchedTextureFromFile(sound_level_img[i], FALSE, LLViewerTexture::BOOST_UI);
mSoundSymbol.mWaveActive [i] = false;
mSoundSymbol.mWaveOpacity [i] = 1.0f;
mSoundSymbol.mWaveExpansion [i] = 1.0f;
diff --git a/indra/newview/skins/default/xui/en/floater_tools.xml b/indra/newview/skins/default/xui/en/floater_tools.xml
index fc736211de..1d87a0f9d2 100644
--- a/indra/newview/skins/default/xui/en/floater_tools.xml
+++ b/indra/newview/skins/default/xui/en/floater_tools.xml
@@ -13,58 +13,58 @@
single_instance="true"
sound_flags="0"
width="280">
- <floater.string
+ <string
name="status_rotate">
Drag colored bands to rotate object
- </floater.string>
- <floater.string
+ </string>
+ <string
name="status_scale">
Click and drag to stretch selected side
- </floater.string>
- <floater.string
+ </string>
+ <string
name="status_move">
Drag to move, shift-drag to copy
- </floater.string>
- <floater.string
+ </string>
+ <string
name="status_modifyland">
Click and hold to modify land
- </floater.string>
- <floater.string
+ </string>
+ <string
name="status_camera">
Click and drag to move camera
- </floater.string>
- <floater.string
+ </string>
+ <string
name="status_grab">
Drag to move, Ctrl to lift, Ctrl+Shift to rotate
- </floater.string>
- <floater.string
+ </string>
+ <string
name="status_place">
Click inworld to build
- </floater.string>
- <floater.string
+ </string>
+ <string
name="status_selectland">
Click and drag to select land
- </floater.string>
- <floater.string
+ </string>
+ <string
name="grid_screen_text">
Screen
- </floater.string>
- <floater.string
+ </string>
+ <string
name="grid_local_text">
Local
- </floater.string>
- <floater.string
+ </string>
+ <string
name="grid_world_text">
World
- </floater.string>
- <floater.string
+ </string>
+ <string
name="grid_reference_text">
Reference
- </floater.string>
- <floater.string
+ </string>
+ <string
name="grid_attachment_text">
Attachment
- </floater.string>
+ </string>
<button
follows="left|top"
height="20"
@@ -1034,7 +1034,10 @@
label="Original"
value="1" />
</combo_box>
-<!-- NEW PRICE SPINNER -->
+<!-- NEW PRICE SPINNER
+ Objects are allowed to be for sale for L$0 to invoke buy UI behavior
+ even though the user gets a free copy.
+-->
<spinner
follows="left|top"
decimal_digits="0"
@@ -1046,7 +1049,7 @@
label="Price: L$"
label_width="65"
width="150"
- min_val="1"
+ min_val="0"
height="20"
max_val="999999999" />
<check_box
diff --git a/indra/newview/skins/default/xui/en/mime_types.xml b/indra/newview/skins/default/xui/en/mime_types.xml
index 2de9449ea6..76c0d027f3 100644
--- a/indra/newview/skins/default/xui/en/mime_types.xml
+++ b/indra/newview/skins/default/xui/en/mime_types.xml
@@ -163,8 +163,8 @@
movie
</widgettype>
<impl>
- media_plugin_quicktime
- </impl>
+ media_plugin_quicktime
+ </impl>
</mimetype>
<mimetype name="application/javascript">
<label name="application/javascript_label">
@@ -208,7 +208,7 @@
</mimetype>
<mimetype name="application/smil">
<label name="application/smil_label">
- Synchronized Multimedia Integration Language (SMIL)
+ Synchronized Multimedia Integration Language (SMIL)
</label>
<widgettype>
movie
@@ -348,8 +348,8 @@
web
</widgettype>
<impl>
- media_plugin_webkit
- </impl>
+ media_plugin_webkit
+ </impl>
</mimetype>
<mimetype menu="1" name="text/plain">
<label name="text/plain_label">
@@ -381,8 +381,8 @@
movie
</widgettype>
<impl>
- media_plugin_quicktime
- </impl>
+ media_plugin_quicktime
+ </impl>
</mimetype>
<mimetype name="video/mp4">
<label name="video/mp4_label">
@@ -392,8 +392,8 @@
movie
</widgettype>
<impl>
- media_plugin_quicktime
- </impl>
+ media_plugin_quicktime
+ </impl>
</mimetype>
<mimetype menu="1" name="video/quicktime">
<label name="video/quicktime_label">
@@ -403,8 +403,8 @@
movie
</widgettype>
<impl>
- media_plugin_quicktime
- </impl>
+ media_plugin_quicktime
+ </impl>
</mimetype>
<mimetype name="video/x-ms-asf">
<label name="video/x-ms-asf_label">
@@ -414,8 +414,8 @@
movie
</widgettype>
<impl>
- media_plugin_quicktime
- </impl>
+ media_plugin_quicktime
+ </impl>
</mimetype>
<mimetype name="video/x-ms-wmv">
<label name="video/x-ms-wmv_label">
@@ -425,8 +425,8 @@
movie
</widgettype>
<impl>
- media_plugin_quicktime
- </impl>
+ media_plugin_quicktime
+ </impl>
</mimetype>
<mimetype menu="1" name="video/x-msvideo">
<label name="video/x-msvideo_label">
@@ -436,7 +436,7 @@
movie
</widgettype>
<impl>
- media_plugin_quicktime
- </impl>
+ media_plugin_quicktime
+ </impl>
</mimetype>
</mimetypes>
generated by cgit v1.2.3 (git 2.25.1) at 2025-04-29 05:08:41 +0000