diff options
| author | James Cook <james@lindenlab.com> | 2009-07-07 00:53:05 +0000 |
|---|---|---|
| committer | James Cook <james@lindenlab.com> | 2009-07-07 00:53:05 +0000 |
| commit | 52aeaa32841e7d0b37abab0a2a2540c2be2f16b7 (patch) | |
| tree | d8f5c98644029dd289a97aa0d8b55c5a6200c214 /indra/newview/skins | |
| parent | 2c722655bd6701a3dc8518c6518c51f538765dcd (diff) | |
Merge skinning-14 to viewer-2, including refactoring many floaters to register them with LLFloaterReg, support for introspection of ParamBlock based UI widgets to dump XML schema, splitting llfolderview.cpp into three separate files to unravel dependencies and skeleton for for LLListView widget. Resolved conflicts in these files:
lldraghandle.h, lluictrl.h, llchiclet.cpp, llfolderview.h/cpp, lliinventorybridge.cpp, llpanelpicks.cpp, llviewermenu.cpp, floater_mute.xml, floater_preferences.xml, notifications.xml, panel_preferences_audio.xml, panel_preferences_graphics1.xml, panel_region_general.xml
svn merge -r124961:126284 svn+ssh://svn.lindenlab.com/svn/linden/branches/skinning/skinning-14
Diffstat (limited to 'indra/newview/skins')
21 files changed, 774 insertions, 399 deletions
diff --git a/indra/newview/skins/default/xui/en/floater_auction.xml b/indra/newview/skins/default/xui/en/floater_auction.xml index 076332e062..32d3f4fd7e 100644 --- a/indra/newview/skins/default/xui/en/floater_auction.xml +++ b/indra/newview/skins/default/xui/en/floater_auction.xml @@ -48,7 +48,7 @@ left_delta="0" name="snapshot_btn" top_pad="4" - width="96" > + width="96"> <button.commit_callback function="ClickSnapshot" /> </button> diff --git a/indra/newview/skins/default/xui/en/floater_beacons.xml b/indra/newview/skins/default/xui/en/floater_beacons.xml index 41ddec6395..049ea9ab14 100644 --- a/indra/newview/skins/default/xui/en/floater_beacons.xml +++ b/indra/newview/skins/default/xui/en/floater_beacons.xml @@ -20,43 +20,64 @@ control_name="scripttouchbeacon" label="Scripted Objects with Touch Only" layout="topleft" - name="touch_only" /> + name="touch_only" > + <check_box.commit_callback + function="Beacons.UICheck" /> + </check_box> <check_box bottom_delta="20" control_name="scriptsbeacon" label="Scripted Objects" layout="topleft" - name="scripted" /> + name="scripted"> + <check_box.commit_callback + function="Beacons.UICheck" /> + </check_box> <check_box bottom_delta="20" control_name="physicalbeacon" label="Physical Objects" layout="topleft" - name="physical" /> + name="physical" > + <check_box.commit_callback + function="Beacons.UICheck" /> + </check_box> <check_box bottom_delta="20" control_name="soundsbeacon" label="Sound Sources" layout="topleft" - name="sounds" /> + name="sounds" > + <check_box.commit_callback + function="Beacons.UICheck" /> + </check_box> <check_box bottom_delta="20" control_name="particlesbeacon" label="Particle Sources" layout="topleft" - name="particles" /> + name="particles" > + <check_box.commit_callback + function="Beacons.UICheck" /> + </check_box> <check_box bottom_delta="20" control_name="renderhighlights" label="Render Highlights" layout="topleft" - name="highlights" /> + name="highlights" > + <check_box.commit_callback + function="Beacons.UICheck" /> + </check_box> <check_box bottom_delta="20" control_name="renderbeacons" label="Render Beacons" layout="topleft" - name="beacons" /> + name="beacons" > + <check_box.commit_callback + function="Beacons.UICheck" /> + </check_box> <text type="string" length="1" diff --git a/indra/newview/skins/default/xui/en/floater_bulk_perms.xml b/indra/newview/skins/default/xui/en/floater_bulk_perms.xml index 6d7e3a9c45..843a8848bf 100644 --- a/indra/newview/skins/default/xui/en/floater_bulk_perms.xml +++ b/indra/newview/skins/default/xui/en/floater_bulk_perms.xml @@ -224,7 +224,10 @@ left="8" name="check_all" top="257" - width="100" /> + width="100"> + <button.commit_callback + function="BulkPermission.CheckAll" /> + </button> <button follows="left|top" height="20" @@ -234,7 +237,10 @@ left_delta="0" name="check_none" top_pad="4" - width="100" /> + width="100" > + <button.commit_callback + function="BulkPermission.UncheckAll"/> + </button> <text type="string" length="1" @@ -295,10 +301,13 @@ left_delta="78" name="next_owner_copy" top_delta="0" - width="88" /> - <check_box + width="88"> + <check_box.commit_callback + function="BulkPermission.CommitCopy"/> + </check_box> + <check_box control_name="BulkChangeNextOwnerTransfer" - enabled="false" + enabled_control="BulkChangeNextOwnerCopy" height="16" initial_value="true" label="Resell/Give away" @@ -324,7 +333,10 @@ left="65" name="apply" top_pad="10" - width="100" /> + width="100"> + <button.commit_callback + function="BulkPermission.Apply"/> + </button> <button follows="left|top" height="20" @@ -333,5 +345,8 @@ left_pad="5" name="close" top_delta="0" - width="100" /> + width="100" > + <button.commit_callback + function="BulkPermission.Close"/> + </button> </floater> diff --git a/indra/newview/skins/default/xui/en/floater_god_tools.xml b/indra/newview/skins/default/xui/en/floater_god_tools.xml index e35ab3ea49..f3abad8cb2 100644 --- a/indra/newview/skins/default/xui/en/floater_god_tools.xml +++ b/indra/newview/skins/default/xui/en/floater_god_tools.xml @@ -34,7 +34,10 @@ left="10" name="Kick all users" top="8" - width="100" /> + width="100"> + <button.commit_callback + function="GridTools.KickAll" /> + </button> <button follows="left|top" height="20" @@ -44,7 +47,10 @@ left_delta="0" name="Flush This Region's Map Visibility Caches" top_pad="8" - width="250" /> + width="250"> + <button.commit_callback + function="GridTools.FlushMapVisibilityCaches" /> + </button> </panel> <panel border="true" @@ -79,7 +85,10 @@ max_length="63" name="region name" top_delta="0" - width="208" /> + width="208"> + <line_editor.commit_callback + function="RegionTools.ChangeAnything" /> + </line_editor> <check_box height="16" label="Prelude" @@ -88,7 +97,10 @@ name="check prelude" tool_tip="Set this to make the region a prelude." top="30" - width="180" /> + width="180"> + <check_box.commit_callback + function="RegionTools.ChangePrelude" /> + </check_box> <check_box height="16" label="Fixed Sun" @@ -97,7 +109,10 @@ name="check fixed sun" tool_tip="Fix the sun position (like in Region/Estate > Terrain." top_pad="4" - width="180" /> + width="180"> + <check_box.commit_callback + function="RegionTools.ChangeAnything" /> + </check_box> <check_box height="16" label="Reset Home On Teleport" @@ -106,7 +121,10 @@ name="check reset home" tool_tip="When resident teleports out, reset their home to the destination position." top_pad="4" - width="180" /> + width="180"> + <check_box.commit_callback + function="RegionTools.ChangeAnything" /> + </check_box> <check_box height="16" label="Visible" @@ -115,7 +133,10 @@ name="check visible" tool_tip="Set this to make the region visible to non-gods." top_pad="4" - width="180" /> + width="180"> + <check_box.commit_callback + function="RegionTools.ChangeAnything" /> + </check_box> <check_box height="16" label="Damage" @@ -124,7 +145,10 @@ name="check damage" tool_tip="Set this to enable damage in this region." top_pad="4" - width="180" /> + width="180"> + <check_box.commit_callback + function="RegionTools.ChangeAnything" /> + </check_box> <check_box height="16" label="Block Traffic Tracking" @@ -133,7 +157,10 @@ name="block dwell" tool_tip="Set this to make the region not compute traffic." top_pad="4" - width="180" /> + width="180"> + <check_box.commit_callback + function="RegionTools.ChangeAnything" /> + </check_box> <check_box height="16" label="Block Terraform" @@ -142,7 +169,10 @@ name="block terraform" tool_tip="Set this to disallow people terraforming their land" top_pad="4" - width="180" /> + width="180"> + <check_box.commit_callback + function="RegionTools.ChangeAnything" /> + </check_box> <check_box height="16" label="Sandbox" @@ -151,7 +181,10 @@ name="is sandbox" tool_tip="Toggle whether this is a sandbox region." top_pad="4" - width="180" /> + width="180"> + <check_box.commit_callback + function="RegionTools.ChangeAnything" /> + </check_box> <button follows="top|right" font="SansSerifSmall" @@ -163,7 +196,10 @@ name="Bake Terrain" tool_tip="Save the current terrain as default." top_pad="32" - width="110" /> + width="110"> + <button.commit_callback + function="RegionTools.BakeTerrain" /> + </button> <button follows="top|right" font="SansSerifSmall" @@ -175,7 +211,10 @@ name="Revert Terrain" tool_tip="Replace the current terrain with default." top_pad="4" - width="110" /> + width="110"> + <button.commit_callback + function="RegionTools.RevertTerrain" /> + </button> <button follows="top|right" font="SansSerifSmall" @@ -187,7 +226,10 @@ name="Swap Terrain" tool_tip="Swap current terrain with default." top_pad="4" - width="110" /> + width="110"> + <button.commit_callback + function="RegionTools.SwapTerrain" /> + </button> <text type="string" length="1" @@ -236,7 +278,10 @@ name="parentestate" tool_tip="This is the parent estate for this region" top_delta="0" - width="50" /> + width="50"> + <line_editor.commit_callback + function="RegionTools.ChangeAnything" /> + </line_editor> <text type="string" length="1" @@ -260,7 +305,10 @@ name="gridposx" tool_tip="This is the grid x position for this region" top_delta="0" - width="50" /> + width="50"> + <line_editor.commit_callback + function="RegionTools.ChangeAnything" /> + </line_editor> <line_editor border_style="line" border_thickness="1" @@ -272,7 +320,10 @@ name="gridposy" tool_tip="This is the grid y position for this region" top_delta="0" - width="40" /> + width="40"> + <line_editor.commit_callback + function="RegionTools.ChangeAnything" /> + </line_editor> <text type="string" length="1" @@ -295,7 +346,10 @@ max_length="10" name="redirectx" top_delta="0" - width="50" /> + width="50"> + <line_editor.commit_callback + function="RegionTools.ChangeAnything" /> + </line_editor> <line_editor border_style="line" border_thickness="1" @@ -306,7 +360,10 @@ max_length="10" name="redirecty" top_delta="0" - width="40" /> + width="40"> + <line_editor.commit_callback + function="RegionTools.ChangeAnything" /> + </line_editor> <spinner follows="top|right" height="16" @@ -316,7 +373,10 @@ max_val="4" name="billable factor" top="110" - width="80" /> + width="80"> + <spinner.commit_callback + function="RegionTools.ChangeAnything" /> + </spinner> <text type="string" length="1" @@ -340,7 +400,10 @@ max_val="100" name="land cost" top="130" - width="80" /> + width="80"> + <spinner.commit_callback + function="RegionTools.ChangeAnything" /> + </spinner> <text type="string" length="1" @@ -365,7 +428,10 @@ name="Refresh" tool_tip="Click here to refresh the above information." top="150" - width="110" /> + width="110"> + <button.commit_callback + function="RegionTools.Refresh" /> + </button> <button follows="top|right" font="SansSerifSmall" @@ -377,7 +443,10 @@ name="Apply" tool_tip="Click here to apply any changes from above." top_pad="36" - width="110" /> + width="110"> + <button.commit_callback + function="RegionTools.ApplyChanges" /> + </button> <button follows="top|right" font="SansSerifSmall" @@ -389,7 +458,10 @@ name="Select Region" tool_tip="Select the whole region with the land tool." top="238" - width="110" /> + width="110"> + <button.commit_callback + function="RegionTools.SelectRegion" /> + </button> <button follows="top|right" font="SansSerifSmall" @@ -401,7 +473,10 @@ name="Autosave now" tool_tip="Save gzipped state to autosave directory." top_pad="4" - width="110" /> + width="110"> + <button.commit_callback + function="RegionTools.SaveState" /> + </button> </panel> <panel border="true" @@ -450,7 +525,10 @@ name="disable scripts" tool_tip="Set this to disable all scripts in this region" top="30" - width="110" /> + width="110"> + <check_box.commit_callback + function="ObjectTools.ChangeAnything" /> + </check_box> <check_box height="16" label="Disable Collisions" @@ -459,7 +537,10 @@ name="disable collisions" tool_tip="Set this to disable non-agent collisions in this region" top_delta="0" - width="121" /> + width="121"> + <check_box.commit_callback + function="ObjectTools.ChangeAnything" /> + </check_box> <check_box height="16" label="Disable Physics" @@ -468,7 +549,10 @@ name="disable physics" tool_tip="Set this to disable all physics in this region" top_delta="0" - width="130" /> + width="130"> + <check_box.commit_callback + function="ObjectTools.ChangeAnything" /> + </check_box> <button follows="top|right" font="SansSerifSmall" @@ -480,8 +564,11 @@ name="Apply" tool_tip="Click here to apply any changes from above." top="54" - width="110" /> - <button + width="110"> + <button.commit_callback + function="ObjectTools.ApplyChanges" /> + </button> + <button follows="top|right" font="SansSerifSmall" height="20" @@ -492,7 +579,10 @@ name="Set Target" tool_tip="Set the target avatar for object deletion." top="78" - width="110" /> + width="110"> + <button.commit_callback + function="ObjectTools.Set" /> + </button> <text type="string" length="1" @@ -516,7 +606,10 @@ name="Delete Target's Scripted Objects On Others Land" tool_tip="Delete all scripted objects owned by the target on land not owned by the target. (no copy) objects will be returned." top="126" - width="380" /> + width="380"> + <button.commit_callback + function="ObjectTools.DeletePublicOwnedBy" /> + </button> <button follows="top|right" font="SansSerifSmall" @@ -528,7 +621,10 @@ name="Delete Target's Scripted Objects On *Any* Land" tool_tip="Delete all scripted objects owned by the target in this region. (no copy) objects will be returned." top_pad="28" - width="380" /> + width="380"> + <button.commit_callback + function="ObjectTools.DeleteAllScriptedOwnedBy" /> + </button> <button follows="top|right" font="SansSerifSmall" @@ -540,8 +636,11 @@ name="Delete *ALL* Of Target's Objects" tool_tip="Delete all objects owned by the target in this region. (no copy) objects will be returned." top_pad="28" - width="380" /> - <button + width="380"> + <button.commit_callback + function="ObjectTools.DeleteAllOwnedBy" /> + </button> + <button follows="top|right" font="SansSerifSmall" height="20" @@ -552,7 +651,10 @@ name="Get Top Colliders" tool_tip="Gets list of objects experiencing the most narrowphase callbacks." top_pad="28" - width="110" /> + width="110"> + <button.commit_callback + function="ObjectTools.GetTopColliders" /> + </button> <button follows="top|right" font="SansSerifSmall" @@ -564,7 +666,10 @@ name="Get Top Scripts" tool_tip="Gets list of objects spending the most time running scripts." top_pad="4" - width="110" /> + width="110"> + <button.commit_callback + function="ObjectTools.GetTopScripts" /> + </button> <button follows="top|right" font="SansSerifSmall" @@ -576,7 +681,10 @@ name="Scripts digest" tool_tip="Gets a list of all scripts and number of occurences of each." top_pad="4" - width="110" /> + width="110" > + <button.commit_callback + function="ObjectTools.GetScriptDigest" /> + </button> </panel> <panel border="true" @@ -679,7 +787,10 @@ left="10" name="Make Request" top="96" - width="100" /> + width="100"> + <button.commit_callback + function="GodTools.Request" /> + </button> </panel> </tab_container> </floater> diff --git a/indra/newview/skins/default/xui/en/floater_im_session.xml b/indra/newview/skins/default/xui/en/floater_im_session.xml new file mode 100644 index 0000000000..7c95fcd96a --- /dev/null +++ b/indra/newview/skins/default/xui/en/floater_im_session.xml @@ -0,0 +1,25 @@ +<?xml version="1.0" encoding="utf-8" standalone="yes" ?>
+<floater
+ background_visible="true"
+ follows="left|top|right|bottom"
+ height="200"
+ layout="topleft"
+ left="0"
+ name="panel_im"
+ top="0"
+ width="300">
+ <text_editor
+ enabled="false"
+ type="string"
+ length="1"
+ top="20"
+ follows="left|top|right"
+ font="SansSerif"
+ height="175"
+ layout="topleft"
+ left="5"
+ name="im_text"
+ width="290"
+ word_wrap="true">
+ </text_editor>
+</floater>
diff --git a/indra/newview/skins/default/xui/en/floater_inspect.xml b/indra/newview/skins/default/xui/en/floater_inspect.xml index ed3b4f00f2..b11b3e4df5 100644 --- a/indra/newview/skins/default/xui/en/floater_inspect.xml +++ b/indra/newview/skins/default/xui/en/floater_inspect.xml @@ -40,6 +40,8 @@ label="Creation Date" name="creation_date" width="150" /> + <scroll_list.commit_callback + function="Inspect.SelectObject" /> </scroll_list> <button follows="left|bottom" @@ -50,7 +52,10 @@ name="button owner" tool_tip="See profile of the highlighted object's owner" top_pad="5" - width="150" /> + width="150"> + <button.commit_callback + function="Inspect.OwnerProfilet" /> + </button> <button follows="left|bottom" height="20" @@ -60,5 +65,8 @@ name="button creator" tool_tip="See profile of the highlighted object's original creator" top_delta="0" - width="150" /> + width="150"> + <button.commit_callback + function="Inspect.CreatorProfile" /> + </button> </floater> diff --git a/indra/newview/skins/default/xui/en/floater_lagmeter.xml b/indra/newview/skins/default/xui/en/floater_lagmeter.xml index 8af4f74aa3..a326cd006f 100644 --- a/indra/newview/skins/default/xui/en/floater_lagmeter.xml +++ b/indra/newview/skins/default/xui/en/floater_lagmeter.xml @@ -201,7 +201,7 @@ Client: </text> <text - make_visible_control="LagMeterShrunk" + visiblity_control="LagMeterShrunk" type="string" length="1" bottom="40" @@ -215,7 +215,7 @@ Normal </text> <text - make_visible_control="LagMeterShrunk" + visiblity_control="LagMeterShrunk" bottom="56" follows="left|top" height="16" @@ -250,7 +250,7 @@ Network: </text> <text - make_visible_control="LagMeterShrunk" + visiblity_control="LagMeterShrunk" type="string" length="1" bottom="80" @@ -264,7 +264,7 @@ Normal </text> <text - make_visible_control="LagMeterShrunk" + visiblity_control="LagMeterShrunk" bottom="96" follows="left|top" height="16" diff --git a/indra/newview/skins/default/xui/en/floater_media_browser.xml b/indra/newview/skins/default/xui/en/floater_media_browser.xml index a073c3443a..15ec2e220f 100644 --- a/indra/newview/skins/default/xui/en/floater_media_browser.xml +++ b/indra/newview/skins/default/xui/en/floater_media_browser.xml @@ -34,7 +34,10 @@ left="0" name="back" top="0" - width="55" /> + width="55"> + <button.commit_callback + function="MediaBrowser.Back" /> + </button> <button follows="left|top" height="20" @@ -43,7 +46,10 @@ left_pad="3" name="forward" top_delta="0" - width="68" /> + width="68"> + <button.commit_callback + function="MediaBrowser.Forward" /> + </button> <button enabled="false" follows="left|top" @@ -53,7 +59,10 @@ left_pad="2" name="reload" top_delta="0" - width="70" /> + width="70"> + <button.commit_callback + function="MediaBrowser.Refresh" /> + </button> <combo_box allow_text_entry="true" follows="left|top|right" @@ -63,7 +72,10 @@ max_chars="255" name="address" top_delta="0" - width="540" /> + width="540"> + <combo_box.commit_callback + function="MediaBrowser.EnterAddress" /> + </combo_box> <button enabled="false" follows="right|top" @@ -73,7 +85,10 @@ left_pad="5" name="go" top_delta="0" - width="55" /> + width="55"> + <button.commit_callback + function="MediaBrowser.Go" /> + </button> </layout_panel> <layout_panel auto_resize="false" @@ -93,7 +108,10 @@ left="0" name="assign" top="0" - width="200" /> + width="200"> + <button.commit_callback + function="MediaBrowser.Assign" /> + </button> </layout_panel> <layout_panel height="20" @@ -119,7 +137,10 @@ left_delta="0" name="open_browser" top_pad="5" - width="185" /> + width="185"> + <button.commit_callback + function="MediaBrowser.OpenWebBrowser" /> + </button> <check_box control_name="UseExternalBrowser" follows="bottom|left" @@ -138,7 +159,10 @@ left_pad="80" name="close" top_delta="0" - width="70" /> + width="70"> + <button.commit_callback + function="MediaBrowser.Close" /> + </button> </layout_panel> </layout_stack> </floater> diff --git a/indra/newview/skins/default/xui/en/floater_mem_leaking.xml b/indra/newview/skins/default/xui/en/floater_mem_leaking.xml index e2a99e6614..da698f276b 100644 --- a/indra/newview/skins/default/xui/en/floater_mem_leaking.xml +++ b/indra/newview/skins/default/xui/en/floater_mem_leaking.xml @@ -20,7 +20,10 @@ max_val="4.29497e+009" name="leak_speed" top="30" - width="330" /> + width="330"> + <spinner.commit_callback + function="MemLeak.ChangeLeakingSpeed" /> + </spinner> <spinner decimal_digits="0" follows="left|top" @@ -34,7 +37,10 @@ max_val="4096" name="max_leak" top_pad="5" - width="330" /> + width="330"> + <spinner.commit_callback + function="MemLeak.ChangeMaxMemLeaking" /> + </spinner> <text type="string" length="1" @@ -79,7 +85,10 @@ left_delta="0" name="start_btn" top_delta="20" - width="70" /> + width="70"> + <button.commit_callback + function="MemLeak.Start" /> + </button> <button follows="left|top" height="20" @@ -88,7 +97,10 @@ left_pad="7" name="stop_btn" top_delta="0" - width="70" /> + width="70"> + <button.commit_callback + function="MemLeak.Stop" /> + </button> <button follows="left|top" height="20" @@ -97,7 +109,10 @@ left_pad="7" name="release_btn" top_delta="0" - width="70" /> + width="70"> + <button.commit_callback + function="MemLeak.Release" /> + </button> <button follows="left|top" height="20" @@ -106,5 +121,8 @@ left_pad="36" name="close_btn" top_delta="0" - width="70" /> + width="70"> + <button.commit_callback + function="MemLeak.Close" /> + </button> </floater> diff --git a/indra/newview/skins/default/xui/en/floater_openobject.xml b/indra/newview/skins/default/xui/en/floater_openobject.xml index 742934b57b..e0ac2c1d51 100644 --- a/indra/newview/skins/default/xui/en/floater_openobject.xml +++ b/indra/newview/skins/default/xui/en/floater_openobject.xml @@ -42,7 +42,10 @@ name="copy_to_inventory_button" tab_group="1" top_pad="285" - width="120" /> + width="120"> + <button.commit_callback + function="OpenObject.MoveToInventory" /> + </button> <button follows="bottom|left" font="SansSerifSmall" @@ -53,5 +56,8 @@ left_pad="10" name="copy_and_wear_button" top_delta="0" - width="120" /> + width="120"> + <button.commit_callback + function="OpenObject.MoveAndWear" /> + </button> </floater> diff --git a/indra/newview/skins/default/xui/en/floater_perm_prefs.xml b/indra/newview/skins/default/xui/en/floater_perm_prefs.xml index 430cb940e5..e4cb97035c 100644 --- a/indra/newview/skins/default/xui/en/floater_perm_prefs.xml +++ b/indra/newview/skins/default/xui/en/floater_perm_prefs.xml @@ -24,7 +24,11 @@ left="260" name="help" top="7" - width="22" /> + width="22"> + <button.commit_callback + function="Notification.Show" + parameter="ClickUploadHelpPermissions" /> + </button> <check_box control_name="ShareWithGroup" height="16" @@ -72,8 +76,12 @@ left_delta="78" name="next_owner_copy" top_delta="0" - width="88" /> + width="88" > + <check_box.commit_callback + function="Perms.Copy" /> + </check_box> <check_box + enabled_control="NextOwnerCopy" control_name="NextOwnerTransfer" enabled="false" height="16" @@ -93,7 +101,10 @@ left="90" name="ok" top="150" - width="100" /> + width="100"> + <button.commit_callback + function="Perms.OK" /> + </button> <button height="20" label="Cancel" @@ -102,5 +113,8 @@ left_pad="5" name="cancel" top_delta="0" - width="100" /> + width="100"> + <button.commit_callback + function="Perms.Cancel" /> + </button> </floater> diff --git a/indra/newview/skins/default/xui/en/floater_test_list_view.xml b/indra/newview/skins/default/xui/en/floater_test_list_view.xml new file mode 100644 index 0000000000..3991a4a82b --- /dev/null +++ b/indra/newview/skins/default/xui/en/floater_test_list_view.xml @@ -0,0 +1,31 @@ +<?xml version="1.0" encoding="utf-8" standalone="yes" ?>
+<floater
+ can_resize="true"
+ height="400"
+ layout="topleft"
+ name="floater_test_list_view"
+ width="400">
+ <list_view
+ height="300"
+ left="10"
+ name="test_list_view"
+ top="28"
+ width="300" />
+ <button
+ name="test_1_btn"
+ label="Test 1"
+ top="350"
+ left="10"
+ height="20"
+ width="80"
+ commit_callback.function="TestListView.Test1" />
+ <button
+ name="test_2_btn"
+ label="Test 2"
+ top_delta="0"
+ left_pad="10"
+ height="20"
+ width="80"
+ commit_callback.function="TestListView.Test2" />
+
+</floater>
diff --git a/indra/newview/skins/default/xui/en/floater_top_objects.xml b/indra/newview/skins/default/xui/en/floater_top_objects.xml index 20e39beb6f..ecd64d08e6 100644 --- a/indra/newview/skins/default/xui/en/floater_top_objects.xml +++ b/indra/newview/skins/default/xui/en/floater_top_objects.xml @@ -87,6 +87,8 @@ label="Mono Time" name="mono_time" width="55" /> + <scroll_list.commit_callback + function="TopObjects.CommitObjectsList" /> </scroll_list> <text type="string" @@ -117,7 +119,10 @@ left_pad="10" name="show_beacon_btn" top_delta="0" - width="100" /> + width="100"> + <button.commit_callback + function="TopObjects.ShowBeacon" /> + </button> <text type="string" length="1" @@ -146,7 +151,10 @@ left_pad="10" name="filter_object_btn" top_delta="0" - width="100" /> + width="100"> + <button.commit_callback + function="TopObjects.GetByObjectName" /> + </button> <text type="string" length="1" @@ -175,7 +183,10 @@ left_pad="10" name="filter_owner_btn" top_delta="0" - width="100" /> + width="100"> + <button.commit_callback + function="TopObjects.GetByOwnerName" /> + </button> <button follows="bottom|left" height="20" @@ -184,7 +195,10 @@ left="10" name="return_selected_btn" top="295" - width="130" /> + width="130"> + <button.commit_callback + function="TopObjects.ReturnSelected" /> + </button> <button follows="bottom|left" height="20" @@ -193,7 +207,10 @@ left_pad="10" name="return_all_btn" top_delta="0" - width="130" /> + width="130"> + <button.commit_callback + function="TopObjects.ReturnAll" /> + </button> <button follows="bottom|left" height="20" @@ -202,7 +219,10 @@ left="10" name="disable_selected_btn" top="320" - width="130" /> + width="130"> + <button.commit_callback + function="TopObjects.DisableSelected" /> + </button> <button follows="bottom|left" height="20" @@ -211,7 +231,10 @@ left_pad="10" name="disable_all_btn" top_delta="0" - width="130" /> + width="130"> + <button.commit_callback + function="TopObjects.DisableAll" /> + </button> <button bottom="315" follows="bottom|right" @@ -220,5 +243,8 @@ layout="topleft" name="refresh_btn" right="-10" - width="100" /> + width="100"> + <button.commit_callback + function="TopObjects.Refresh" /> + </button> </floater> diff --git a/indra/newview/skins/default/xui/en/floater_world_map.xml b/indra/newview/skins/default/xui/en/floater_world_map.xml index 43f209546a..b179190819 100644 --- a/indra/newview/skins/default/xui/en/floater_world_map.xml +++ b/indra/newview/skins/default/xui/en/floater_world_map.xml @@ -144,7 +144,10 @@ name="Go Home" tool_tip="Teleport to your home" top="34" - width="88" /> + width="88" > + <button.commit_callback + function="WMap.GoHome" /> + </button> <icon color="0 1 0 1" follows="top|right" @@ -325,6 +328,8 @@ <combo_box.item label="Online Friends" value="None" /> + <combo_box.commit_callback + function="WMap.AvatarCombo"/> </combo_box> <icon color="0.5 0 0 1" @@ -352,6 +357,8 @@ <combo_box.item label="Landmarks" value="None" /> + <combo_box.commit_callback + function="WMap.Landmark" /> </combo_box> <icon color="0.5 0 0 1" @@ -384,7 +391,10 @@ name="DoSearch" tool_tip="Search for region" top_delta="0" - width="60" /> + width="60"> + <button.commit_callback + function="WMap.Location" /> + </button> <text type="string" length="1" @@ -415,6 +425,8 @@ label="" name="sim_name" width="206" /> + <scroll_list.commit_callback + function="WMap.SearchResult" /> </scroll_list> <text type="string" @@ -441,7 +453,10 @@ name="spin x" tool_tip="X coordinate of location to show on map" top_delta="0" - width="48" /> + width="48"> + <spinner.commit_callback + function="WMap.CommitLocation" /> + </spinner> <spinner decimal_digits="0" follows="bottom|right" @@ -454,7 +469,10 @@ name="spin y" tool_tip="Y coordinate of location to show on map" top_delta="0" - width="48" /> + width="48" > + <spinner.commit_callback + function="WMap.CommitLocation" /> + </spinner> <spinner decimal_digits="0" follows="bottom|right" @@ -467,7 +485,10 @@ name="spin z" tool_tip="Z coordinate of location to show on map" top_delta="0" - width="48" /> + width="48"> + <spinner.commit_callback + function="WMap.CommitLocation" /> + </spinner> <button follows="right|bottom" height="20" @@ -478,7 +499,10 @@ name="Teleport" tool_tip="Teleport to selected location" top="494" - width="90" /> + width="90"> + <button.commit_callback + function="WMap.Teleport" /> + </button> <button follows="right|bottom" height="20" @@ -489,7 +513,10 @@ name="Show Destination" tool_tip="Center map on selected location" top_delta="0" - width="125" /> + width="125"> + <button.commit_callback + function="WMap.ShowTarget" /> + </button> <button follows="right|bottom" height="20" @@ -500,7 +527,10 @@ name="Clear" tool_tip="Stop tracking" top="518" - width="90" /> + width="90"> + <button.commit_callback + function="WMap.Clear" /> + </button> <button follows="right|bottom" height="20" @@ -511,7 +541,10 @@ name="Show My Location" tool_tip="Center map on your avatar's location" top_delta="0" - width="125" /> + width="125" > + <button.commit_callback + function="WMap.ShowAgent" /> + </button> <button enabled="false" follows="bottom|right" @@ -522,7 +555,10 @@ name="copy_slurl" tool_tip="Copies current location as SLURL to be used on the web." top="542" - width="222" /> + width="222"> + <button.commit_callback + function="WMap.CopySLURL" /> + </button> <slider follows="right|bottom" height="16" diff --git a/indra/newview/skins/default/xui/en/menu_login.xml b/indra/newview/skins/default/xui/en/menu_login.xml index eb3dcc225e..14c38f6f26 100644 --- a/indra/newview/skins/default/xui/en/menu_login.xml +++ b/indra/newview/skins/default/xui/en/menu_login.xml @@ -101,5 +101,13 @@ function="ShowFloater" parameter="test_widgets" /> </menu_item_call> + <menu_item_call + label="List View Test" + name="List View Test" + shortcut="control|shift|L"> + <menu_item_call.on_click + function="ShowFloater" + parameter="test_list_view" /> + </menu_item_call> </menu> </menu_bar> diff --git a/indra/newview/skins/default/xui/en/menu_viewer.xml b/indra/newview/skins/default/xui/en/menu_viewer.xml index 1d1a1c063e..4ce3c18dcc 100644 --- a/indra/newview/skins/default/xui/en/menu_viewer.xml +++ b/indra/newview/skins/default/xui/en/menu_viewer.xml @@ -15,9 +15,18 @@ name="Preferences" shortcut="control|P"> <menu_item_call.on_click - function="ShowFloater" + function="Floater.Show" parameter="preferences" /> </menu_item_call> + <menu_item_call + label="Media Remote Ctrl" + layout="topleft" + name="Preferences" + shortcut="control|A"> + <menu_item_call.on_click + function="Floater.Toggle" + parameter="media_remote_ctrl" /> + </menu_item_call> <menu_item_separator layout="topleft" /> <menu @@ -221,22 +230,22 @@ layout="topleft" name="Active Speakers"> <menu_item_check.on_check - function="FloaterVisible" - parameter="active speakers" /> + function="Floater.Visible" + parameter="active_speakers" /> <menu_item_check.on_click - function="ShowFloater" - parameter="active speakers" /> + function="Floater.Toggle" + parameter="active_speakers" /> </menu_item_check> <menu_item_check label="Block List" layout="topleft" name="Mute List"> <menu_item_check.on_check - function="FloaterVisible" - parameter="mute list" /> + function="Floater.Visible" + parameter="mute" /> <menu_item_check.on_click - function="ShowFloater" - parameter="mute list" /> + function="Floater.Toggle" + parameter="mute" /> </menu_item_check> </menu> <menu @@ -249,22 +258,22 @@ layout="topleft" name="Camera Controls"> <menu_item_check.on_check - function="FloaterVisible" - parameter="camera controls" /> + function="Floater.Visible" + parameter="camera" /> <menu_item_check.on_click - function="ShowFloater" - parameter="camera controls" /> + function="Floater.Toggle" + parameter="camera" /> </menu_item_check> <menu_item_check label="Movement Controls" layout="topleft" name="Movement Controls"> <menu_item_check.on_check - function="FloaterVisible" - parameter="movement controls" /> + function="Floater.Visible" + parameter="moveview" /> <menu_item_check.on_click - function="ShowFloater" - parameter="movement controls" /> + function="Floater.Toggle" + parameter="moveview" /> </menu_item_check> <menu_item_separator layout="topleft" /> @@ -273,16 +282,16 @@ layout="topleft" name="About Land"> <menu_item_call.on_click - function="ShowFloater" - parameter="about land" /> + function="Floater.Show" + parameter="about_land" /> </menu_item_call> <menu_item_call label="Region/Estate" layout="topleft" name="Region/Estate"> <menu_item_call.on_click - function="ShowFloater" - parameter="about region" /> + function="Floater.Show" + parameter="region_info" /> </menu_item_call> <menu_item_separator layout="topleft" /> @@ -350,9 +359,10 @@ name="Mini-Map" shortcut="control|shift|M"> <menu_item_check.on_check - function="FloaterVisible" /> + function="Floater.Visible" + parameter="mini_map" /> <menu_item_check.on_click - function="ShowFloater" + function="Floater.Show" parameter="mini_map" /> </menu_item_check> <menu_item_separator @@ -400,8 +410,8 @@ layout="topleft" name="Tutorial"> <menu_item_call.on_click - function="ShowFloater" - parameter="help tutorial" /> + function="Floater.Show" + parameter="hud" /> </menu_item_call> <menu label="Report" @@ -429,16 +439,16 @@ layout="topleft" name="Bumps, Pushes &amp; Hits"> <menu_item_call.on_click - function="ShowFloater" - parameter="mean events" /> + function="Floater.Show" + parameter="bumps" /> </menu_item_call> <menu_item_call label="About Second Life" layout="topleft" name="About Second Life"> <menu_item_call.on_click - function="ShowFloater" - parameter="about" /> + function="Floater.Show" + parameter="sl_about" /> </menu_item_call> </menu> </menu> @@ -573,8 +583,8 @@ layout="topleft" name="perm prefs"> <menu_item_call.on_click - function="ShowFloater" - parameter="perm prefs" /> + function="Floater.Toggle" + parameter="perm_prefs" /> </menu_item_call> <menu_item_call label="Show Script Warning/Error Window" @@ -702,8 +712,8 @@ name="Grid Options" shortcut="control|shift|B"> <menu_item_call.on_click - function="ShowFloater" - parameter="grid options" /> + function="Floater.Show" + parameter="build_options" /> <menu_item_call.on_enable function="Tools.EnableToolNotPie" /> </menu_item_call> @@ -720,10 +730,10 @@ name="beacons" shortcut="control|alt|shift|N"> <menu_item_check.on_check - function="FloaterVisible" + function="Floater.Visible" parameter="beacons" /> <menu_item_check.on_click - function="ShowFloater" + function="Floater.Toggle" parameter="beacons" /> </menu_item_check> <menu_item_check @@ -1312,8 +1322,8 @@ layout="topleft" name="Lag Meter"> <menu_item_call.on_click - function="ShowFloater" - parameter="lag meter" /> + function="Floater.Show" + parameter="lagmeter" /> </menu_item_call> <menu_item_check label="Statistics Bar" @@ -1894,8 +1904,8 @@ function="Advanced.CheckConsole" parameter="notifications" /> <menu_item_check.on_click - function="Advanced.ToggleConsole" - parameter="notifications" /> + function="Floater.Show" + parameter="notifications_console" /> </menu_item_check> <menu_item_separator layout="topleft" /> @@ -1999,8 +2009,8 @@ layout="topleft" name="Memory Leaking Simulation"> <menu_item_call.on_click - function="Advanced.MemoryLeakingSimulation" - parameter="" /> + function="Floater.Show" + parameter="mem_leaking" /> </menu_item_call> <menu_item_separator layout="topleft" /> @@ -2843,7 +2853,8 @@ layout="topleft" name="Show Font Test"> <menu_item_call.on_click - function="Advanced.ShowFontTest" /> + function="Floater.Show" + parameter="font_test" /> </menu_item_call> <menu_item_call label="Load from XML..." @@ -2869,6 +2880,13 @@ <menu_item_check.on_click function="Advanced.ToggleXUINames" /> </menu_item_check> + <menu_item_call + label="Send Test IMs" + layout="topleft" + name="Send Test IMs"> + <menu_item_call.on_click + function="Advanced.SendTestIMs" /> + </menu_item_call> </menu> <menu create_jump_keys="true" @@ -3304,7 +3322,8 @@ layout="topleft" name="God Tools"> <menu_item_call.on_click - function="Admin.ShowGodTools" /> + function="Floater.Show" + parameter="god_tools" /> <menu_item_call.on_enable function="EnableGodCustomerService" /> </menu_item_call> diff --git a/indra/newview/skins/default/xui/en/notifications.xml b/indra/newview/skins/default/xui/en/notifications.xml index 0a63da1463..d2c0ffd13d 100644 --- a/indra/newview/skins/default/xui/en/notifications.xml +++ b/indra/newview/skins/default/xui/en/notifications.xml @@ -13,7 +13,7 @@ <global name="implicitclosebutton"> Close </global> - + <template name="okbutton"> <form> <button @@ -4980,347 +4980,347 @@ The string [STRING_NAME] is missing from strings.xml icon="notifytip.tga" name="SystemMessageTip" type="notifytip"> -[MESSAGE] + [MESSAGE] </notification> <notification icon="notifytip.tga" name="Cancelled" type="notifytip"> -Cancelled + Cancelled </notification> <notification icon="notifytip.tga" name="CancelledSit" type="notifytip"> -Cancelled Sit + Cancelled Sit </notification> <notification icon="notifytip.tga" name="CancelledAttach" type="notifytip"> -Cancelled Attach + Cancelled Attach </notification> <notification icon="notifytip.tga" name="ReplacedMissingWearable" type="notifytip"> -Replaced missing clothing/body part with default. + Replaced missing clothing/body part with default. </notification> <notification icon="groupnotify" name="GroupNotice" type="groupnotify"> -Topic: [SUBJECT], Message: [MESSAGE] + Topic: [SUBJECT], Message: [MESSAGE] </notification> <notification icon="notifytip.tga" name="FriendOnline" type="notifytip"> -[FIRST] [LAST] is Online + [FIRST] [LAST] is Online </notification> <notification icon="notifytip.tga" name="FriendOffline" type="notifytip"> -[FIRST] [LAST] is Offline + [FIRST] [LAST] is Offline </notification> <notification icon="notifytip.tga" name="AddSelfFriend" type="notifytip"> -You cannot add yourself as a friend. + You cannot add yourself as a friend. </notification> <notification icon="notifytip.tga" name="UploadingAuctionSnapshot" type="notifytip"> -Uploading in-world and web site snapshots... -(Takes about 5 minutes.) + Uploading in-world and web site snapshots... + (Takes about 5 minutes.) </notification> <notification icon="notify.tga" name="UploadPayment" type="notify"> -You paid L$[AMOUNT] to upload. + You paid L$[AMOUNT] to upload. </notification> <notification icon="notifytip.tga" name="UploadWebSnapshotDone" type="notifytip"> -Web site snapshot upload done. + Web site snapshot upload done. </notification> <notification icon="notifytip.tga" name="UploadSnapshotDone" type="notifytip"> -In-world snapshot upload done + In-world snapshot upload done </notification> <notification icon="notifytip.tga" name="TerrainDownloaded" type="notifytip"> -Terrain.raw downloaded + Terrain.raw downloaded </notification> <notification icon="notifytip.tga" name="GestureMissing" type="notifytip"> -Gesture [NAME] is missing from database. + Gesture [NAME] is missing from database. </notification> <notification icon="notifytip.tga" name="UnableToLoadGesture" type="notifytip"> -Unable to load gesture [NAME]. -Please try again. + Unable to load gesture [NAME]. + Please try again. </notification> <notification icon="notifytip.tga" name="LandmarkMissing" type="notifytip"> -Landmark is missing from database. + Landmark is missing from database. </notification> <notification icon="notifytip.tga" name="UnableToLoadLandmark" type="notifytip"> -Unable to load landmark. Please try again. + Unable to load landmark. Please try again. </notification> <notification icon="notifytip.tga" name="CapsKeyOn" type="notifytip"> -Your Caps Lock key is on. -As this will affect the password you type in, you will probably want to turn it off. + Your Caps Lock key is on. + As this will affect the password you type in, you will probably want to turn it off. </notification> <notification icon="notifytip.tga" name="NotecardMissing" type="notifytip"> -Notecard is missing from database. + Notecard is missing from database. </notification> <notification icon="notifytip.tga" name="NotecardNoPermissions" type="notifytip"> -Insufficient permissions to view notecard. + Insufficient permissions to view notecard. </notification> <notification icon="notifytip.tga" name="RezItemNoPermissions" type="notifytip"> -Insufficient permissions to rez object. + Insufficient permissions to rez object. </notification> <notification icon="notifytip.tga" name="UnableToLoadNotecard" type="notifytip"> -Unable to load notecard. -Please try again. + Unable to load notecard. + Please try again. </notification> <notification icon="notifytip.tga" name="ScriptMissing" type="notifytip"> -Script is missing from database. + Script is missing from database. </notification> <notification icon="notifytip.tga" name="ScriptNoPermissions" type="notifytip"> -Insufficient permissions to view script. + Insufficient permissions to view script. </notification> <notification icon="notifytip.tga" name="UnableToLoadScript" type="notifytip"> -Unable to load script. Please try again. + Unable to load script. Please try again. </notification> <notification icon="notifytip.tga" name="IncompleteInventory" type="notifytip"> -The complete contents you are offering are not yet locally available. Please try offering those items again in a minute. + The complete contents you are offering are not yet locally available. Please try offering those items again in a minute. </notification> <notification icon="notifytip.tga" name="CannotModifyProtectedCategories" type="notifytip"> -You cannot modify protected categories. + You cannot modify protected categories. </notification> <notification icon="notifytip.tga" name="CannotRemoveProtectedCategories" type="notifytip"> -You cannot remove protected categories. + You cannot remove protected categories. </notification> <notification icon="notifytip.tga" name="OfferedCard" type="notifytip"> -You have offered a calling card to [FIRST] [LAST] + You have offered a calling card to [FIRST] [LAST] </notification> <notification icon="notifytip.tga" name="UnableToBuyWhileDownloading" type="notifytip"> -Unable to buy while downloading object data. -Please try again. + Unable to buy while downloading object data. + Please try again. </notification> <notification icon="notifytip.tga" name="UnableToLinkWhileDownloading" type="notifytip"> -Unable to link while downloading object data. -Please try again. + Unable to link while downloading object data. + Please try again. </notification> <notification icon="notifytip.tga" name="CannotBuyObjectsFromDifferentOwners" type="notifytip"> -Cannot buy objects from different owners at the same time. -Please select a single object. + Cannot buy objects from different owners at the same time. + Please select a single object. </notification> <notification icon="notifytip.tga" name="ObjectNotForSale" type="notifytip"> -Object does not appear to be for sale. + Object does not appear to be for sale. </notification> <notification icon="notifytip.tga" name="EnteringGodMode" type="notifytip"> -Entering god mode, level [LEVEL] + Entering god mode, level [LEVEL] </notification> <notification icon="notifytip.tga" name="LeavingGodMode" type="notifytip"> -Leaving god mode, level [LEVEL] + Leaving god mode, level [LEVEL] </notification> <notification icon="notifytip.tga" name="CopyFailed" type="notifytip"> -Copy failed because you lack copy permission + Copy failed because you lack copy permission </notification> <notification icon="notifytip.tga" name="InventoryAccepted" type="notifytip"> -[NAME] accepted your inventory offer. + [NAME] accepted your inventory offer. </notification> <notification icon="notifytip.tga" name="InventoryDeclined" type="notifytip"> -[NAME] declined your inventory offer. + [NAME] declined your inventory offer. </notification> <notification icon="notifytip.tga" name="ObjectMessage" type="notifytip"> -[NAME]: [MESSAGE] + [NAME]: [MESSAGE] </notification> <notification icon="notifytip.tga" name="CallingCardAccepted" type="notifytip"> -Your calling card was accepted. + Your calling card was accepted. </notification> <notification icon="notifytip.tga" name="CallingCardDeclined" type="notifytip"> -Your calling card was declined. + Your calling card was declined. </notification> <notification icon="notifytip.tga" name="TeleportToLandmark" type="notifytip"> -Now that you have reached the mainland, you can teleport to locations like '[NAME]' by clicking on the Inventory button on the bottom right of your screen, and then select the Landmarks folder. -Double click on the landmark and click on Teleport to travel there. + Now that you have reached the mainland, you can teleport to locations like '[NAME]' by clicking on the Inventory button on the bottom right of your screen, and then select the Landmarks folder. + Double click on the landmark and click on Teleport to travel there. </notification> <notification icon="notifytip.tga" name="TeleportToPerson" type="notifytip"> -Now that you have reached the mainland, you can contact residents like '[NAME]' by clicking on the Inventory button on the bottom right of your screen, and then select the Calling Cards folder. -Double click on the card, click on Instant Message, and type a message. + Now that you have reached the mainland, you can contact residents like '[NAME]' by clicking on the Inventory button on the bottom right of your screen, and then select the Calling Cards folder. + Double click on the card, click on Instant Message, and type a message. </notification> <notification icon="notifytip.tga" name="CantSelectLandFromMultipleRegions" type="notifytip"> -Can't select land across server boundaries. -Try selecting a smaller piece of land. + Can't select land across server boundaries. + Try selecting a smaller piece of land. </notification> <notification icon="notifytip.tga" name="SearchWordBanned" type="notifytip"> -Some terms in your search query were excluded due to content restrictions as clarified in the Community Standards. + Some terms in your search query were excluded due to content restrictions as clarified in the Community Standards. </notification> <notification icon="notifytip.tga" name="NoContentToSearch" type="notifytip"> -Please select at least one type of content to search (PG, Mature, or Adult). + Please select at least one type of content to search (PG, Mature, or Adult). </notification> <notification icon="notify.tga" name="GroupVote" type="notify"> -[NAME] has proposed to vote on: -[MESSAGE] + [NAME] has proposed to vote on: + [MESSAGE] <form name="form"> <button index="0" @@ -5337,17 +5337,17 @@ Please select at least one type of content to search (PG, Mature, or Adult). icon="notify.tga" name="SystemMessage" type="notify"> -[MESSAGE] + [MESSAGE] </notification> <notification icon="notify.tga" name="EventNotification" type="notify"> -Event Notification: + Event Notification: -[NAME] -[DATE] + [NAME] + [DATE] <form name="form"> <button index="0" @@ -5368,9 +5368,9 @@ Event Notification: icon="notify.tga" name="TransferObjectsHighlighted" type="notify"> -All objects on this parcel that will transfer to the purchaser of this parcel are now highlighted. + All objects on this parcel that will transfer to the purchaser of this parcel are now highlighted. -* Trees and grasses that will transfer are not highlighted. + * Trees and grasses that will transfer are not highlighted. <form name="form"> <button index="0" @@ -5383,61 +5383,61 @@ All objects on this parcel that will transfer to the purchaser of this parcel ar icon="notify.tga" name="DeactivatedGesturesTrigger" type="notify"> -Deactivated gestures with same trigger: -[NAMES] + Deactivated gestures with same trigger: + [NAMES] </notification> <notification icon="notify.tga" name="NoQuickTime" type="notify"> -Apple's QuickTime software does not appear to be installed on your system. -If you want to view streaming media on parcels that support it you should go to the QuickTime site (http://www.apple.com/quicktime) and install the QuickTime Player. + Apple's QuickTime software does not appear to be installed on your system. + If you want to view streaming media on parcels that support it you should go to the QuickTime site (http://www.apple.com/quicktime) and install the QuickTime Player. </notification> <notification icon="notify.tga" name="OwnedObjectsReturned" type="notify"> -The objects you own on the selected parcel of land have been returned back to your inventory. + The objects you own on the selected parcel of land have been returned back to your inventory. </notification> <notification icon="notify.tga" name="OtherObjectsReturned" type="notify"> -The objects on the selected parcel of land that is owned by [FIRST] [LAST] have been returned to his or her inventory. + The objects on the selected parcel of land that is owned by [FIRST] [LAST] have been returned to his or her inventory. </notification> <notification icon="notify.tga" name="OtherObjectsReturned2" type="notify"> -The objects on the selected parcel of land owned by the resident '[NAME]' have been returned to their owner. + The objects on the selected parcel of land owned by the resident '[NAME]' have been returned to their owner. </notification> <notification icon="notify.tga" name="GroupObjectsReturned" type="notify"> -The objects on the selected parcel of land shared with the group [GROUPNAME] have been returned back to their owner's inventory. -Transferable deeded objects have been returned to their previous owners. -Non-transferable objects that are deeded to the group have been deleted. + The objects on the selected parcel of land shared with the group [GROUPNAME] have been returned back to their owner's inventory. + Transferable deeded objects have been returned to their previous owners. + Non-transferable objects that are deeded to the group have been deleted. </notification> <notification icon="notify.tga" name="UnOwnedObjectsReturned" type="notify"> -The objects on the selected parcel that are NOT owned by you have been returned to their owners. + The objects on the selected parcel that are NOT owned by you have been returned to their owners. </notification> <notification icon="notify.tga" name="NotSafe" type="notify"> -This land has damage enabled ('not safe'). -You can be hurt here. If you die, you will be teleported to your home location. + This land has damage enabled ('not safe'). + You can be hurt here. If you die, you will be teleported to your home location. <unique/> </notification> @@ -5445,8 +5445,8 @@ You can be hurt here. If you die, you will be teleported to your home location. icon="notify.tga" name="NoFly" type="notify"> -This land has flying disabled ('no fly'). -You cannot fly here. + This land has flying disabled ('no fly'). + You cannot fly here. <unique/> </notification> @@ -5454,8 +5454,8 @@ You cannot fly here. icon="notify.tga" name="PushRestricted" type="notify"> -This land is 'No Pushing'. -You cannot push others here unless you own the land. + This land is 'No Pushing'. + You cannot push others here unless you own the land. <unique/> </notification> @@ -5463,7 +5463,7 @@ You cannot push others here unless you own the land. icon="notify.tga" name="NoVoice" type="notify"> -This land has voice disabled. + This land has voice disabled. <unique/> </notification> @@ -5471,8 +5471,8 @@ This land has voice disabled. icon="notify.tga" name="NoBuild" type="notify"> -This land has building disabled ('no build'). -You cannot create objects here. + This land has building disabled ('no build'). + You cannot create objects here. <unique/> </notification> @@ -5480,222 +5480,222 @@ You cannot create objects here. icon="notify.tga" name="ScriptsStopped" type="notify"> -An administrator has temporarily stopped scripts in this region. + An administrator has temporarily stopped scripts in this region. </notification> <notification icon="notify.tga" name="ScriptsNotRunning" type="notify"> -This region is not running any scripts. + This region is not running any scripts. </notification> <notification icon="notify.tga" name="NoOutsideScripts" type="notify"> -This land has outside scripts disabled ('no outside scripts'). -No scripts will run except those belonging to the land owner. + This land has outside scripts disabled ('no outside scripts'). + No scripts will run except those belonging to the land owner. </notification> <notification icon="notify.tga" name="ClaimPublicLand" type="notify"> -Can only claim public land in region you're in. + Can only claim public land in region you're in. </notification> <notification icon="notify.tga" name="RegionTPAccessBlocked" type="notify"> -You aren't allowed in that Region due to your maturity Rating. You may need to validate your age and/or install the latest Viewer. + You aren't allowed in that Region due to your maturity Rating. You may need to validate your age and/or install the latest Viewer. -Please go to the Knowledge Base for details on accessing areas with this maturity Rating. + Please go to the Knowledge Base for details on accessing areas with this maturity Rating. </notification> <notification icon="notify.tga" name="URBannedFromRegion" type="notify"> -You are banned from the region. + You are banned from the region. </notification> <notification icon="notify.tga" name="NoTeenGridAccess" type="notify"> -Your account cannot connect to this teen grid region. + Your account cannot connect to this teen grid region. </notification> <notification icon="notify.tga" name="NoHelpIslandTP" type="notify"> -You cannot teleport back to Help Island. -Go to 'Help Island Public' to repeat the tutorial. + You cannot teleport back to Help Island. + Go to 'Help Island Public' to repeat the tutorial. </notification> <notification icon="notify.tga" name="ImproperPaymentStatus" type="notify"> -You do not have proper payment status to enter this region. + You do not have proper payment status to enter this region. </notification> <notification icon="notify.tga" name="MustGetAgeRgion" type="notify"> -You must be age-verified to enter this region. + You must be age-verified to enter this region. </notification> <notification icon="notify.tga" name="MustGetAgeParcel" type="notify"> -You must be age-verified to enter this parcel. + You must be age-verified to enter this parcel. </notification> <notification icon="notify.tga" name="NoDestRegion" type="notify"> -No destination region found. + No destination region found. </notification> <notification icon="notify.tga" name="NotAllowedInDest" type="notify"> -You are not allowed into the destination. + You are not allowed into the destination. </notification> <notification icon="notify.tga" name="RegionParcelBan" type="notify"> -Cannot region cross into banned parcel. Try another way. + Cannot region cross into banned parcel. Try another way. </notification> <notification icon="notify.tga" name="TelehubRedirect" type="notify"> -You have been redirected to a telehub. + You have been redirected to a telehub. </notification> <notification icon="notify.tga" name="CouldntTPCloser" type="notify"> -Could not teleport closer to destination. + Could not teleport closer to destination. </notification> <notification icon="notify.tga" name="TPCancelled" type="notify"> - Teleport cancelled. + Teleport cancelled. </notification> <notification icon="notify.tga" name="FullRegionTryAgain" type="notify"> -The region you are attempting to enter is currently full. -Please try again in a few moments. + The region you are attempting to enter is currently full. + Please try again in a few moments. </notification> <notification icon="notify.tga" name="GeneralFailure" type="notify"> -General failure. + General failure. </notification> <notification icon="notify.tga" name="RoutedWrongRegion" type="notify"> -Routed to wrong region. Please try again. + Routed to wrong region. Please try again. </notification> <notification icon="notify.tga" name="NoValidAgentID" type="notify"> -No valid agent id. + No valid agent id. </notification> <notification icon="notify.tga" name="NoValidSession" type="notify"> -No valid session id. + No valid session id. </notification> <notification icon="notify.tga" name="NoValidCircuit" type="notify"> -No valid circuit code. + No valid circuit code. </notification> <notification icon="notify.tga" name="NoValidTimestamp" type="notify"> -No valid timestamp. + No valid timestamp. </notification> <notification icon="notify.tga" name="NoPendingConnection" type="notify"> -Unable to create pending connection. + Unable to create pending connection. </notification> <notification icon="notify.tga" name="InternalUsherError" type="notify"> -Internal error attempting to connect agent usher. + Internal error attempting to connect agent usher. </notification> <notification icon="notify.tga" name="NoGoodTPDestination" type="notify"> -Unable to find a good teleport destination in this region. + Unable to find a good teleport destination in this region. </notification> <notification icon="notify.tga" name="InternalErrorRegionResolver" type="notify"> -Internal error attempting to activate region resolver. + Internal error attempting to activate region resolver. </notification> <notification icon="notify.tga" name="NoValidLanding" type="notify"> -A valid landing point could not be found. + A valid landing point could not be found. </notification> <notification icon="notify.tga" name="NoValidParcel" type="notify"> -No valid parcel could be found. + No valid parcel could be found. </notification> <notification icon="notify.tga" name="ObjectGiveItem" type="notify"> -An object named [OBJECTFROMNAME] owned by [FIRST] [LAST] has given you a [OBJECTTYPE] named [OBJECTNAME]. + An object named [OBJECTFROMNAME] owned by [FIRST] [LAST] has given you a [OBJECTTYPE] named [OBJECTNAME]. <form name="form"> <button index="0" @@ -5716,7 +5716,7 @@ An object named [OBJECTFROMNAME] owned by [FIRST] [LAST] has given you a [OBJECT icon="notify.tga" name="ObjectGiveItemUnknownUser" type="notify"> -An object named [OBJECTFROMNAME] owned by (an unknown user) has given you a [OBJECTTYPE] named [OBJECTNAME]. + An object named [OBJECTFROMNAME] owned by (an unknown user) has given you a [OBJECTTYPE] named [OBJECTNAME]. <form name="form"> <button index="0" @@ -5737,7 +5737,7 @@ An object named [OBJECTFROMNAME] owned by (an unknown user) has given you a [OBJ icon="notify.tga" name="UserGiveItem" type="notify"> -[NAME] has given you a [OBJECTTYPE] named '[OBJECTNAME]'. + [NAME] has given you a [OBJECTTYPE] named '[OBJECTNAME]'. <form name="form"> <button index="0" @@ -5758,15 +5758,15 @@ An object named [OBJECTFROMNAME] owned by (an unknown user) has given you a [OBJ icon="notify.tga" name="GodMessage" type="notify"> -[NAME] -[MESSAGE] + [NAME] + [MESSAGE] </notification> <notification icon="notify.tga" name="JoinGroup" type="notify"> -[MESSAGE] + [MESSAGE] <form name="form"> <button index="0" @@ -5787,9 +5787,9 @@ An object named [OBJECTFROMNAME] owned by (an unknown user) has given you a [OBJ icon="notify.tga" name="TeleportOffered" type="notify"> -[NAME] has offered to teleport you to his or her location: + [NAME] has offered to teleport you to his or her location: -[MESSAGE] + [MESSAGE] <form name="form"> <button index="0" @@ -5806,8 +5806,8 @@ An object named [OBJECTFROMNAME] owned by (an unknown user) has given you a [OBJ icon="notify.tga" name="GotoURL" type="notify"> -[MESSAGE] -[URL] + [MESSAGE] + [URL] <form name="form"> <button index="0" @@ -5824,11 +5824,11 @@ An object named [OBJECTFROMNAME] owned by (an unknown user) has given you a [OBJ icon="notify.tga" name="OfferFriendship" type="notify"> -[NAME] is offering friendship. + [NAME] is offering friendship. -[MESSAGE] + [MESSAGE] -(By default, you will be able to see each other's online status.) + (By default, you will be able to see each other's online status.) <form name="form"> <button index="0" @@ -5845,9 +5845,9 @@ An object named [OBJECTFROMNAME] owned by (an unknown user) has given you a [OBJ icon="notify.tga" name="OfferFriendshipNoMessage" type="notify"> -[NAME] is offering friendship. + [NAME] is offering friendship. -(By default, you will be able to see each other's online status.) + (By default, you will be able to see each other's online status.) <form name="form"> <button index="0" @@ -5864,22 +5864,22 @@ An object named [OBJECTFROMNAME] owned by (an unknown user) has given you a [OBJ icon="notify.tga" name="FriendshipAccepted" type="notify"> -[NAME] accepted your friendship offer. + [NAME] accepted your friendship offer. </notification> <notification icon="notify.tga" name="FriendshipDeclined" type="notify"> -[NAME] declined your friendship offer. + [NAME] declined your friendship offer. </notification> <notification icon="notify.tga" name="OfferCallingCard" type="notify"> -[FIRST] [LAST] is offering their calling card. -This will add a bookmark in your inventory so you can quickly IM this resident. + [FIRST] [LAST] is offering their calling card. + This will add a bookmark in your inventory so you can quickly IM this resident. <form name="form"> <button index="0" @@ -5898,8 +5898,8 @@ This will add a bookmark in your inventory so you can quickly IM this resident. priority="high" sound="UISndAlert" type="notify"> -Region is restarting in [MINUTES] minutes. -If you remain in this region you will be logged out. + Region is restarting in [MINUTES] minutes. + If you remain in this region you will be logged out. </notification> <notification @@ -5908,19 +5908,19 @@ If you remain in this region you will be logged out. priority="high" sound="UISndAlert" type="notify"> -Region is restarting in [SECONDS] seconds. -If you remain in this region you will be logged out. + Region is restarting in [SECONDS] seconds. + If you remain in this region you will be logged out. </notification> <notification icon="notify.tga" name="LoadWebPage" type="notify"> -Load web page [URL]? + Load web page [URL]? -[MESSAGE] + [MESSAGE] -From object: [OBJECTNAME], owner: [NAME]? + From object: [OBJECTNAME], owner: [NAME]? <form name="form"> <button index="0" @@ -5937,14 +5937,14 @@ From object: [OBJECTNAME], owner: [NAME]? icon="notify.tga" name="FailedToFindWearableUnnamed" type="notify"> -Failed to find [TYPE] in database. + Failed to find [TYPE] in database. </notification> <notification icon="notify.tga" name="FailedToFindWearable" type="notify"> -Failed to find [TYPE] named [DESC] in database. + Failed to find [TYPE] named [DESC] in database. </notification> <notification @@ -5958,10 +5958,10 @@ Failed to find [TYPE] named [DESC] in database. icon="notify.tga" name="ScriptQuestion" type="notify"> -'[OBJECTNAME]', an object owned by '[NAME]', would like to: + '[OBJECTNAME]', an object owned by '[NAME]', would like to: -[QUESTIONS] -Is this OK? + [QUESTIONS] + Is this OK? <form name="form"> <button index="0" @@ -5983,12 +5983,12 @@ Is this OK? name="ScriptQuestionCaution" priority="high" type="notify"> -'[OBJECTNAME]', an object owned by '[NAME]', would like to: + '[OBJECTNAME]', an object owned by '[NAME]', would like to: -[QUESTIONS] -If you do not trust this object and its creator, you should deny the request. For additional information, click the Details button. + [QUESTIONS] + If you do not trust this object and its creator, you should deny the request. For additional information, click the Details button. -Grant this request? + Grant this request? <form name="form"> <button index="0" @@ -6010,8 +6010,8 @@ Grant this request? icon="notify.tga" name="ScriptDialog" type="notify"> -[FIRST] [LAST]'s '[TITLE]' -[MESSAGE] + [FIRST] [LAST]'s '[TITLE]' + [MESSAGE] <form name="form"> <button index="-1" @@ -6024,8 +6024,8 @@ Grant this request? icon="notify.tga" name="ScriptDialogGroup" type="notify"> -[GROUPNAME]'s '[TITLE]' -[MESSAGE] + [GROUPNAME]'s '[TITLE]' + [MESSAGE] <form name="form"> <button index="-1" @@ -6038,142 +6038,142 @@ Grant this request? icon="notify.tga" name="FirstBalanceIncrease" type="notify"> -You just received L$[AMOUNT]. -Objects and other users may give you L$. -Your balance is shown in the upper-right corner of the screen. + You just received L$[AMOUNT]. + Objects and other users may give you L$. + Your balance is shown in the upper-right corner of the screen. </notification> <notification icon="notify.tga" name="FirstBalanceDecrease" type="notify"> -You just paid L$[AMOUNT]. -Your balance is shown in the upper-right corner of the screen. + You just paid L$[AMOUNT]. + Your balance is shown in the upper-right corner of the screen. </notification> <notification icon="notify.tga" name="FirstSit" type="notify"> -You are sitting. -Use the arrow keys (or AWSD) to change the view. -Click the 'Stand Up' button to get up. + You are sitting. + Use the arrow keys (or AWSD) to change the view. + Click the 'Stand Up' button to get up. </notification> <notification icon="notify.tga" name="FirstMap" type="notify"> -Click and drag to scroll the map. -Double-click to teleport. -Use the controls on the right to find things and display different backgrounds. + Click and drag to scroll the map. + Double-click to teleport. + Use the controls on the right to find things and display different backgrounds. </notification> <notification icon="notify.tga" name="FirstBuild" type="notify"> -You can build new objects in some areas of [SECOND_LIFE]. -Use the tools in the upper left to build, and try holding down Ctrl or Alt to rapidly switch tools. -Press Esc to stop building. + You can build new objects in some areas of [SECOND_LIFE]. + Use the tools in the upper left to build, and try holding down Ctrl or Alt to rapidly switch tools. + Press Esc to stop building. </notification> <notification icon="notify.tga" name="FirstLeftClickNoHit" type="notify"> -Left-clicking interacts with special objects. -If the mouse pointer changes to a hand, you can interact with the object. -Right-click always shows a menu of things you can do. + Left-clicking interacts with special objects. + If the mouse pointer changes to a hand, you can interact with the object. + Right-click always shows a menu of things you can do. </notification> <notification icon="notify.tga" name="FirstTeleport" type="notify"> -This region doesn't allow point-to-point teleports, so you've been transported to the nearest telehub. -Your destination is marked with a tall beacon. -Follow the red arrow to the beacon, or click the arrow to dismiss the beacon. + This region doesn't allow point-to-point teleports, so you've been transported to the nearest telehub. + Your destination is marked with a tall beacon. + Follow the red arrow to the beacon, or click the arrow to dismiss the beacon. </notification> <notification icon="notify.tga" name="FirstOverrideKeys" type="notify"> -Your movement keys are now being handled by an object. -Try the arrow keys or AWSD to see what they do. -Some objects (like guns) require you to go into mouselook to use them. -Press 'M' to do this. + Your movement keys are now being handled by an object. + Try the arrow keys or AWSD to see what they do. + Some objects (like guns) require you to go into mouselook to use them. + Press 'M' to do this. </notification> <notification icon="notify.tga" name="FirstAppearance" type="notify"> -You are editing your appearance. -To rotate and zoom view, use the arrow keys. -When you are finished, press 'Save All' to save your look and exit. -You can edit your appearance as often as you like. + You are editing your appearance. + To rotate and zoom view, use the arrow keys. + When you are finished, press 'Save All' to save your look and exit. + You can edit your appearance as often as you like. </notification> <notification icon="notify.tga" name="FirstInventory" type="notify"> -This is your inventory, which contains objects, notecards, clothing, and other things you own. -* To wear an object or outfit folder, drag it onto yourself. -* To bring an object into the world, drag it onto the ground. -* To read a notecard, double-click it. + This is your inventory, which contains objects, notecards, clothing, and other things you own. + * To wear an object or outfit folder, drag it onto yourself. + * To bring an object into the world, drag it onto the ground. + * To read a notecard, double-click it. </notification> <notification icon="notify.tga" name="FirstSandbox" type="notify"> -This is a sandbox region. -Objects you build here may be deleted after you leave the area, Sandboxes clean on a regular basis, please refer to the information at the top of the screen next to the region name. + This is a sandbox region. + Objects you build here may be deleted after you leave the area, Sandboxes clean on a regular basis, please refer to the information at the top of the screen next to the region name. -Sandbox regions are uncommon, and are marked with signs. + Sandbox regions are uncommon, and are marked with signs. </notification> <notification icon="notify.tga" name="FirstFlexible" type="notify"> -This object is flexible. -Flexible objects may not be physical and must be phantom until the flexible checkbox is unchecked. + This object is flexible. + Flexible objects may not be physical and must be phantom until the flexible checkbox is unchecked. </notification> <notification icon="notify.tga" name="FirstDebugMenus" type="notify"> -You have enabled the Advanced menu. -This menu contains features useful for developers debugging Second Life. -To toggle this menu on Windows press Ctrl-Alt-D. On Mac press Cmd-Opt-Shift-D. + You have enabled the Advanced menu. + This menu contains features useful for developers debugging Second Life. + To toggle this menu on Windows press Ctrl-Alt-D. On Mac press Cmd-Opt-Shift-D. </notification> <notification icon="notify.tga" name="FirstSculptedPrim" type="notify"> -You are editing a sculpted prim. -Sculpted prims require a special texture to specify their shape. -You can find example sculpted textures in the inventory library. + You are editing a sculpted prim. + Sculpted prims require a special texture to specify their shape. + You can find example sculpted textures in the inventory library. </notification> <notification icon="notify.tga" name="FirstMedia" type="notify"> -You have begun playing media. Media can set to play automatically in the preferences window under Audio / Video. Note that this can be a security risk for media sites you do not trust. + You have begun playing media. Media can set to play automatically in the preferences window under Audio / Video. Note that this can be a security risk for media sites you do not trust. </notification> <notification icon="notifytip.tga" name="MaxListSelectMessage" type="notifytip"> -You may only select up to [MAX_SELECT] items from this list. + You may only select up to [MAX_SELECT] items from this list. </notification> <notification @@ -6302,7 +6302,7 @@ Click Accept to join the chat or Decline to decline the invitation. Click Block icon="notifytip.tga" name="VoiceChannelFull" type="notifytip"> -The voice call you are trying to join, [VOICE_CHANNEL_NAME], has reached maximum capacity. Please try again later. + The voice call you are trying to join, [VOICE_CHANNEL_NAME], has reached maximum capacity. Please try again later. <unique> <context key="VOICE_CHANNEL_NAME"/> </unique> @@ -6312,7 +6312,7 @@ The voice call you are trying to join, [VOICE_CHANNEL_NAME], has reached maximum icon="notifytip.tga" name="ProximalVoiceChannelFull" type="notifytip"> -We're sorry. This area has reached maximum capacity for voice conversations. Please try to use voice in another area. + We're sorry. This area has reached maximum capacity for voice conversations. Please try to use voice in another area. <unique/> </notification> @@ -6320,7 +6320,7 @@ We're sorry. This area has reached maximum capacity for voice conversation icon="notifytip.tga" name="VoiceChannelDisconnected" type="notifytip"> -You have been disconnected from [VOICE_CHANNEL_NAME]. You will now be reconnected to spatial voice chat. + You have been disconnected from [VOICE_CHANNEL_NAME]. You will now be reconnected to spatial voice chat. <unique> <context key="VOICE_CHANNEL_NAME"/> </unique> @@ -6330,7 +6330,7 @@ You have been disconnected from [VOICE_CHANNEL_NAME]. You will now be reconnect icon="notifytip.tga" name="VoiceChannelDisconnectedP2P" type="notifytip"> -[VOICE_CHANNEL_NAME] has ended the call. You will now be reconnected to spatial voice chat. + [VOICE_CHANNEL_NAME] has ended the call. You will now be reconnected to spatial voice chat. <unique> <context key="VOICE_CHANNEL_NAME"/> </unique> @@ -6340,7 +6340,7 @@ You have been disconnected from [VOICE_CHANNEL_NAME]. You will now be reconnect icon="notifytip.tga" name="P2PCallDeclined" type="notifytip"> -[VOICE_CHANNEL_NAME] has declined your call. You will now be reconnected to spatial voice chat. + [VOICE_CHANNEL_NAME] has declined your call. You will now be reconnected to spatial voice chat. <unique> <context key="VOICE_CHANNEL_NAME"/> </unique> @@ -6350,7 +6350,7 @@ You have been disconnected from [VOICE_CHANNEL_NAME]. You will now be reconnect icon="notifytip.tga" name="P2PCallNoAnswer" type="notifytip"> -[VOICE_CHANNEL_NAME] is not available to take your call. You will now be reconnected to spatial voice chat. + [VOICE_CHANNEL_NAME] is not available to take your call. You will now be reconnected to spatial voice chat. <unique> <context key="VOICE_CHANNEL_NAME"/> </unique> @@ -6360,7 +6360,7 @@ You have been disconnected from [VOICE_CHANNEL_NAME]. You will now be reconnect icon="notifytip.tga" name="VoiceChannelJoinFailed" type="notifytip"> -Failed to connect to [VOICE_CHANNEL_NAME], please try again later. You will now be reconnected to spatial voice chat. + Failed to connect to [VOICE_CHANNEL_NAME], please try again later. You will now be reconnected to spatial voice chat. <unique> <context key="VOICE_CHANNEL_NAME"/> </unique> @@ -6371,7 +6371,7 @@ Failed to connect to [VOICE_CHANNEL_NAME], please try again later. You will now icon="notifytip.tga" name="VoiceLoginRetry" type="notifytip"> -We are creating a voice channel for you. This may take up to one minute. + We are creating a voice channel for you. This may take up to one minute. <unique/> </notification> @@ -6379,28 +6379,28 @@ We are creating a voice channel for you. This may take up to one minute. icon="notifytip.tga" name="Cannot enter parcel: not a group member" type="notifytip"> -Cannot enter parcel, you are not a member of the appropriate group. + Cannot enter parcel, you are not a member of the appropriate group. </notification> <notification icon="notifytip.tga" name="Cannot enter parcel: banned" type="notifytip"> -Cannot enter parcel, you have been banned. + Cannot enter parcel, you have been banned. </notification> <notification icon="notifytip.tga" name="Cannot enter parcel: not on access list" type="notifytip"> -Cannot enter parcel, you are not on the access list. + Cannot enter parcel, you are not on the access list. </notification> <notification icon="notifytip.tga" name="VoiceNotAllowed" type="notifytip"> -You do not have permission to connect to voice chat for [VOICE_CHANNEL_NAME]. + You do not have permission to connect to voice chat for [VOICE_CHANNEL_NAME]. <unique> <context key="VOICE_CHANNEL_NAME"/> </unique> @@ -6410,7 +6410,7 @@ You do not have permission to connect to voice chat for [VOICE_CHANNEL_NAME]. icon="notifytip.tga" name="VoiceCallGenericError" type="notifytip"> -An error has occurred while trying to connect to voice chat for [VOICE_CHANNEL_NAME]. Please try again later. + An error has occurred while trying to connect to voice chat for [VOICE_CHANNEL_NAME]. Please try again later. <unique> <context key="VOICE_CHANNEL_NAME"/> </unique> @@ -6422,7 +6422,7 @@ An error has occurred while trying to connect to voice chat for [VOICE_CHANNEL_N name="ServerVersionChanged" priority="high" type="notifytip"> -The region you have entered is running a different simulator version. Click this message for details. + The region you have entered is running a different simulator version. Click this message for details. </notification> <notification @@ -6430,7 +6430,14 @@ The region you have entered is running a different simulator version. Click this name="UnableToOpenCommandURL" priority="high" type="notifytip"> -The URL you clicked cannot be opened from this web browser. + The URL you clicked cannot be opened from this web browser. + </notification> + + <notification name="IMToast" type="notify"> + [MESSAGE] + <form name="form"> + <button index="0" name="respondbutton" text="Respond"/> + </form> </notification> <global name="UnsupportedCPU"> diff --git a/indra/newview/skins/default/xui/en/panel_preferences_graphics1.xml b/indra/newview/skins/default/xui/en/panel_preferences_graphics1.xml index 7b802fb5b3..61ba76aa28 100644 --- a/indra/newview/skins/default/xui/en/panel_preferences_graphics1.xml +++ b/indra/newview/skins/default/xui/en/panel_preferences_graphics1.xml @@ -40,7 +40,7 @@ width="100"> </check_box> <combo_box - make_visible_control="WindowFullScreen" + visiblity_control="WindowFullScreen" allow_text_entry="true" height="16" layout="topleft" @@ -208,7 +208,7 @@ Ultra </text> <panel - make_visible_control="ShowAdvancedGraphicsSettings" + visiblity_control="ShowAdvancedGraphicsSettings" border="false" follows="top|left" height="260" diff --git a/indra/newview/skins/default/xui/en/panel_region_general.xml b/indra/newview/skins/default/xui/en/panel_region_general.xml index 90cc209a68..8ea1a05e97 100644 --- a/indra/newview/skins/default/xui/en/panel_region_general.xml +++ b/indra/newview/skins/default/xui/en/panel_region_general.xml @@ -310,7 +310,10 @@ left="108" name="apply_btn" top="320" - width="100" /> + width="100"> + <button.commit_callback + function="RegionInfo.Cancel" /> + </button> <button follows="left|top" height="20" diff --git a/indra/newview/skins/default/xui/en/strings.xml b/indra/newview/skins/default/xui/en/strings.xml index c21c691680..e8027b1b4b 100644 --- a/indra/newview/skins/default/xui/en/strings.xml +++ b/indra/newview/skins/default/xui/en/strings.xml @@ -341,36 +341,39 @@ You do not have a copy of this texture in your inventory </string> - <string name="no_transfer"> (no transfer)</string> - <string name="no_modify"> (no modify)</string> - <string name="no_copy"> (no copy)</string> - <string name="worn"> (worn)</string> + <!-- use value="" because they have preceding spaces --> + <string name="no_transfer" value=" (no transfer)" /> + <string name="no_modify" value=" (no modify)" /> + <string name="no_copy" value=" (no copy)" /> + <string name="worn" value=" (worn)" /> <string name="LoadingContents">Loading contents...</string> <string name="NoContents">No contents</string> <!-- Gestures labels --> - <string name="Chat"> Chat : </string> - <string name="Sound"> Sound : </string> - <string name="Wait"> --- Wait : </string> - <string name="AnimFlagStop"> Stop Animation : </string> - <string name="AnimFlagStart"> Start Animation : </string> - <string name="Wave"> Wave </string> - <string name="HelloAvatar"> Hello, avatar! </string> + <!-- use value="" because they have preceding spaces --> + <string name="Chat" value=" Chat : " /> + <string name="Sound" value=" Sound : " /> + <string name="Wait" value=" --- Wait : " /> + <string name="AnimFlagStop" value=" Stop Animation : " /> + <string name="AnimFlagStart" value=" Start Animation : " /> + <string name="Wave" value=" Wave " /> + <string name="HelloAvatar" value=" Hello, avatar! " /> <!-- inventory filter --> - <string name="Animations"> Animations,</string> - <string name="Calling Cards"> Calling Cards,</string> - <string name="Clothing"> Clothing,</string> - <string name="Gestures"> Gestures,</string> - <string name="Landmarks"> Landmarks,</string> - <string name="Notecards"> Notecards,</string> - <string name="Objects"> Objects,</string> - <string name="Scripts"> Scripts,</string> - <string name="Sounds"> Sounds,</string> - <string name="Textures"> Textures,</string> - <string name="Snapshots"> Snapshots,</string> - <string name="No Filters"> No </string> - <string name="Since Logoff"> - Since Logoff</string> + <!-- use value="" because they have preceding spaces --> + <string name="Animations" value=" Animations," /> + <string name="Calling Cards" value=" Calling Cards," /> + <string name="Clothing" value=" Clothing," /> + <string name="Gestures" value=" Gestures," /> + <string name="Landmarks" value=" Landmarks," /> + <string name="Notecards" value=" Notecards," /> + <string name="Objects" value=" Objects," /> + <string name="Scripts" value=" Scripts," /> + <string name="Sounds" value=" Sounds," /> + <string name="Textures" value=" Textures," /> + <string name="Snapshots" value=" Snapshots," /> + <string name="No Filters" value="No " /> + <string name="Since Logoff" value=" - Since Logoff" /> <!-- inventory folder --> <string name="InvFolder My Inventory">My Inventory</string> @@ -397,10 +400,6 @@ this texture in your inventory <string name="InvFolder favorite">Favorites</string> <!-- inventory FVBridge --> - <string name="NO_COPY"> (no copy)</string> - <string name="NO_MOD"> (no modify)</string> - <string name="NO_XFER"> (no transfer)</string> - <string name="Buy">Buy</string> <string name="BuyforL$">Buy for L$</string> @@ -486,13 +485,11 @@ this texture in your inventory <!-- groups --> <string name="GroupsNone">none</string> - <string name="Group"> (group)</string> + <string name="Group" value=" (group)" /> <string name="Unknown">(Unknown)</string> - <string name="SummaryForTheWeek">Summary for this week, beginning on </string> - <string name="NextStipendDay">The next stipend day is </string> - <string name="GroupIndividualShare"> Group Individual Share - - </string> + <string name="SummaryForTheWeek" value="Summary for this week, beginning on " /> + <string name="NextStipendDay" value="The next stipend day is " /> + <string name="GroupIndividualShare" value=" Group Individual Share" /> <string name="Balance">Balance</string> <string name="Credits">Credits</string> <string name="Debits">Debits</string> @@ -544,8 +541,8 @@ you managed for [OWNER] <string name="RegionNoCovenant">There is no Covenant provided for this Estate.</string> <string name="RegionNoCovenantOtherOwner">There is no Covenant provided for this Estate. The land on this estate is being sold by the Estate owner, not Linden Lab. Please contact the Estate Owner for sales details.</string> <string name="covenant_last_modified">Last Modified:</string> - <string name="none_text"> (none) </string> - <string name="never_text"> (never) </string> + <string name="none_text" value=" (none) " /> + <string name="never_text" value=" (never) " /> <!--Region Details--> <string name="GroupOwned">Group Owned</string> diff --git a/indra/newview/skins/default/xui/en/widgets/list_view.xml b/indra/newview/skins/default/xui/en/widgets/list_view.xml new file mode 100644 index 0000000000..c66aeb57a0 --- /dev/null +++ b/indra/newview/skins/default/xui/en/widgets/list_view.xml @@ -0,0 +1,6 @@ +<?xml version="1.0" encoding="utf-8" standalone="yes" ?>
+<list_view
+ fg_selected_color="ListViewSelectedFgColor"
+ bg_selected_color="ListViewSelectedBgColor"
+ bg_color="ListViewBgColor"
+ />
|