diff options
Diffstat (limited to 'indra/newview/skins')
353 files changed, 8686 insertions, 7791 deletions
diff --git a/indra/newview/skins/default/colors.xml b/indra/newview/skins/default/colors.xml index 49ea0bc8aa..d55f9fa42f 100644 --- a/indra/newview/skins/default/colors.xml +++ b/indra/newview/skins/default/colors.xml @@ -1,3157 +1,667 @@ -<?xml version="1.0"?> -<llsd> - <map> - <key>AgentChatColor</key> - <map> - <key>Comment</key> - <string>Color of chat messages from other residents</string> - <key>Persist</key> - <integer>1</integer> - <key>Type</key> - <string>Color4</string> - <key>Value</key> - <array> - <real>1.0</real> - <real>1.0</real> - <real>1.0</real> - <real>1.0</real> - </array> - </map> - <key>AlertBoxColor</key> - <map> - <key>Comment</key> - <string>Alert Box Color</string> - <key>Persist</key> - <integer>1</integer> - <key>Type</key> - <string>Color4</string> - <key>Value</key> - <array> - <real>0.24</real> - <real>0.24</real> - <real>0.24</real> - <real>1</real> - </array> - </map> - <key>AlertCautionBoxColor</key> - <map> - <key>Comment</key> - <string>Alert Caution Box Color</string> - <key>Persist</key> - <integer>1</integer> - <key>Type</key> - <string>Color4</string> - <key>Value</key> - <array> - <real>1</real> - <real>0.82</real> - <real>0.46</real> - <real>1</real> - </array> - </map> - <key>AlertCautionTextColor</key> - <map> - <key>Comment</key> - <string>Alert Caution Text Color</string> - <key>Persist</key> - <integer>1</integer> - <key>Type</key> - <string>Color4</string> - <key>Value</key> - <array> - <real>0</real> - <real>0</real> - <real>0</real> - <real>1</real> - </array> - </map> - <key>AlertTextColor</key> - <map> - <key>Comment</key> - <string>Alert Text Color</string> - <key>Persist</key> - <integer>1</integer> - <key>Type</key> - <string>Color4</string> - <key>Value</key> - <array> - <real>0.58</real> - <real>0.66</real> - <real>0.84</real> - <real>1</real> - </array> - </map> - <key>AvatarNameColor</key> - <map> - <key>Comment</key> - <string>Avatar Name Color</string> - <key>Persist</key> - <integer>1</integer> - <key>Type</key> - <string>Color4</string> - <key>Value</key> - <array> - <real>0.98</real> - <real>0.69</real> - <real>0.36</real> - <real>1</real> - </array> - </map> - <key>BackgroundChatColor</key> - <map> - <key>Comment</key> - <string>Color of chat bubble background</string> - <key>Persist</key> - <integer>1</integer> - <key>Type</key> - <string>Color4</string> - <key>Value</key> - <array> - <real>0.0</real> - <real>0.0</real> - <real>0.0</real> - <real>1.0</real> - </array> - </map> - <key>ButtonBorderColor</key> - <map> - <key>Comment</key> - <string>Button Border Color</string> - <key>Persist</key> - <integer>1</integer> - <key>Type</key> - <string>Color4</string> - <key>Value</key> - <array> - <real>0.94</real> - <real>0.61</real> - <real>0</real> - <real>1</real> - </array> - </map> - <key>ButtonCautionImageColor</key> - <map> - <key>Comment</key> - <string>Button Caution Image Color</string> - <key>Persist</key> - <integer>1</integer> - <key>Type</key> - <string>Color4</string> - <key>Value</key> - <array> - <real>1</real> - <real>1</real> - <real>1</real> - <real>1</real> - </array> - </map> - <key>ButtonColor</key> - <map> - <key>Comment</key> - <string>Button Color</string> - <key>Persist</key> - <integer>1</integer> - <key>Type</key> - <string>Color4</string> - <key>Value</key> - <array> - <real>1</real> - <real>1</real> - <real>1</real> - <real>1</real> - </array> - </map> - <key>ButtonFlashBgColor</key> - <map> - <key>Comment</key> - <string>Button Color</string> - <key>Persist</key> - <integer>1</integer> - <key>Type</key> - <string>Color4</string> - <key>Value</key> - <array> - <real>1</real> - <real>0.75</real> - <real>0.24</real> - <real>0.5</real> - </array> - </map> - <key>ButtonImageColor</key> - <map> - <key>Comment</key> - <string>Button Image Color</string> - <key>Persist</key> - <integer>1</integer> - <key>Type</key> - <string>Color4</string> - <key>Value</key> - <array> - <real>1</real> - <real>1</real> - <real>1</real> - <real>1</real> - </array> - </map> - <key>ButtonLabelColor</key> - <map> - <key>Comment</key> - <string>Button Label Color</string> - <key>Persist</key> - <integer>1</integer> - <key>Type</key> - <string>Color4</string> - <key>Value</key> - <array> - <real>0.86</real> - <real>0.86</real> - <real>0.86</real> - <real>1</real> - </array> - </map> - <key>ButtonLabelDisabledColor</key> - <map> - <key>Comment</key> - <string>Button Label Disabled Color</string> - <key>Persist</key> - <integer>1</integer> - <key>Type</key> - <string>Color4</string> - <key>Value</key> - <array> - <real>0.58</real> - <real>0.66</real> - <real>0.84</real> - <real>0.78</real> - </array> - </map> - <key>ButtonLabelSelectedColor</key> - <map> - <key>Comment</key> - <string>Button Label Selected Color</string> - <key>Persist</key> - <integer>1</integer> - <key>Type</key> - <string>Color4</string> - <key>Value</key> - <array> - <real>0.86</real> - <real>0.86</real> - <real>0.86</real> - <real>1</real> - </array> - </map> - <key>ButtonLabelSelectedDisabledColor</key> - <map> - <key>Comment</key> - <string>Button Label Selected Disabled Color</string> - <key>Persist</key> - <integer>1</integer> - <key>Type</key> - <string>Color4</string> - <key>Value</key> - <array> - <real>0.64</real> - <real>0.75</real> - <real>0.93</real> - <real>0.78</real> - </array> - </map> - <key>ButtonSelectedBgColor</key> - <map> - <key>Comment</key> - <string>Button Selected Bg Color</string> - <key>Persist</key> - <integer>1</integer> - <key>Type</key> - <string>Color4</string> - <key>Value</key> - <array> - <real>0.24</real> - <real>0.24</real> - <real>0.24</real> - <real>1</real> - </array> - </map> - <key>ButtonSelectedColor</key> - <map> - <key>Comment</key> - <string>Button Selected Color</string> - <key>Persist</key> - <integer>1</integer> - <key>Type</key> - <string>Color4</string> - <key>Value</key> - <array> - <real>1</real> - <real>1</real> - <real>1</real> - <real>1</real> - </array> - </map> - <key>ButtonUnselectedBgColor</key> - <map> - <key>Comment</key> - <string>Button Unselected Bg Color</string> - <key>Persist</key> - <integer>1</integer> - <key>Type</key> - <string>Color4</string> - <key>Value</key> - <array> - <real>0.24</real> - <real>0.24</real> - <real>0.24</real> - <real>1</real> - </array> - </map> - <key>ButtonUnselectedFgColor</key> - <map> - <key>Comment</key> - <string>Button Unselected Fg Color</string> - <key>Persist</key> - <integer>1</integer> - <key>Type</key> - <string>Color4</string> - <key>Value</key> - <array> - <real>1</real> - <real>1</real> - <real>1</real> - <real>1</real> - </array> - </map> - <key>ChatHistoryBgColor</key> - <map> - <key>Comment</key> - <string>Chat History Bg Color</string> - <key>Persist</key> - <integer>1</integer> - <key>Type</key> - <string>Color4</string> - <key>Value</key> - <array> - <real>0</real> - <real>0</real> - <real>0</real> - <real>0</real> - </array> - </map> - <key>ChatHistoryTextColor</key> - <map> - <key>Comment</key> - <string>Chat History Text Color</string> - <key>Persist</key> - <integer>1</integer> - <key>Type</key> - <string>Color4</string> - <key>Value</key> - <array> - <real>1</real> - <real>1</real> - <real>1</real> - <real>1</real> - </array> - </map> - <key>ColorDropShadow</key> - <map> - <key>Comment</key> - <string>Color Drop Shadow</string> - <key>Persist</key> - <integer>1</integer> - <key>Type</key> - <string>Color4</string> - <key>Value</key> - <array> - <real>0</real> - <real>0</real> - <real>0</real> - <real>0.78</real> - </array> - </map> - <key>ColorPaletteEntry01</key> - <map> - <key>Comment</key> - <string>Color picker palette entry</string> - <key>Persist</key> - <integer>1</integer> - <key>Type</key> - <string>Color4</string> - <key>Value</key> - <array> - <real>0.0</real> - <real>0.0</real> - <real>0.0</real> - <real>1.0</real> - </array> - </map> - <key>ColorPaletteEntry02</key> - <map> - <key>Comment</key> - <string>Color picker palette entry</string> - <key>Persist</key> - <integer>1</integer> - <key>Type</key> - <string>Color4</string> - <key>Value</key> - <array> - <real>0.5</real> - <real>0.5</real> - <real>0.5</real> - <real>1.0</real> - </array> - </map> - <key>ColorPaletteEntry03</key> - <map> - <key>Comment</key> - <string>Color picker palette entry</string> - <key>Persist</key> - <integer>1</integer> - <key>Type</key> - <string>Color4</string> - <key>Value</key> - <array> - <real>0.5</real> - <real>0.0</real> - <real>0.0</real> - <real>1.0</real> - </array> - </map> - <key>ColorPaletteEntry04</key> - <map> - <key>Comment</key> - <string>Color picker palette entry</string> - <key>Persist</key> - <integer>1</integer> - <key>Type</key> - <string>Color4</string> - <key>Value</key> - <array> - <real>0.5</real> - <real>0.5</real> - <real>0.0</real> - <real>1.0</real> - </array> - </map> - <key>ColorPaletteEntry05</key> - <map> - <key>Comment</key> - <string>Color picker palette entry</string> - <key>Persist</key> - <integer>1</integer> - <key>Type</key> - <string>Color4</string> - <key>Value</key> - <array> - <real>0.0</real> - <real>0.5</real> - <real>0.0</real> - <real>1.0</real> - </array> - </map> - <key>ColorPaletteEntry06</key> - <map> - <key>Comment</key> - <string>Color picker palette entry</string> - <key>Persist</key> - <integer>1</integer> - <key>Type</key> - <string>Color4</string> - <key>Value</key> - <array> - <real>0.0</real> - <real>0.5</real> - <real>0.5</real> - <real>1.0</real> - </array> - </map> - <key>ColorPaletteEntry07</key> - <map> - <key>Comment</key> - <string>Color picker palette entry</string> - <key>Persist</key> - <integer>1</integer> - <key>Type</key> - <string>Color4</string> - <key>Value</key> - <array> - <real>0.0</real> - <real>0.0</real> - <real>0.5</real> - <real>1.0</real> - </array> - </map> - <key>ColorPaletteEntry08</key> - <map> - <key>Comment</key> - <string>Color picker palette entry</string> - <key>Persist</key> - <integer>1</integer> - <key>Type</key> - <string>Color4</string> - <key>Value</key> - <array> - <real>0.5</real> - <real>0.0</real> - <real>0.5</real> - <real>1.0</real> - </array> - </map> - <key>ColorPaletteEntry09</key> - <map> - <key>Comment</key> - <string>Color picker palette entry</string> - <key>Persist</key> - <integer>1</integer> - <key>Type</key> - <string>Color4</string> - <key>Value</key> - <array> - <real>0.5</real> - <real>0.5</real> - <real>0.0</real> - <real>1.0</real> - </array> - </map> - <key>ColorPaletteEntry10</key> - <map> - <key>Comment</key> - <string>Color picker palette entry</string> - <key>Persist</key> - <integer>1</integer> - <key>Type</key> - <string>Color4</string> - <key>Value</key> - <array> - <real>0.0</real> - <real>0.25</real> - <real>0.25</real> - <real>1.0</real> - </array> - </map> - <key>ColorPaletteEntry11</key> - <map> - <key>Comment</key> - <string>Color picker palette entry</string> - <key>Persist</key> - <integer>1</integer> - <key>Type</key> - <string>Color4</string> - <key>Value</key> - <array> - <real>0.0</real> - <real>0.5</real> - <real>1.0</real> - <real>1.0</real> - </array> - </map> - <key>ColorPaletteEntry12</key> - <map> - <key>Comment</key> - <string>Color picker palette entry</string> - <key>Persist</key> - <integer>1</integer> - <key>Type</key> - <string>Color4</string> - <key>Value</key> - <array> - <real>0.0</real> - <real>0.25</real> - <real>0.5</real> - <real>1.0</real> - </array> - </map> - <key>ColorPaletteEntry13</key> - <map> - <key>Comment</key> - <string>Color picker palette entry</string> - <key>Persist</key> - <integer>1</integer> - <key>Type</key> - <string>Color4</string> - <key>Value</key> - <array> - <real>0.5</real> - <real>0.0</real> - <real>1.0</real> - <real>1.0</real> - </array> - </map> - <key>ColorPaletteEntry14</key> - <map> - <key>Comment</key> - <string>Color picker palette entry</string> - <key>Persist</key> - <integer>1</integer> - <key>Type</key> - <string>Color4</string> - <key>Value</key> - <array> - <real>0.5</real> - <real>0.25</real> - <real>0.0</real> - <real>1.0</real> - </array> - </map> - <key>ColorPaletteEntry15</key> - <map> - <key>Comment</key> - <string>Color picker palette entry</string> - <key>Persist</key> - <integer>1</integer> - <key>Type</key> - <string>Color4</string> - <key>Value</key> - <array> - <real>1.0</real> - <real>1.0</real> - <real>1.0</real> - <real>1.0</real> - </array> - </map> - <key>ColorPaletteEntry16</key> - <map> - <key>Comment</key> - <string>Color picker palette entry</string> - <key>Persist</key> - <integer>1</integer> - <key>Type</key> - <string>Color4</string> - <key>Value</key> - <array> - <real>1.0</real> - <real>1.0</real> - <real>1.0</real> - <real>1.0</real> - </array> - </map> - <key>ColorPaletteEntry17</key> - <map> - <key>Comment</key> - <string>Color picker palette entry</string> - <key>Persist</key> - <integer>1</integer> - <key>Type</key> - <string>Color4</string> - <key>Value</key> - <array> - <real>1.0</real> - <real>1.0</real> - <real>1.0</real> - <real>1.0</real> - </array> - </map> - <key>ColorPaletteEntry18</key> - <map> - <key>Comment</key> - <string>Color picker palette entry</string> - <key>Persist</key> - <integer>1</integer> - <key>Type</key> - <string>Color4</string> - <key>Value</key> - <array> - <real>0.75</real> - <real>0.75</real> - <real>0.75</real> - <real>1.0</real> - </array> - </map> - <key>ColorPaletteEntry19</key> - <map> - <key>Comment</key> - <string>Color picker palette entry</string> - <key>Persist</key> - <integer>1</integer> - <key>Type</key> - <string>Color4</string> - <key>Value</key> - <array> - <real>1.0</real> - <real>0.0</real> - <real>0.0</real> - <real>1.0</real> - </array> - </map> - <key>ColorPaletteEntry20</key> - <map> - <key>Comment</key> - <string>Color picker palette entry</string> - <key>Persist</key> - <integer>1</integer> - <key>Type</key> - <string>Color4</string> - <key>Value</key> - <array> - <real>1.0</real> - <real>1.0</real> - <real>0.0</real> - <real>1.0</real> - </array> - </map> - <key>ColorPaletteEntry21</key> - <map> - <key>Comment</key> - <string>Color picker palette entry</string> - <key>Persist</key> - <integer>1</integer> - <key>Type</key> - <string>Color4</string> - <key>Value</key> - <array> - <real>0.0</real> - <real>1.0</real> - <real>0.0</real> - <real>1.0</real> - </array> - </map> - <key>ColorPaletteEntry22</key> - <map> - <key>Comment</key> - <string>Color picker palette entry</string> - <key>Persist</key> - <integer>1</integer> - <key>Type</key> - <string>Color4</string> - <key>Value</key> - <array> - <real>0.0</real> - <real>1.0</real> - <real>1.0</real> - <real>1.0</real> - </array> - </map> - <key>ColorPaletteEntry23</key> - <map> - <key>Comment</key> - <string>Color picker palette entry</string> - <key>Persist</key> - <integer>1</integer> - <key>Type</key> - <string>Color4</string> - <key>Value</key> - <array> - <real>0.0</real> - <real>0.0</real> - <real>1.0</real> - <real>1.0</real> - </array> - </map> - <key>ColorPaletteEntry24</key> - <map> - <key>Comment</key> - <string>Color picker palette entry</string> - <key>Persist</key> - <integer>1</integer> - <key>Type</key> - <string>Color4</string> - <key>Value</key> - <array> - <real>1.0</real> - <real>0.0</real> - <real>1.0</real> - <real>1.0</real> - </array> - </map> - <key>ColorPaletteEntry25</key> - <map> - <key>Comment</key> - <string>Color picker palette entry</string> - <key>Persist</key> - <integer>1</integer> - <key>Type</key> - <string>Color4</string> - <key>Value</key> - <array> - <real>1.0</real> - <real>1.0</real> - <real>0.5</real> - <real>1.0</real> - </array> - </map> - <key>ColorPaletteEntry26</key> - <map> - <key>Comment</key> - <string>Color picker palette entry</string> - <key>Persist</key> - <integer>1</integer> - <key>Type</key> - <string>Color4</string> - <key>Value</key> - <array> - <real>0.0</real> - <real>1.0</real> - <real>0.5</real> - <real>1.0</real> - </array> - </map> - <key>ColorPaletteEntry27</key> - <map> - <key>Comment</key> - <string>Color picker palette entry</string> - <key>Persist</key> - <integer>1</integer> - <key>Type</key> - <string>Color4</string> - <key>Value</key> - <array> - <real>0.5</real> - <real>1.0</real> - <real>1.0</real> - <real>1.0</real> - </array> - </map> - <key>ColorPaletteEntry28</key> - <map> - <key>Comment</key> - <string>Color picker palette entry</string> - <key>Persist</key> - <integer>1</integer> - <key>Type</key> - <string>Color4</string> - <key>Value</key> - <array> - <real>0.5</real> - <real>0.5</real> - <real>1.0</real> - <real>1.0</real> - </array> - </map> - <key>ColorPaletteEntry29</key> - <map> - <key>Comment</key> - <string>Color picker palette entry</string> - <key>Persist</key> - <integer>1</integer> - <key>Type</key> - <string>Color4</string> - <key>Value</key> - <array> - <real>1.0</real> - <real>0.0</real> - <real>0.5</real> - <real>1.0</real> - </array> - </map> - <key>ColorPaletteEntry30</key> - <map> - <key>Comment</key> - <string>Color picker palette entry</string> - <key>Persist</key> - <integer>1</integer> - <key>Type</key> - <string>Color4</string> - <key>Value</key> - <array> - <real>1.0</real> - <real>0.5</real> - <real>0.0</real> - <real>1.0</real> - </array> - </map> - <key>ColorPaletteEntry31</key> - <map> - <key>Comment</key> - <string>Color picker palette entry</string> - <key>Persist</key> - <integer>1</integer> - <key>Type</key> - <string>Color4</string> - <key>Value</key> - <array> - <real>1.0</real> - <real>1.0</real> - <real>1.0</real> - <real>1.0</real> - </array> - </map> - <key>ColorPaletteEntry32</key> - <map> - <key>Comment</key> - <string>Color picker palette entry</string> - <key>Persist</key> - <integer>1</integer> - <key>Type</key> - <string>Color4</string> - <key>Value</key> - <array> - <real>1.0</real> - <real>1.0</real> - <real>1.0</real> - <real>1.0</real> - </array> - </map> - <key>ConsoleBackground</key> - <map> - <key>Comment</key> - <string>Console Background</string> - <key>Persist</key> - <integer>1</integer> - <key>Type</key> - <string>Color4</string> - <key>Value</key> - <array> - <real>0</real> - <real>0</real> - <real>0</real> - <real>1</real> - </array> - </map> - <key>ContextSilhouetteColor</key> - <map> - <key>Comment</key> - <string>Context Silhouette Color</string> - <key>Persist</key> - <integer>1</integer> - <key>Type</key> - <string>Color4</string> - <key>Value</key> - <array> - <real>0.94</real> - <real>0.61</real> - <real>0</real> - <real>1</real> - </array> - </map> - <key>DefaultHighlightDark</key> - <map> - <key>Comment</key> - <string>Default Highlight Dark</string> - <key>Persist</key> - <integer>1</integer> - <key>Type</key> - <string>Color4</string> - <key>Value</key> - <array> - <real>0.1</real> - <real>0.1</real> - <real>0.1</real> - <real>1</real> - </array> - </map> - <key>DefaultHighlightLight</key> - <map> - <key>Comment</key> - <string>Default Highlight Light</string> - <key>Persist</key> - <integer>1</integer> - <key>Type</key> - <string>Color4</string> - <key>Value</key> - <array> - <real>0.45</real> - <real>0.52</real> - <real>0.61</real> - <real>1</real> - </array> - </map> - <key>DefaultShadowDark</key> - <map> - <key>Comment</key> - <string>Default Shadow Dark</string> - <key>Persist</key> - <integer>1</integer> - <key>Type</key> - <string>Color4</string> - <key>Value</key> - <array> - <real>0.1</real> - <real>0.1</real> - <real>0.1</real> - <real>1</real> - </array> - </map> - <key>DefaultShadowLight</key> - <map> - <key>Comment</key> - <string>Default Shadow Light</string> - <key>Persist</key> - <integer>1</integer> - <key>Type</key> - <string>Color4</string> - <key>Value</key> - <array> - <real>0</real> - <real>0</real> - <real>0</real> - <real>1</real> - </array> - </map> - <key>EffectColor</key> - <map> - <key>Comment</key> - <string>Particle effects color</string> - <key>Persist</key> - <integer>1</integer> - <key>Type</key> - <string>Color4</string> - <key>Value</key> - <array> - <real>1.0</real> - <real>1.0</real> - <real>1.0</real> - <real>1.0</real> - </array> - </map> - <key>FilterBackgroundColor</key> - <map> - <key>Comment</key> - <string>Filter Background Color</string> - <key>Persist</key> - <integer>1</integer> - <key>Type</key> - <string>Color4</string> - <key>Value</key> - <array> - <real>0</real> - <real>0</real> - <real>0.08</real> - <real>1</real> - </array> - </map> - <key>FilterTextColor</key> - <map> - <key>Comment</key> - <string>Filter Text Color</string> - <key>Persist</key> - <integer>1</integer> - <key>Type</key> - <string>Color4</string> - <key>Value</key> - <array> - <real>1</real> - <real>0.78</real> - <real>0.27</real> - <real>1</real> - </array> - </map> - <key>FloaterButtonImageColor</key> - <map> - <key>Comment</key> - <string>Floater Button Image Color</string> - <key>Persist</key> - <integer>1</integer> - <key>Type</key> - <string>Color4</string> - <key>Value</key> - <array> - <real>0.94</real> - <real>0.61</real> - <real>0</real> - <real>1</real> - </array> - </map> - <key>FloaterDefaultBackgroundColor</key> - <map> - <key>Comment</key> - <string>Default Background Color</string> - <key>Persist</key> - <integer>1</integer> - <key>Type</key> - <string>Color4</string> - <key>Value</key> - <array> - <real>0.24</real> - <real>0.24</real> - <real>0.24</real> - <real>0.55</real> - </array> - </map> - <key>FloaterFocusBackgroundColor</key> - <map> - <key>Comment</key> - <string>Focus Background Color</string> - <key>Persist</key> - <integer>1</integer> - <key>Type</key> - <string>Color4</string> - <key>Value</key> - <array> - <real>0.24</real> - <real>0.24</real> - <real>0.24</real> - <real>1</real> - </array> - </map> - <key>FloaterFocusBorderColor</key> - <map> - <key>Comment</key> - <string>Floater Focus Border Color</string> - <key>Persist</key> - <integer>1</integer> - <key>Type</key> - <string>Color4</string> - <key>Value</key> - <array> - <real>0</real> - <real>0</real> - <real>0</real> - <real>0.31</real> - </array> - </map> - <key>FloaterUnfocusBorderColor</key> - <map> - <key>Comment</key> - <string>Floater Unfocus Border Color</string> - <key>Persist</key> - <integer>1</integer> - <key>Type</key> - <string>Color4</string> - <key>Value</key> - <array> - <real>0</real> - <real>0</real> - <real>0</real> - <real>0.31</real> - </array> - </map> - <key>FocusColor</key> - <map> - <key>Comment</key> - <string>Focus Color</string> - <key>Persist</key> - <integer>1</integer> - <key>Type</key> - <string>Color4</string> - <key>Value</key> - <array> - <real>0.94</real> - <real>0.61</real> - <real>0</real> - <real>1</real> - </array> - </map> - <key>FolderViewLoadingMessageTextColor</key> - <map> - <key>Comment</key> - <string>Folder View Loading Message Text Color</string> - <key>Persist</key> - <integer>1</integer> - <key>Type</key> - <string>Color4</string> - <key>Value</key> - <array> - <real>0.94</real> - <real>0.65</real> - <real>0.35</real> - <real>1</real> - </array> - </map> - <key>GridFocusPointColor</key> - <map> - <key>Comment</key> - <string>Grid Focus Point Color</string> - <key>Persist</key> - <integer>1</integer> - <key>Type</key> - <string>Color4</string> - <key>Value</key> - <array> - <real>1</real> - <real>1</real> - <real>1</real> - <real>0.5</real> - </array> - </map> - <key>GridlineBGColor</key> - <map> - <key>Comment</key> - <string>Gridline BGColor</string> - <key>Persist</key> - <integer>1</integer> - <key>Type</key> - <string>Color4</string> - <key>Value</key> - <array> - <real>0.92</real> - <real>0.92</real> - <real>1</real> - <real>0.78</real> - </array> - </map> - <key>GridlineColor</key> - <map> - <key>Comment</key> - <string>Gridline Color</string> - <key>Persist</key> - <integer>1</integer> - <key>Type</key> - <string>Color4</string> - <key>Value</key> - <array> - <real>1</real> - <real>1</real> - <real>1</real> - <real>1</real> - </array> - </map> - <key>GridlineShadowColor</key> - <map> - <key>Comment</key> - <string>Gridline Shadow Color</string> - <key>Persist</key> - <integer>1</integer> - <key>Type</key> - <string>Color4</string> - <key>Value</key> - <array> - <real>0</real> - <real>0</real> - <real>0</real> - <real>0.31</real> - </array> - </map> - <key>GroupNotifyBoxColor</key> - <map> - <key>Comment</key> - <string>Group Notify Box Color</string> - <key>Persist</key> - <integer>1</integer> - <key>Type</key> - <string>Color4</string> - <key>Value</key> - <array> - <real>0.27</real> - <real>0.67</real> - <real>1</real> - <real>1</real> - </array> - </map> - <key>GroupNotifyTextColor</key> - <map> - <key>Comment</key> - <string>Group Notify Text Color</string> - <key>Persist</key> - <integer>1</integer> - <key>Type</key> - <string>Color4</string> - <key>Value</key> - <array> - <real>0</real> - <real>0.12</real> - <real>0.24</real> - <real>1</real> - </array> - </map> - <key>GroupOverTierColor</key> - <map> - <key>Comment</key> - <string>Group Over Tier Color</string> - <key>Persist</key> - <integer>1</integer> - <key>Type</key> - <string>Color4</string> - <key>Value</key> - <array> - <real>0.43</real> - <real>0.06</real> - <real>0.06</real> - <real>1</real> - </array> - </map> - <key>HTMLLinkColor</key> - <map> - <key>Comment</key> - <string>Color of hyperlinks</string> - <key>Persist</key> - <integer>1</integer> - <key>Type</key> - <string>Color4</string> - <key>Value</key> - <array> - <real>0.60</real> - <real>0.60</real> - <real>1.0</real> - <real>1.0</real> - </array> - </map> - <key>HealthTextColor</key> - <map> - <key>Comment</key> - <string>Health Text Color</string> - <key>Persist</key> - <integer>1</integer> - <key>Type</key> - <string>Color4</string> - <key>Value</key> - <array> - <real>1</real> - <real>1</real> - <real>1</real> - <real>1</real> - </array> - </map> - <key>HelpBgColor</key> - <map> - <key>Comment</key> - <string>Help Bg Color</string> - <key>Persist</key> - <integer>1</integer> - <key>Type</key> - <string>Color4</string> - <key>Value</key> - <array> - <real>0.78</real> - <real>0.82</real> - <real>0.8</real> - <real>1</real> - </array> - </map> - <key>HelpFgColor</key> - <map> - <key>Comment</key> - <string>Help Fg Color</string> - <key>Persist</key> - <integer>1</integer> - <key>Type</key> - <string>Color4</string> - <key>Value</key> - <array> - <real>0</real> - <real>0</real> - <real>0</real> - <real>1</real> - </array> - </map> - <key>HelpScrollHighlightColor</key> - <map> - <key>Comment</key> - <string>Help Scroll Highlight Color</string> - <key>Persist</key> - <integer>1</integer> - <key>Type</key> - <string>Color4</string> - <key>Value</key> - <array> - <real>0.45</real> - <real>0.52</real> - <real>0.61</real> - <real>1</real> - </array> - </map> - <key>HelpScrollShadowColor</key> - <map> - <key>Comment</key> - <string>Help Scroll Shadow Color</string> - <key>Persist</key> - <integer>1</integer> - <key>Type</key> - <string>Color4</string> - <key>Value</key> - <array> - <real>0</real> - <real>0</real> - <real>0</real> - <real>1</real> - </array> - </map> - <key>HelpScrollThumbColor</key> - <map> - <key>Comment</key> - <string>Help Scroll Thumb Color</string> - <key>Persist</key> - <integer>1</integer> - <key>Type</key> - <string>Color4</string> - <key>Value</key> - <array> - <real>0.31</real> - <real>0.38</real> - <real>0.49</real> - <real>1</real> - </array> - </map> - <key>HelpScrollTrackColor</key> - <map> - <key>Comment</key> - <string>Help Scroll Track Color</string> - <key>Persist</key> - <integer>1</integer> - <key>Type</key> - <string>Color4</string> - <key>Value</key> - <array> - <real>0.72</real> - <real>0.72</real> - <real>0.74</real> - <real>1</real> - </array> - </map> - <key>HighlightChildColor</key> - <map> - <key>Comment</key> - <string>Highlight Child Color</string> - <key>Persist</key> - <integer>1</integer> - <key>Type</key> - <string>Color4</string> - <key>Value</key> - <array> - <real>0.67</real> - <real>0.83</real> - <real>0.96</real> - <real>1</real> - </array> - </map> - <key>HighlightInspectColor</key> - <map> - <key>Comment</key> - <string>Highlight Inspect Color</string> - <key>Persist</key> - <integer>1</integer> - <key>Type</key> - <string>Color4</string> - <key>Value</key> - <array> - <real>1</real> - <real>0</real> - <real>1</real> - <real>1</real> - </array> - </map> - <key>HighlightParentColor</key> - <map> - <key>Comment</key> - <string>Highlight Parent Color</string> - <key>Persist</key> - <integer>1</integer> - <key>Type</key> - <string>Color4</string> - <key>Value</key> - <array> - <real>0.67</real> - <real>0.83</real> - <real>0.96</real> - <real>1</real> - </array> - </map> - <key>IMChatColor</key> - <map> - <key>Comment</key> - <string>Color of instant messages from other residents</string> - <key>Persist</key> - <integer>1</integer> - <key>Type</key> - <string>Color4</string> - <key>Value</key> - <array> - <real>1.0</real> - <real>1.0</real> - <real>1.0</real> - <real>1.0</real> - </array> - </map> - <key>IMHistoryBgColor</key> - <map> - <key>Comment</key> - <string>IMHistory Bg Color</string> - <key>Persist</key> - <integer>1</integer> - <key>Type</key> - <string>Color4</string> - <key>Value</key> - <array> - <real>0</real> - <real>0.12</real> - <real>0.31</real> - <real>0.78</real> - </array> - </map> - <key>IMHistoryTextColor</key> - <map> - <key>Comment</key> - <string>IMHistory Text Color</string> - <key>Persist</key> - <integer>1</integer> - <key>Type</key> - <string>Color4</string> - <key>Value</key> - <array> - <real>1</real> - <real>1</real> - <real>1</real> - <real>1</real> - </array> - </map> - <key>IconDisabledColor</key> - <map> - <key>Comment</key> - <string>Icon Disabled Color</string> - <key>Persist</key> - <integer>1</integer> - <key>Type</key> - <string>Color4</string> - <key>Value</key> - <array> - <real>0.58</real> - <real>0.66</real> - <real>0.84</real> - <real>0.78</real> - </array> - </map> - <key>IconEnabledColor</key> - <map> - <key>Comment</key> - <string>Icon Enabled Color</string> - <key>Persist</key> - <integer>1</integer> - <key>Type</key> - <string>Color4</string> - <key>Value</key> - <array> - <real>1</real> - <real>1</real> - <real>1</real> - <real>1</real> - </array> - </map> - <key>InventoryBackgroundColor</key> - <map> - <key>Comment</key> - <string>Inventory Background Color</string> - <key>Persist</key> - <integer>1</integer> - <key>Type</key> - <string>Color4</string> - <key>Value</key> - <array> - <real>0.24</real> - <real>0.24</real> - <real>0.24</real> - <real>0.31</real> - </array> - </map> - <key>InventoryItemSuffixColor</key> - <map> - <key>Comment</key> - <string>Inventory Item Suffix Color</string> - <key>Persist</key> - <integer>1</integer> - <key>Type</key> - <string>Color4</string> - <key>Value</key> - <array> - <real>0.75</real> - <real>0.85</real> - <real>0.85</real> - <real>1</real> - </array> - </map> - <key>InventorySearchStatusColor</key> - <map> - <key>Comment</key> - <string>Inventory Search Status Color</string> - <key>Persist</key> - <integer>1</integer> - <key>Type</key> - <string>Color4</string> - <key>Value</key> - <array> - <real>1</real> - <real>1</real> - <real>1</real> - <real>1</real> - </array> - </map> - <key>LabelDisabledColor</key> - <map> - <key>Comment</key> - <string>Label Disabled Color</string> - <key>Persist</key> - <integer>1</integer> - <key>Type</key> - <string>Color4</string> - <key>Value</key> - <array> - <real>0.58</real> - <real>0.66</real> - <real>0.84</real> - <real>0.3</real> - </array> - </map> - <key>LabelSelectedColor</key> - <map> - <key>Comment</key> - <string>Label Selected Color</string> - <key>Persist</key> - <integer>1</integer> - <key>Type</key> - <string>Color4</string> - <key>Value</key> - <array> - <real>1</real> - <real>1</real> - <real>1</real> - <real>1</real> - </array> - </map> - <key>LabelSelectedDisabledColor</key> - <map> - <key>Comment</key> - <string>Label Selected Disabled Color</string> - <key>Persist</key> - <integer>1</integer> - <key>Type</key> - <string>Color4</string> - <key>Value</key> - <array> - <real>0.64</real> - <real>0.75</real> - <real>0.93</real> - <real>0.5</real> - </array> - </map> - <key>LabelTextColor</key> - <map> - <key>Comment</key> - <string>Label Text Color</string> - <key>Persist</key> - <integer>1</integer> - <key>Type</key> - <string>Color4</string> - <key>Value</key> - <array> - <real>0.58</real> - <real>0.66</real> - <real>0.84</real> - <real>1</real> - </array> - </map> - <key>LoginProgressBarBgColor</key> - <map> - <key>Comment</key> - <string>Login Progress Bar Bg Color</string> - <key>Persist</key> - <integer>1</integer> - <key>Type</key> - <string>Color4</string> - <key>Value</key> - <array> - <real>1</real> - <real>1</real> - <real>1</real> - <real>1</real> - </array> - </map> - <key>LoginProgressBarFgColor</key> - <map> - <key>Comment</key> - <string>Login Progress Bar Fg Color</string> - <key>Persist</key> - <integer>1</integer> - <key>Type</key> - <string>Color4</string> - <key>Value</key> - <array> - <real>1</real> - <real>1</real> - <real>1</real> - <real>1</real> - </array> - </map> - <key>LoginProgressBoxBorderColor</key> - <map> - <key>Comment</key> - <string>Login Progress Box Border Color</string> - <key>Persist</key> - <integer>1</integer> - <key>Type</key> - <string>Color4</string> - <key>Value</key> - <array> - <real>0</real> - <real>0.12</real> - <real>0.24</real> - <real>0</real> - </array> - </map> - <key>LoginProgressBoxCenterColor</key> - <map> - <key>Comment</key> - <string>Login Progress Box Center Color</string> - <key>Persist</key> - <integer>1</integer> - <key>Type</key> - <string>Color4</string> - <key>Value</key> - <array> - <real>0</real> - <real>0</real> - <real>0</real> - <real>0.78</real> - </array> - </map> - <key>LoginProgressBoxShadowColor</key> - <map> - <key>Comment</key> - <string>Login Progress Box Shadow Color</string> - <key>Persist</key> - <integer>1</integer> - <key>Type</key> - <string>Color4</string> - <key>Value</key> - <array> - <real>0</real> - <real>0</real> - <real>0</real> - <real>0.78</real> - </array> - </map> - <key>LoginProgressBoxTextColor</key> - <map> - <key>Comment</key> - <string>Login Progress Box Text Color</string> - <key>Persist</key> - <integer>1</integer> - <key>Type</key> - <string>Color4</string> - <key>Value</key> - <array> - <real>1</real> - <real>1</real> - <real>1</real> - <real>1</real> - </array> - </map> +<?xml version="1.0" encoding="utf-8" standalone="yes" ?> +<colors> + + <!-- Named Colors --> + + <color + name="EmphasisColor" + value="0.38 0.694 0.573 1" /> + <color + name="EmphasisColor_13" + value="0.38 0.694 0.573 0.13" /> + <color + name="EmphasisColor_35" + value="0.38 0.694 0.573 0.35" /> + <color + name="White" + value="1 1 1 1" /> + <color + name="White_05" + value="1 1 1 0.05" /> + <color + name="White_10" + value="1 1 1 0.1" /> + <color + name="White_25" + value="1 1 1 0.25" /> + <color + name="White_50" + value="1 1 1 0.5" /> + <color + name="LtGray" + value="0.75 0.75 0.75 1" /> + <color + name="LtGray_50" + value="0.75 0.75 0.75 0.50" /> + <color + name="DkGray" + value="0.125 0.125 0.125 1" /> + <color + name="DkGray_66" + value="0.125 0.125 0.125 .66" /> + <color + name="DkGray2" + value="0.169 0.169 0.169 1" /> + <color + name="Black" + value="0 0 0 1" /> + <color + name="Black_10" + value="0 0 0 0.1" /> + <color + name="Black_25" + value="0 0 0 0.25" /> + <color + name="Black_50" + value="0 0 0 0.5" /> + <color + name="Red" + value="1 0 0 1" /> + <color + name="Green" + value="0 1 0 1" /> + <color + name="Blue" + value="0 0 1 1" /> + <color + name="Unused?" + value="1 0 1 1" /> + <color + name="Transparent" + value="0 0 0 0" /> + + + + <!-- UI Definitions --> + + <color + name="AgentChatColor" + reference="LtGray" /> + <color + name="AlertBoxColor" + value="0.24 0.24 0.24 1" /> + <color + name="AlertCautionBoxColor" + value="1 0.82 0.46 1" /> + <color + name="AlertCautionTextColor" + reference="Black" /> + <color + name="AlertTextColor" + value="0.58 0.66 0.84 1" /> + <color + name="AvatarNameColor" + value="0.98 0.69 0.36 1" /> + <color + name="BackgroundChatColor" + reference="DkGray_66" /> + <color + name="ButtonBorderColor" + reference="Unused?" /> + <color + name="ButtonCautionImageColor" + reference="Unused?" /> + <color + name="ButtonColor" + reference="Unused?" /> + <color + name="ButtonFlashBgColor" + reference="Unused?" /> + <color + name="ButtonImageColor" + reference="White" /> + <color + name="ButtonLabelColor" + reference="LtGray" /> + <color + name="ButtonLabelDisabledColor" + reference="LtGray_50" /> + <color + name="ButtonLabelSelectedColor" + reference="White" /> + <color + name="ButtonLabelSelectedDisabledColor" + reference="White_50" /> + <color + name="ButtonSelectedBgColor" + reference="Unused?" /> + <color + name="ButtonSelectedColor" + reference="Unused?" /> + <color + name="ButtonUnselectedBgColor" + reference="Unused?" /> + <color + name="ButtonUnselectedFgColor" + reference="Unused?" /> + <color + name="ChatHistoryBgColor" + reference="Transparent" /> + <color + name="ChatHistoryTextColor" + reference="LtGray" /> + <color + name="ColorDropShadow" + reference="Black_50" /> + <color + name="ColorPaletteEntry01" + value="0 0 0 1" /> + <color + name="ColorPaletteEntry02" + value="0.5 0.5 0.5 1" /> + <color + name="ColorPaletteEntry03" + value="0.3344 0.5456 0.5159 1" /> + <color + name="ColorPaletteEntry04" + value="0.5 0.5 0 1" /> + <color + name="ColorPaletteEntry05" + value="0 0.5 0 1" /> + <color + name="ColorPaletteEntry06" + value="0 0.5 0.5 1" /> + <color + name="ColorPaletteEntry07" + value="0 0 0.5 1" /> + <color + name="ColorPaletteEntry08" + value="0.5 0 0.5 1" /> + <color + name="ColorPaletteEntry09" + value="0.5 0.5 0 1" /> + <color + name="ColorPaletteEntry10" + value="0 0.25 0.25 1" /> + <color + name="ColorPaletteEntry11" + value="0 0.5 1 1" /> + <color + name="ColorPaletteEntry12" + value="0 0.25 0.5 1" /> + <color + name="ColorPaletteEntry13" + value="0.5 0 1 1" /> + <color + name="ColorPaletteEntry14" + value="0.5 0.25 0 1" /> + <color + name="ColorPaletteEntry15" + value="1 1 1 1" /> + <color + name="ColorPaletteEntry16" + value="1 1 1 1" /> + <color + name="ColorPaletteEntry17" + value="1 1 1 1" /> + <color + name="ColorPaletteEntry18" + value="0.75 0.75 0.75 1" /> + <color + name="ColorPaletteEntry19" + value="1 0 0 1" /> + <color + name="ColorPaletteEntry20" + reference="Unused?" /> + <color + name="ColorPaletteEntry21" + value="0 1 0 1" /> + <color + name="ColorPaletteEntry22" + value="0 1 1 1" /> + <color + name="ColorPaletteEntry23" + value="0 0 1 1" /> + <color + name="ColorPaletteEntry24" + value="1 0 1 1" /> + <color + name="ColorPaletteEntry25" + value="1 1 0.5 1" /> + <color + name="ColorPaletteEntry26" + value="0 1 0.5 1" /> + <color + name="ColorPaletteEntry27" + value="0.5 1 1 1" /> + <color + name="ColorPaletteEntry28" + value="0.5 0.5 1 1" /> + <color + name="ColorPaletteEntry29" + value="1 0 0.5 1" /> + <color + name="ColorPaletteEntry30" + value="1 0.5 0 1" /> + <color + name="ColorPaletteEntry31" + value="1 1 1 1" /> + <color + name="ColorPaletteEntry32" + value="1 1 1 1" /> + <color + name="ConsoleBackground" + reference="Black" /> + <color + name="ContextSilhouetteColor" + value="0.94 0.61 0 1" /> + <color + name="DefaultHighlightDark" + reference="White_10" /> + <color + name="DefaultHighlightLight" + reference="White_25" /> + <color + name="DefaultShadowDark" + reference="Black_50" /> + <color + name="DefaultShadowLight" + reference="Black_50" /> + <color + name="EffectColor" + reference="White" /> + <color + name="FilterBackgroundColor" + reference="FloaterDefaultBackgroundColor" /> + <color + name="FilterTextColor" + value="1 0.78 0.27 1" /> + <color + name="FloaterButtonImageColor" + reference="LtGray" /> + <color + name="FloaterDefaultBackgroundColor" + reference="DkGray_66" /> + <color + name="FloaterFocusBackgroundColor" + reference="DkGray2" /> + <color + name="FloaterFocusBorderColor" + reference="Black_50" /> + <color + name="FloaterUnfocusBorderColor" + reference="Black_50" /> + <color + name="FocusColor" + reference="EmphasisColor" /> + <color + name="FolderViewLoadingMessageTextColor" + value="0.3344 0.5456 0.5159 1" /> + <color + name="GridFocusPointColor" + reference="White_50" /> + <color + name="GridlineBGColor" + value="0.92 0.92 1 0.78" /> + <color + name="GridlineColor" + value="1 0 0 1" /> + <color + name="GridlineShadowColor" + value="0 0 0 0.31" /> + <color + name="GroupNotifyBoxColor" + value="0.3344 0.5456 0.5159 1" /> + <color + name="GroupNotifyTextColor" + reference="White"/> + <color + name="GroupNotifyDimmedTextColor" + reference="DkGray"/> + <color + name="GroupOverTierColor" + value="0.43 0.06 0.06 1" /> + <color + name="HTMLLinkColor" + reference="EmphasisColor" /> + <color + name="HealthTextColor" + reference="White" /> + <color + name="HelpBgColor" + reference="Unused?" /> + <color + name="HelpFgColor" + reference="Unused?" /> + <color + name="HelpScrollHighlightColor" + reference="Unused?" /> + <color + name="HelpScrollShadowColor" + reference="Unused?" /> + <color + name="HelpScrollThumbColor" + reference="Unused?" /> + <color + name="HelpScrollTrackColor" + reference="Unused?" /> + <color + name="HighlightChildColor" + reference="Unused?" /> + <color + name="HighlightInspectColor" + value="1 0.5 0 1" /> + <color + name="HighlightParentColor" + value="0.67 0.83 0.96 1" /> + <color + name="IMChatColor" + reference="LtGray" /> + <color + name="IMHistoryBgColor" + reference="Unused?" /> + <color + name="IMHistoryTextColor" + reference="Unused?" /> + <color + name="IconDisabledColor" + reference="White_50" /> + <color + name="IconEnabledColor" + reference="White" /> + <color + name="InventoryBackgroundColor" + reference="Unused?" /> + <color + name="InventoryItemSuffixColor" + reference="White_25" /> + <color + name="InventorySearchStatusColor" + reference="Black" /> + <color + name="LabelDisabledColor" + reference="White_50" /> + <color + name="LabelSelectedColor" + reference="White" /> + <color + name="LabelSelectedDisabledColor" + reference="White_50" /> + <color + name="LabelTextColor" + reference="LtGray" /> + <color + name="LoginProgressBarBgColor" + reference="Unused?" /> + <color + name="LoginProgressBarFgColor" + reference="Unused?" /> + <color + name="LoginProgressBoxBorderColor" + value="0 0.12 0.24 0" /> + <color + name="LoginProgressBoxCenterColor" + value="0 0 0 0.78" /> + <color + name="LoginProgressBoxShadowColor" + value="0 0 0 0.78" /> + <color + name="LoginProgressBoxTextColor" + reference="White" /> + <color + name="MapAvatarColor" + reference="White" /> + <color + name="MapAvatarFriendColor" + reference="Unused?" /> + <color + name="MapAvatarSelfColor" + value="0.53125 0 0.498047 1" /> + <color + name="MapFrustumColor" + reference="White_10" /> + <color + name="MapFrustumRotatingColor" + value="1 1 1 0.2" /> + <color + name="MapTrackColor" + reference="Red" /> + <color + name="MapTrackDisabledColor" + value="0.5 0 0 1" /> + <color + name="MenuBarBgColor" + reference="DkGray" /> + <color + name="MenuBarGodBgColor" + reference="DkGray2" /> + <color + name="MenuDefaultBgColor" + reference="DkGray2" /> + <color + name="MenuItemDisabledColor" + reference="LtGray_50" /> + <color + name="MenuItemEnabledColor" + reference="LtGray" /> + <color + name="MenuItemHighlightBgColor" + reference="EmphasisColor_35" /> + <color + name="MenuItemHighlightFgColor" + reference="White" /> + <color + name="MenuNonProductionBgColor" + reference="Black" /> + <color + name="MenuNonProductionGodBgColor" + value="0 0.5 0 1" /> + <color + name="MenuPopupBgColor" + reference="DkGray_66" /> + <color + name="MultiSliderDisabledThumbColor" + reference="Unused?" /> + <color + name="MultiSliderThumbCenterColor" + reference="Unused?" /> + <color + name="MultiSliderThumbCenterSelectedColor" + reference="Unused?" /> + <color + name="MultiSliderThumbOutlineColor" + reference="Unused?" /> + <color + name="MultiSliderTrackColor" + reference="Unused?" /> + <color + name="MultiSliderTriangleColor" + reference="Unused?" /> + <color + name="NetMapBackgroundColor" + value="0 0 0 0.3" /> + <color + name="NetMapGroupOwnAboveWater" + value="1 0 1 1" /> + <color + name="NetMapGroupOwnBelowWater" + value="0.78 0 0.78 1" /> + <color + name="NetMapOtherOwnAboveWater" + value="0.24 0.24 0.24 1" /> + <color + name="NetMapOtherOwnBelowWater" + value="0.12 0.12 0.12 1" /> + <color + name="NetMapYouOwnAboveWater" + value="0 1 1 1" /> + <color + name="NetMapYouOwnBelowWater" + value="0 0.78 0.78 1" /> + <color + name="NotifyBoxColor" + value="0.27 0.67 1 1" /> + <color + name="NotifyCautionBoxColor" + value="1 0.82 0.46 1" /> + <color + name="NotifyCautionWarnColor" + reference="White" /> + <color + name="NotifyTextColor" + reference="White" /> + <color + name="ObjectChatColor" + reference="LtGray" /> + <color + name="OverdrivenColor" + value="1 0 0 1" /> + <color + name="PanelDefaultBackgroundColor" + reference="DkGray" /> + <color + name="PanelDefaultHighlightLight" + reference="White_50" /> + <color + name="PanelFocusBackgroundColor" + reference="DkGray2" /> + <color + name="ParcelHoverColor" + reference="White" /> + <color + name="PieMenuBgColor" + value="0.24 0.24 0.24 0.59" /> + <color + name="PieMenuLineColor" + value="0 0 0 0.5" /> + <color + name="PieMenuSelectedColor" + value="0.72 0.72 0.74 0.3" /> + <color + name="PropertyColorAuction" + value="0.5 0 1 0.4" /> + <color + name="PropertyColorAvail" + reference="Transparent" /> + <color + name="PropertyColorForSale" + value="1 0.5 0 0.4" /> + <color + name="PropertyColorGroup" + value="0 0.72 0.72 0.4" /> + <color + name="PropertyColorOther" + value="1 0 0 0.4" /> + <color + name="PropertyColorSelf" + value="0 1 0 0.4" /> + <color + name="ScriptBgReadOnlyColor" + value="0.39 0.39 0.39 1" /> + <color + name="ScriptErrorColor" + value="0.82 0.27 0.27 1" /> + <color + name="ScrollBGStripeColor" + reference="Transparent" /> + <color + name="ScrollBgReadOnlyColor" + reference="Transparent" /> + <color + name="ScrollBgWriteableColor" + reference="White_05" /> + <color + name="ScrollDisabledColor" + reference="Unused?" /> + <color + name="ScrollHighlightedColor" + reference="Unused?" /> + <color + name="ScrollHoveredColor" + reference="EmphasisColor_13" /> + <color + name="ScrollSelectedBGColor" + reference="EmphasisColor_35" /> + <color + name="ScrollSelectedFGColor" + reference="White" /> + <color + name="ScrollUnselectedColor" + reference="LtGray" /> + <color + name="ScrollbarThumbColor" + reference="White" /> + <color + name="ScrollbarTrackColor" + reference="Black" /> + <color + name="SilhouetteChildColor" + value="0.13 0.42 0.77 1" /> + <color + name="SilhouetteParentColor" + reference="Unused?" /> + <color + name="SliderDisabledThumbColor" + reference="White_50" /> + <color + name="SliderThumbCenterColor" + reference="White" /> + <color + name="SliderThumbOutlineColor" + reference="White" /> + <color + name="SliderTrackColor" + reference="Unused?" /> + <color + name="SpeakingColor" + value="0 1 0 1" /> + <color + name="SystemChatColor" + reference="White" /> + <color + name="TextBgFocusColor" + reference="White" /> + <color + name="TextBgReadOnlyColor" + reference="White_05" /> + <color + name="TextBgWriteableColor" + reference="LtGray" /> + <color + name="TextCursorColor" + reference="Black" /> + <color + name="TextDefaultColor" + value="0 0 0 .33" /> + <color + name="TextEmbeddedItemColor" + value="0 0 0.5 1" /> + <color + name="TextEmbeddedItemReadOnlyColor" + reference="Unused?" /> + <color + name="TextFgColor" + value="0.102 0.102 0.102 1" /> + <color + name="TextFgReadOnlyColor" + reference="LtGray" /> + <color + name="TextFgTentativeColor" + value="0 0 0 .33" /> + <color + name="TimeTextColor" + reference="LtGray" /> + <color + name="TitleBarFocusColor" + reference="White_10" /> + <color + name="ToolTipBgColor" + value="0 0 0 .75" /> + <color + name="ToolTipBorderColor" + value="0 0 0 .75" /> + <color + name="ToolTipTextColor" + reference="LtGray" /> + <color + name="UserChatColor" + reference="LtGray" /> + <color + name="llOwnerSayChatColor" + reference="LtGray" /> - <key>MapAvatarColor</key> - <map> - <key>Comment</key> - <string>Color of chat messages from other residents</string> - <key>Persist</key> - <integer>1</integer> - <key>Type</key> - <string>Color4</string> - <key>Value</key> - <array> - <real>0.0</real> - <real>1.0</real> - <real>0.0</real> - <real>1.0</real> - </array> - </map> - <key>MapAvatarFriendColor</key> - <map> - <key>Comment</key> - <string>Color of chat messages from other residents</string> - <key>Persist</key> - <integer>1</integer> - <key>Type</key> - <string>Color4</string> - <key>Value</key> - <array> - <real>1.0</real> - <real>1.0</real> - <real>0.0</real> - <real>1.0</real> - </array> - </map> - <key>MapAvatarSelfColor</key> - <map> - <key>Comment</key> - <string>Color of chat messages from other residents</string> - <key>Persist</key> - <integer>1</integer> - <key>Type</key> - <string>Color4</string> - <key>Value</key> - <array> - <real>1.0</real> - <real>1.0</real> - <real>1.0</real> - <real>1.0</real> - </array> - </map> - <key>MapFrustumColor</key> - <map> - <key>Comment</key> - <string>Color of chat messages from other residents</string> - <key>Persist</key> - <integer>1</integer> - <key>Type</key> - <string>Color4</string> - <key>Value</key> - <array> - <real>1.0</real> - <real>1.0</real> - <real>1.0</real> - <real>0.1</real> - </array> - </map> - <key>MapFrustumRotatingColor</key> - <map> - <key>Comment</key> - <string>Color of chat messages from other residents</string> - <key>Persist</key> - <integer>1</integer> - <key>Type</key> - <string>Color4</string> - <key>Value</key> - <array> - <real>1.0</real> - <real>1.0</real> - <real>1.0</real> - <real>0.2</real> - </array> - </map> - <key>MapTrackColor</key> - <map> - <key>Comment</key> - <string>Color of chat messages from other residents</string> - <key>Persist</key> - <integer>1</integer> - <key>Type</key> - <string>Color4</string> - <key>Value</key> - <array> - <real>1.0</real> - <real>0.0</real> - <real>0.0</real> - <real>1.0</real> - </array> - </map> - <key>MapTrackDisabledColor</key> - <map> - <key>Comment</key> - <string>Color of chat messages from other residents</string> - <key>Persist</key> - <integer>1</integer> - <key>Type</key> - <string>Color4</string> - <key>Value</key> - <array> - <real>0.5</real> - <real>0.0</real> - <real>0.0</real> - <real>1.0</real> - </array> - </map> - - - <key>MenuBarBgColor</key> - <map> - <key>Comment</key> - <string>Menu Bar Bg Color</string> - <key>Persist</key> - <integer>1</integer> - <key>Type</key> - <string>Color4</string> - <key>Value</key> - <array> - <real>0.24</real> - <real>0.24</real> - <real>0.24</real> - <real>1</real> - </array> - </map> - <key>MenuBarGodBgColor</key> - <map> - <key>Comment</key> - <string>Menu Bar God Bg Color</string> - <key>Persist</key> - <integer>1</integer> - <key>Type</key> - <string>Color4</string> - <key>Value</key> - <array> - <real>0.24</real> - <real>0.5</real> - <real>0.24</real> - <real>1</real> - </array> - </map> - <key>MenuDefaultBgColor</key> - <map> - <key>Comment</key> - <string>Menu Default Bg Color</string> - <key>Persist</key> - <integer>1</integer> - <key>Type</key> - <string>Color4</string> - <key>Value</key> - <array> - <real>0</real> - <real>0</real> - <real>0</real> - <real>1</real> - </array> - </map> - <key>MenuItemDisabledColor</key> - <map> - <key>Comment</key> - <string>Menu Item Disabled Color</string> - <key>Persist</key> - <integer>1</integer> - <key>Type</key> - <string>Color4</string> - <key>Value</key> - <array> - <real>0.52</real> - <real>0.52</real> - <real>0.64</real> - <real>0.5</real> - </array> - </map> - <key>MenuItemEnabledColor</key> - <map> - <key>Comment</key> - <string>Menu Item Enabled Color</string> - <key>Persist</key> - <integer>1</integer> - <key>Type</key> - <string>Color4</string> - <key>Value</key> - <array> - <real>1</real> - <real>1</real> - <real>1</real> - <real>1</real> - </array> - </map> - <key>MenuItemHighlightBgColor</key> - <map> - <key>Comment</key> - <string>Menu Item Highlight Bg Color</string> - <key>Persist</key> - <integer>1</integer> - <key>Type</key> - <string>Color4</string> - <key>Value</key> - <array> - <real>0.72</real> - <real>0.72</real> - <real>0.74</real> - <real>0.39</real> - </array> - </map> - <key>MenuItemHighlightFgColor</key> - <map> - <key>Comment</key> - <string>Menu Item Highlight Fg Color</string> - <key>Persist</key> - <integer>1</integer> - <key>Type</key> - <string>Color4</string> - <key>Value</key> - <array> - <real>1</real> - <real>1</real> - <real>1</real> - <real>1</real> - </array> - </map> - <key>MenuNonProductionBgColor</key> - <map> - <key>Comment</key> - <string>Menu Non Production Bg Color</string> - <key>Persist</key> - <integer>1</integer> - <key>Type</key> - <string>Color4</string> - <key>Value</key> - <array> - <real>0.5</real> - <real>0</real> - <real>0</real> - <real>1</real> - </array> - </map> - <key>MenuNonProductionGodBgColor</key> - <map> - <key>Comment</key> - <string>Menu Non Production God Bg Color</string> - <key>Persist</key> - <integer>1</integer> - <key>Type</key> - <string>Color4</string> - <key>Value</key> - <array> - <real>0</real> - <real>0.5</real> - <real>0</real> - <real>1</real> - </array> - </map> - <key>MenuPopupBgColor</key> - <map> - <key>Comment</key> - <string>Menu Popup Bg Color</string> - <key>Persist</key> - <integer>1</integer> - <key>Type</key> - <string>Color4</string> - <key>Value</key> - <array> - <real>0</real> - <real>0</real> - <real>0</real> - <real>1</real> - </array> - </map> - <key>MultiSliderDisabledThumbColor</key> - <map> - <key>Comment</key> - <string>Multi Slider Disabled Thumb Color</string> - <key>Persist</key> - <integer>1</integer> - <key>Type</key> - <string>Color4</string> - <key>Value</key> - <array> - <real>0</real> - <real>0</real> - <real>0</real> - <real>1</real> - </array> - </map> - <key>MultiSliderThumbCenterColor</key> - <map> - <key>Comment</key> - <string>Multi Slider Thumb Center Color</string> - <key>Persist</key> - <integer>1</integer> - <key>Type</key> - <string>Color4</string> - <key>Value</key> - <array> - <real>0.72</real> - <real>0.72</real> - <real>0.74</real> - <real>1</real> - </array> - </map> - <key>MultiSliderThumbCenterSelectedColor</key> - <map> - <key>Comment</key> - <string>Multi Slider Thumb Center Selected Color</string> - <key>Persist</key> - <integer>1</integer> - <key>Type</key> - <string>Color4</string> - <key>Value</key> - <array> - <real>1</real> - <real>0.2</real> - <real>0.2</real> - <real>1</real> - </array> - </map> - <key>MultiSliderThumbOutlineColor</key> - <map> - <key>Comment</key> - <string>Multi Slider Thumb Outline Color</string> - <key>Persist</key> - <integer>1</integer> - <key>Type</key> - <string>Color4</string> - <key>Value</key> - <array> - <real>0</real> - <real>0</real> - <real>0</real> - <real>1</real> - </array> - </map> - <key>MultiSliderTrackColor</key> - <map> - <key>Comment</key> - <string>Multi Slider Track Color</string> - <key>Persist</key> - <integer>1</integer> - <key>Type</key> - <string>Color4</string> - <key>Value</key> - <array> - <real>0.12</real> - <real>0.12</real> - <real>0.12</real> - <real>1</real> - </array> - </map> - <key>MultiSliderTriangleColor</key> - <map> - <key>Comment</key> - <string>Multi Slider Triangle Color</string> - <key>Persist</key> - <integer>1</integer> - <key>Type</key> - <string>Color4</string> - <key>Value</key> - <array> - <real>1</real> - <real>1</real> - <real>0.2</real> - <real>1</real> - </array> - </map> - <key>NetMapBackgroundColor</key> - <map> - <key>Comment</key> - <string>Net Map Background Color</string> - <key>Persist</key> - <integer>1</integer> - <key>Type</key> - <string>Color4</string> - <key>Value</key> - <array> - <real>0</real> - <real>0</real> - <real>0</real> - <real>0.3</real> - </array> - </map> - <key>NetMapGroupOwnAboveWater</key> - <map> - <key>Comment</key> - <string>Net Map Group Own Above Water</string> - <key>Persist</key> - <integer>1</integer> - <key>Type</key> - <string>Color4</string> - <key>Value</key> - <array> - <real>1</real> - <real>0</real> - <real>1</real> - <real>1</real> - </array> - </map> - <key>NetMapGroupOwnBelowWater</key> - <map> - <key>Comment</key> - <string>Net Map Group Own Below Water</string> - <key>Persist</key> - <integer>1</integer> - <key>Type</key> - <string>Color4</string> - <key>Value</key> - <array> - <real>0.78</real> - <real>0</real> - <real>0.78</real> - <real>1</real> - </array> - </map> - <key>NetMapOtherOwnAboveWater</key> - <map> - <key>Comment</key> - <string>Net Map Other Own Above Water</string> - <key>Persist</key> - <integer>1</integer> - <key>Type</key> - <string>Color4</string> - <key>Value</key> - <array> - <real>0.24</real> - <real>0.24</real> - <real>0.24</real> - <real>1</real> - </array> - </map> - <key>NetMapOtherOwnBelowWater</key> - <map> - <key>Comment</key> - <string>Net Map Other Own Below Water</string> - <key>Persist</key> - <integer>1</integer> - <key>Type</key> - <string>Color4</string> - <key>Value</key> - <array> - <real>0.12</real> - <real>0.12</real> - <real>0.12</real> - <real>1</real> - </array> - </map> - <key>NetMapYouOwnAboveWater</key> - <map> - <key>Comment</key> - <string>Net Map You Own Above Water</string> - <key>Persist</key> - <integer>1</integer> - <key>Type</key> - <string>Color4</string> - <key>Value</key> - <array> - <real>0</real> - <real>1</real> - <real>1</real> - <real>1</real> - </array> - </map> - <key>NetMapYouOwnBelowWater</key> - <map> - <key>Comment</key> - <string>Net Map You Own Below Water</string> - <key>Persist</key> - <integer>1</integer> - <key>Type</key> - <string>Color4</string> - <key>Value</key> - <array> - <real>0</real> - <real>0.78</real> - <real>0.78</real> - <real>1</real> - </array> - </map> - <key>NotifyBoxColor</key> - <map> - <key>Comment</key> - <string>Notify Box Color</string> - <key>Persist</key> - <integer>1</integer> - <key>Type</key> - <string>Color4</string> - <key>Value</key> - <array> - <real>0.27</real> - <real>0.67</real> - <real>1</real> - <real>1</real> - </array> - </map> - <key>NotifyCautionBoxColor</key> - <map> - <key>Comment</key> - <string>Notify Caution Box Color</string> - <key>Persist</key> - <integer>1</integer> - <key>Type</key> - <string>Color4</string> - <key>Value</key> - <array> - <real>1</real> - <real>0.82</real> - <real>0.46</real> - <real>1</real> - </array> - </map> - <key>NotifyCautionWarnColor</key> - <map> - <key>Comment</key> - <string>Notify Caution Warn Color</string> - <key>Persist</key> - <integer>1</integer> - <key>Type</key> - <string>Color4</string> - <key>Value</key> - <array> - <real>0</real> - <real>0</real> - <real>0</real> - <real>1</real> - </array> - </map> - <key>NotifyTextColor</key> - <map> - <key>Comment</key> - <string>Notify Text Color</string> - <key>Persist</key> - <integer>1</integer> - <key>Type</key> - <string>Color4</string> - <key>Value</key> - <array> - <real>0</real> - <real>0</real> - <real>0</real> - <real>1</real> - </array> - </map> - <key>ObjectChatColor</key> - <map> - <key>Comment</key> - <string>Color of chat messages from objects</string> - <key>Persist</key> - <integer>0</integer> - <key>Type</key> - <string>Color4</string> - <key>Value</key> - <array> - <real>0.7</real> - <real>0.9</real> - <real>0.7</real> - <real>1.0</real> - </array> - </map> - <key>OverdrivenColor</key> - <map> - <key>Comment</key> - <string>Color of various indicators when resident is speaking too loud.</string> - <key>Persist</key> - <integer>0</integer> - <key>Type</key> - <string>Color4</string> - <key>Value</key> - <array> - <real>1.0</real> - <real>0.0</real> - <real>0.0</real> - <real>1.0</real> - </array> - </map> - <key>PanelDefaultBackgroundColor</key> - <map> - <key>Comment</key> - <string>Default Background Color</string> - <key>Persist</key> - <integer>1</integer> - <key>Type</key> - <string>Color4</string> - <key>Value</key> - <array> - <real>0.24</real> - <real>0.24</real> - <real>0.24</real> - <real>0.55</real> - </array> - </map> - <key>PanelDefaultHighlightLight</key> - <map> - <key>Comment</key> - <string>Default Highlight Light</string> - <key>Persist</key> - <integer>1</integer> - <key>Type</key> - <string>Color4</string> - <key>Value</key> - <array> - <real>0.45</real> - <real>0.52</real> - <real>0.61</real> - <real>1</real> - </array> - </map> - <key>PanelFocusBackgroundColor</key> - <map> - <key>Comment</key> - <string>Focus Background Color</string> - <key>Persist</key> - <integer>1</integer> - <key>Type</key> - <string>Color4</string> - <key>Value</key> - <array> - <real>0.24</real> - <real>0.24</real> - <real>0.24</real> - <real>1</real> - </array> - </map> - <key>ParcelHoverColor</key> - <map> - <key>Comment</key> - <string>Parcel Hover Color</string> - <key>Persist</key> - <integer>1</integer> - <key>Type</key> - <string>Color4</string> - <key>Value</key> - <array> - <real>1</real> - <real>1</real> - <real>1</real> - <real>1</real> - </array> - </map> - <key>PieMenuBgColor</key> - <map> - <key>Comment</key> - <string>Pie Menu Bg Color</string> - <key>Persist</key> - <integer>1</integer> - <key>Type</key> - <string>Color4</string> - <key>Value</key> - <array> - <real>0.24</real> - <real>0.24</real> - <real>0.24</real> - <real>0.59</real> - </array> - </map> - <key>PieMenuLineColor</key> - <map> - <key>Comment</key> - <string>Pie Menu Line Color</string> - <key>Persist</key> - <integer>1</integer> - <key>Type</key> - <string>Color4</string> - <key>Value</key> - <array> - <real>0</real> - <real>0</real> - <real>0</real> - <real>0.5</real> - </array> - </map> - <key>PieMenuSelectedColor</key> - <map> - <key>Comment</key> - <string>Pie Menu Selected Color</string> - <key>Persist</key> - <integer>1</integer> - <key>Type</key> - <string>Color4</string> - <key>Value</key> - <array> - <real>0.72</real> - <real>0.72</real> - <real>0.74</real> - <real>0.3</real> - </array> - </map> - <key>PropertyColorAuction</key> - <map> - <key>Comment</key> - <string>Property Color Auction</string> - <key>Persist</key> - <integer>1</integer> - <key>Type</key> - <string>Color4</string> - <key>Value</key> - <array> - <real>0.50</real> - <real>0</real> - <real>1</real> - <real>0.4</real> - </array> - </map> - <key>PropertyColorAvail</key> - <map> - <key>Comment</key> - <string>Property Color Avail</string> - <key>Persist</key> - <integer>1</integer> - <key>Type</key> - <string>Color4</string> - <key>Value</key> - <array> - <real>0</real> - <real>0</real> - <real>0</real> - <real>0</real> - </array> - </map> - <key>PropertyColorForSale</key> - <map> - <key>Comment</key> - <string>Property Color For Sale</string> - <key>Persist</key> - <integer>1</integer> - <key>Type</key> - <string>Color4</string> - <key>Value</key> - <array> - <real>1</real> - <real>0.50</real> - <real>0</real> - <real>0.4</real> - </array> - </map> - <key>PropertyColorGroup</key> - <map> - <key>Comment</key> - <string>Property Color Group</string> - <key>Persist</key> - <integer>1</integer> - <key>Type</key> - <string>Color4</string> - <key>Value</key> - <array> - <real>0</real> - <real>0.72</real> - <real>0.72</real> - <real>0.4</real> - </array> - </map> - <key>PropertyColorOther</key> - <map> - <key>Comment</key> - <string>Property Color Other</string> - <key>Persist</key> - <integer>1</integer> - <key>Type</key> - <string>Color4</string> - <key>Value</key> - <array> - <real>1</real> - <real>0</real> - <real>0</real> - <real>0.4</real> - </array> - </map> - <key>PropertyColorSelf</key> - <map> - <key>Comment</key> - <string>Property Color Self</string> - <key>Persist</key> - <integer>1</integer> - <key>Type</key> - <string>Color4</string> - <key>Value</key> - <array> - <real>0</real> - <real>1</real> - <real>0</real> - <real>0.4</real> - </array> - </map> - <key>RenderGlowLumWeights</key> - <map> - <key>Comment</key> - <string>Weights for each color channel to be used in calculating luminance (should add up to 1.0)</string> - <key>Persist</key> - <integer>1</integer> - <key>Type</key> - <string>Vector3</string> - <key>Value</key> - <array> - <real>0.299</real> - <real>0.587</real> - <real>0.114</real> - </array> - </map> - <key>RenderGlowWarmthWeights</key> - <map> - <key>Comment</key> - <string>Weight of each color channel used before finding the max warmth</string> - <key>Persist</key> - <integer>1</integer> - <key>Type</key> - <string>Vector3</string> - <key>Value</key> - <array> - <real>1.0</real> - <real>0.5</real> - <real>0.7</real> - </array> - </map> - <key>ScriptBgReadOnlyColor</key> - <map> - <key>Comment</key> - <string>Script Bg Read Only Color</string> - <key>Persist</key> - <integer>1</integer> - <key>Type</key> - <string>Color4</string> - <key>Value</key> - <array> - <real>0.39</real> - <real>0.39</real> - <real>0.39</real> - <real>1</real> - </array> - </map> - <key>ScriptErrorColor</key> - <map> - <key>Comment</key> - <string>Color of script error messages</string> - <key>Persist</key> - <integer>1</integer> - <key>Type</key> - <string>Color4</string> - <key>Value</key> - <array> - <real>0.82</real> - <real>0.27</real> - <real>0.27</real> - <real>1.0</real> - </array> - </map> - <key>ScrollBGStripeColor</key> - <map> - <key>Comment</key> - <string>Scroll BGStripe Color</string> - <key>Persist</key> - <integer>1</integer> - <key>Type</key> - <string>Color4</string> - <key>Value</key> - <array> - <real>0.39</real> - <real>0.39</real> - <real>0.39</real> - <real>0.16</real> - </array> - </map> - <key>ScrollBgReadOnlyColor</key> - <map> - <key>Comment</key> - <string>Scroll Bg Read Only Color</string> - <key>Persist</key> - <integer>1</integer> - <key>Type</key> - <string>Color4</string> - <key>Value</key> - <array> - <real>0.78</real> - <real>0.82</real> - <real>0.8</real> - <real>1</real> - </array> - </map> - <key>ScrollBgWriteableColor</key> - <map> - <key>Comment</key> - <string>Scroll Bg Writeable Color</string> - <key>Persist</key> - <integer>1</integer> - <key>Type</key> - <string>Color4</string> - <key>Value</key> - <array> - <real>0.78</real> - <real>0.82</real> - <real>0.8</real> - <real>1</real> - </array> - </map> - <key>ScrollDisabledColor</key> - <map> - <key>Comment</key> - <string>Scroll Disabled Color</string> - <key>Persist</key> - <integer>1</integer> - <key>Type</key> - <string>Color4</string> - <key>Value</key> - <array> - <real>0.5</real> - <real>0.5</real> - <real>0.5</real> - <real>0.8</real> - </array> - </map> - <key>ScrollHighlightedColor</key> - <map> - <key>Comment</key> - <string>Scroll Highlighted Color</string> - <key>Persist</key> - <integer>1</integer> - <key>Type</key> - <string>Color4</string> - <key>Value</key> - <array> - <real>0.72</real> - <real>0.72</real> - <real>0.74</real> - <real>0.5</real> - </array> - </map> - <key>ScrollHoveredColor</key> - <map> - <key>Comment</key> - <string>Scroll Hovered Color</string> - <key>Persist</key> - <integer>1</integer> - <key>Type</key> - <string>Color4</string> - <key>Value</key> - <array> - <real>0.72</real> - <real>0.72</real> - <real>0.74</real> - <real>0.5</real> - </array> - </map> - <key>ScrollSelectedBGColor</key> - <map> - <key>Comment</key> - <string>Scroll Selected BGColor</string> - <key>Persist</key> - <integer>1</integer> - <key>Type</key> - <string>Color4</string> - <key>Value</key> - <array> - <real>0.39</real> - <real>0.39</real> - <real>0.74</real> - <real>0.59</real> - </array> - </map> - <key>ScrollSelectedFGColor</key> - <map> - <key>Comment</key> - <string>Scroll Selected FGColor</string> - <key>Persist</key> - <integer>1</integer> - <key>Type</key> - <string>Color4</string> - <key>Value</key> - <array> - <real>0</real> - <real>0</real> - <real>0</real> - <real>0.8</real> - </array> - </map> - <key>ScrollUnselectedColor</key> - <map> - <key>Comment</key> - <string>Scroll Unselected Color</string> - <key>Persist</key> - <integer>1</integer> - <key>Type</key> - <string>Color4</string> - <key>Value</key> - <array> - <real>0</real> - <real>0</real> - <real>0</real> - <real>0.8</real> - </array> - </map> - <key>ScrollbarThumbColor</key> - <map> - <key>Comment</key> - <string>Scrollbar Thumb Color</string> - <key>Persist</key> - <integer>1</integer> - <key>Type</key> - <string>Color4</string> - <key>Value</key> - <array> - <real>0.24</real> - <real>0.3</real> - <real>0.49</real> - <real>1</real> - </array> - </map> - <key>ScrollbarTrackColor</key> - <map> - <key>Comment</key> - <string>Scrollbar Track Color</string> - <key>Persist</key> - <integer>1</integer> - <key>Type</key> - <string>Color4</string> - <key>Value</key> - <array> - <real>0.6</real> - <real>0.6</real> - <real>0.62</real> - <real>1</real> - </array> - </map> - <key>SilhouetteChildColor</key> - <map> - <key>Comment</key> - <string>Silhouette Child Color</string> - <key>Persist</key> - <integer>1</integer> - <key>Type</key> - <string>Color4</string> - <key>Value</key> - <array> - <real>0.13</real> - <real>0.42</real> - <real>0.77</real> - <real>1</real> - </array> - </map> - <key>SilhouetteParentColor</key> - <map> - <key>Comment</key> - <string>Silhouette Parent Color</string> - <key>Persist</key> - <integer>1</integer> - <key>Type</key> - <string>Color4</string> - <key>Value</key> - <array> - <real>1</real> - <real>1</real> - <real>0</real> - <real>1</real> - </array> - </map> - <key>SkyNightColorShift</key> - <map> - <key>Comment</key> - <string>Controls moonlight color (base color applied to moon as light source)</string> - <key>Persist</key> - <integer>1</integer> - <key>Type</key> - <string>Color3</string> - <key>Value</key> - <array> - <real>0.67</real> - <real>0.67</real> - <real>1.0</real> - </array> - </map> - <key>SliderDisabledThumbColor</key> - <map> - <key>Comment</key> - <string>Slider Disabled Thumb Color</string> - <key>Persist</key> - <integer>1</integer> - <key>Type</key> - <string>Color4</string> - <key>Value</key> - <array> - <real>0</real> - <real>0</real> - <real>0</real> - <real>1</real> - </array> - </map> - <key>SliderThumbCenterColor</key> - <map> - <key>Comment</key> - <string>Slider Thumb Center Color</string> - <key>Persist</key> - <integer>1</integer> - <key>Type</key> - <string>Color4</string> - <key>Value</key> - <array> - <real>0.78</real> - <real>0.78</real> - <real>0.78</real> - <real>1</real> - </array> - </map> - <key>SliderThumbOutlineColor</key> - <map> - <key>Comment</key> - <string>Slider Thumb Outline Color</string> - <key>Persist</key> - <integer>1</integer> - <key>Type</key> - <string>Color4</string> - <key>Value</key> - <array> - <real>1</real> - <real>1</real> - <real>1</real> - <real>1</real> - </array> - </map> - <key>SliderTrackColor</key> - <map> - <key>Comment</key> - <string>Slider Track Color</string> - <key>Persist</key> - <integer>1</integer> - <key>Type</key> - <string>Color4</string> - <key>Value</key> - <array> - <real>1</real> - <real>1</real> - <real>1</real> - <real>1</real> - </array> - </map> - <key>SpeakingColor</key> - <map> - <key>Comment</key> - <string>Color of various indicators when resident is speaking on a voice channel.</string> - <key>Persist</key> - <integer>1</integer> - <key>Type</key> - <string>Color4</string> - <key>Value</key> - <array> - <real>0.0</real> - <real>1.0</real> - <real>0.0</real> - <real>1.0</real> - </array> - </map> - <key>SystemChatColor</key> - <map> - <key>Comment</key> - <string>Color of chat messages from SL System</string> - <key>Persist</key> - <integer>1</integer> - <key>Type</key> - <string>Color4</string> - <key>Value</key> - <array> - <real>0.800000011921</real> - <real>1.0</real> - <real>1.0</real> - <real>1.0</real> - </array> - </map> - <key>TextBgFocusColor</key> - <map> - <key>Comment</key> - <string>Text Bg Focus Color</string> - <key>Persist</key> - <integer>1</integer> - <key>Type</key> - <string>Color4</string> - <key>Value</key> - <array> - <real>0.78</real> - <real>0.82</real> - <real>0.8</real> - <real>1</real> - </array> - </map> - <key>TextBgReadOnlyColor</key> - <map> - <key>Comment</key> - <string>Text Bg Read Only Color</string> - <key>Persist</key> - <integer>1</integer> - <key>Type</key> - <string>Color4</string> - <key>Value</key> - <array> - <real>0.24</real> - <real>0.24</real> - <real>0.24</real> - <real>0.63</real> - </array> - </map> - <key>TextBgWriteableColor</key> - <map> - <key>Comment</key> - <string>Text Bg Writeable Color</string> - <key>Persist</key> - <integer>1</integer> - <key>Type</key> - <string>Color4</string> - <key>Value</key> - <array> - <real>0.78</real> - <real>0.82</real> - <real>0.8</real> - <real>0.9</real> - </array> - </map> - <key>TextCursorColor</key> - <map> - <key>Comment</key> - <string>Text Cursor Color</string> - <key>Persist</key> - <integer>1</integer> - <key>Type</key> - <string>Color4</string> - <key>Value</key> - <array> - <real>0</real> - <real>0</real> - <real>0</real> - <real>1</real> - </array> - </map> - <key>TextDefaultColor</key> - <map> - <key>Comment</key> - <string>Text Default Color</string> - <key>Persist</key> - <integer>1</integer> - <key>Type</key> - <string>Color4</string> - <key>Value</key> - <array> - <real>0</real> - <real>0.08</real> - <real>0</real> - <real>1</real> - </array> - </map> - <key>TextEmbeddedItemColor</key> - <map> - <key>Comment</key> - <string>Text Embedded Item Color</string> - <key>Persist</key> - <integer>1</integer> - <key>Type</key> - <string>Color4</string> - <key>Value</key> - <array> - <real>0</real> - <real>0</real> - <real>0.5</real> - <real>1</real> - </array> - </map> - <key>TextEmbeddedItemReadOnlyColor</key> - <map> - <key>Comment</key> - <string>Text Embedded Item Read Only Color</string> - <key>Persist</key> - <integer>1</integer> - <key>Type</key> - <string>Color4</string> - <key>Value</key> - <array> - <real>0.23</real> - <real>0.58</real> - <real>0.95</real> - <real>1</real> - </array> - </map> - <key>TextFgColor</key> - <map> - <key>Comment</key> - <string>Text Fg Color</string> - <key>Persist</key> - <integer>1</integer> - <key>Type</key> - <string>Color4</string> - <key>Value</key> - <array> - <real>0</real> - <real>0</real> - <real>0</real> - <real>1</real> - </array> - </map> - <key>TextFgReadOnlyColor</key> - <map> - <key>Comment</key> - <string>Text Fg Read Only Color</string> - <key>Persist</key> - <integer>1</integer> - <key>Type</key> - <string>Color4</string> - <key>Value</key> - <array> - <real>1</real> - <real>1</real> - <real>1</real> - <real>0.78</real> - </array> - </map> - <key>TextFgTentativeColor</key> - <map> - <key>Comment</key> - <string>Text Fg Tentative Color</string> - <key>Persist</key> - <integer>1</integer> - <key>Type</key> - <string>Color4</string> - <key>Value</key> - <array> - <real>0</real> - <real>0</real> - <real>0</real> - <real>0.5</real> - </array> - </map> - <key>TimeTextColor</key> - <map> - <key>Comment</key> - <string>Time Text Color</string> - <key>Persist</key> - <integer>1</integer> - <key>Type</key> - <string>Color4</string> - <key>Value</key> - <array> - <real>1</real> - <real>1</real> - <real>1</real> - <real>1</real> - </array> - </map> - <key>TitleBarFocusColor</key> - <map> - <key>Comment</key> - <string>Title Bar Focus Color</string> - <key>Persist</key> - <integer>1</integer> - <key>Type</key> - <string>Color4</string> - <key>Value</key> - <array> - <real>1</real> - <real>1</real> - <real>1</real> - <real>0.12</real> - </array> - </map> - <key>ToolTipBgColor</key> - <map> - <key>Comment</key> - <string>Tool Tip Bg Color</string> - <key>Persist</key> - <integer>1</integer> - <key>Type</key> - <string>Color4</string> - <key>Value</key> - <array> - <real>0.72</real> - <real>0.72</real> - <real>0.74</real> - <real>0.78</real> - </array> - </map> - <key>ToolTipBorderColor</key> - <map> - <key>Comment</key> - <string>Tool Tip Border Color</string> - <key>Persist</key> - <integer>1</integer> - <key>Type</key> - <string>Color4</string> - <key>Value</key> - <array> - <real>0.67</real> - <real>0.83</real> - <real>0.96</real> - <real>1</real> - </array> - </map> - <key>ToolTipTextColor</key> - <map> - <key>Comment</key> - <string>Tool Tip Text Color</string> - <key>Persist</key> - <integer>1</integer> - <key>Type</key> - <string>Color4</string> - <key>Value</key> - <array> - <real>0</real> - <real>0</real> - <real>0</real> - <real>1</real> - </array> - </map> - <key>UserChatColor</key> - <map> - <key>Comment</key> - <string>Color of your chat messages</string> - <key>Persist</key> - <integer>1</integer> - <key>Type</key> - <string>Color4</string> - <key>Value</key> - <array> - <real>1.0</real> - <real>1.0</real> - <real>1.0</real> - <real>1.0</real> - </array> - </map> - <key>llOwnerSayChatColor</key> - <map> - <key>Comment</key> - <string>Color of chat messages from objects only visible to the owner</string> - <key>Persist</key> - <integer>1</integer> - <key>Type</key> - <string>Color4</string> - <key>Value</key> - <array> - <real>0.99</real> - <real>0.99</real> - <real>0.67</real> - <real>1.0</real> - </array> - </map> - </map> -</llsd> + <!-- New Colors --> + <color + name="OutputMonitorMutedColor" + reference="DkGray2" /> +</colors> diff --git a/indra/newview/skins/default/textures/bottomtray/DownArrow.png b/indra/newview/skins/default/textures/bottomtray/DownArrow.png Binary files differnew file mode 100644 index 0000000000..82f58b22b9 --- /dev/null +++ b/indra/newview/skins/default/textures/bottomtray/DownArrow.png diff --git a/indra/newview/skins/default/textures/bottomtray/Unread_IM.png b/indra/newview/skins/default/textures/bottomtray/Unread_IM.png Binary files differnew file mode 100644 index 0000000000..a355917fca --- /dev/null +++ b/indra/newview/skins/default/textures/bottomtray/Unread_IM.png diff --git a/indra/newview/skins/default/textures/bottomtray/VoicePTT_Lvl1.png b/indra/newview/skins/default/textures/bottomtray/VoicePTT_Lvl1.png Binary files differnew file mode 100644 index 0000000000..cd18ae310d --- /dev/null +++ b/indra/newview/skins/default/textures/bottomtray/VoicePTT_Lvl1.png diff --git a/indra/newview/skins/default/textures/bottomtray/VoicePTT_Lvl2.png b/indra/newview/skins/default/textures/bottomtray/VoicePTT_Lvl2.png Binary files differnew file mode 100644 index 0000000000..b0ed6ee8eb --- /dev/null +++ b/indra/newview/skins/default/textures/bottomtray/VoicePTT_Lvl2.png diff --git a/indra/newview/skins/default/textures/bottomtray/VoicePTT_Lvl3.png b/indra/newview/skins/default/textures/bottomtray/VoicePTT_Lvl3.png Binary files differnew file mode 100644 index 0000000000..14ec77b99a --- /dev/null +++ b/indra/newview/skins/default/textures/bottomtray/VoicePTT_Lvl3.png diff --git a/indra/newview/skins/default/textures/bottomtray/VoicePTT_Off.png b/indra/newview/skins/default/textures/bottomtray/VoicePTT_Off.png Binary files differnew file mode 100644 index 0000000000..48be51e9af --- /dev/null +++ b/indra/newview/skins/default/textures/bottomtray/VoicePTT_Off.png diff --git a/indra/newview/skins/default/textures/bottomtray/VoicePTT_On.png b/indra/newview/skins/default/textures/bottomtray/VoicePTT_On.png Binary files differnew file mode 100644 index 0000000000..be4881b64c --- /dev/null +++ b/indra/newview/skins/default/textures/bottomtray/VoicePTT_On.png diff --git a/indra/newview/skins/default/textures/containers/Accordion_ArrowClosed_Off.png b/indra/newview/skins/default/textures/containers/Accordion_ArrowClosed_Off.png Binary files differnew file mode 100644 index 0000000000..19c842b816 --- /dev/null +++ b/indra/newview/skins/default/textures/containers/Accordion_ArrowClosed_Off.png diff --git a/indra/newview/skins/default/textures/containers/Accordion_ArrowClosed_Over.png b/indra/newview/skins/default/textures/containers/Accordion_ArrowClosed_Over.png Binary files differnew file mode 100644 index 0000000000..e47f913db1 --- /dev/null +++ b/indra/newview/skins/default/textures/containers/Accordion_ArrowClosed_Over.png diff --git a/indra/newview/skins/default/textures/containers/Accordion_ArrowClosed_Press.png b/indra/newview/skins/default/textures/containers/Accordion_ArrowClosed_Press.png Binary files differnew file mode 100644 index 0000000000..b9879dcc8a --- /dev/null +++ b/indra/newview/skins/default/textures/containers/Accordion_ArrowClosed_Press.png diff --git a/indra/newview/skins/default/textures/containers/Accordion_ArrowOpened_Off.png b/indra/newview/skins/default/textures/containers/Accordion_ArrowOpened_Off.png Binary files differnew file mode 100644 index 0000000000..d506cda5c9 --- /dev/null +++ b/indra/newview/skins/default/textures/containers/Accordion_ArrowOpened_Off.png diff --git a/indra/newview/skins/default/textures/containers/Accordion_ArrowOpened_Over.png b/indra/newview/skins/default/textures/containers/Accordion_ArrowOpened_Over.png Binary files differnew file mode 100644 index 0000000000..e2c67de9c0 --- /dev/null +++ b/indra/newview/skins/default/textures/containers/Accordion_ArrowOpened_Over.png diff --git a/indra/newview/skins/default/textures/containers/Accordion_ArrowOpened_Press.png b/indra/newview/skins/default/textures/containers/Accordion_ArrowOpened_Press.png Binary files differnew file mode 100644 index 0000000000..08f7493a02 --- /dev/null +++ b/indra/newview/skins/default/textures/containers/Accordion_ArrowOpened_Press.png diff --git a/indra/newview/skins/default/textures/containers/Accordion_Off.png b/indra/newview/skins/default/textures/containers/Accordion_Off.png Binary files differnew file mode 100644 index 0000000000..414f4509c6 --- /dev/null +++ b/indra/newview/skins/default/textures/containers/Accordion_Off.png diff --git a/indra/newview/skins/default/textures/containers/Accordion_Over.png b/indra/newview/skins/default/textures/containers/Accordion_Over.png Binary files differnew file mode 100644 index 0000000000..5416d73310 --- /dev/null +++ b/indra/newview/skins/default/textures/containers/Accordion_Over.png diff --git a/indra/newview/skins/default/textures/containers/Accordion_Press.png b/indra/newview/skins/default/textures/containers/Accordion_Press.png Binary files differnew file mode 100644 index 0000000000..1578e0dfc5 --- /dev/null +++ b/indra/newview/skins/default/textures/containers/Accordion_Press.png diff --git a/indra/newview/skins/default/textures/containers/Container.png b/indra/newview/skins/default/textures/containers/Container.png Binary files differnew file mode 100644 index 0000000000..511eb94386 --- /dev/null +++ b/indra/newview/skins/default/textures/containers/Container.png diff --git a/indra/newview/skins/default/textures/containers/TabTop_Left_Off.png b/indra/newview/skins/default/textures/containers/TabTop_Left_Off.png Binary files differnew file mode 100644 index 0000000000..1951413f8d --- /dev/null +++ b/indra/newview/skins/default/textures/containers/TabTop_Left_Off.png diff --git a/indra/newview/skins/default/textures/containers/TabTop_Left_Over.png b/indra/newview/skins/default/textures/containers/TabTop_Left_Over.png Binary files differnew file mode 100644 index 0000000000..295cd89a57 --- /dev/null +++ b/indra/newview/skins/default/textures/containers/TabTop_Left_Over.png diff --git a/indra/newview/skins/default/textures/containers/TabTop_Left_Selected.png b/indra/newview/skins/default/textures/containers/TabTop_Left_Selected.png Binary files differnew file mode 100644 index 0000000000..8364716e02 --- /dev/null +++ b/indra/newview/skins/default/textures/containers/TabTop_Left_Selected.png diff --git a/indra/newview/skins/default/textures/containers/TabTop_Middle_Off.png b/indra/newview/skins/default/textures/containers/TabTop_Middle_Off.png Binary files differnew file mode 100644 index 0000000000..21f1c2d8a8 --- /dev/null +++ b/indra/newview/skins/default/textures/containers/TabTop_Middle_Off.png diff --git a/indra/newview/skins/default/textures/containers/TabTop_Middle_Over.png b/indra/newview/skins/default/textures/containers/TabTop_Middle_Over.png Binary files differnew file mode 100644 index 0000000000..0758cbcf0d --- /dev/null +++ b/indra/newview/skins/default/textures/containers/TabTop_Middle_Over.png diff --git a/indra/newview/skins/default/textures/containers/TabTop_Middle_Selected.png b/indra/newview/skins/default/textures/containers/TabTop_Middle_Selected.png Binary files differnew file mode 100644 index 0000000000..3946917c7c --- /dev/null +++ b/indra/newview/skins/default/textures/containers/TabTop_Middle_Selected.png diff --git a/indra/newview/skins/default/textures/containers/TabTop_Right_Off.png b/indra/newview/skins/default/textures/containers/TabTop_Right_Off.png Binary files differnew file mode 100644 index 0000000000..eeef28e5a5 --- /dev/null +++ b/indra/newview/skins/default/textures/containers/TabTop_Right_Off.png diff --git a/indra/newview/skins/default/textures/containers/TabTop_Right_Over.png b/indra/newview/skins/default/textures/containers/TabTop_Right_Over.png Binary files differnew file mode 100644 index 0000000000..c2cbc2b1e5 --- /dev/null +++ b/indra/newview/skins/default/textures/containers/TabTop_Right_Over.png diff --git a/indra/newview/skins/default/textures/containers/TabTop_Right_Selected.png b/indra/newview/skins/default/textures/containers/TabTop_Right_Selected.png Binary files differnew file mode 100644 index 0000000000..b0f1f16398 --- /dev/null +++ b/indra/newview/skins/default/textures/containers/TabTop_Right_Selected.png diff --git a/indra/newview/skins/default/textures/containers/Toolbar_Left_Off.png b/indra/newview/skins/default/textures/containers/Toolbar_Left_Off.png Binary files differnew file mode 100644 index 0000000000..41b5d24d87 --- /dev/null +++ b/indra/newview/skins/default/textures/containers/Toolbar_Left_Off.png diff --git a/indra/newview/skins/default/textures/containers/Toolbar_Left_Over.png b/indra/newview/skins/default/textures/containers/Toolbar_Left_Over.png Binary files differnew file mode 100644 index 0000000000..083acc0156 --- /dev/null +++ b/indra/newview/skins/default/textures/containers/Toolbar_Left_Over.png diff --git a/indra/newview/skins/default/textures/containers/Toolbar_Left_Selected.png b/indra/newview/skins/default/textures/containers/Toolbar_Left_Selected.png Binary files differnew file mode 100644 index 0000000000..ee4649a8f9 --- /dev/null +++ b/indra/newview/skins/default/textures/containers/Toolbar_Left_Selected.png diff --git a/indra/newview/skins/default/textures/containers/Toolbar_Middle_Off.png b/indra/newview/skins/default/textures/containers/Toolbar_Middle_Off.png Binary files differnew file mode 100644 index 0000000000..55c02160e3 --- /dev/null +++ b/indra/newview/skins/default/textures/containers/Toolbar_Middle_Off.png diff --git a/indra/newview/skins/default/textures/containers/Toolbar_Middle_Over.png b/indra/newview/skins/default/textures/containers/Toolbar_Middle_Over.png Binary files differnew file mode 100644 index 0000000000..2f6ea90196 --- /dev/null +++ b/indra/newview/skins/default/textures/containers/Toolbar_Middle_Over.png diff --git a/indra/newview/skins/default/textures/containers/Toolbar_Middle_Selected.png b/indra/newview/skins/default/textures/containers/Toolbar_Middle_Selected.png Binary files differnew file mode 100644 index 0000000000..642113b135 --- /dev/null +++ b/indra/newview/skins/default/textures/containers/Toolbar_Middle_Selected.png diff --git a/indra/newview/skins/default/textures/containers/Toolbar_Right_Off.png b/indra/newview/skins/default/textures/containers/Toolbar_Right_Off.png Binary files differnew file mode 100644 index 0000000000..01fd765c3d --- /dev/null +++ b/indra/newview/skins/default/textures/containers/Toolbar_Right_Off.png diff --git a/indra/newview/skins/default/textures/containers/Toolbar_Right_Over.png b/indra/newview/skins/default/textures/containers/Toolbar_Right_Over.png Binary files differnew file mode 100644 index 0000000000..74e00635f1 --- /dev/null +++ b/indra/newview/skins/default/textures/containers/Toolbar_Right_Over.png diff --git a/indra/newview/skins/default/textures/containers/Toolbar_Right_Selected.png b/indra/newview/skins/default/textures/containers/Toolbar_Right_Selected.png Binary files differnew file mode 100644 index 0000000000..8a0d98a780 --- /dev/null +++ b/indra/newview/skins/default/textures/containers/Toolbar_Right_Selected.png diff --git a/indra/newview/skins/default/textures/icons/AddItem_Off.png b/indra/newview/skins/default/textures/icons/AddItem_Off.png Binary files differnew file mode 100644 index 0000000000..52d4f9bc80 --- /dev/null +++ b/indra/newview/skins/default/textures/icons/AddItem_Off.png diff --git a/indra/newview/skins/default/textures/icons/AddItem_Over.png b/indra/newview/skins/default/textures/icons/AddItem_Over.png Binary files differnew file mode 100644 index 0000000000..cad6e8d52f --- /dev/null +++ b/indra/newview/skins/default/textures/icons/AddItem_Over.png diff --git a/indra/newview/skins/default/textures/icons/AddItem_Press.png b/indra/newview/skins/default/textures/icons/AddItem_Press.png Binary files differnew file mode 100644 index 0000000000..acc898e5f4 --- /dev/null +++ b/indra/newview/skins/default/textures/icons/AddItem_Press.png diff --git a/indra/newview/skins/default/textures/icons/BackArrow_Off.png b/indra/newview/skins/default/textures/icons/BackArrow_Off.png Binary files differnew file mode 100644 index 0000000000..ff32192856 --- /dev/null +++ b/indra/newview/skins/default/textures/icons/BackArrow_Off.png diff --git a/indra/newview/skins/default/textures/icons/BackArrow_Over.png b/indra/newview/skins/default/textures/icons/BackArrow_Over.png Binary files differnew file mode 100644 index 0000000000..b36e03a8cf --- /dev/null +++ b/indra/newview/skins/default/textures/icons/BackArrow_Over.png diff --git a/indra/newview/skins/default/textures/icons/Info.png b/indra/newview/skins/default/textures/icons/Info.png Binary files differnew file mode 100644 index 0000000000..e52560281b --- /dev/null +++ b/indra/newview/skins/default/textures/icons/Info.png diff --git a/indra/newview/skins/default/textures/icons/OptionsMenu_Off.png b/indra/newview/skins/default/textures/icons/OptionsMenu_Off.png Binary files differnew file mode 100644 index 0000000000..25b055bfc0 --- /dev/null +++ b/indra/newview/skins/default/textures/icons/OptionsMenu_Off.png diff --git a/indra/newview/skins/default/textures/icons/OptionsMenu_Over.png b/indra/newview/skins/default/textures/icons/OptionsMenu_Over.png Binary files differnew file mode 100644 index 0000000000..fcabd4c6d3 --- /dev/null +++ b/indra/newview/skins/default/textures/icons/OptionsMenu_Over.png diff --git a/indra/newview/skins/default/textures/icons/OptionsMenu_Press.png b/indra/newview/skins/default/textures/icons/OptionsMenu_Press.png Binary files differnew file mode 100644 index 0000000000..6e91dd7159 --- /dev/null +++ b/indra/newview/skins/default/textures/icons/OptionsMenu_Press.png diff --git a/indra/newview/skins/default/textures/icons/TrashItem_Off.png b/indra/newview/skins/default/textures/icons/TrashItem_Off.png Binary files differnew file mode 100644 index 0000000000..bb64920ec4 --- /dev/null +++ b/indra/newview/skins/default/textures/icons/TrashItem_Off.png diff --git a/indra/newview/skins/default/textures/icons/TrashItem_Over.png b/indra/newview/skins/default/textures/icons/TrashItem_Over.png Binary files differnew file mode 100644 index 0000000000..1a0eea6c67 --- /dev/null +++ b/indra/newview/skins/default/textures/icons/TrashItem_Over.png diff --git a/indra/newview/skins/default/textures/icons/TrashItem_Press.png b/indra/newview/skins/default/textures/icons/TrashItem_Press.png Binary files differnew file mode 100644 index 0000000000..c62f833d86 --- /dev/null +++ b/indra/newview/skins/default/textures/icons/TrashItem_Press.png diff --git a/indra/newview/skins/default/textures/icons/VoicePTT_Lvl1.png b/indra/newview/skins/default/textures/icons/VoicePTT_Lvl1.png Binary files differnew file mode 100644 index 0000000000..cd18ae310d --- /dev/null +++ b/indra/newview/skins/default/textures/icons/VoicePTT_Lvl1.png diff --git a/indra/newview/skins/default/textures/icons/VoicePTT_Lvl2.png b/indra/newview/skins/default/textures/icons/VoicePTT_Lvl2.png Binary files differnew file mode 100644 index 0000000000..b0ed6ee8eb --- /dev/null +++ b/indra/newview/skins/default/textures/icons/VoicePTT_Lvl2.png diff --git a/indra/newview/skins/default/textures/icons/VoicePTT_Lvl3.png b/indra/newview/skins/default/textures/icons/VoicePTT_Lvl3.png Binary files differnew file mode 100644 index 0000000000..14ec77b99a --- /dev/null +++ b/indra/newview/skins/default/textures/icons/VoicePTT_Lvl3.png diff --git a/indra/newview/skins/default/textures/icons/VoicePTT_Off.png b/indra/newview/skins/default/textures/icons/VoicePTT_Off.png Binary files differnew file mode 100644 index 0000000000..48be51e9af --- /dev/null +++ b/indra/newview/skins/default/textures/icons/VoicePTT_Off.png diff --git a/indra/newview/skins/default/textures/icons/VoicePTT_On.png b/indra/newview/skins/default/textures/icons/VoicePTT_On.png Binary files differnew file mode 100644 index 0000000000..be4881b64c --- /dev/null +++ b/indra/newview/skins/default/textures/icons/VoicePTT_On.png diff --git a/indra/newview/skins/default/textures/image_edit_icon.tga b/indra/newview/skins/default/textures/image_edit_icon.tga Binary files differnew file mode 100644 index 0000000000..8666f0bbe6 --- /dev/null +++ b/indra/newview/skins/default/textures/image_edit_icon.tga diff --git a/indra/newview/skins/default/textures/navbar/Arrow_Left_Off.png b/indra/newview/skins/default/textures/navbar/Arrow_Left_Off.png Binary files differnew file mode 100644 index 0000000000..19569501fe --- /dev/null +++ b/indra/newview/skins/default/textures/navbar/Arrow_Left_Off.png diff --git a/indra/newview/skins/default/textures/navbar/Arrow_Left_Over.png b/indra/newview/skins/default/textures/navbar/Arrow_Left_Over.png Binary files differnew file mode 100644 index 0000000000..a91b74819f --- /dev/null +++ b/indra/newview/skins/default/textures/navbar/Arrow_Left_Over.png diff --git a/indra/newview/skins/default/textures/navbar/Arrow_Right_Off.png b/indra/newview/skins/default/textures/navbar/Arrow_Right_Off.png Binary files differnew file mode 100644 index 0000000000..3648c42656 --- /dev/null +++ b/indra/newview/skins/default/textures/navbar/Arrow_Right_Off.png diff --git a/indra/newview/skins/default/textures/navbar/Arrow_Right_Over.png b/indra/newview/skins/default/textures/navbar/Arrow_Right_Over.png Binary files differnew file mode 100644 index 0000000000..a2caf227a7 --- /dev/null +++ b/indra/newview/skins/default/textures/navbar/Arrow_Right_Over.png diff --git a/indra/newview/skins/default/textures/navbar/Favorite_Star_Active.png b/indra/newview/skins/default/textures/navbar/Favorite_Star_Active.png Binary files differnew file mode 100644 index 0000000000..a4060e5e37 --- /dev/null +++ b/indra/newview/skins/default/textures/navbar/Favorite_Star_Active.png diff --git a/indra/newview/skins/default/textures/navbar/Favorite_Star_Off.png b/indra/newview/skins/default/textures/navbar/Favorite_Star_Off.png Binary files differnew file mode 100644 index 0000000000..9c2815ebba --- /dev/null +++ b/indra/newview/skins/default/textures/navbar/Favorite_Star_Off.png diff --git a/indra/newview/skins/default/textures/navbar/Favorite_Star_Over.png b/indra/newview/skins/default/textures/navbar/Favorite_Star_Over.png Binary files differnew file mode 100644 index 0000000000..377b707529 --- /dev/null +++ b/indra/newview/skins/default/textures/navbar/Favorite_Star_Over.png diff --git a/indra/newview/skins/default/textures/navbar/Favorite_Star_Press.png b/indra/newview/skins/default/textures/navbar/Favorite_Star_Press.png Binary files differnew file mode 100644 index 0000000000..a69a729bd4 --- /dev/null +++ b/indra/newview/skins/default/textures/navbar/Favorite_Star_Press.png diff --git a/indra/newview/skins/default/textures/navbar/FileMenu_Divider.png b/indra/newview/skins/default/textures/navbar/FileMenu_Divider.png Binary files differnew file mode 100644 index 0000000000..5ab4abc5b8 --- /dev/null +++ b/indra/newview/skins/default/textures/navbar/FileMenu_Divider.png diff --git a/indra/newview/skins/default/textures/navbar/Help_Over.png b/indra/newview/skins/default/textures/navbar/Help_Over.png Binary files differnew file mode 100644 index 0000000000..b9bc0d0f87 --- /dev/null +++ b/indra/newview/skins/default/textures/navbar/Help_Over.png diff --git a/indra/newview/skins/default/textures/navbar/Help_Press.png b/indra/newview/skins/default/textures/navbar/Help_Press.png Binary files differnew file mode 100644 index 0000000000..ed3695f9d5 --- /dev/null +++ b/indra/newview/skins/default/textures/navbar/Help_Press.png diff --git a/indra/newview/skins/default/textures/navbar/Home_Off.png b/indra/newview/skins/default/textures/navbar/Home_Off.png Binary files differnew file mode 100644 index 0000000000..fe3bc63b77 --- /dev/null +++ b/indra/newview/skins/default/textures/navbar/Home_Off.png diff --git a/indra/newview/skins/default/textures/navbar/Home_Over.png b/indra/newview/skins/default/textures/navbar/Home_Over.png Binary files differnew file mode 100644 index 0000000000..d9c6b3842e --- /dev/null +++ b/indra/newview/skins/default/textures/navbar/Home_Over.png diff --git a/indra/newview/skins/default/textures/navbar/Info_Off.png b/indra/newview/skins/default/textures/navbar/Info_Off.png Binary files differnew file mode 100644 index 0000000000..64722255a3 --- /dev/null +++ b/indra/newview/skins/default/textures/navbar/Info_Off.png diff --git a/indra/newview/skins/default/textures/navbar/Info_Over.png b/indra/newview/skins/default/textures/navbar/Info_Over.png Binary files differnew file mode 100644 index 0000000000..84f1d03129 --- /dev/null +++ b/indra/newview/skins/default/textures/navbar/Info_Over.png diff --git a/indra/newview/skins/default/textures/navbar/Info_Press.png b/indra/newview/skins/default/textures/navbar/Info_Press.png Binary files differnew file mode 100644 index 0000000000..169105829e --- /dev/null +++ b/indra/newview/skins/default/textures/navbar/Info_Press.png diff --git a/indra/newview/skins/default/textures/navbar/NavBar_BG.png b/indra/newview/skins/default/textures/navbar/NavBar_BG.png Binary files differnew file mode 100644 index 0000000000..1df61751a8 --- /dev/null +++ b/indra/newview/skins/default/textures/navbar/NavBar_BG.png diff --git a/indra/newview/skins/default/textures/navbar/Row_Selection.png b/indra/newview/skins/default/textures/navbar/Row_Selection.png Binary files differnew file mode 100644 index 0000000000..fc4f0c07ef --- /dev/null +++ b/indra/newview/skins/default/textures/navbar/Row_Selection.png diff --git a/indra/newview/skins/default/textures/navbar/Search.png b/indra/newview/skins/default/textures/navbar/Search.png Binary files differnew file mode 100644 index 0000000000..c43519d5f1 --- /dev/null +++ b/indra/newview/skins/default/textures/navbar/Search.png diff --git a/indra/newview/skins/default/textures/taskpanel/TabIcon_Close_Off.png b/indra/newview/skins/default/textures/taskpanel/TabIcon_Close_Off.png Binary files differnew file mode 100644 index 0000000000..bc4e00c646 --- /dev/null +++ b/indra/newview/skins/default/textures/taskpanel/TabIcon_Close_Off.png diff --git a/indra/newview/skins/default/textures/taskpanel/TabIcon_Home_Off.png b/indra/newview/skins/default/textures/taskpanel/TabIcon_Home_Off.png Binary files differnew file mode 100644 index 0000000000..1e7d7beafa --- /dev/null +++ b/indra/newview/skins/default/textures/taskpanel/TabIcon_Home_Off.png diff --git a/indra/newview/skins/default/textures/taskpanel/TabIcon_Home_Selected.png b/indra/newview/skins/default/textures/taskpanel/TabIcon_Home_Selected.png Binary files differnew file mode 100644 index 0000000000..a70d3abbbf --- /dev/null +++ b/indra/newview/skins/default/textures/taskpanel/TabIcon_Home_Selected.png diff --git a/indra/newview/skins/default/textures/taskpanel/TabIcon_Me_Off.png b/indra/newview/skins/default/textures/taskpanel/TabIcon_Me_Off.png Binary files differnew file mode 100644 index 0000000000..2d36f70361 --- /dev/null +++ b/indra/newview/skins/default/textures/taskpanel/TabIcon_Me_Off.png diff --git a/indra/newview/skins/default/textures/taskpanel/TabIcon_Me_Selected.png b/indra/newview/skins/default/textures/taskpanel/TabIcon_Me_Selected.png Binary files differnew file mode 100644 index 0000000000..3c20459126 --- /dev/null +++ b/indra/newview/skins/default/textures/taskpanel/TabIcon_Me_Selected.png diff --git a/indra/newview/skins/default/textures/taskpanel/TabIcon_Open_Off.png b/indra/newview/skins/default/textures/taskpanel/TabIcon_Open_Off.png Binary files differnew file mode 100644 index 0000000000..4556602f58 --- /dev/null +++ b/indra/newview/skins/default/textures/taskpanel/TabIcon_Open_Off.png diff --git a/indra/newview/skins/default/textures/taskpanel/TabIcon_People_Off.png b/indra/newview/skins/default/textures/taskpanel/TabIcon_People_Off.png Binary files differnew file mode 100644 index 0000000000..c272372a39 --- /dev/null +++ b/indra/newview/skins/default/textures/taskpanel/TabIcon_People_Off.png diff --git a/indra/newview/skins/default/textures/taskpanel/TabIcon_People_Selected.png b/indra/newview/skins/default/textures/taskpanel/TabIcon_People_Selected.png Binary files differnew file mode 100644 index 0000000000..3828752606 --- /dev/null +++ b/indra/newview/skins/default/textures/taskpanel/TabIcon_People_Selected.png diff --git a/indra/newview/skins/default/textures/taskpanel/TabIcon_Places_Off.png b/indra/newview/skins/default/textures/taskpanel/TabIcon_Places_Off.png Binary files differnew file mode 100644 index 0000000000..d7ec33af55 --- /dev/null +++ b/indra/newview/skins/default/textures/taskpanel/TabIcon_Places_Off.png diff --git a/indra/newview/skins/default/textures/taskpanel/TabIcon_Places_Selected.png b/indra/newview/skins/default/textures/taskpanel/TabIcon_Places_Selected.png Binary files differnew file mode 100644 index 0000000000..dd7e361ea9 --- /dev/null +++ b/indra/newview/skins/default/textures/taskpanel/TabIcon_Places_Selected.png diff --git a/indra/newview/skins/default/textures/taskpanel/TabIcon_Things_Off.png b/indra/newview/skins/default/textures/taskpanel/TabIcon_Things_Off.png Binary files differnew file mode 100644 index 0000000000..e56eda9802 --- /dev/null +++ b/indra/newview/skins/default/textures/taskpanel/TabIcon_Things_Off.png diff --git a/indra/newview/skins/default/textures/taskpanel/TabIcon_Things_Selected.png b/indra/newview/skins/default/textures/taskpanel/TabIcon_Things_Selected.png Binary files differnew file mode 100644 index 0000000000..d4ac451c8e --- /dev/null +++ b/indra/newview/skins/default/textures/taskpanel/TabIcon_Things_Selected.png diff --git a/indra/newview/skins/default/textures/taskpanel/TaskPanel_Tab_Off.png b/indra/newview/skins/default/textures/taskpanel/TaskPanel_Tab_Off.png Binary files differnew file mode 100644 index 0000000000..918be7555f --- /dev/null +++ b/indra/newview/skins/default/textures/taskpanel/TaskPanel_Tab_Off.png diff --git a/indra/newview/skins/default/textures/taskpanel/TaskPanel_Tab_Selected.png b/indra/newview/skins/default/textures/taskpanel/TaskPanel_Tab_Selected.png Binary files differnew file mode 100644 index 0000000000..b3316386b9 --- /dev/null +++ b/indra/newview/skins/default/textures/taskpanel/TaskPanel_Tab_Selected.png diff --git a/indra/newview/skins/default/textures/textures.xml b/indra/newview/skins/default/textures/textures.xml index 84dd3ffd7a..dc5936a435 100644 --- a/indra/newview/skins/default/textures/textures.xml +++ b/indra/newview/skins/default/textures/textures.xml @@ -1,75 +1,180 @@ <textures version="101"> + <!-- Please add new files alphabetically to prevent merge conflicts. JC --> - <texture name="icn_scrollbar_thumb.tga" preload="true" scale.top="7" scale.left="4" scale.bottom="8" scale.right="4" /> - <texture name="icn_scrollbar_bg.tga" preload="true" scale.top="7" scale.left="4" scale.bottom="8" scale.right="4" /> + <texture name="ScrollThumb_Horiz" file_name="widgets/ScrollThumb_Horiz.png" preload="true" scale.left="4" scale.top="10" scale.bottom="53" scale.right="4" /> + <texture name="ScrollThumb_Vert" file_name="widgets/ScrollThumb_Vert.png" preload="true" scale.left="4" scale.top="53" scale.bottom="10" scale.right="4" /> + <texture name="ScrollTrack_Vert" file_name="widgets/ScrollTrack_Vert.png" preload="true" scale.left="2" scale.top="40" scale.bottom="13" scale.right="0" /> + <texture name="ScrollTrack_Horiz" file_name="widgets/ScrollTrack_Horiz.png" preload="true" scale.left="0" scale.top="13" scale.bottom="40" scale.right="2" /> <texture name="sm_rounded_corners_simple.tga" scale.left="4" scale.top="4" scale.bottom="4" scale.right="4"/> + + <!--There are still references to this old textfield art in the code somewhere -erica--> <texture name="icn_textfield_enabled.tga" scale.left="5" scale.top="5" scale.bottom="5" scale.right="5"/> - - <texture name="button_disabled_32x128.tga" preload="true" scale.left="16" scale.top="16" scale.right="112" scale.bottom="16" /> - - <texture name="button_enabled_32x128.tga" preload="true" scale.left="16" scale.top="16" scale.right="112" scale.bottom="16" /> - - <texture name="toolbar_btn_enabled.tga" scale.left="7" scale.top="32" scale.right="121" scale.bottom="0" /> + <texture name="icn_rounded-text-field.tga" scale.left="14" scale.bottom="16" scale.top="16" scale.right="114"/> - <texture name="toolbar_btn_disabled.tga" scale.left="7" scale.top="32" scale.right="121" scale.bottom="0" /> - - <texture name="toolbar_btn_selected.tga" scale.left="7" scale.top="32" scale.right="121" scale.bottom="0" /> - - <texture name="button_enabled_selected_32x128.tga" preload="true" scale.left="16" scale.top="16" scale.right="112" scale.bottom="16" /> - - <texture name="checkbox_disabled_false.tga" preload="true"/> - <texture name="checkbox_disabled_true.tga" preload="true"/> - <texture name="checkbox_enabled_false.tga" preload="true"/> - <texture name="checkbox_enabled_true.tga" preload="true"/> - - <texture name="close_in_blue.tga" preload="true"/> + <texture name="TextField_Search_Disabled" file_name="widgets/TextField_Search_Disabled.png" preload="true" scale.left="4" scale.top="18" scale.right="252" scale.bottom="4" /> + <texture name="TextField_Off" file_name="widgets/TextField_Off.png" preload="true" scale.left="4" scale.top="18" scale.right="252" scale.bottom="4" /> + <texture name="TextField_Search_Active" file_name="widgets/TextField_Search_Active.png" preload="true" scale.left="4" scale.top="18" scale.right="252" scale.bottom="4" /> + <texture name="TextField_Search_Off" file_name="widgets/TextField_Search_Off.png" preload="true" scale.left="4" scale.top="18" scale.right="252" scale.bottom="4" /> + <texture name="TextField_Disabled" file_name="widgets/TextField_Disabled.png" preload="true" scale.left="4" scale.top="18" scale.right="252" scale.bottom="4" /> + <texture name="TextField_Active" file_name="widgets/TextField_Active.png" preload="true" scale.left="4" scale.top="18" scale.right="252" scale.bottom="4" /> + + <texture name="PushButton_Off" file_name="widgets/PushButton_Off.png" preload="true" scale.left="4" scale.top="19" scale.right="28" scale.bottom="4" /> + <texture name="PushButton_Press" file_name="widgets/PushButton_Press.png" preload="true" scale.left="4" scale.top="19" scale.right="28" scale.bottom="4" /> + <texture name="PushButton_Disabled" file_name="widgets/PushButton_Disabled.png" preload="true" scale.left="4" scale.top="19" scale.right="28" scale.bottom="4" /> + <texture name="PushButton_Selected" file_name="widgets/PushButton_Selected.png" preload="true" scale.left="4" scale.top="19" scale.right="28" scale.bottom="4" /> + <texture name="PushButton_Selected_Press" file_name="widgets/PushButton_Selected_Press.png" preload="true" scale.left="4" scale.top="19" scale.right="28" scale.bottom="4" /> + <texture name="PushButton_Selected_Disabled" file_name="widgets/PushButton_Selected_Disabled.png" preload="true" scale.left="4" scale.top="19" scale.right="28" scale.bottom="4" /> + + <texture name="toolbar_btn_enabled.tga" scale.left="7" scale.top="32" scale.right="121" scale.bottom="0" /> + <texture name="toolbar_btn_disabled.tga" scale.left="7" scale.top="32" scale.right="121" scale.bottom="0" /> + <texture name="toolbar_btn_selected.tga" scale.left="7" scale.top="32" scale.right="121" scale.bottom="0" /> + + <texture name="Checkbox_Off_Disabled" file_name="widgets/Checkbox_Disabled.png" preload="true" /> + <texture name="Checkbox_On_Disabled" file_name="widgets/Checkbox_On_Disabled.png" preload="true" /> + <texture name="Checkbox_Off" file_name="widgets/Checkbox_Off.png" preload="true" /> + <texture name="Checkbox_On" file_name="widgets/Checkbox_On.png" preload="true" /> + <texture name="Checkbox_On_Press" file_name="widgets/Checkbox_On_Press.png" preload="true" /> + <texture name="Checkbox_Press" file_name="widgets/Checkbox_Press.png" preload="true" /> + <texture name="RadioButton_On_Press" file_name="widgets/RadioButton_On_Press.png" preload="true" /> <texture name="minimize_inactive.tga" preload="true"/> - <texture name="minimize.tga" preload="true"/> + <texture name="minimize.tga" preload="true" /> <texture name="minimize_pressed.tga" preload="true"/> - - <texture name="radio_active_false.tga" preload="true"/> - <texture name="radio_active_true.tga" preload="true"/> - <texture name="radio_inactive_false.tga" preload="true"/> - <texture name="radio_inactive_true.tga" preload="true"/> - - <texture name="combobox_arrow.tga" preload="true"/> - - <texture name="resize_handle_bottom_right_blue.tga" preload="true"/> - - <texture name="rounded_square.tga" file_name="rounded_square.j2c" preload="true" scale.left="16" scale.top="16" scale.right="112" scale.bottom="16"/> - + + <texture name="Icon_Close_Background" file_name="windows/Icon_Close_Background.png" preload="true" /> + <texture name="Icon_Close_Foreground" file_name="windows/Icon_Close_Foreground.png" preload="true" /> + <texture name="Icon_Close_Press" file_name="windows/Icon_Close_Press.png" preload="true" /> + <texture name="Icon_Close_Toast" file_name="windows/Icon_Close_Toast.png" preload="true" /> + <texture name="Icon_Dock_Background" file_name="windows/Icon_Dock_Background.png" preload="true" /> + <texture name="Icon_Dock_Foreground" file_name="windows/Icon_Dock_Foreground.png" preload="true" /> + <texture name="Icon_Dock_Press" file_name="windows/Icon_Dock_Press.png" preload="true" /> + <texture name="Icon_Undock_Background" file_name="windows/Icon_Undock_Background.png" preload="true" /> + <texture name="Icon_Undock_Foreground" file_name="windows/Icon_Undock_Foreground.png" preload="true" /> + <texture name="Icon_Undock_Press" file_name="windows/Icon_Undock_Press.png" preload="true" /> + <texture name="Toast_CloseBtn" file_name="windows/Toast_CloseBtn.png" preload="true" /> + <texture name="Toast" file_name="windows/Toast.png" preload="true" /> + + <texture name="Window_Background" file_name="windows/Window_Background.png" preload="true" /> + <texture name="Window_Foreground" file_name="windows/Window_Foreground.png" preload="true" /> + + <texture name="Favorite_Star_Active" file_name="navbar/Favorite_Star_Active.png" preload="true" /> + <texture name="Favorite_Star_Off" file_name="navbar/Favorite_Star_Off.png" preload="true" /> + <texture name="Favorite_Star_Press" file_name="navbar/Favorite_Star_Press.png" preload="true" /> + <texture name="FileMenu_BarSelect" file_name="navbar/FileMenu_BarSelect.png" preload="true" /> + <texture name="FileMenu_BG" file_name="navbar/FileMenu_BG.png" preload="true" /> + <texture name="NavBar_BG_NoFav" file_name="navbar/NavBar_BG_NoFav.png" preload="true" /> + <texture name="NavBar_BG" file_name="navbar/NavBar_BG.png" preload="true" /> + <texture name="Row_Selection" file_name="navbar/Row_Selection.png" preload="true" /> + + <texture name="BottomTray_BG" file_name="bottomtray/BottomTray_BG.png" preload="true" /> + <texture name="DownArrow" file_name="bottomtray/DownArrow.png" preload="true" /> + <texture name="NearbyVoice_Lvl1" file_name="bottomtray/NearbyVoice_Lvl1.png" preload="true" /> + <texture name="NearbyVoice_Lvl2" file_name="bottomtray/NearbyVoice_Lvl2.png" preload="true" /> + <texture name="NearbyVoice_Lvl3" file_name="bottomtray/NearbyVoice_Lvl3.png" preload="true" /> + <texture name="NearbyVoice_On" file_name="bottomtray/NearbyVoice_On.png" preload="true" /> + <texture name="Unread_IM" file_name="bottomtray/Unread_IM.png" preload="true" /> + <texture name="Unread_Msg" file_name="bottomtray/Unread_Msg.png" preload="true" /> + <texture name="VoicePPT_Lvl1" file_name="bottomtray/VoicePPT_Lvl1.png" preload="true" /> + <texture name="VoicePPT_Lvl2" file_name="bottomtray/VoicePPT_Lvl2.png" preload="true" /> + <texture name="VoicePPT_Lvl3" file_name="bottomtray/VoicePPT_Lvl3.png" preload="true" /> + <texture name="VoicePPT_Off" file_name="bottomtray/VoicePPT_Off.png" preload="true" /> + <texture name="VoicePPT_On" file_name="bottomtray/VoicePPT_On.png" preload="true" /> + + <texture name="Accordion_ArrowClosed_Off" file_name="containers/Accordion_ArrowClosed_Off.png" preload="true" /> + <texture name="Accordion_ArrowClosed_Press" file_name="containers/Accordion_ArrowClosed_Press.png" preload="true" /> + <texture name="Accordion_ArrowOpened_Off" file_name="containers/Accordion_ArrowOpened_Off.png" preload="true" /> + <texture name="Accordion_ArrowOpened_Press" file_name="containers/Accordion_ArrowOpened_Press.png" preload="true" /> + <texture name="Accordion_Off" file_name="containers/Accordion_Off.png" preload="true" /> + <texture name="Accordion_Press" file_name="containers/Accordion_Press.png" preload="true" /> + <texture name="Container" file_name="containers/Container.png" preload="true" /> + <texture name="TabTop_Divider" file_name="containers/TabTop_Divider.png" preload="true" /> + <texture name="TabTop_Left_Press" file_name="containers/TabTop_Left_Press.png" preload="true" /> + <texture name="TabTop_Middle_Press" file_name="containers/TabTop_Middle_Press.png" preload="true" /> + <texture name="TabTop_Right_Off" file_name="containers/TabTop_Right_Off.png" preload="true" /> + <texture name="TabTop_Right_Press" file_name="containers/TabTop_Right_Press.png" preload="true" /> + <texture name="TabTop_Right_Selected" file_name="containers/TabTop_Right_Selected.png" preload="true" /> + <texture name="Toolbar_Divider" file_name="containers/Toolbar_Divider.png" preload="true" /> + <texture name="Toolbar_Left_Off" file_name="containers/Toolbar_Left_Off.png" preload="true" /> + <texture name="Toolbar_Left_Press" file_name="containers/Toolbar_Left_Press.png" preload="true" /> + <texture name="Toolbar_Left_Selected" file_name="containers/Toolbar_Left_Selected.png" preload="true" /> + <texture name="Toolbar_Middle_Off" file_name="containers/Toolbar_Middle_Off.png" preload="true" /> + <texture name="Toolbar_Middle_Press" file_name="containers/Toolbar_Middle_Press.png" preload="true" /> + <texture name="Toolbar_Middle_Selected" file_name="containers/Toolbar_Middle_Selected.png" preload="true" /> + <texture name="Toolbar_Right_Off" file_name="containers/Toolbar_Right_Off.png" preload="true" /> + <texture name="Toolbar_Right_Press" file_name="containers/Toolbar_Right_Press.png" preload="true" /> + <texture name="Toolbar_Right_Selected" file_name="containers/Toolbar_Right_Selected.png" preload="true" /> + + <texture name="AddItem_Off" file_name="icons/AddItem_Off.png" preload="true" /> + <texture name="AddItem_Press" file_name="icons/AddItem_Press.png" preload="true" /> + <texture name="BackArrow_Off" file_name="icons/BackArrow_Off.png" preload="true" /> + <texture name="BackArrow_Press" file_name="icons/BackArrow_Press.png" preload="true" /> + <texture name="Info" file_name="icons/Info.png" preload="true" /> + <texture name="OptionsMenu_Off" file_name="icons/OptionsMenu_Off.png" preload="true" /> + <texture name="OptionsMenu_Press" file_name="icons/OptionsMenu_Press.png" preload="true" /> + <texture name="TrashItem_Off" file_name="icons/TrashItem_Off.png" preload="true" /> + <texture name="TrashItem_Press" file_name="icons/TrashItem_Press.png" preload="true" /> + <texture name="Widget_DownArrow" file_name="icons/Widget_DownArrow.png" preload="true" /> + + <texture name="TabIcon_Close_Off" file_name="taskpanel/TabIcon_Close_Off.png" preload="true" /> + <texture name="TabIcon_Home_Off" file_name="taskpanel/TabIcon_Home_Off.png" preload="true" /> + <texture name="TabIcon_Home_Selected" file_name="taskpanel/TabIcon_Home_Selected.png" preload="true" /> + <texture name="TabIcon_Me_Off" file_name="taskpanel/TabIcon_Me_Off.png" preload="true" /> + <texture name="TabIcon_Me_Selected" file_name="taskpanel/TabIcon_Me_Selected.png" preload="true" /> + <texture name="TabIcon_Open_Off" file_name="taskpanel/TabIcon_Open_Off.png" preload="true" /> + <texture name="TabIcon_People_Off" file_name="taskpanel/TabIcon_People_Off.png" preload="true" /> + <texture name="TabIcon_People_Selected" file_name="taskpanel/TabIcon_People_Selected.png" preload="true" /> + <texture name="TabIcon_Places_Off" file_name="taskpanel/TabIcon_Places_Off.png" preload="true" /> + <texture name="TabIcon_Places_Selected" file_name="taskpanel/TabIcon_Places_Selected.png" preload="true" /> + <texture name="TabIcon_Things_Off" file_name="taskpanel/TabIcon_Things_Off.png" preload="true" /> + <texture name="TabIcon_Things_Selected" file_name="taskpanel/TabIcon_Things_Selected.png" preload="true" /> + + <texture name="DisclosureArrow_Closed_Off" file_name="widgets/DisclosureArrow_Closed_Off.png" preload="true" /> + <texture name="DisclosureArrow_Closed_Process" file_name="widgets/DisclosureArrow_Closed_Process.png" preload="true" /> + <texture name="DisclosureArrow_Opened_Off" file_name="widgets/DisclosureArrow_Opened_Off.png" preload="true" /> + <texture name="DisclosureArrow_Opened_Press" file_name="widgets/DisclosureArrow_Opened_Press.png" preload="true" /> + <texture name="ListItem_Select" file_name="widgets/ListItem_Select.png" preload="true" /> + + <texture name="RadioButton_Off" file_name="widgets/RadioButton_Off.png" preload="true" /> + <texture name="RadioButton_On" file_name="widgets/RadioButton_On.png" preload="true" /> + <texture name="RadioButton_Disabled" file_name="widgets/RadioButton_Disabled.png" preload="true" /> + <texture name="RadioButton_On_Disabled" file_name="widgets/RadioButton_On_Disabled.png" preload="true" /> + + <texture name="ComboButton_Disabled" file_name="widgets/ComboButton_Disabled.png" preload="true" scale.left="2" scale.top="19" scale.right="18" scale.bottom="2" /> + <texture name="ComboButton_Over" file_name="widgets/ComboButton_Over.png" preload="true" scale.left="2" scale.top="19" scale.right="18" scale.bottom="2" /> + <texture name="ComboButton_Press" file_name="widgets/ComboButton_Press.png" preload="true" scale.left="2" scale.top="19" scale.right="18" scale.bottom="2" /> + <texture name="ComboButton_Selected" file_name="widgets/ComboButton_Selected.png" preload="true" scale.left="2" scale.top="19" scale.right="18" scale.bottom="2" /> + <texture name="ComboButton_Off" file_name="widgets/ComboButton_Off.png" preload="true" scale.left="2" scale.top="19" scale.right="18" scale.bottom="2" /> + + <texture name="DropDown_Disabled" file_name="widgets/DropDown_Disabled.png" preload="true" scale.left="2" scale.top="19" scale.right="18" scale.bottom="2" /> + <texture name="DropDown_Over" file_name="widgets/DropDown_Over.png" preload="true" scale.left="2" scale.top="19" scale.right="18" scale.bottom="2" /> + <texture name="DropDown_Press" file_name="widgets/DropDown_Press.png" preload="true" scale.left="2" scale.top="19" scale.right="18" scale.bottom="2" /> + <texture name="DropDown_Selected" file_name="widgets/DropDown_Selected.png" preload="true" scale.left="2" scale.top="19" scale.right="18" scale.bottom="2" /> + <texture name="DropDown_Off" file_name="widgets/DropDown_Off.png" preload="true" scale.left="2" scale.top="19" scale.right="18" scale.bottom="2" /> + + <texture name="Resize_Corner" file_name="windows/Resize_Corner.png" preload="true"/> + + <texture name="rounded_square.tga" file_name="rounded_square.j2c" preload="true" scale.left="16" scale.top="16" scale.right="112" scale.bottom="16" /> + <texture name="rounded_square_soft.tga" file_name="rounded_square_soft.j2c" preload="true" scale.left="16" scale.top="16" scale.right="112" scale.bottom="16"/> - + <texture name="toolbar_tab.tga" preload="true" scale.left="6" scale.top="42" scale.right="104" scale.bottom="8"/> <texture name="toolbar_bg.tga" preload="true" scale.left="6" scale.top="42" scale.right="96" scale.bottom="16"/> - - <texture name="progressbar_fill.tga" preload="true" scale.left="10" scale.top="7" scale.right="65" scale.bottom="7"/> - <texture name="progressbar_track.tga" preload="true" scale.left="10" scale.top="7" scale.right="80" scale.bottom="7"/> - - <texture name="scrollbutton_down_in_blue.tga" preload="true"/> - <texture name="scrollbutton_down_out_blue.tga" preload="true"/> - <texture name="scrollbutton_left_in_blue.tga" preload="true"/> - <texture name="scrollbutton_left_out_blue.tga" preload="true"/> - <texture name="scrollbutton_right_in_blue.tga" preload="true"/> - <texture name="scrollbutton_right_out_blue.tga" preload="true"/> - <texture name="scrollbutton_up_in_blue.tga" preload="true"/> - <texture name="scrollbutton_up_out_blue.tga" preload="true"/> - <texture name="spin_down_in_blue.tga" preload="true"/> - <texture name="spin_down_out_blue.tga" preload="true"/> - <texture name="spin_up_in_blue.tga" preload="true"/> - <texture name="spin_up_out_blue.tga" preload="true"/> - - <texture name="square_btn_32x128.tga" preload="true" scale.left="8" scale.top="10" scale.right="120" scale.bottom="10"/> - <texture name="square_btn_selected_32x128.tga" preload="true" scale.left="2" scale.top="10" scale.right="126" scale.bottom="10"/> - - <texture name="tab_bottom_blue.tga" preload="true" scale.left="8" scale.top="8" scale.right="120" scale.bottom="9"/> - <texture name="tab_bottom_selected_blue.tga" preload="true" scale.left="8" scale.top="8" scale.right="96" scale.bottom="9"/> - <texture name="tab_left.tga" preload="true" scale.left="8" scale.top="8" scale.right="120" scale.bottom="9"/> - <texture name="tab_left_selected.tga" preload="true" scale.left="8" scale.top="8" scale.right="96" scale.bottom="9"/> + + <texture name="ProgressBar" file_name="widgets/ProgressBar.png" preload="true" scale.left="4" scale.top="10" scale.right="48" scale.bottom="2" /> + <texture name="ProgressTrack" file_name="widgets/ProgressTrack.png" preload="true" scale.left="4" scale.top="13" scale.right="148" scale.bottom="2" /> + + <texture name="ScrollArrow_Down" file_name="widgets/ScrollArrow_Down.png" preload="true" scale.left="2" scale.top="13" scale.right="13" scale.bottom="2" /> + <texture name="ScrollArrow_Left" file_name="widgets/ScrollArrow_Left.png" preload="true" scale.left="2" scale.top="13" scale.right="13" scale.bottom="2" /> + <texture name="ScrollArrow_Right" file_name="widgets/ScrollArrow_Right.png" preload="true" scale.left="2" scale.top="13" scale.right="13" scale.bottom="2" /> + <texture name="ScrollArrow_Up" file_name="widgets/ScrollArrow_Up.png" preload="true" scale.left="2" scale.top="13" scale.right="13" scale.bottom="2" /> + + <texture name="TabTop_Middle_Off" file_name="containers/TabTop_Middle_Off.png" preload="true" scale.left="8" scale.top="8" scale.right="120" scale.bottom="9" /> + <texture name="TabTop_Middle_Selected" file_name="containers/TabTop_Middle_Selected.png" preload="true" scale.left="8" scale.top="8" scale.right="96" scale.bottom="9" /> + <texture name="TabTop_Left_Off" file_name="containers/TabTop_Left_Off.png" preload="true" scale.left="8" scale.top="8" scale.right="120" scale.bottom="9"/> + <texture name="TabTop_Left_Selected" file_name="containers/TabTop_Left_Selected.png" preload="true" scale.left="8" scale.top="8" scale.right="96" scale.bottom="9"/> <texture name="tab_top_blue.tga" preload="true" scale.left="8" scale.top="8" scale.right="120" scale.bottom="9"/> <texture name="tab_top_selected_blue.tga" preload="true" scale.left="8" scale.top="8" scale.right="96" scale.bottom="9"/> - + <texture name="startup_logo.j2c" preload="true"/> <texture name="color_swatch_alpha.tga" preload="true"/> @@ -115,7 +220,7 @@ <texture name="inv_folder_sound.tga"/> <texture name="inv_folder_texture.tga"/> <texture name="inv_folder_trash.tga"/> - + <texture name="inv_item_animation.tga"/> <texture name="inv_item_skin.tga"/> <texture name="inv_item_callingcard_offline.tga"/> @@ -142,13 +247,13 @@ <texture name="inv_item_texture.tga"/> <texture name="inv_item_underpants.tga"/> <texture name="inv_item_undershirt.tga"/> - + <texture name="lag_status_critical.tga"/> <texture name="lag_status_good.tga"/> <texture name="lag_status_warning.tga"/> - + <texture name="legend.tga"/> - + <texture name="map_avatar_16.tga"/> <texture name="map_avatar_8.tga"/> <texture name="map_avatar_you_8.tga"/> @@ -158,17 +263,17 @@ <texture name="map_infohub.tga"/> <texture name="map_telehub.tga"/> <texture name="map_track_16.tga"/> - + <texture name="media_icon.tga" file_name="icn_label_media.tga" /> <texture name="music_icon.tga" file_name="icn_label_music.tga" /> - <texture name="noentrylines.j2c" use_mips="true"/> - <texture name="noentrypasslines.j2c" use_mips="true"/> - + <texture name="NoEntryLines" file_name="world/NoEntryLines.png" use_mips="true" preload="true" /> + <texture name="NoEntryPassLines" file_name="world/NoEntryPassLines.png" use_mips="true" preload="true" /> + <texture name="notify_tip_icon.tga"/> <texture name="notify_caution_icon.tga"/> <texture name="notify_next.png" preload="true"/> <texture name="notify_box_icon.tga"/> - + <texture name="object_cone.tga"/> <texture name="object_cone_active.tga"/> <texture name="object_cube.tga"/> @@ -199,11 +304,11 @@ <texture name="object_tree_active.tga"/> <texture name="object_tube.tga"/> <texture name="object_tube_active.tga"/> - + <texture name="pixiesmall.j2c" use_mips="true"/> <texture name="script_error.j2c" use_mips="true"/> <texture name="silhouette.j2c" use_mips="true"/> - + <texture name="status_no_build.tga"/> <texture name="status_voice.tga"/> <texture name="status_buy_currency.tga"/> @@ -214,7 +319,7 @@ <texture name="status_health.tga"/> <texture name="status_no_push.tga"/> <texture name="status_no_scripts.tga"/> - + <texture name="tool_dozer.tga"/> <texture name="tool_dozer_active.tga"/> <texture name="tool_zoom.tga"/> @@ -226,7 +331,7 @@ <texture name="icn_active-speakers-typing1.tga"/> <texture name="icn_active-speakers-typing2.tga"/> <texture name="icn_active-speakers-typing3.tga"/> - + <texture name="icn_voice_ptt-off.tga"/> <texture name="icn_voice_ptt-on.tga"/> <texture name="icn_voice_ptt-on-lvl1.tga"/> @@ -234,39 +339,53 @@ <texture name="icn_voice_ptt-on-lvl3.tga"/> <texture name="icn_voice-call-end.tga"/> <texture name="icn_voice-call-start.tga"/> - + <texture name="mute_icon.tga"/> - - <texture name="icn_slide-groove_dark.tga" scale.left="2" scale.top="5" scale.right="29" scale.bottom="4"/> - <texture name="icn_slide-highlight.tga" scale.left="2" scale.top="5" scale.right="29" scale.bottom="4"/> - <texture name="icn_slide-thumb_dark.tga" scale.left="2" scale.top="5" scale.right="29" scale.bottom="4"/> - + + <texture name="SliderTrack_Horiz" file_name="widgets/SliderTrack_Horiz.png" scale.left="4" scale.top="4" scale.right="100" scale.bottom="2" /> + <texture name="SliderTrack_Vert" file_name="widgets/SliderTrack_Vert.png" scale.left="2" scale.top="100" scale.right="4" scale.bottom="4" /> + <texture name="SliderThumb_Off" file_name="widgets/SliderThumb_Off.png" /> + <texture name="SliderThumb_Disabled" file_name="widgets/SliderThumb_Disabled.png" /> + <texture name="SliderThumb_Press" file_name="widgets/SliderThumb_Press.png" /> + <texture name="icn_speaker-muted_dark.tga"/> <texture name="icn_speaker_dark.tga"/> <texture name="icn_voice-localchat.tga"/> <texture name="icn_voice-groupfocus.tga"/> <texture name="icn_voice-pvtfocus.tga"/> - + <texture name="icn_media-pause.tga"/> <texture name="icn_media-play.tga"/> <texture name="icn_music-play.tga"/> <texture name="icn_music-pause.tga"/> <texture name="icn_media_web.tga" preload="true"/> <texture name="icn_media_movie.tga" preload="true"/> - + <texture name="icn_chatbar.tga"/> <texture name="btn_chatbar.tga" scale.left="20" scale.top="24" scale.right="44" scale.bottom="0"/> <texture name="btn_chatbar_selected.tga" scale.left="20" scale.top="24" scale.right="44" scale.bottom="0"/> - - <texture name="icn_rounded-text-field.tga" scale.left="14" scale.bottom="16" scale.top="16" scale.right="114"/> - <texture name="flyout_btn_right_selected.tga" scale.left="0" scale.top="30" scale.right="32" scale.bottom="0"/> - <texture name="flyout_btn_right.tga" scale.left="0" scale.top="30" scale.right="32" scale.bottom="0"/> - <texture name="flyout_btn_right_disabled.tga" scale.left="0" scale.top="30" scale.right="32" scale.bottom="0"/> - <texture name="flyout_btn_left_selected.tga" scale.left="16" scale.top="15" scale.right="112" scale.bottom="15"/> - <texture name="flyout_btn_left.tga" scale.left="16" scale.top="15" scale.right="112" scale.bottom="15"/> - <texture name="flyout_btn_left_disabled.tga" scale.left="16" scale.top="15" scale.right="112" scale.bottom="15"/> + <texture name="SegmentedBtn_Left_Off" file_name="widgets/SegmentedBtn_Left_Off.png" preload="true" scale.left="4" scale.top="19" scale.right="22" scale.bottom="4" /> + <texture name="SegmentedBtn_Left_Press" file_name="widgets/SegmentedBtn_Left_Press.png" preload="true" scale.left="4" scale.top="19" scale.right="22" scale.bottom="4" /> + <texture name="SegmentedBtn_Left_Disabled" file_name="widgets/SegmentedBtn_Left_Disabled.png" preload="true" scale.left="4" scale.top="19" scale.right="22" scale.bottom="4" /> + <texture name="SegmentedBtn_Left_Selected" file_name="widgets/SegmentedBtn_Left_Selected.png" preload="true" scale.left="4" scale.top="19" scale.right="22" scale.bottom="4" /> + <texture name="SegmentedBtn_Left_Selected_Press" file_name="widgets/SegmentedBtn_Left_Selected_Press.png" preload="true" scale.left="4" scale.top="19" scale.right="22" scale.bottom="4" /> + <texture name="SegmentedBtn_Left_Selected_Disabled" file_name="widgets/SegmentedBtn_Left_Selected_Disabled.png" preload="true" scale.left="4" scale.top="19" scale.right="22" scale.bottom="4" /> + + <texture name="SegmentedBtn_Middle_Off" file_name="widgets/SegmentedBtn_Middle_Off.png" preload="true" scale.left="4" scale.top="19" scale.right="22" scale.bottom="4" /> + <texture name="SegmentedBtn_Middle_Press" file_name="widgets/SegmentedBtn_Middle_Press.png" preload="true" scale.left="4" scale.top="19" scale.right="22" scale.bottom="4" /> + <texture name="SegmentedBtn_Middle_Disabled" file_name="widgets/SegmentedBtn_Middle_Disabled.png" preload="true" scale.left="4" scale.top="19" scale.right="22" scale.bottom="4" /> + <texture name="SegmentedBtn_Middle_Selected" file_name="widgets/SegmentedBtn_Middle_Selected.png" preload="true" scale.left="4" scale.top="19" scale.right="22" scale.bottom="4" /> + <texture name="SegmentedBtn_Middle_Selected_Press" file_name="widgets/SegmentedBtn_Middle_Selected_Press.png" preload="true" scale.left="4" scale.top="19" scale.right="22" scale.bottom="4" /> + <texture name="SegmentedBtn_Middle_Selected_Disabled" file_name="widgets/SegmentedBtn_Middle_Selected_Disabled.png" preload="true" scale.left="4" scale.top="19" scale.right="22" scale.bottom="4" /> + + <texture name="SegmentedBtn_Right_Off" file_name="widgets/SegmentedBtn_Right_Off.png" preload="true" scale.left="4" scale.top="19" scale.right="22" scale.bottom="4" /> + <texture name="SegmentedBtn_Right_Press" file_name="widgets/SegmentedBtn_Right_Press.png" preload="true" scale.left="4" scale.top="19" scale.right="22" scale.bottom="4" /> + <texture name="SegmentedBtn_Right_Disabled" file_name="widgets/SegmentedBtn_Right_Disabled.png" preload="true" scale.left="4" scale.top="19" scale.right="22" scale.bottom="4" /> + <texture name="SegmentedBtn_Right_Selected" file_name="widgets/SegmentedBtn_Right_Selected.png" preload="true" scale.left="4" scale.top="19" scale.right="22" scale.bottom="4" /> + <texture name="SegmentedBtn_Right_Selected_Press" file_name="widgets/SegmentedBtn_Right_Selected_Press.png" preload="true" scale.left="4" scale.top="19" scale.right="22" scale.bottom="4" /> + <texture name="SegmentedBtn_Right_Selected_Disabled" file_name="widgets/SegmentedBtn_Right_Selected_Disabled.png" preload="true" scale.left="4" scale.top="19" scale.right="22" scale.bottom="4" /> <texture name="move_forward_out.tga" preload="true"/> <texture name="move_forward_in.tga" preload="true"/> @@ -282,7 +401,7 @@ <texture name="move_up_out.tga" preload="true"/> <texture name="move_down_in.tga" preload="true"/> <texture name="move_down_out.tga" preload="true"/> - + <texture name="cam_rotate_out.tga" preload="true"/> <texture name="cam_rotate_in.tga" preload="true"/> <texture name="cam_zoom_out.tga" preload="true"/> @@ -306,7 +425,7 @@ <texture name="close_inactive_blue.tga"/> <texture name="closebox.tga"/> <texture name="icn_clear_lineeditor.tga" /> - + <texture name="up_arrow.tga" file_name="up_arrow.png"/> <texture name="down_arrow.tga" file_name="down_arrow.png"/> @@ -321,17 +440,42 @@ <texture name="icn_label_media.tga"/> <texture name="arrow_down.tga"/> <texture name="cloud-particle.j2c" use_mips="true"/> - + <texture name="skin_thumbnail_default.png" preload="true" /> <texture name="default_land_picture.j2c"/> <texture name="default_profile_picture.j2c"/> <texture name="locked_image.j2c"/> - <texture name="menu_separator" file_name="menu_separator.png"/> + <texture name="menu_separator" file_name="navbar/FileMenu_Divider.png" scale.left="4" scale.top="166" scale.right="0" scale.bottom="0" /> + + <texture name="TaskPanel_Tab_Off" file_name="taskpanel/TaskPanel_Tab_Off.png" preload="true" scale.left="4" scale.top="29" scale.right="36" scale.bottom="4" /> + <texture name="TaskPanel_Tab_Selected" file_name="taskpanel/TaskPanel_Tab_Selected.png" preload="true" scale.left="5" scale.top="30" scale.right="36" scale.bottom="5" /> + <texture name="TaskPanel_BG" file_name="taskpanel/TaskPanel_BG.png" preload="true" scale.left="4" scale.top="146" scale.right="146" scale.bottom="4" /> + <texture name="TaskPanel_Tab_Unselected" file_name="taskpanel/TaskPanel_Tab_Over.png" preload="true" scale.left="5" scale.top="30" scale.right="36" scale.bottom="5" /> - <texture name="sidebar_tab_left.tga" preload="true" scale.left="16" scale.top="8" scale.right="112" scale.bottom="9"/> - <texture name="sidebar_tab_left_selected.tga" preload="true" scale.left="16" scale.top="8" scale.right="112" scale.bottom="9"/> + <texture name="Arrow_Left_Off" file_name="navbar/Arrow_Left_Off.png" preload="true"/> + <texture name="Arrow_Left_Press" file_name="navbar/Arrow_Left_Press.png" preload="true"/> + <texture name="Arrow_Right_Off" file_name="navbar/Arrow_Right_Off.png" preload="true"/> + <texture name="Arrow_Right_Press" file_name="navbar/Arrow_Right_Press.png" preload="true"/> + <texture name="Home_Off" file_name="navbar/Home_Off.png" preload="true"/> + <texture name="Home_Press" file_name="navbar/Home_Press.png" preload="true"/> + <texture name="Info_Off" file_name="navbar/Info_Off.png" preload="true"/> + <texture name="Info_Press" file_name="navbar/Info_Press.png" preload="true"/> + <texture name="Favorite_Star_Over" file_name="navbar/Favorite_Star_Over.png" preload="true"/> + <texture name="History_Arrow" file_name="navbar/History_Arrow.png" preload="true"/> + <texture name="Search" file_name="navbar/Search.png" preload="true"/> + <texture name="Help_Off" file_name="navbar/Help_Off.png" preload="true"/> + <texture name="Help_Press" file_name="navbar/Help_Press.png" preload="true"/> + + <texture name="Icon_Gear_Background" file_name="windows/Icon_Gear_Background.png" preload="true"/> + <texture name="Icon_Gear_Foreground" file_name="windows/Icon_Gear_Foreground.png" preload="true"/> + <texture name="Icon_Gear_Press" file_name="windows/Icon_Gear_Press.png" preload="true"/> + <texture name="Stepper_Down_Disabled" file_name="widgets/Stepper_Down_Disabled.png" preload="true"/> + <texture name="Stepper_Down_Off" file_name="widgets/Stepper_Down_Off.png" preload="true"/> + <texture name="Stepper_Down_Press" file_name="widgets/Stepper_Down_Press.png" preload="true"/> + <texture name="Stepper_Up_Disabled" file_name="widgets/Stepper_Up_Disabled.png" preload="true"/> + <texture name="Stepper_Up_Off" file_name="widgets/Stepper_Up_Off.png" preload="true"/> + <texture name="Stepper_Up_Press" file_name="widgets/Stepper_Up_Press.png" preload="true"/> - <texture name="teleport_history_backward.tga" preload="true"/> - <texture name="teleport_history_forward.tga" preload="true"/> + <!-- Please add new files alphabetically to prevent merge conflicts. JC --> </textures> diff --git a/indra/newview/skins/default/textures/widgets/Checkbox_Disabled.png b/indra/newview/skins/default/textures/widgets/Checkbox_Disabled.png Binary files differnew file mode 100644 index 0000000000..c1ee210099 --- /dev/null +++ b/indra/newview/skins/default/textures/widgets/Checkbox_Disabled.png diff --git a/indra/newview/skins/default/textures/widgets/Checkbox_Off.png b/indra/newview/skins/default/textures/widgets/Checkbox_Off.png Binary files differnew file mode 100644 index 0000000000..2525405f37 --- /dev/null +++ b/indra/newview/skins/default/textures/widgets/Checkbox_Off.png diff --git a/indra/newview/skins/default/textures/widgets/Checkbox_On.png b/indra/newview/skins/default/textures/widgets/Checkbox_On.png Binary files differnew file mode 100644 index 0000000000..2d9dba1592 --- /dev/null +++ b/indra/newview/skins/default/textures/widgets/Checkbox_On.png diff --git a/indra/newview/skins/default/textures/widgets/Checkbox_On_Disabled.png b/indra/newview/skins/default/textures/widgets/Checkbox_On_Disabled.png Binary files differnew file mode 100644 index 0000000000..beaa7bcbf6 --- /dev/null +++ b/indra/newview/skins/default/textures/widgets/Checkbox_On_Disabled.png diff --git a/indra/newview/skins/default/textures/widgets/Checkbox_On_Over.png b/indra/newview/skins/default/textures/widgets/Checkbox_On_Over.png Binary files differnew file mode 100644 index 0000000000..bc504d130e --- /dev/null +++ b/indra/newview/skins/default/textures/widgets/Checkbox_On_Over.png diff --git a/indra/newview/skins/default/textures/widgets/Checkbox_On_Press.png b/indra/newview/skins/default/textures/widgets/Checkbox_On_Press.png Binary files differnew file mode 100644 index 0000000000..5bced95a89 --- /dev/null +++ b/indra/newview/skins/default/textures/widgets/Checkbox_On_Press.png diff --git a/indra/newview/skins/default/textures/widgets/Checkbox_Over.png b/indra/newview/skins/default/textures/widgets/Checkbox_Over.png Binary files differnew file mode 100644 index 0000000000..5a7162addf --- /dev/null +++ b/indra/newview/skins/default/textures/widgets/Checkbox_Over.png diff --git a/indra/newview/skins/default/textures/widgets/Checkbox_Press.png b/indra/newview/skins/default/textures/widgets/Checkbox_Press.png Binary files differnew file mode 100644 index 0000000000..44be193678 --- /dev/null +++ b/indra/newview/skins/default/textures/widgets/Checkbox_Press.png diff --git a/indra/newview/skins/default/textures/widgets/ComboButton_Disabled.png b/indra/newview/skins/default/textures/widgets/ComboButton_Disabled.png Binary files differnew file mode 100644 index 0000000000..d0fff1b3c3 --- /dev/null +++ b/indra/newview/skins/default/textures/widgets/ComboButton_Disabled.png diff --git a/indra/newview/skins/default/textures/widgets/ComboButton_Off.png b/indra/newview/skins/default/textures/widgets/ComboButton_Off.png Binary files differnew file mode 100644 index 0000000000..80402458b7 --- /dev/null +++ b/indra/newview/skins/default/textures/widgets/ComboButton_Off.png diff --git a/indra/newview/skins/default/textures/widgets/ComboButton_On.png b/indra/newview/skins/default/textures/widgets/ComboButton_On.png Binary files differnew file mode 100644 index 0000000000..b42cc7542e --- /dev/null +++ b/indra/newview/skins/default/textures/widgets/ComboButton_On.png diff --git a/indra/newview/skins/default/textures/widgets/ComboButton_Selected.png b/indra/newview/skins/default/textures/widgets/ComboButton_Selected.png Binary files differnew file mode 100644 index 0000000000..bbc0657487 --- /dev/null +++ b/indra/newview/skins/default/textures/widgets/ComboButton_Selected.png diff --git a/indra/newview/skins/default/textures/widgets/DisclosureArrow_Closed_Over.png b/indra/newview/skins/default/textures/widgets/DisclosureArrow_Closed_Over.png Binary files differnew file mode 100644 index 0000000000..45bcb0464e --- /dev/null +++ b/indra/newview/skins/default/textures/widgets/DisclosureArrow_Closed_Over.png diff --git a/indra/newview/skins/default/textures/widgets/DisclosureArrow_Opened_Off.png b/indra/newview/skins/default/textures/widgets/DisclosureArrow_Opened_Off.png Binary files differnew file mode 100644 index 0000000000..75057938d2 --- /dev/null +++ b/indra/newview/skins/default/textures/widgets/DisclosureArrow_Opened_Off.png diff --git a/indra/newview/skins/default/textures/widgets/DisclosureArrow_Opened_Over.png b/indra/newview/skins/default/textures/widgets/DisclosureArrow_Opened_Over.png Binary files differnew file mode 100644 index 0000000000..dabbd85b34 --- /dev/null +++ b/indra/newview/skins/default/textures/widgets/DisclosureArrow_Opened_Over.png diff --git a/indra/newview/skins/default/textures/widgets/DropDown_Disabled.png b/indra/newview/skins/default/textures/widgets/DropDown_Disabled.png Binary files differnew file mode 100644 index 0000000000..b295752ea9 --- /dev/null +++ b/indra/newview/skins/default/textures/widgets/DropDown_Disabled.png diff --git a/indra/newview/skins/default/textures/widgets/DropDown_Off.png b/indra/newview/skins/default/textures/widgets/DropDown_Off.png Binary files differnew file mode 100644 index 0000000000..4764ed4ee2 --- /dev/null +++ b/indra/newview/skins/default/textures/widgets/DropDown_Off.png diff --git a/indra/newview/skins/default/textures/widgets/DropDown_On.png b/indra/newview/skins/default/textures/widgets/DropDown_On.png Binary files differnew file mode 100644 index 0000000000..10262d3979 --- /dev/null +++ b/indra/newview/skins/default/textures/widgets/DropDown_On.png diff --git a/indra/newview/skins/default/textures/widgets/DropDown_Press.png b/indra/newview/skins/default/textures/widgets/DropDown_Press.png Binary files differnew file mode 100644 index 0000000000..16cb25cc77 --- /dev/null +++ b/indra/newview/skins/default/textures/widgets/DropDown_Press.png diff --git a/indra/newview/skins/default/textures/widgets/ListItem_Over.png b/indra/newview/skins/default/textures/widgets/ListItem_Over.png Binary files differnew file mode 100644 index 0000000000..4b2b9ab3e5 --- /dev/null +++ b/indra/newview/skins/default/textures/widgets/ListItem_Over.png diff --git a/indra/newview/skins/default/textures/widgets/ListItem_Select.png b/indra/newview/skins/default/textures/widgets/ListItem_Select.png Binary files differnew file mode 100644 index 0000000000..317c672441 --- /dev/null +++ b/indra/newview/skins/default/textures/widgets/ListItem_Select.png diff --git a/indra/newview/skins/default/textures/widgets/ProgressBar.png b/indra/newview/skins/default/textures/widgets/ProgressBar.png Binary files differnew file mode 100644 index 0000000000..edf11ac1f5 --- /dev/null +++ b/indra/newview/skins/default/textures/widgets/ProgressBar.png diff --git a/indra/newview/skins/default/textures/widgets/ProgressTrack.png b/indra/newview/skins/default/textures/widgets/ProgressTrack.png Binary files differnew file mode 100644 index 0000000000..bb6d9f4144 --- /dev/null +++ b/indra/newview/skins/default/textures/widgets/ProgressTrack.png diff --git a/indra/newview/skins/default/textures/widgets/PushButton_Disabled.png b/indra/newview/skins/default/textures/widgets/PushButton_Disabled.png Binary files differnew file mode 100644 index 0000000000..04e91bdaab --- /dev/null +++ b/indra/newview/skins/default/textures/widgets/PushButton_Disabled.png diff --git a/indra/newview/skins/default/textures/widgets/PushButton_Off.png b/indra/newview/skins/default/textures/widgets/PushButton_Off.png Binary files differnew file mode 100644 index 0000000000..1ee0329e66 --- /dev/null +++ b/indra/newview/skins/default/textures/widgets/PushButton_Off.png diff --git a/indra/newview/skins/default/textures/widgets/PushButton_On.png b/indra/newview/skins/default/textures/widgets/PushButton_On.png Binary files differnew file mode 100644 index 0000000000..661d1c5611 --- /dev/null +++ b/indra/newview/skins/default/textures/widgets/PushButton_On.png diff --git a/indra/newview/skins/default/textures/widgets/PushButton_On_Over.png b/indra/newview/skins/default/textures/widgets/PushButton_On_Over.png Binary files differnew file mode 100644 index 0000000000..064a4c4f7f --- /dev/null +++ b/indra/newview/skins/default/textures/widgets/PushButton_On_Over.png diff --git a/indra/newview/skins/default/textures/widgets/PushButton_On_Selected.png b/indra/newview/skins/default/textures/widgets/PushButton_On_Selected.png Binary files differnew file mode 100644 index 0000000000..48e8aa2eab --- /dev/null +++ b/indra/newview/skins/default/textures/widgets/PushButton_On_Selected.png diff --git a/indra/newview/skins/default/textures/widgets/PushButton_Over.png b/indra/newview/skins/default/textures/widgets/PushButton_Over.png Binary files differnew file mode 100644 index 0000000000..c227f07513 --- /dev/null +++ b/indra/newview/skins/default/textures/widgets/PushButton_Over.png diff --git a/indra/newview/skins/default/textures/widgets/PushButton_Press.png b/indra/newview/skins/default/textures/widgets/PushButton_Press.png Binary files differnew file mode 100644 index 0000000000..0a4a3a6ad9 --- /dev/null +++ b/indra/newview/skins/default/textures/widgets/PushButton_Press.png diff --git a/indra/newview/skins/default/textures/widgets/PushButton_Selected.png b/indra/newview/skins/default/textures/widgets/PushButton_Selected.png Binary files differnew file mode 100644 index 0000000000..0a4a3a6ad9 --- /dev/null +++ b/indra/newview/skins/default/textures/widgets/PushButton_Selected.png diff --git a/indra/newview/skins/default/textures/widgets/PushButton_Selected_Disabled.png b/indra/newview/skins/default/textures/widgets/PushButton_Selected_Disabled.png Binary files differnew file mode 100644 index 0000000000..661d1c5611 --- /dev/null +++ b/indra/newview/skins/default/textures/widgets/PushButton_Selected_Disabled.png diff --git a/indra/newview/skins/default/textures/widgets/PushButton_Selected_Over.png b/indra/newview/skins/default/textures/widgets/PushButton_Selected_Over.png Binary files differnew file mode 100644 index 0000000000..064a4c4f7f --- /dev/null +++ b/indra/newview/skins/default/textures/widgets/PushButton_Selected_Over.png diff --git a/indra/newview/skins/default/textures/widgets/PushButton_Selected_Press.png b/indra/newview/skins/default/textures/widgets/PushButton_Selected_Press.png Binary files differnew file mode 100644 index 0000000000..48e8aa2eab --- /dev/null +++ b/indra/newview/skins/default/textures/widgets/PushButton_Selected_Press.png diff --git a/indra/newview/skins/default/textures/widgets/RadioButton_Disabled.png b/indra/newview/skins/default/textures/widgets/RadioButton_Disabled.png Binary files differnew file mode 100644 index 0000000000..a1052684b9 --- /dev/null +++ b/indra/newview/skins/default/textures/widgets/RadioButton_Disabled.png diff --git a/indra/newview/skins/default/textures/widgets/RadioButton_Off.png b/indra/newview/skins/default/textures/widgets/RadioButton_Off.png Binary files differnew file mode 100644 index 0000000000..c58e0305ef --- /dev/null +++ b/indra/newview/skins/default/textures/widgets/RadioButton_Off.png diff --git a/indra/newview/skins/default/textures/widgets/RadioButton_On.png b/indra/newview/skins/default/textures/widgets/RadioButton_On.png Binary files differnew file mode 100644 index 0000000000..c09a2197c7 --- /dev/null +++ b/indra/newview/skins/default/textures/widgets/RadioButton_On.png diff --git a/indra/newview/skins/default/textures/widgets/RadioButton_On_Disabled.png b/indra/newview/skins/default/textures/widgets/RadioButton_On_Disabled.png Binary files differnew file mode 100644 index 0000000000..d7d444fd0c --- /dev/null +++ b/indra/newview/skins/default/textures/widgets/RadioButton_On_Disabled.png diff --git a/indra/newview/skins/default/textures/widgets/RadioButton_On_Over.png b/indra/newview/skins/default/textures/widgets/RadioButton_On_Over.png Binary files differnew file mode 100644 index 0000000000..3e7d803a28 --- /dev/null +++ b/indra/newview/skins/default/textures/widgets/RadioButton_On_Over.png diff --git a/indra/newview/skins/default/textures/widgets/RadioButton_On_Press.png b/indra/newview/skins/default/textures/widgets/RadioButton_On_Press.png Binary files differnew file mode 100644 index 0000000000..a707e8ceb8 --- /dev/null +++ b/indra/newview/skins/default/textures/widgets/RadioButton_On_Press.png diff --git a/indra/newview/skins/default/textures/widgets/RadioButton_Over.png b/indra/newview/skins/default/textures/widgets/RadioButton_Over.png Binary files differnew file mode 100644 index 0000000000..a5c8cbe293 --- /dev/null +++ b/indra/newview/skins/default/textures/widgets/RadioButton_Over.png diff --git a/indra/newview/skins/default/textures/widgets/RadioButton_Press.png b/indra/newview/skins/default/textures/widgets/RadioButton_Press.png Binary files differnew file mode 100644 index 0000000000..33eaa14030 --- /dev/null +++ b/indra/newview/skins/default/textures/widgets/RadioButton_Press.png diff --git a/indra/newview/skins/default/textures/widgets/ScrollArrow_Down.png b/indra/newview/skins/default/textures/widgets/ScrollArrow_Down.png Binary files differnew file mode 100644 index 0000000000..186822da43 --- /dev/null +++ b/indra/newview/skins/default/textures/widgets/ScrollArrow_Down.png diff --git a/indra/newview/skins/default/textures/widgets/ScrollArrow_Down_Over.png b/indra/newview/skins/default/textures/widgets/ScrollArrow_Down_Over.png Binary files differnew file mode 100644 index 0000000000..605d159eaa --- /dev/null +++ b/indra/newview/skins/default/textures/widgets/ScrollArrow_Down_Over.png diff --git a/indra/newview/skins/default/textures/widgets/ScrollArrow_Left.png b/indra/newview/skins/default/textures/widgets/ScrollArrow_Left.png Binary files differnew file mode 100644 index 0000000000..42f999a451 --- /dev/null +++ b/indra/newview/skins/default/textures/widgets/ScrollArrow_Left.png diff --git a/indra/newview/skins/default/textures/widgets/ScrollArrow_Left_Over.png b/indra/newview/skins/default/textures/widgets/ScrollArrow_Left_Over.png Binary files differnew file mode 100644 index 0000000000..c79547dffd --- /dev/null +++ b/indra/newview/skins/default/textures/widgets/ScrollArrow_Left_Over.png diff --git a/indra/newview/skins/default/textures/widgets/ScrollArrow_Right.png b/indra/newview/skins/default/textures/widgets/ScrollArrow_Right.png Binary files differnew file mode 100644 index 0000000000..176ffcdbb9 --- /dev/null +++ b/indra/newview/skins/default/textures/widgets/ScrollArrow_Right.png diff --git a/indra/newview/skins/default/textures/widgets/ScrollArrow_Right_Over.png b/indra/newview/skins/default/textures/widgets/ScrollArrow_Right_Over.png Binary files differnew file mode 100644 index 0000000000..e353542ad9 --- /dev/null +++ b/indra/newview/skins/default/textures/widgets/ScrollArrow_Right_Over.png diff --git a/indra/newview/skins/default/textures/widgets/ScrollArrow_Up.png b/indra/newview/skins/default/textures/widgets/ScrollArrow_Up.png Binary files differnew file mode 100644 index 0000000000..4d245eb57a --- /dev/null +++ b/indra/newview/skins/default/textures/widgets/ScrollArrow_Up.png diff --git a/indra/newview/skins/default/textures/widgets/ScrollArrow_Up_Over.png b/indra/newview/skins/default/textures/widgets/ScrollArrow_Up_Over.png Binary files differnew file mode 100644 index 0000000000..dd2fceb716 --- /dev/null +++ b/indra/newview/skins/default/textures/widgets/ScrollArrow_Up_Over.png diff --git a/indra/newview/skins/default/textures/widgets/ScrollThumb_Horiz.png b/indra/newview/skins/default/textures/widgets/ScrollThumb_Horiz.png Binary files differnew file mode 100644 index 0000000000..8a085aa966 --- /dev/null +++ b/indra/newview/skins/default/textures/widgets/ScrollThumb_Horiz.png diff --git a/indra/newview/skins/default/textures/widgets/ScrollThumb_Horiz_Over.png b/indra/newview/skins/default/textures/widgets/ScrollThumb_Horiz_Over.png Binary files differnew file mode 100644 index 0000000000..cf78ea3924 --- /dev/null +++ b/indra/newview/skins/default/textures/widgets/ScrollThumb_Horiz_Over.png diff --git a/indra/newview/skins/default/textures/widgets/ScrollThumb_Vert.png b/indra/newview/skins/default/textures/widgets/ScrollThumb_Vert.png Binary files differnew file mode 100644 index 0000000000..fc7fd93e7a --- /dev/null +++ b/indra/newview/skins/default/textures/widgets/ScrollThumb_Vert.png diff --git a/indra/newview/skins/default/textures/widgets/ScrollThumb_Vert_Over.png b/indra/newview/skins/default/textures/widgets/ScrollThumb_Vert_Over.png Binary files differnew file mode 100644 index 0000000000..53587197da --- /dev/null +++ b/indra/newview/skins/default/textures/widgets/ScrollThumb_Vert_Over.png diff --git a/indra/newview/skins/default/textures/widgets/ScrollTrack_Horiz.png b/indra/newview/skins/default/textures/widgets/ScrollTrack_Horiz.png Binary files differnew file mode 100644 index 0000000000..4f31c48c02 --- /dev/null +++ b/indra/newview/skins/default/textures/widgets/ScrollTrack_Horiz.png diff --git a/indra/newview/skins/default/textures/widgets/ScrollTrack_Vert.png b/indra/newview/skins/default/textures/widgets/ScrollTrack_Vert.png Binary files differnew file mode 100644 index 0000000000..f89ee3f68f --- /dev/null +++ b/indra/newview/skins/default/textures/widgets/ScrollTrack_Vert.png diff --git a/indra/newview/skins/default/textures/widgets/SegmentedBtn_Left_Disabled.png b/indra/newview/skins/default/textures/widgets/SegmentedBtn_Left_Disabled.png Binary files differnew file mode 100644 index 0000000000..3b39c51a77 --- /dev/null +++ b/indra/newview/skins/default/textures/widgets/SegmentedBtn_Left_Disabled.png diff --git a/indra/newview/skins/default/textures/widgets/SegmentedBtn_Left_Off.png b/indra/newview/skins/default/textures/widgets/SegmentedBtn_Left_Off.png Binary files differnew file mode 100644 index 0000000000..57ed79d733 --- /dev/null +++ b/indra/newview/skins/default/textures/widgets/SegmentedBtn_Left_Off.png diff --git a/indra/newview/skins/default/textures/widgets/SegmentedBtn_Left_On.png b/indra/newview/skins/default/textures/widgets/SegmentedBtn_Left_On.png Binary files differnew file mode 100644 index 0000000000..7afb9c99c3 --- /dev/null +++ b/indra/newview/skins/default/textures/widgets/SegmentedBtn_Left_On.png diff --git a/indra/newview/skins/default/textures/widgets/SegmentedBtn_Left_On_Disabled.png b/indra/newview/skins/default/textures/widgets/SegmentedBtn_Left_On_Disabled.png Binary files differnew file mode 100644 index 0000000000..77c4224539 --- /dev/null +++ b/indra/newview/skins/default/textures/widgets/SegmentedBtn_Left_On_Disabled.png diff --git a/indra/newview/skins/default/textures/widgets/SegmentedBtn_Left_On_Over.png b/indra/newview/skins/default/textures/widgets/SegmentedBtn_Left_On_Over.png Binary files differnew file mode 100644 index 0000000000..8b93dd551e --- /dev/null +++ b/indra/newview/skins/default/textures/widgets/SegmentedBtn_Left_On_Over.png diff --git a/indra/newview/skins/default/textures/widgets/SegmentedBtn_Left_On_Selected.png b/indra/newview/skins/default/textures/widgets/SegmentedBtn_Left_On_Selected.png Binary files differnew file mode 100644 index 0000000000..3f207cbea2 --- /dev/null +++ b/indra/newview/skins/default/textures/widgets/SegmentedBtn_Left_On_Selected.png diff --git a/indra/newview/skins/default/textures/widgets/SegmentedBtn_Left_Over.png b/indra/newview/skins/default/textures/widgets/SegmentedBtn_Left_Over.png Binary files differnew file mode 100644 index 0000000000..5b8878e0cb --- /dev/null +++ b/indra/newview/skins/default/textures/widgets/SegmentedBtn_Left_Over.png diff --git a/indra/newview/skins/default/textures/widgets/SegmentedBtn_Left_Press.png b/indra/newview/skins/default/textures/widgets/SegmentedBtn_Left_Press.png Binary files differnew file mode 100644 index 0000000000..379953216b --- /dev/null +++ b/indra/newview/skins/default/textures/widgets/SegmentedBtn_Left_Press.png diff --git a/indra/newview/skins/default/textures/widgets/SegmentedBtn_Left_Selected.png b/indra/newview/skins/default/textures/widgets/SegmentedBtn_Left_Selected.png Binary files differnew file mode 100644 index 0000000000..379953216b --- /dev/null +++ b/indra/newview/skins/default/textures/widgets/SegmentedBtn_Left_Selected.png diff --git a/indra/newview/skins/default/textures/widgets/SegmentedBtn_Left_Selected_Disabled.png b/indra/newview/skins/default/textures/widgets/SegmentedBtn_Left_Selected_Disabled.png Binary files differnew file mode 100644 index 0000000000..77c4224539 --- /dev/null +++ b/indra/newview/skins/default/textures/widgets/SegmentedBtn_Left_Selected_Disabled.png diff --git a/indra/newview/skins/default/textures/widgets/SegmentedBtn_Left_Selected_Over.png b/indra/newview/skins/default/textures/widgets/SegmentedBtn_Left_Selected_Over.png Binary files differnew file mode 100644 index 0000000000..8b93dd551e --- /dev/null +++ b/indra/newview/skins/default/textures/widgets/SegmentedBtn_Left_Selected_Over.png diff --git a/indra/newview/skins/default/textures/widgets/SegmentedBtn_Left_Selected_Press.png b/indra/newview/skins/default/textures/widgets/SegmentedBtn_Left_Selected_Press.png Binary files differnew file mode 100644 index 0000000000..3f207cbea2 --- /dev/null +++ b/indra/newview/skins/default/textures/widgets/SegmentedBtn_Left_Selected_Press.png diff --git a/indra/newview/skins/default/textures/widgets/SegmentedBtn_Middle_Disabled.png b/indra/newview/skins/default/textures/widgets/SegmentedBtn_Middle_Disabled.png Binary files differnew file mode 100644 index 0000000000..deb87c8489 --- /dev/null +++ b/indra/newview/skins/default/textures/widgets/SegmentedBtn_Middle_Disabled.png diff --git a/indra/newview/skins/default/textures/widgets/SegmentedBtn_Middle_On.png b/indra/newview/skins/default/textures/widgets/SegmentedBtn_Middle_On.png Binary files differnew file mode 100644 index 0000000000..220df9db25 --- /dev/null +++ b/indra/newview/skins/default/textures/widgets/SegmentedBtn_Middle_On.png diff --git a/indra/newview/skins/default/textures/widgets/SegmentedBtn_Middle_On_Over.png b/indra/newview/skins/default/textures/widgets/SegmentedBtn_Middle_On_Over.png Binary files differnew file mode 100644 index 0000000000..5bbcdcb0b4 --- /dev/null +++ b/indra/newview/skins/default/textures/widgets/SegmentedBtn_Middle_On_Over.png diff --git a/indra/newview/skins/default/textures/widgets/SegmentedBtn_Middle_On_Press.png b/indra/newview/skins/default/textures/widgets/SegmentedBtn_Middle_On_Press.png Binary files differnew file mode 100644 index 0000000000..dde367f05e --- /dev/null +++ b/indra/newview/skins/default/textures/widgets/SegmentedBtn_Middle_On_Press.png diff --git a/indra/newview/skins/default/textures/widgets/SegmentedBtn_Middle_Over.png b/indra/newview/skins/default/textures/widgets/SegmentedBtn_Middle_Over.png Binary files differnew file mode 100644 index 0000000000..d4f30b9adb --- /dev/null +++ b/indra/newview/skins/default/textures/widgets/SegmentedBtn_Middle_Over.png diff --git a/indra/newview/skins/default/textures/widgets/SegmentedBtn_Middle_Selected.png b/indra/newview/skins/default/textures/widgets/SegmentedBtn_Middle_Selected.png Binary files differnew file mode 100644 index 0000000000..ca7027da91 --- /dev/null +++ b/indra/newview/skins/default/textures/widgets/SegmentedBtn_Middle_Selected.png diff --git a/indra/newview/skins/default/textures/widgets/SegmentedBtn_Middle_Selected_Disabled.png b/indra/newview/skins/default/textures/widgets/SegmentedBtn_Middle_Selected_Disabled.png Binary files differnew file mode 100644 index 0000000000..220df9db25 --- /dev/null +++ b/indra/newview/skins/default/textures/widgets/SegmentedBtn_Middle_Selected_Disabled.png diff --git a/indra/newview/skins/default/textures/widgets/SegmentedBtn_Middle_Selected_Over.png b/indra/newview/skins/default/textures/widgets/SegmentedBtn_Middle_Selected_Over.png Binary files differnew file mode 100644 index 0000000000..5bbcdcb0b4 --- /dev/null +++ b/indra/newview/skins/default/textures/widgets/SegmentedBtn_Middle_Selected_Over.png diff --git a/indra/newview/skins/default/textures/widgets/SegmentedBtn_Middle_Selected_Press.png b/indra/newview/skins/default/textures/widgets/SegmentedBtn_Middle_Selected_Press.png Binary files differnew file mode 100644 index 0000000000..dde367f05e --- /dev/null +++ b/indra/newview/skins/default/textures/widgets/SegmentedBtn_Middle_Selected_Press.png diff --git a/indra/newview/skins/default/textures/widgets/SegmentedBtn_Right_Disabled.png b/indra/newview/skins/default/textures/widgets/SegmentedBtn_Right_Disabled.png Binary files differnew file mode 100644 index 0000000000..8e6b9c8c6f --- /dev/null +++ b/indra/newview/skins/default/textures/widgets/SegmentedBtn_Right_Disabled.png diff --git a/indra/newview/skins/default/textures/widgets/SegmentedBtn_Right_Off.png b/indra/newview/skins/default/textures/widgets/SegmentedBtn_Right_Off.png Binary files differnew file mode 100644 index 0000000000..b1521199ff --- /dev/null +++ b/indra/newview/skins/default/textures/widgets/SegmentedBtn_Right_Off.png diff --git a/indra/newview/skins/default/textures/widgets/SegmentedBtn_Right_On.png b/indra/newview/skins/default/textures/widgets/SegmentedBtn_Right_On.png Binary files differnew file mode 100644 index 0000000000..467c43fc90 --- /dev/null +++ b/indra/newview/skins/default/textures/widgets/SegmentedBtn_Right_On.png diff --git a/indra/newview/skins/default/textures/widgets/SegmentedBtn_Right_On_Over.png b/indra/newview/skins/default/textures/widgets/SegmentedBtn_Right_On_Over.png Binary files differnew file mode 100644 index 0000000000..2049736897 --- /dev/null +++ b/indra/newview/skins/default/textures/widgets/SegmentedBtn_Right_On_Over.png diff --git a/indra/newview/skins/default/textures/widgets/SegmentedBtn_Right_On_Selected.png b/indra/newview/skins/default/textures/widgets/SegmentedBtn_Right_On_Selected.png Binary files differnew file mode 100644 index 0000000000..1574f48b28 --- /dev/null +++ b/indra/newview/skins/default/textures/widgets/SegmentedBtn_Right_On_Selected.png diff --git a/indra/newview/skins/default/textures/widgets/SegmentedBtn_Right_Over.png b/indra/newview/skins/default/textures/widgets/SegmentedBtn_Right_Over.png Binary files differnew file mode 100644 index 0000000000..2717e7d7b0 --- /dev/null +++ b/indra/newview/skins/default/textures/widgets/SegmentedBtn_Right_Over.png diff --git a/indra/newview/skins/default/textures/widgets/SegmentedBtn_Right_Press.png b/indra/newview/skins/default/textures/widgets/SegmentedBtn_Right_Press.png Binary files differnew file mode 100644 index 0000000000..3883518033 --- /dev/null +++ b/indra/newview/skins/default/textures/widgets/SegmentedBtn_Right_Press.png diff --git a/indra/newview/skins/default/textures/widgets/SegmentedBtn_Right_Selected.png b/indra/newview/skins/default/textures/widgets/SegmentedBtn_Right_Selected.png Binary files differnew file mode 100644 index 0000000000..3883518033 --- /dev/null +++ b/indra/newview/skins/default/textures/widgets/SegmentedBtn_Right_Selected.png diff --git a/indra/newview/skins/default/textures/widgets/SegmentedBtn_Right_Selected_Disabled.png b/indra/newview/skins/default/textures/widgets/SegmentedBtn_Right_Selected_Disabled.png Binary files differnew file mode 100644 index 0000000000..ab31f6ded7 --- /dev/null +++ b/indra/newview/skins/default/textures/widgets/SegmentedBtn_Right_Selected_Disabled.png diff --git a/indra/newview/skins/default/textures/widgets/SegmentedBtn_Right_Selected_Over.png b/indra/newview/skins/default/textures/widgets/SegmentedBtn_Right_Selected_Over.png Binary files differnew file mode 100644 index 0000000000..2049736897 --- /dev/null +++ b/indra/newview/skins/default/textures/widgets/SegmentedBtn_Right_Selected_Over.png diff --git a/indra/newview/skins/default/textures/widgets/SegmentedBtn_Right_Selected_Press.png b/indra/newview/skins/default/textures/widgets/SegmentedBtn_Right_Selected_Press.png Binary files differnew file mode 100644 index 0000000000..1574f48b28 --- /dev/null +++ b/indra/newview/skins/default/textures/widgets/SegmentedBtn_Right_Selected_Press.png diff --git a/indra/newview/skins/default/textures/widgets/SliderThumb_Disabled.png b/indra/newview/skins/default/textures/widgets/SliderThumb_Disabled.png Binary files differnew file mode 100644 index 0000000000..b627232012 --- /dev/null +++ b/indra/newview/skins/default/textures/widgets/SliderThumb_Disabled.png diff --git a/indra/newview/skins/default/textures/widgets/SliderThumb_Off.png b/indra/newview/skins/default/textures/widgets/SliderThumb_Off.png Binary files differnew file mode 100644 index 0000000000..b627232012 --- /dev/null +++ b/indra/newview/skins/default/textures/widgets/SliderThumb_Off.png diff --git a/indra/newview/skins/default/textures/widgets/SliderThumb_Over.png b/indra/newview/skins/default/textures/widgets/SliderThumb_Over.png Binary files differnew file mode 100644 index 0000000000..b6f900d3bd --- /dev/null +++ b/indra/newview/skins/default/textures/widgets/SliderThumb_Over.png diff --git a/indra/newview/skins/default/textures/widgets/SliderThumb_Press.png b/indra/newview/skins/default/textures/widgets/SliderThumb_Press.png Binary files differnew file mode 100644 index 0000000000..7081f9cfe0 --- /dev/null +++ b/indra/newview/skins/default/textures/widgets/SliderThumb_Press.png diff --git a/indra/newview/skins/default/textures/widgets/SliderTrack_Horiz.png b/indra/newview/skins/default/textures/widgets/SliderTrack_Horiz.png Binary files differnew file mode 100644 index 0000000000..232006ee5a --- /dev/null +++ b/indra/newview/skins/default/textures/widgets/SliderTrack_Horiz.png diff --git a/indra/newview/skins/default/textures/widgets/SliderTrack_Vert.png b/indra/newview/skins/default/textures/widgets/SliderTrack_Vert.png Binary files differnew file mode 100644 index 0000000000..cd002b3973 --- /dev/null +++ b/indra/newview/skins/default/textures/widgets/SliderTrack_Vert.png diff --git a/indra/newview/skins/default/textures/widgets/Stepper_Down_Off.png b/indra/newview/skins/default/textures/widgets/Stepper_Down_Off.png Binary files differnew file mode 100644 index 0000000000..cf0d8ee2c1 --- /dev/null +++ b/indra/newview/skins/default/textures/widgets/Stepper_Down_Off.png diff --git a/indra/newview/skins/default/textures/widgets/Stepper_Down_Over.png b/indra/newview/skins/default/textures/widgets/Stepper_Down_Over.png Binary files differnew file mode 100644 index 0000000000..01e0a2d9f1 --- /dev/null +++ b/indra/newview/skins/default/textures/widgets/Stepper_Down_Over.png diff --git a/indra/newview/skins/default/textures/widgets/Stepper_Down_Press.png b/indra/newview/skins/default/textures/widgets/Stepper_Down_Press.png Binary files differnew file mode 100644 index 0000000000..fe3a7beafd --- /dev/null +++ b/indra/newview/skins/default/textures/widgets/Stepper_Down_Press.png diff --git a/indra/newview/skins/default/textures/widgets/Stepper_Up_Off.png b/indra/newview/skins/default/textures/widgets/Stepper_Up_Off.png Binary files differnew file mode 100644 index 0000000000..133589b8a6 --- /dev/null +++ b/indra/newview/skins/default/textures/widgets/Stepper_Up_Off.png diff --git a/indra/newview/skins/default/textures/widgets/Stepper_Up_Over.png b/indra/newview/skins/default/textures/widgets/Stepper_Up_Over.png Binary files differnew file mode 100644 index 0000000000..2ce84ea5be --- /dev/null +++ b/indra/newview/skins/default/textures/widgets/Stepper_Up_Over.png diff --git a/indra/newview/skins/default/textures/widgets/Stepper_Up_Press.png b/indra/newview/skins/default/textures/widgets/Stepper_Up_Press.png Binary files differnew file mode 100644 index 0000000000..e83babc519 --- /dev/null +++ b/indra/newview/skins/default/textures/widgets/Stepper_Up_Press.png diff --git a/indra/newview/skins/default/textures/widgets/TextField_Active.png b/indra/newview/skins/default/textures/widgets/TextField_Active.png Binary files differnew file mode 100644 index 0000000000..ca6daab4e0 --- /dev/null +++ b/indra/newview/skins/default/textures/widgets/TextField_Active.png diff --git a/indra/newview/skins/default/textures/widgets/TextField_Disabled.png b/indra/newview/skins/default/textures/widgets/TextField_Disabled.png Binary files differnew file mode 100644 index 0000000000..3d205a3f2e --- /dev/null +++ b/indra/newview/skins/default/textures/widgets/TextField_Disabled.png diff --git a/indra/newview/skins/default/textures/widgets/TextField_Off.png b/indra/newview/skins/default/textures/widgets/TextField_Off.png Binary files differnew file mode 100644 index 0000000000..911d907acc --- /dev/null +++ b/indra/newview/skins/default/textures/widgets/TextField_Off.png diff --git a/indra/newview/skins/default/textures/widgets/TextField_Search_Active.png b/indra/newview/skins/default/textures/widgets/TextField_Search_Active.png Binary files differnew file mode 100644 index 0000000000..fa79cb6260 --- /dev/null +++ b/indra/newview/skins/default/textures/widgets/TextField_Search_Active.png diff --git a/indra/newview/skins/default/textures/widgets/TextField_Search_Disabled.png b/indra/newview/skins/default/textures/widgets/TextField_Search_Disabled.png Binary files differnew file mode 100644 index 0000000000..8b504af101 --- /dev/null +++ b/indra/newview/skins/default/textures/widgets/TextField_Search_Disabled.png diff --git a/indra/newview/skins/default/textures/widgets/TextField_Search_Off.png b/indra/newview/skins/default/textures/widgets/TextField_Search_Off.png Binary files differnew file mode 100644 index 0000000000..862b13d219 --- /dev/null +++ b/indra/newview/skins/default/textures/widgets/TextField_Search_Off.png diff --git a/indra/newview/skins/default/textures/windows/Flyout.png b/indra/newview/skins/default/textures/windows/Flyout.png Binary files differnew file mode 100644 index 0000000000..5596b194c9 --- /dev/null +++ b/indra/newview/skins/default/textures/windows/Flyout.png diff --git a/indra/newview/skins/default/textures/windows/Flyout_Pointer.png b/indra/newview/skins/default/textures/windows/Flyout_Pointer.png Binary files differnew file mode 100644 index 0000000000..69fc08ceaa --- /dev/null +++ b/indra/newview/skins/default/textures/windows/Flyout_Pointer.png diff --git a/indra/newview/skins/default/textures/windows/Icon_Close_Foreground.png b/indra/newview/skins/default/textures/windows/Icon_Close_Foreground.png Binary files differnew file mode 100644 index 0000000000..fb59f2e61e --- /dev/null +++ b/indra/newview/skins/default/textures/windows/Icon_Close_Foreground.png diff --git a/indra/newview/skins/default/textures/windows/Icon_Close_Press.png b/indra/newview/skins/default/textures/windows/Icon_Close_Press.png Binary files differnew file mode 100644 index 0000000000..7177c803b0 --- /dev/null +++ b/indra/newview/skins/default/textures/windows/Icon_Close_Press.png diff --git a/indra/newview/skins/default/textures/windows/Icon_Close_Toast.png b/indra/newview/skins/default/textures/windows/Icon_Close_Toast.png Binary files differnew file mode 100644 index 0000000000..ecf01c617a --- /dev/null +++ b/indra/newview/skins/default/textures/windows/Icon_Close_Toast.png diff --git a/indra/newview/skins/default/textures/windows/Icon_Dock_Foreground.png b/indra/newview/skins/default/textures/windows/Icon_Dock_Foreground.png Binary files differnew file mode 100644 index 0000000000..cadd6bc8ce --- /dev/null +++ b/indra/newview/skins/default/textures/windows/Icon_Dock_Foreground.png diff --git a/indra/newview/skins/default/textures/windows/Icon_Dock_Press.png b/indra/newview/skins/default/textures/windows/Icon_Dock_Press.png Binary files differnew file mode 100644 index 0000000000..08f8cfc3d4 --- /dev/null +++ b/indra/newview/skins/default/textures/windows/Icon_Dock_Press.png diff --git a/indra/newview/skins/default/textures/windows/Icon_Gear_Background.png b/indra/newview/skins/default/textures/windows/Icon_Gear_Background.png Binary files differnew file mode 100644 index 0000000000..db74b93afd --- /dev/null +++ b/indra/newview/skins/default/textures/windows/Icon_Gear_Background.png diff --git a/indra/newview/skins/default/textures/windows/Icon_Gear_Foreground.png b/indra/newview/skins/default/textures/windows/Icon_Gear_Foreground.png Binary files differnew file mode 100644 index 0000000000..1032e45f7e --- /dev/null +++ b/indra/newview/skins/default/textures/windows/Icon_Gear_Foreground.png diff --git a/indra/newview/skins/default/textures/windows/Icon_Gear_Over.png b/indra/newview/skins/default/textures/windows/Icon_Gear_Over.png Binary files differnew file mode 100644 index 0000000000..01dbde102b --- /dev/null +++ b/indra/newview/skins/default/textures/windows/Icon_Gear_Over.png diff --git a/indra/newview/skins/default/textures/windows/Icon_Gear_Press.png b/indra/newview/skins/default/textures/windows/Icon_Gear_Press.png Binary files differnew file mode 100644 index 0000000000..6614bdd165 --- /dev/null +++ b/indra/newview/skins/default/textures/windows/Icon_Gear_Press.png diff --git a/indra/newview/skins/default/textures/windows/Icon_Undock_Foreground.png b/indra/newview/skins/default/textures/windows/Icon_Undock_Foreground.png Binary files differnew file mode 100644 index 0000000000..d790cf57ef --- /dev/null +++ b/indra/newview/skins/default/textures/windows/Icon_Undock_Foreground.png diff --git a/indra/newview/skins/default/textures/windows/Icon_Undock_Press.png b/indra/newview/skins/default/textures/windows/Icon_Undock_Press.png Binary files differnew file mode 100644 index 0000000000..fdae4b75f6 --- /dev/null +++ b/indra/newview/skins/default/textures/windows/Icon_Undock_Press.png diff --git a/indra/newview/skins/default/textures/windows/Resize_Corner.png b/indra/newview/skins/default/textures/windows/Resize_Corner.png Binary files differnew file mode 100644 index 0000000000..16ed63e428 --- /dev/null +++ b/indra/newview/skins/default/textures/windows/Resize_Corner.png diff --git a/indra/newview/skins/default/textures/windows/Toast_CloseBtn.png b/indra/newview/skins/default/textures/windows/Toast_CloseBtn.png Binary files differnew file mode 100644 index 0000000000..78b137cdaf --- /dev/null +++ b/indra/newview/skins/default/textures/windows/Toast_CloseBtn.png diff --git a/indra/newview/skins/default/textures/windows/Toast_Over.png b/indra/newview/skins/default/textures/windows/Toast_Over.png Binary files differnew file mode 100644 index 0000000000..807e8e553c --- /dev/null +++ b/indra/newview/skins/default/textures/windows/Toast_Over.png diff --git a/indra/newview/skins/default/textures/windows/Window_Background.png b/indra/newview/skins/default/textures/windows/Window_Background.png Binary files differnew file mode 100644 index 0000000000..e9f15e76b9 --- /dev/null +++ b/indra/newview/skins/default/textures/windows/Window_Background.png diff --git a/indra/newview/skins/default/textures/windows/Window_Foreground.png b/indra/newview/skins/default/textures/windows/Window_Foreground.png Binary files differnew file mode 100644 index 0000000000..e76e9f3c79 --- /dev/null +++ b/indra/newview/skins/default/textures/windows/Window_Foreground.png diff --git a/indra/newview/skins/default/textures/world/NoEntryLines.png b/indra/newview/skins/default/textures/world/NoEntryLines.png Binary files differnew file mode 100644 index 0000000000..5a1f0ea95e --- /dev/null +++ b/indra/newview/skins/default/textures/world/NoEntryLines.png diff --git a/indra/newview/skins/default/textures/world/NoEntryPassLines.png b/indra/newview/skins/default/textures/world/NoEntryPassLines.png Binary files differnew file mode 100644 index 0000000000..e4b8fc6ae2 --- /dev/null +++ b/indra/newview/skins/default/textures/world/NoEntryPassLines.png diff --git a/indra/newview/skins/default/xui/de/floater_tools.xml b/indra/newview/skins/default/xui/de/floater_tools.xml index cef204eb5f..8084d2427e 100644 --- a/indra/newview/skins/default/xui/de/floater_tools.xml +++ b/indra/newview/skins/default/xui/de/floater_tools.xml @@ -1,5 +1,633 @@ <?xml version="1.0" encoding="utf-8" standalone="yes"?> -<floater name="toolbox floater" title=""> +<floater name="toolbox floater" title="" short_title="Bauen"> + <button label="" label_selected="" name="button focus" tool_tip="Fokus"/> + <button label="" label_selected="" name="button move" tool_tip="Verschieben"/> + <button label="" label_selected="" name="button edit" tool_tip="Bearbeiten"/> + <button label="" label_selected="" name="button create" tool_tip="Erstellen"/> + <button label="" label_selected="" name="button land" tool_tip="Land"/> + <check_box label="Zoom" name="radio zoom"/> + <check_box label="Orbit (Strg)" name="radio orbit"/> + <check_box label="Schwenken (Strg-Umschalt)" name="radio pan"/> + <check_box label="Verschieben" name="radio move"/> + <check_box label="Heben (Strg)" name="radio lift"/> + <check_box label="Rotieren (Strg-Umschalt)" name="radio spin"/> + <check_box label="Position" name="radio position"/> + <check_box label="Drehen (Strg)" name="radio rotate"/> + <check_box label="Dehnen (Strg-Umschalt)" name="radio stretch"/> + <check_box label="Textur auswählen" name="radio select face"/> + <check_box label="Verknüpfte Teile bearbeiten" name="checkbox edit linked parts"/> + <text name="text ruler mode"> + Lineal: + </text> + <combo_box name="combobox grid mode"> + <combo_item name="World"> + Welt + </combo_item> + <combo_item name="Local"> + Lokal + </combo_item> + <combo_item name="Reference"> + Referenz + </combo_item> + </combo_box> + <check_box label="Beide Seiten dehnen" name="checkbox uniform"/> + <check_box label="Texturen dehnen" name="checkbox stretch textures"/> + <check_box label="Raster verwenden" name="checkbox snap to grid"/> + <button label="Optionen..." label_selected="Optionen..." name="Options..."/> + <text name="text status"> + Zum Verschieben ziehen, zum Kopieren Umschalttaste-Ziehen + </text> + <button label="" label_selected="" name="ToolCube" tool_tip="Würfel"/> + <button label="" label_selected="" name="ToolPrism" tool_tip="Prisma"/> + <button label="" label_selected="" name="ToolPyramid" tool_tip="Pyramide"/> + <button label="" label_selected="" name="ToolTetrahedron" tool_tip="Tetraeder"/> + <button label="" label_selected="" name="ToolCylinder" tool_tip="Zylinder"/> + <button label="" label_selected="" name="ToolHemiCylinder" tool_tip="Halbzylinder"/> + <button label="" label_selected="" name="ToolCone" tool_tip="Kegel"/> + <button label="" label_selected="" name="ToolHemiCone" tool_tip="Halbkegel"/> + <button label="" label_selected="" name="ToolSphere" tool_tip="Kugel"/> + <button label="" label_selected="" name="ToolHemiSphere" tool_tip="Halbkugel"/> + <button label="" label_selected="" name="ToolTorus" tool_tip="Torus"/> + <button label="" label_selected="" name="ToolTube" tool_tip="Rohr"/> + <button label="" label_selected="" name="ToolRing" tool_tip="Ring"/> + <button label="" label_selected="" name="ToolTree" tool_tip="Baum"/> + <button label="" label_selected="" name="ToolGrass" tool_tip="Gras"/> + <check_box label="Auswahl behalten" name="checkbox sticky"/> + <check_box label="Auswahl kopieren" name="checkbox copy selection"/> + <check_box label="Zentrieren" name="checkbox copy centers"/> + <check_box label="Drehen" name="checkbox copy rotates"/> + <check_box label="Land auswählen" name="radio select land"/> + <check_box label="Einebnen" name="radio flatten"/> + <check_box label="Anheben" name="radio raise"/> + <check_box label="Absenken" name="radio lower"/> + <check_box label="Glätten" name="radio smooth"/> + <check_box label="Aufrauen" name="radio noise"/> + <check_box label="Zurücksetzen" name="radio revert"/> + <button label="Übernehmen" label_selected="Übernehmen" name="button apply to selection" tool_tip="Ausgewähltes Land ändern"/> + <text name="Bulldozer:"> + Planierraupe: + </text> + <text name="Dozer Size:"> + Größe + </text> + <text name="Strength:"> + Stärke + </text> + <text name="obj_count"> + Ausgewählte Objekte: [COUNT] + </text> + <text name="prim_count"> + Primitive: [COUNT] + </text> + <tab_container name="Object Info Tabs"> + <panel label="Allgemein" name="General"> + <text name="Name:"> + Name: + </text> + <text name="Description:"> + Beschreibung: + </text> + <text name="Creator:"> + Ersteller: + </text> + <text name="Creator Name"> + Thrax Linden + </text> + <button label="Profil..." label_selected="Profil..." name="button creator profile"/> + <text name="Owner:"> + Eigentümer: + </text> + <text name="Owner Name"> + Thrax Linden + </text> + <button label="Profil..." label_selected="Profil..." name="button owner profile"/> + <text name="Group:"> + Gruppe: + </text> + <text name="Group Name Proxy"> + Die Lindens + </text> + <button label="Festlegen..." label_selected="Festlegen..." name="button set group"/> + <text name="Permissions:"> + Berechtigungen: + </text> + <text name="perm_modify"> + Sie können dieses Objekt ändern. + </text> + <check_box label="Mit Gruppe teilen" name="checkbox share with group" tool_tip="Allen Mitgliedern der zugeordneten Gruppe die Erlaubnis erteilen, Ihre Berechtigungen für dieses Objekt zu teilen und zu verwenden. Sie müssen Übereignen, um Rollenbeschränkungen zu aktivieren."/> + <string name="text deed continued"> + Übertragung... + </string> + <string name="text deed"> + Übertragung + </string> + <button label="Übertragung..." label_selected="Übertragung..." name="button deed" tool_tip="In der Gruppe gemeinsam verwendete Objekte können von einem Gruppenfunktionär übertragen werden."/> + <check_box label="Verschieben durch beliebige Personen zulassen" name="checkbox allow everyone move"/> + <check_box label="Kopieren durch beliebige Personen zulassen" name="checkbox allow everyone copy"/> + <check_box label="In Suche anzeigen" name="search_check" tool_tip="Dieses Objekt in Suchergebnissen anzeigen"/> + <check_box label="Zu verkaufen" name="checkbox for sale"/> + <text name="Cost"> + Preis:L$ + </text> + <radio_group name="sale type"> + <radio_item name="Original"> + Original + </radio_item> + <radio_item name="Copy"> + Kopieren + </radio_item> + <radio_item name="Contents"> + Inhalt + </radio_item> + </radio_group> + <text name="Next owner can:"> + Nächster Eigentümer kann: + </text> + <check_box label="Ändern" name="checkbox next owner can modify"/> + <check_box label="Kopieren" name="checkbox next owner can copy"/> + <check_box label="Wiederverkaufen" name="checkbox next owner can transfer"/> + <text name="label click action"> + Bei Linksklicken: + </text> + <combo_box name="clickaction"> + <combo_item name="Touch/grab(default)"> + Berühren/Greifen (Standard) + </combo_item> + <combo_item name="Sitonobject"> + Auf Objekt sitzen + </combo_item> + <combo_item name="Buyobject"> + Objekt kaufen + </combo_item> + <combo_item name="Payobject"> + Objekt bezahlen + </combo_item> + <combo_item name="Open"> + Öffnen + </combo_item> + <combo_item name="Play"> + Parzellenmedien wiedergeben + </combo_item> + <combo_item name="Opemmedia"> + Parzellenmedien öffnen + </combo_item> + </combo_box> + <text name="B:"> + B: + </text> + <text name="O:"> + O; + </text> + <text name="G:"> + G: + </text> + <text name="E:"> + E: + </text> + <text name="N:"> + N: + </text> + <text name="F:"> + F: + </text> + <string name="text modify info 1"> + Sie können dieses Objekt ändern. + </string> + <string name="text modify info 2"> + Sie können diese Objekte ändern. + </string> + <string name="text modify info 3"> + Sie können dieses Objekt nicht ändern. + </string> + <string name="text modify info 4"> + Sie können diese Objekte nicht ändern. + </string> + <string name="text modify warning"> + Gesamtes Objekt muss gewählt werden, um Berechtigungen festzulegen. + </string> + <string name="Cost Default"> + Preis:L$ + </string> + <string name="Cost Total"> + Summe:L$ + </string> + <string name="Cost Per Unit"> + Stückpreis:L$ + </string> + <string name="Cost Mixed"> + Mischpreis + </string> + <string name="Sale Mixed"> + Mischverkauf + </string> + </panel> + <panel label="Objekt" name="Object"> + <text name="select_single"> + Wählen Sie nur ein Primitivum aus, um Parameter zu bearbeiten. + </text> + <text name="edit_object"> + Objektparameter bearbeiten: + </text> + <check_box label="Gesperrt" name="checkbox locked" tool_tip="Verhindert, dass Objekt verschoben oder gelöscht wird. Oft beim Bauen nützlich, um unbeabsichtigte Bearbeitungen zu vermeiden."/> + <check_box label="Physisch" name="Physical Checkbox Ctrl" tool_tip="Gestattet, das Objekt geschoben und von Schwerkraft beeinflusst wird"/> + <check_box label="Temporär" name="Temporary Checkbox Ctrl" tool_tip="Verursacht, dass Objekt 1 Minute nach Erstellung gelöscht wird."/> + <check_box label="Phantom" name="Phantom Checkbox Ctrl" tool_tip="Verursacht, dass Objekt nicht mit anderen Objekten oder Avataren kollidiert"/> + <text name="label position"> + Position (Meter) + </text> + <spinner label="X" name="Pos X"/> + <spinner label="Y" name="Pos Y"/> + <spinner label="Z" name="Pos Z"/> + <text name="label size"> + Größe (Meter) + </text> + <spinner label="X" name="Scale X"/> + <spinner label="Y" name="Scale Y"/> + <spinner label="Z" name="Scale Z"/> + <text name="label rotation"> + Rotation (Grad) + </text> + <spinner label="X" name="Rot X"/> + <spinner label="Y" name="Rot Y"/> + <spinner label="Z" name="Rot Z"/> + <text name="label material"> + Material + </text> + <combo_box name="material"> + <combo_item name="Stone"> + Stein + </combo_item> + <combo_item name="Metal"> + Metall + </combo_item> + <combo_item name="Glass"> + Glas + </combo_item> + <combo_item name="Wood"> + Holz + </combo_item> + <combo_item name="Flesh"> + Fleisch + </combo_item> + <combo_item name="Plastic"> + Kunststoff + </combo_item> + <combo_item name="Rubber"> + Gummi + </combo_item> + </combo_box> + <text name="label basetype"> + Bausteintyp + </text> + <combo_box name="comboBaseType"> + <combo_item name="Box"> + Quader + </combo_item> + <combo_item name="Cylinder"> + Zylinder + </combo_item> + <combo_item name="Prism"> + Prisma + </combo_item> + <combo_item name="Sphere"> + Kugel + </combo_item> + <combo_item name="Torus"> + Torus + </combo_item> + <combo_item name="Tube"> + Rohr + </combo_item> + <combo_item name="Ring"> + Ring + </combo_item> + <combo_item name="Sculpted"> + Geformt + </combo_item> + </combo_box> + <text name="text cut"> + Pfadschnitt Beginn und Ende + </text> + <spinner label="B" name="cut begin"/> + <spinner label="E" name="cut end"/> + <text name="text hollow"> + Hohl + </text> + <text name="text skew"> + Versatz + </text> + <spinner name="Scale 1"/> + <spinner name="Skew"/> + <text name="Hollow Shape"> + Hohlform + </text> + <combo_box name="hole"> + <combo_item name="Default"> + Standard + </combo_item> + <combo_item name="Circle"> + Kreis + </combo_item> + <combo_item name="Square"> + Quadrat + </combo_item> + <combo_item name="Triangle"> + Dreieck + </combo_item> + </combo_box> + <text name="text twist"> + Torsion + </text> + <spinner label="B" name="Twist Begin"/> + <spinner label="E" name="Twist End"/> + <text name="scale_taper"> + Verjüngung + </text> + <text name="scale_hole"> + Lochgröße + </text> + <spinner label="X" name="Taper Scale X"/> + <spinner label="Y" name="Taper Scale Y"/> + <text name="text topshear"> + Verscherung + </text> + <spinner label="X" name="Shear X"/> + <spinner label="Y" name="Shear Y"/> + <text name="advanced_cut"> + Profilschnitt-Beginn und Ende + </text> + <text name="advanced_dimple"> + Vertiefung-Beginn und Ende + </text> + <text name="advanced_slice"> + Anfang/Ende abschneiden + </text> + <spinner label="B" name="Path Limit Begin"/> + <spinner label="E" name="Path Limit End"/> + <text name="text taper2"> + Verjüngung + </text> + <spinner label="X" name="Taper X"/> + <spinner label="Y" name="Taper Y"/> + <text name="text radius delta"> + Radius + </text> + <text name="text revolutions"> + Umdrehungen + </text> + <spinner name="Radius Offset"/> + <texture_picker label="Textur für gestaltetes +Primitiv" name="sculpt texture control" tool_tip="Klicken Sie hier, um ein Bild auszuwählen"/> + <check_box label="Spiegeln" name="sculpt mirror control" tool_tip="Geformtes Primitiv entlang der X-Achse spiegeln."/> + <check_box label="Wenden" name="sculpt invert control" tool_tip="Dreht die Normalen des geformten Primitivs von innen nach außen."/> + <text name="label sculpt type"> + Naht + </text> + <combo_box name="sculpt type control"> + <combo_item name="None"> + (keiner) + </combo_item> + <combo_item name="Sphere"> + Kugel + </combo_item> + <combo_item name="Torus"> + Torus + </combo_item> + <combo_item name="Plane"> + Fläche + </combo_item> + <combo_item name="Cylinder"> + Zylinder + </combo_item> + </combo_box> + </panel> + <panel label="Eigenschaften" name="Features"> + <text name="select_single"> + Wählen Sie nur einen einzelnen Baustein aus, um Eigenschaften zu bearbeiten. + </text> + <text name="edit_object"> + Objekteigenschaften bearbeiten: + </text> + <check_box label="Flexibler Weg" name="Flexible1D Checkbox Ctrl" tool_tip="Gestattet, dass Objekt um die Z-Achse gebogen wird. (nur Client-Seite)"/> + <spinner label="Weichheit" name="FlexNumSections"/> + <spinner label="Schwerkraft" name="FlexGravity"/> + <spinner label="Ziehen" name="FlexFriction"/> + <spinner label="Wind" name="FlexWind"/> + <spinner label="Spannung" name="FlexTension"/> + <spinner label="Erzwingen X" name="FlexForceX"/> + <spinner label="Erzwingen Y" name="FlexForceY"/> + <spinner label="Erzwingen Z" name="FlexForceZ"/> + <check_box label="Licht" name="Light Checkbox Ctrl" tool_tip="Verursacht, dass Objekt Licht emittiert"/> + <text name="label color"> + Farbe + </text> + <color_swatch label="" name="colorswatch" tool_tip="Klicken, um Farbauswahl zu öffnen"/> + <spinner label="Intensität" name="Light Intensity"/> + <spinner label="Radius" name="Light Radius"/> + <spinner label="Abnehmend" name="Light Falloff"/> + </panel> + <panel label="Textur" name="Texture"> + <texture_picker label="Textur" name="texture control" tool_tip="Klicken, um ein Bild zu wählen"/> + <color_swatch label="Farbe" name="colorswatch" tool_tip="Klicken, um Farbauswahl zu öffnen"/> + <text name="color trans"> + Transparenz % + </text> + <text name="glow label"> + Leuchten + </text> + <check_box label="Ganz hell" name="checkbox fullbright"/> + <text name="tex gen"> + Zuordnung + </text> + <combo_box name="combobox texgen"> + <combo_item name="Default"> + Standard + </combo_item> + <combo_item name="Planar"> + Eben + </combo_item> + </combo_box> + <text name="label shininess"> + Glanz + </text> + <combo_box name="combobox shininess"> + <combo_item name="None"> + Kein + </combo_item> + <combo_item name="Low"> + Niedrig + </combo_item> + <combo_item name="Medium"> + Mittel + </combo_item> + <combo_item name="High"> + Hoch + </combo_item> + </combo_box> + <text name="label bumpiness"> + Holprigkeit + </text> + <combo_box name="combobox bumpiness"> + <combo_item name="None"> + Keine + </combo_item> + <combo_item name="Brightness"> + Helligkeit + </combo_item> + <combo_item name="Darkness"> + Dunkelheit + </combo_item> + <combo_item name="woodgrain"> + Holzmaserung + </combo_item> + <combo_item name="bark"> + Rinde + </combo_item> + <combo_item name="bricks"> + Ziegel + </combo_item> + <combo_item name="checker"> + Karo + </combo_item> + <combo_item name="concrete"> + Beton + </combo_item> + <combo_item name="crustytile"> + verkrustete Fliesen + </combo_item> + <combo_item name="cutstone"> + Steinplatten + </combo_item> + <combo_item name="discs"> + Scheiben + </combo_item> + <combo_item name="gravel"> + Kies + </combo_item> + <combo_item name="petridish"> + Petrischale + </combo_item> + <combo_item name="siding"> + Verkleidung + </combo_item> + <combo_item name="stonetile"> + Steinfliesen + </combo_item> + <combo_item name="stucco"> + Stuck + </combo_item> + <combo_item name="suction"> + Saugen + </combo_item> + <combo_item name="weave"> + gewoben + </combo_item> + </combo_box> + <text name="tex scale"> + Wiederholungen + </text> + <spinner label="Horizontal (U)" name="TexScaleU"/> + <check_box label="Umkehren" name="checkbox flip s"/> + <spinner label="Vertikal (V)" name="TexScaleV"/> + <check_box label="Umkehren" name="checkbox flip t"/> + <text name="tex rotate"> + Rotation (Grad) + </text> + <string name="string repeats per meter"> + Kacheln pro Meter + </string> + <string name="string repeats per face"> + Wiederholungen pro Fläche + </string> + <text name="rpt"> + Kacheln pro Meter + </text> + <button label="Übernehmen" label_selected="Übernehmen" name="button apply"/> + <text name="tex offset"> + Versatz + </text> + <spinner label="Horizontal (U)" name="TexOffsetU"/> + <spinner label="Vertikal (V)" name="TexOffsetV"/> + <text name="textbox autofix"> + Medientextur ausrichten +(zuerst laden) + </text> + <button label="Ausrichten" label_selected="Ausrichten" name="button align"/> + </panel> + <panel label="Inhalt" name="Contents"> + <button label="Neues Skript" label_selected="Neues Skript..." name="button new script"/> + <button label="Berechtigungen..." name="button permissions"/> + </panel> + </tab_container> + <panel name="land info panel"> + <text name="label_parcel_info"> + Parzelleninformation + </text> + <text name="label_area_price"> + Preis: L$ [PRICE] für [AREA] m2. + </text> + <text name="label_area"> + Fläche: [AREA] m2 + </text> + <button label="Info zu Land..." label_selected="Info zu Land..." name="button about land"/> + <check_box label="Eigentümer anzeigen" name="checkbox show owners" tool_tip="Parzellen nach Eigentümer farbig kennzeichnen"/> + <button label="?" label_selected="?" name="button show owners help"/> + <text name="label_parcel_modify"> + Parzelle ändern + </text> + <button label="Unterteilen..." label_selected="Unterteilen..." name="button subdivide land"/> + <button label="Zusammenlegen" label_selected="Zusammenlegen" name="button join land"/> + <text name="label_parcel_trans"> + Land-Transaktionen + </text> + <button label="Land kaufen..." label_selected="Land kaufen..." name="button buy land"/> + <button label="Land aufgeben..." label_selected="Land aufgeben..." name="button abandon land"/> + </panel> + <string name="status_rotate"> + An den farbigen Bändern ziehen, um das Objekt zu drehen + </string> + <string name="status_scale"> + Klicken und ziehen, um die ausgewählte Seite zu dehnen + </string> + <string name="status_move"> + Maus verschiebt, Umschalt-Taste und Maus kopiert + </string> + <string name="status_modifyland"> + Klicken und halten, um das Land zu bearbeiten + </string> + <string name="status_camera"> + Klicken und ziehen, um die Ansicht zu ändern + </string> + <string name="status_grab"> + Ziehen, um Objekte zu verschieben, Strg zum Heben, Strg-Umschalt zum Drehen + </string> + <string name="status_place"> + Inworld klicken, um zu bauen. + </string> + <string name="status_selectland"> + Klicken und ziehen, um Land auszuwählen + </string> + <string name="grid_screen_text"> + Bildschirm + </string> + <string name="grid_local_text"> + Lokal + </string> + <string name="grid_world_text"> + Welt + </string> + <string name="grid_reference_text"> + Referenz + </string> + <string name="grid_attachment_text"> + Anhang + </string> +</floater> + +<!-- original file + +<?xml version="1.0" encoding="utf-8" standalone="yes"?> +<floater name="toolbox floater" title="" short_title="Bauen"> <button label="" label_selected="" name="button focus" tool_tip="Fokus"/> <button label="" label_selected="" name="button move" tool_tip="Verschieben"/> <button label="" label_selected="" name="button edit" tool_tip="Bearbeiten"/> @@ -623,3 +1251,5 @@ Primitiv" name="sculpt texture control" tool_tip="Klicken Sie hier, um ein Bild Anhang </string> </floater> + +--> diff --git a/indra/newview/skins/default/xui/de/panel_group_general.xml b/indra/newview/skins/default/xui/de/panel_group_general.xml index ce19248755..2ce40e5787 100644 --- a/indra/newview/skins/default/xui/de/panel_group_general.xml +++ b/indra/newview/skins/default/xui/de/panel_group_general.xml @@ -47,6 +47,89 @@ Bewegen Sie die Maus über die Optionen, um weitere Informationen anzuzeigen. <panel name="preferences_container"> <check_box label="In Suche anzeigen" name="show_in_group_list" tool_tip="Diese Gruppe in Suchergebnissen anzeigen."/> <check_box label="Registrierung offen" name="open_enrollement" tool_tip="Festlegen, ob der Gruppenbeitritt ohne Einladung zulässig ist."/> + <check_box label="Beitrittsgebühr: L$" name="check_enrollment_fee" tool_tip="Festlegen, ob Neumitglieder eine Beitrittsgebühr zahlen müssen."/> + <spinner name="spin_enrollment_fee" tool_tip="Wenn „Beitrittsgebühr“ aktiviert ist, müssen neue Mitglieder diesen Betrag zahlen."/> + <combo_box name="group_mature_check" tool_tip="Festlegen, ob die Informationen Ihrer Gruppe „Mature“ sind."> + <combo_item name="select_mature"> + - Mature wählen - + </combo_item> + <combo_item name="mature"> + Mature-Inhalt + </combo_item> + <combo_item name="pg"> + PG-Inhalt + </combo_item> + </combo_box> + <panel name="title_container"> + <text name="active_title_label"> + Mein aktiver Titel + </text> + <combo_box name="active_title" tool_tip="Legt fest, was im Namensschild Ihres Avatars angezeigt wird, wenn diese Gruppe aktiviert ist."/> + </panel> + <check_box label="Gruppenmitteilungen erhalten" name="receive_notices" tool_tip="Festlegen, ob Sie von dieser Gruppe Mitteilungen erhalten können. Deaktivieren Sie diese Option, wenn Sie von der Gruppe Spam erhalten."/> + <check_box label="Gruppe im Profil anzeigen" name="list_groups_in_profile" tool_tip="Steuert, ob diese Gruppe in Ihrem Profil angezeigt wird"/> + </panel> + <string name="incomplete_member_data_str"> + Mitgliedsdaten werden abgerufen + </string> + <string name="confirm_group_create_str"> + Die Gründung dieser Gruppe kostet 100 L$. +Sind Sie wirklich, WIRKLICH sicher, dass Sie 100 L$ für die Gründung dieser Gruppe ausgeben möchten? +Falls in den nächsten 48 Stunden niemand sonst dieser Gruppe beitritt, wird sie aufgelöst und der Name der Gruppe wird nicht mehr verfügbar sein. + </string> +</panel> + +<!-- original file + +<?xml version="1.0" encoding="utf-8" standalone="yes"?> +<panel label="Allgemein" name="general_tab"> + <string name="help_text"> + Die Registerkarte „Allgemein“ enthält Informationen über +diese Gruppe, eine Liste der Eigentümer und sichtbaren Mitglieder, +allgemeine Gruppeneinstellungen und Mitgliederoptionen. + +Bewegen Sie die Maus über die Optionen, um weitere Informationen anzuzeigen. + </string> + <string name="group_info_unchanged"> + Die allgemeine Gruppeninfo wurde geändert. + </string> + <button label="?" label_selected="?" name="help_button"/> + <line_editor label="Neuen Gruppennamen hier eingeben" name="group_name_editor"/> + <text name="group_name"> + Neuen Gruppennamen hier eingeben + </text> + <text name="prepend_founded_by"> + Gegründet von + </text> + <text left_delta="79" name="founder_name"> + (wartet) + </text> + <text name="group_charter_label"> + Gruppencharta + </text> + <texture_picker label="Gruppeninsignien" name="insignia" tool_tip="Klicken Sie hier, um ein Bild auszuwählen"/> + <text_editor name="charter"> + Gruppencharta + </text_editor> + <button label="Beitreten (0 L$)" label_selected="Beitreten (0 L$)" name="join_button"/> + <button label="Detailansicht" label_selected="Detailansicht" name="info_button"/> + <text name="text_owners_and_visible_members"> + Eigentümer und sichtbare Mitglieder + </text> + <text name="text_owners_are_shown_in_bold"> + (Eigentümer werden fettgedruckt angezeigt) + </text> + <name_list name="visible_members"> + <column label="Mitgliedsname" name="name" relwidth="0.40"/> + <column label="Titel" name="title" relwidth="0.25"/> + <column label="Letzte Anmeldung" name="online" relwidth="0.35"/> + </name_list> + <text name="text_group_preferences"> + Gruppeneinstellungen + </text> + <panel name="preferences_container"> + <check_box label="In Suche anzeigen" name="show_in_group_list" tool_tip="Diese Gruppe in Suchergebnissen anzeigen."/> + <check_box label="Registrierung offen" name="open_enrollement" tool_tip="Festlegen, ob der Gruppenbeitritt ohne Einladung zulässig ist."/> <check_box label="Beitrittsgebühr: L$" name="check_enrollment_fee" tool_tip="Festlegen, ob Neumitglieder eine Beitrittsgebühr zahlen müssen." width="125"/> <spinner name="spin_enrollment_fee" tool_tip="Wenn „Beitrittsgebühr“ aktiviert ist, müssen neue Mitglieder diesen Betrag zahlen."/> <combo_box name="group_mature_check" tool_tip="Festlegen, ob die Informationen Ihrer Gruppe „Mature“ sind."> @@ -78,3 +161,5 @@ Sind Sie wirklich, WIRKLICH sicher, dass Sie 100 L$ für die Gründung dieser Gr Falls in den nächsten 48 Stunden niemand sonst dieser Gruppe beitritt, wird sie aufgelöst und der Name der Gruppe wird nicht mehr verfügbar sein. </string> </panel> + +--> diff --git a/indra/newview/skins/default/xui/de/panel_group_land_money.xml b/indra/newview/skins/default/xui/de/panel_group_land_money.xml index c038d97822..e2e30b7479 100644 --- a/indra/newview/skins/default/xui/de/panel_group_land_money.xml +++ b/indra/newview/skins/default/xui/de/panel_group_land_money.xml @@ -52,6 +52,90 @@ qm (max. [AMOUNT]) </text> <text name="group_over_limit_text"> + Die Gruppenmitglieder müssen mehr Landnutzungsrechte spenden, damit das verwendete Land gehalten werden kann. + </text> + <text name="group_money_heading"> + Gruppen-L$ + </text> + <tab_container name="group_money_tab_container"> + <panel label="Planung" name="group_money_planning_tab"> + <text_editor name="group_money_planning_text"> + Wird berechnet... + </text_editor> + </panel> + <panel label="Details" name="group_money_details_tab"> + <text_editor name="group_money_details_text"> + Wird berechnet... + </text_editor> + <button label="< Früher" label_selected="< Früher" name="earlier_details_button" tool_tip="Zurück in der Zeit"/> + <button label="Später >" label_selected="Später >" name="later_details_button" tool_tip="Weiter in der Zeit"/> + </panel> + <panel label="Verkäufe" name="group_money_sales_tab"> + <text_editor name="group_money_sales_text"> + Wird berechnet... + </text_editor> + <button label="< Früher" label_selected="< Früher" name="earlier_sales_button" tool_tip="Zurück in der Zeit"/> + <button label="Später >" label_selected="Später >" name="later_sales_button" tool_tip="Weiter in der Zeit"/> + </panel> + </tab_container> +</panel> + +<!-- + +<?xml version="1.0" encoding="utf-8" standalone="yes"?> +<panel label="Land und L$" name="land_money_tab"> + <string name="help_text"> + Parzellen in Gruppenbesitz werden zusammen mit Beitragsdetails angezeigt. Ein Warnhinweis wird angezeigt, solange der Wert für das insgesamt verwendete Land gleich oder weniger ist als der Gesamtbeitrag. Die Registerkarten „Planung“, „Details“ und „Verkäufe“ enthalten Informationen über die Gruppenfinanzen. + </string> + <button label="?" name="help_button"/> + <string name="cant_view_group_land_text"> + Sie sind nicht berechtigt, Landeigentum der Gruppe anzuzeigen. + </string> + <string name="cant_view_group_accounting_text"> + Sie sind nicht berechtigt, die Finanzinformationen der Gruppe anzuzeigen. + </string> + <string name="loading_txt"> + Wird geladen... + </string> + <text name="group_land_heading"> + Land in Gruppenbesitz + </text> + <scroll_list name="group_parcel_list"> + <column label="Parzellenname" name="name"/> + <column label="Region" name="location"/> + <column label="Typ" name="type"/> + <column label="Gebiet" name="area"/> + <column label="" name="hidden"/> + </scroll_list> + <button label="Auf Karte" label_selected="Auf Karte" name="map_button"/> + <text name="total_contributed_land_label"> + Gesamtbeitrag: + </text> + <text name="total_contributed_land_value"> + [AREA] qm + </text> + <text name="total_land_in_use_label"> + Insgesamt verwendetes Land: + </text> + <text name="total_land_in_use_value"> + [AREA] qm + </text> + <text name="land_available_label"> + Land verfügbar: + </text> + <text name="land_available_value"> + [AREA] qm + </text> + <text name="your_contribution_label"> + Ihr Beitrag: + </text> + <string name="land_contrib_error"> + Ihr Landbeitrag kann nicht festgelegt werden. + </string> + <text name="your_contribution_max_value"> + qm (max. [AMOUNT]) + </text> + <text name="group_over_limit_text"> Die Gruppenmitglieder müssen mehr Landnutzungsrechte spenden, damit das verwendete Land gehalten werden kann. </text> @@ -80,3 +164,5 @@ das verwendete Land gehalten werden kann. </panel> </tab_container> </panel> + +--> diff --git a/indra/newview/skins/default/xui/de/panel_group_notices.xml b/indra/newview/skins/default/xui/de/panel_group_notices.xml index 12dcbb1321..8d4afd356e 100644 --- a/indra/newview/skins/default/xui/de/panel_group_notices.xml +++ b/indra/newview/skins/default/xui/de/panel_group_notices.xml @@ -16,6 +16,81 @@ gesendet. Mitteilungen können unter Gruppenmitteilungsarchiv </text> <text name="lbl2"> + Mitteilungen werden 14 Tage lang aufbewahrt. Klicken Sie auf eine Mitteilung, um sie anzuzeigen. Klicken Sie „Aktualisieren“, um neue Mitteilungen zu suchen. Eine Mitteilungsliste speichert maximal 200 Mitteilungen pro Gruppe täglich. + </text> + <scroll_list name="notice_list"> + <column label="" name="icon" /> + <column label="Thema" name="subject" /> + <column label="Von" name="from" /> + <column label="Datum" name="date" /> + </scroll_list> + <text name="notice_list_none_found"> + Nicht gefunden. + </text> + <button label="Neue Mitteilung" label_selected="Neue Mitteilung" + name="create_new_notice" /> + <button label="Aktualisieren" label_selected="Liste aktualisieren" + name="refresh_notices" /> + <panel label="Neue Mitteilung" name="panel_create_new_notice"> + <text name="lbl"> + Mitteilung schreiben + </text> + <text name="lbl2"> + Geben Sie einen Betreff für die Mitteilung ein. Sie können der Mitteilung ein Objekt anfügen, indem Sie es aus dem Inventar in dieses Feld ziehen. Angehängte Objekte müssen kopier-und transferierbar sein. Ordner können nicht gesendet werden. + </text> + <text name="lbl3"> + Betreff: + </text> + <text name="lbl4"> + Nachricht: + </text> + <text name="lbl5"> + Anhängen: + </text> + <button label="Anhang entfernen" label_selected="Anhang entfernen" + name="remove_attachment" /> + <button label="Mitteilung senden" label_selected="Mitteilung senden" name="send_notice" /> + <panel name="drop_target" + tool_tip="Drag an inventory item onto the message box to send it with the notice. You must have permission to copy and transfer the object to send it with the notice." /> + </panel> + <panel label="Ältere Notiz anzeigen" name="panel_view_past_notice"> + <text name="lbl"> + Archivierte Mitteilung + </text> + <text name="lbl2"> + Klicken Sie zum Senden einer Mitteilung auf „Neue Mitteilung“. + </text> + <text name="lbl3"> + Betreff: + </text> + <text name="lbl4"> + Nachricht: + </text> + <button label="Anlage öffnen" label_selected="Anlage öffnen" name="open_attachment" /> + </panel> +</panel> + + +<!-- original file + +<?xml version="1.0" encoding="utf-8" standalone="yes" ?> +<panel label="Mitteilungen" name="notices_tab"> + <text name="help_text"> + Mitteilungen sind eine schnelle Möglichkeit, +Mitglieder auf dem Laufenden zu halten und +Objekte im Anhang zu versenden. Mitteilungen werden +nur an Mitglieder mit einer entsprechenden Rolle +gesendet. Mitteilungen können unter +„Allgemein“ ausgeschaltet werden. + </text> + <text name="no_notices_text"> + Keine älteren Mitteilungen. + </text> + <button label="?" label_selected="?" name="help_button" /> + <text name="lbl"> + Gruppenmitteilungsarchiv + </text> + <text name="lbl2"> Mitteilungen werden 14 Tage lang aufbewahrt. Klicken Sie auf eine Mitteilung, um sie anzuzeigen. Klicken Sie „Aktualisieren“, um neue Mitteilungen zu suchen. Eine Mitteilungsliste speichert maximal 200 Mitteilungen pro Gruppe täglich. @@ -74,3 +149,8 @@ und transferierbar sein. Ordner können nicht gesendet werden. <button label="Anlage öffnen" label_selected="Anlage öffnen" name="open_attachment" /> </panel> </panel> + +--> + + + diff --git a/indra/newview/skins/default/xui/de/panel_group_roles.xml b/indra/newview/skins/default/xui/de/panel_group_roles.xml index d4589f83e4..d7f47de46f 100644 --- a/indra/newview/skins/default/xui/de/panel_group_roles.xml +++ b/indra/newview/skins/default/xui/de/panel_group_roles.xml @@ -12,8 +12,165 @@ Mitglieder und Rollen </text> <text name="static2"> - Gruppenmitgliedern werden Rollen mit Fähigkeiten zugewiesen. Diese -Einstellungen können zur flexibleren Organisation angepasst werden. + Gruppenmitgliedern werden Rollen mit Fähigkeiten zugewiesen. Diese Einstellungen können zur flexibleren Organisation angepasst werden. + </text> + </panel> + <panel name="roles_header"> + <text name="static"> + Rollen + </text> + <text name="role_properties_modifiable"> + Wählen Sie eine Rolle. Sie können ihren Namen, ihre Beschreibung und den Mitgliedstitel ändern. + </text> + <text name="role_properties_not_modifiable"> + Rolle anklicken um Mitglieder und Fähigkeiten anzuzeigen. + </text> + <text name="role_actions_modifiable"> + Sie können der Rolle auch Fähigkeiten zuweisen. + </text> + <text name="role_actions_not_modifiable"> + Sie können zugewiesene Fähigkeiten anzeigen, aber nicht bearbeiten. + </text> + </panel> + <panel name="actions_header"> + <text name="static"> + Fähigkeiten + </text> + <text name="static2"> + Sie können Fähigkeiten-Beschreibungen anzeigen und welche Rollen bzw. Mitglieder diese Fähigkeit haben. + </text> + </panel> + <tab_container name="roles_tab_container"> + <panel label="Mitglieder" name="members_sub_tab" tool_tip="Mitglieder"> + <button label="Suchen" name="search_button"/> + <button label="Alle anzeigen" name="show_all_button"/> + <name_list name="member_list"> + <column label="Mitgliedsname" name="name"/> + <column label="Übertragene Landanteile" name="donated"/> + <column label="Letzte Anmeldung" name="online"/> + </name_list> + <button label="Neues Mitglied einladen..." name="member_invite"/> + <button label="Aus Gruppe werfen" name="member_eject"/> + <string name="help_text"> + Sie können Mitgliedern Rollen zuweisen und entziehen. +Drücken Sie die Strg-Taste und klicken Sie auf Namen, +um mehrere Mitglieder auszuwählen. + </string> + </panel> + <panel label="Rollen" name="roles_sub_tab"> + <button label="Suchen" name="search_button"/> + <button label="Alle anzeigen" name="show_all_button"/> + <scroll_list name="role_list"> + <column label="Rolle" name="name"/> + <column label="Titel" name="title"/> + <column label="Mitglieder" name="members"/> + </scroll_list> + <button label="Neue Rolle erstellen..." name="role_create"/> + <button label="Rolle löschen" name="role_delete"/> + <string name="help_text"> + Rollen haben einen Titel und umfassen bestimmte +Fähigkeiten. Mitglieder können mehrere +Rollen innehaben. Eine Gruppe kann bis zu 10 Rollen +definieren, darunter „Jeder“ und „Eigentümer“. + </string> + <string name="cant_delete_role"> + Die Rollen „Jeder“ und „Eigentümer“ können nicht gelöscht werden. + </string> + </panel> + <panel label="Fähigkeiten" name="actions_sub_tab"> + <button label="Suchen" name="search_button"/> + <button label="Alle anzeigen" name="show_all_button"/> + <scroll_list name="action_list" tool_tip="Select an Ability to view more details."> + <column label="" name="icon"/> + <column label="" name="action"/> + </scroll_list> + <string name="help_text"> + Fähigkeiten verleihen Mitgliedern in Rollen bestimmte +Rechte in einer Gruppe. Es gibt viele verschiedene Fähigkeiten. + </string> + </panel> + </tab_container> + <panel name="members_footer"> + <text name="static"> + Rollen + </text> + <text name="static2"> + Zulässige Fähigkeiten + </text> + <scroll_list name="member_assigned_roles"> + <column label="" name="checkbox"/> + <column label="" name="role"/> + </scroll_list> + <scroll_list name="member_allowed_actions" tool_tip="Um detaillierte Informationen zu erlaubten Fähigkeiten anzuzeigen, siehe Reiter Fähigkeiten."> + <column label="" name="icon"/> + <column label="" name="action"/> + </scroll_list> + </panel> + <panel name="roles_footer"> + <text name="static"> + Name + </text> + <text name="static2"> + Beschreibung + </text> + <line_editor name="role_name"> + Angestellte + </line_editor> + <text name="static3"> + Titel + </text> + <line_editor name="role_title"> + (wartet) + </line_editor> + <text_editor name="role_description"> + (wartet) + </text_editor> + <text name="static4"> + Mitglieder in Rolle + </text> + <text name="static5" tool_tip="Eine Liste der Fähigkeiten der aktuell ausgewählten Rolle."> + Zulässige Fähigkeiten + </text> + <check_box label="Mitglieder sind sichtbar" name="role_visible_in_list" tool_tip="Festlegen, ob Mitglieder in dieser Rolle auf der Registerkarte „Allgemein“ für Personen außerhalb der Gruppe sichtbar sind."/> + <scroll_list name="role_allowed_actions" tool_tip="Um detaillierte Informationen zu erlaubten Fähigkeiten anzuzeigen, siehe Reiter Fähigkeiten."> + <column label="" name="icon"/> + <column label="" name="checkbox"/> + <column label="" name="action"/> + </scroll_list> + </panel> + <panel name="actions_footer"> + <text name="static"> + Beschreibung + </text> + <text_editor name="action_description"> + Diese Fähigkeit heißt „Mitglieder aus dieser Gruppe werfen“. Eigentümer können nur von anderen Eigentümern hinausgeworfen werden. + </text_editor> + <text name="static2"> + Rollen mit Fähigkeit + </text> + <text name="static3"> + Mitglieder mit Fähigkeit + </text> + </panel> +</panel> + +<!-- original file + +<?xml version="1.0" encoding="utf-8" standalone="yes"?> +<panel label="Mitglieder und Rollen" name="roles_tab"> + <string name="default_needs_apply_text"> + Das Unterregister enthält nicht übernommene Änderungen. + </string> + <string name="want_apply_text"> + Diese Änderungen übernehmen? + </string> + <button label="?" name="help_button"/> + <panel name="members_header"> + <text name="static"> + Mitglieder und Rollen + </text> + <text name="static2"> + Gruppenmitgliedern werden Rollen mit Fähigkeiten zugewiesen. Diese Einstellungen können zur flexibleren Organisation angepasst werden. </text> </panel> <panel name="roles_header"> @@ -155,3 +312,5 @@ Rechte in einer Gruppe. Es gibt viele verschiedene Fähigkeiten. </text> </panel> </panel> + +--> diff --git a/indra/newview/skins/default/xui/en/accordion_drag.xml b/indra/newview/skins/default/xui/en/accordion_drag.xml new file mode 100644 index 0000000000..94839a7593 --- /dev/null +++ b/indra/newview/skins/default/xui/en/accordion_drag.xml @@ -0,0 +1,8 @@ +<?xml version="1.0" encoding="utf-8" standalone="yes"?> +<panel border_thickness="2" visible ="true" name="splitter_drag" + width="100" + height="5" + left="50" + top="50" + follows="left|bottom|right" background_visible="true" label="splitter_drag" title=""> +</panel> diff --git a/indra/newview/skins/default/xui/en/accordion_parent.xml b/indra/newview/skins/default/xui/en/accordion_parent.xml index 632752b1c4..914a6eddb9 100644 --- a/indra/newview/skins/default/xui/en/accordion_parent.xml +++ b/indra/newview/skins/default/xui/en/accordion_parent.xml @@ -1,6 +1,6 @@ <?xml version="1.0" encoding="utf-8" standalone="yes"?> <panel border_thickness="2" name="splitter_parent" - can_resize="true" background_visible="true" + background_visible="true" label="splitter_parent" title="" > diff --git a/indra/newview/skins/default/xui/en/floater_about.xml b/indra/newview/skins/default/xui/en/floater_about.xml index f52c5d6175..ece0cf737f 100644 --- a/indra/newview/skins/default/xui/en/floater_about.xml +++ b/indra/newview/skins/default/xui/en/floater_about.xml @@ -101,7 +101,7 @@ Voice chat Audio coding: Polycom(R) Siren14(TM) (ITU-T Rec. G.722.1 Annex C) - To be a success in business, be daring, be first, be different. --Henry Marchant + Oh, Parabuild, why hast thou forsaken me? </text_editor> <text_editor follows="left|top|right|bottom" diff --git a/indra/newview/skins/default/xui/en/floater_about_land.xml b/indra/newview/skins/default/xui/en/floater_about_land.xml index 3563780f8b..cb3388ccbc 100644 --- a/indra/newview/skins/default/xui/en/floater_about_land.xml +++ b/indra/newview/skins/default/xui/en/floater_about_land.xml @@ -56,7 +56,7 @@ </panel.string> <panel.string name="area_size_text"> - [AREA] sq.m. + [AREA] m² </panel.string> <panel.string name="auction_id_text"> @@ -264,7 +264,7 @@ Go to World menu > About Land or select another parcel to show its details. layout="topleft" left="96" name="check deed" - tool_tip="A group officer can deed this land to the group, so it will be supported by the group&apos;s land allocation." + tool_tip="A group officer can deed this land to the group, so it will be supported by the group's land allocation." top="164" width="116" /> <button @@ -324,7 +324,7 @@ Go to World menu > About Land or select another parcel to show its details. name="For Sale: Price L$[PRICE]." top_delta="0" width="226"> - Price: L$[PRICE] (L$[PRICE_PER_SQM]/sq.m.). + Price: L$[PRICE] (L$[PRICE_PER_SQM]/m²). </text> <text enabled="false" @@ -437,7 +437,7 @@ Go to World menu > About Land or select another parcel to show its details. name="PriceText" top_delta="0" width="186"> - 4048 sq.m. + 4048 m² </text> <text type="string" @@ -1147,7 +1147,7 @@ Go to World menu > About Land or select another parcel to show its details. name="online_status" width="-1" /> <name_list.columns - dynamicwidth="true" + dynamic_width="true" label="Name" name="name" /> <name_list.columns @@ -1176,7 +1176,7 @@ Go to World menu > About Land or select another parcel to show its details. </panel.string> <panel.string name="search_disabled_small_tooltip"> - This option is disabled because this parcel's area is 128 sq.m. or smaller. + This option is disabled because this parcel's area is 128 m² or smaller. Only large parcels can be listed in search. </panel.string> <panel.string @@ -1234,14 +1234,6 @@ Only large parcels can be listed in search. width="268" /> <check_box height="16" - label="Create Landmarks" - layout="topleft" - left_delta="0" - name="check landmark" - top_pad="4" - width="268" /> - <check_box - height="16" label="Fly" layout="topleft" left_delta="0" @@ -1383,42 +1375,55 @@ Only large parcels can be listed in search. width="130"> <combo_box.item label="Any Category" + name="item0" value="any" /> <combo_box.item label="Linden Location" + name="item1" value="linden" /> <combo_box.item label="Adult" + name="item2" value="adult" /> <combo_box.item label="Arts & Culture" + name="item3" value="arts" /> <combo_box.item label="Business" + name="item4" value="store" /> <combo_box.item label="Educational" + name="item5" value="educational" /> <combo_box.item label="Gaming" + name="item6" value="game" /> <combo_box.item label="Hangout" + name="item7" value="gather" /> <combo_box.item label="Newcomer Friendly" + name="item8" value="newcomer" /> <combo_box.item label="Parks & Nature" + name="item9" value="park" /> <combo_box.item label="Residential" + name="item10" value="home" /> <combo_box.item label="Shopping" + name="item11" value="shopping" /> <combo_box.item label="Other" + name="item12" value="other" /> </combo_box> <combo_box @@ -1432,39 +1437,51 @@ Only large parcels can be listed in search. width="130"> <combo_box.item label="Any Category" + name="item0" value="any" /> <combo_box.item label="Linden Location" + name="item1" value="linden" /> <combo_box.item label="Arts & Culture" + name="item3" value="arts" /> <combo_box.item label="Business" + name="item4" value="store" /> <combo_box.item label="Educational" + name="item5" value="educational" /> <combo_box.item label="Gaming" + name="item6" value="game" /> <combo_box.item label="Hangout" + name="item7" value="gather" /> <combo_box.item label="Newcomer Friendly" + name="item8" value="newcomer" /> <combo_box.item label="Parks & Nature" + name="item9" value="park" /> <combo_box.item label="Residential" + name="item10" value="home" /> <combo_box.item label="Shopping" + name="item11" value="shopping" /> <combo_box.item label="Other" + name="item12" value="other" /> </combo_box> <button @@ -1566,14 +1583,17 @@ Only large parcels can be listed in search. <combo_box.item enabled="true" label="Blocked" + name="Blocked" value="Blocked" /> <combo_box.item enabled="true" label="Landing Point" + name="LandingPoint" value="Landing Point" /> <combo_box.item enabled="true" label="Anywhere" + name="Anywhere" value="Anywhere" /> </combo_box> </panel> @@ -2004,9 +2024,11 @@ Options: width="100"> <combo_box.item label="Anyone" + name="Anyone" value="anyone" /> <combo_box.item label="Group" + name="Group" value="group" /> </combo_box> <spinner diff --git a/indra/newview/skins/default/xui/en/floater_animation_preview.xml b/indra/newview/skins/default/xui/en/floater_animation_preview.xml index 59d0d45425..846dda802d 100644 --- a/indra/newview/skins/default/xui/en/floater_animation_preview.xml +++ b/indra/newview/skins/default/xui/en/floater_animation_preview.xml @@ -4,7 +4,7 @@ height="556" layout="topleft" name="Animation Preview" - width="300"> + width="280"> <floater.string name="failed_to_initialize"> Failed to initialize motion @@ -252,42 +252,55 @@ Maximum animation length is [MAX_LENGTH] seconds. width="104"> <combo_box.item label="Spread" + name="Spread" value="" /> <combo_box.item label="Relaxed" + name="Relaxed" value="Hands_Relaxed" /> <combo_box.item label="Point Both" + name="PointBoth" value="Hands_Point" /> <combo_box.item label="Fist" + name="Fist" value="Hands_Fist" /> <combo_box.item label="Relaxed Left" + name="RelaxedLeft" value="Hands_Relaxed_L" /> <combo_box.item label="Point Left" + name="PointLeft" value="Hands_Point_L" /> <combo_box.item label="Fist Left" + name="FistLeft" value="Hands_Fist_L" /> <combo_box.item label="Relaxed Right" + name="RelaxedRight" value="Hands_Relaxed_R" /> <combo_box.item label="Point Right" + name="PointRight" value="Hands_Point_R" /> <combo_box.item label="Fist Right" + name="FistRight" value="Hands_Fist_R" /> <combo_box.item label="Salute Right" + name="SaluteRight" value="Hands_Salute_R" /> <combo_box.item label="Typing" + name="Typing" value="Hands_Typing" /> <combo_box.item label="Peace Right" + name="PeaceRight" value="Hands_Peace_R" /> </combo_box> <text @@ -310,45 +323,65 @@ Maximum animation length is [MAX_LENGTH] seconds. top_delta="-1" width="104"> <combo_box.item - label="None]" /> + label="(None)" + name="[None]" /> <combo_box.item - label="Aaaaah" /> + label="Aaaaah" + name="Aaaaah" /> <combo_box.item - label="Afraid" /> + label="Afraid" + name="Afraid" /> <combo_box.item - label="Angry" /> + label="Angry" + name="Angry" /> <combo_box.item - label="Big Smile" /> + label="Big Smile" + name="BigSmile" /> <combo_box.item - label="Bored" /> + label="Bored" + name="Bored" /> <combo_box.item - label="Cry" /> + label="Cry" + name="Cry" /> <combo_box.item - label="Disdain" /> + label="Disdain" + name="Disdain" /> <combo_box.item - label="Embarrassed" /> + label="Embarrassed" + name="Embarrassed" /> <combo_box.item - label="Frown" /> + label="Frown" + name="Frown" /> <combo_box.item - label="Kiss" /> + label="Kiss" + name="Kiss" /> <combo_box.item - label="Laugh" /> + label="Laugh" + name="Laugh" /> <combo_box.item - label="Plllppt" /> + label="Plllppt" + name="Plllppt" /> <combo_box.item - label="Repulsed" /> + label="Repulsed" + name="Repulsed" /> <combo_box.item - label="Sad" /> + label="Sad" + name="Sad" /> <combo_box.item - label="Shrug" /> + label="Shrug" + name="Shrug" /> <combo_box.item - label="Smile" /> + label="Smile" + name="Smile" /> <combo_box.item - label="Surprise" /> + label="Surprise" + name="Surprise" /> <combo_box.item - label="Wink" /> + label="Wink" + name="Wink" /> <combo_box.item - label="Worry" /> + label="Worry" + name="Worry" /> </combo_box> <text type="string" @@ -371,13 +404,17 @@ Maximum animation length is [MAX_LENGTH] seconds. top_delta="-1" width="104"> <combo_box.item - label="Standing" /> + label="Standing" + name="Standing" /> <combo_box.item - label="Walking" /> + label="Walking" + name="Walking" /> <combo_box.item - label="Sitting" /> + label="Sitting" + name="Sitting" /> <combo_box.item - label="Flying" /> + label="Flying" + name="Flying" /> </combo_box> <spinner follows="left|top" @@ -385,7 +422,7 @@ Maximum animation length is [MAX_LENGTH] seconds. increment="0.01" initial_value="0" label="Ease In (sec)" - label_width="65" + label_width="75" layout="topleft" left="10" max_val="10" @@ -399,14 +436,14 @@ Maximum animation length is [MAX_LENGTH] seconds. increment="0.01" initial_value="0" label="Ease Out (sec)" - label_width="75" + label_width="80" layout="topleft" - left_pad="15" + left_pad="10" max_val="10" name="ease_out_time" tool_tip="Amount of time (in seconds) over which animations blends out." top_delta="0" - width="135" /> + width="130" /> <button follows="top|right" height="28" @@ -440,7 +477,7 @@ Maximum animation length is [MAX_LENGTH] seconds. layout="topleft" left="80" name="playback_slider" - right="290" + right="275" show_text="false" /> <text type="string" @@ -461,7 +498,7 @@ We recommend BVH files exported from Poser 4. label="Cancel" layout="topleft" name="cancel_btn" - right="290" + right="265" width="123" /> <button follows="bottom|left" 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 cf75da078e..0414ab5fa6 100644 --- a/indra/newview/skins/default/xui/en/floater_bulk_perms.xml +++ b/indra/newview/skins/default/xui/en/floater_bulk_perms.xml @@ -1,11 +1,11 @@ <?xml version="1.0" encoding="utf-8" standalone="yes" ?> <floater can_tear_off="false" - height="340" + height="360" layout="topleft" name="floaterbulkperms" title="Bulk change content permissions" - width="480"> + width="280"> <floater.string name="nothing_to_modify_text"> Selection contains no editable contents. @@ -109,30 +109,12 @@ width="126" /> <icon height="16" - image_name="inv_item_landmark_visited.tga" - layout="topleft" - left="12" - mouse_opaque="true" - name="icon_landmark" - top="134" - width="16" /> - <check_box - control_name="BulkChangeIncludeLandmarks" - height="16" - label="Landmarks" - layout="topleft" - left_pad="2" - name="check_landmark" - top_delta="0" - width="126" /> - <icon - height="16" image_name="inv_item_notecard.tga" layout="topleft" left="12" mouse_opaque="true" name="icon_notecard" - top="154" + top="134" width="16" /> <check_box control_name="BulkChangeIncludeNotecards" @@ -150,7 +132,7 @@ left="12" mouse_opaque="true" name="icon_object" - top="174" + top="154" width="16" /> <check_box control_name="BulkChangeIncludeObjects" @@ -168,7 +150,7 @@ left="12" mouse_opaque="true" name="icon_script" - top="194" + top="174" width="16" /> <check_box control_name="BulkChangeIncludeScripts" @@ -186,7 +168,7 @@ left="12" mouse_opaque="true" name="icon_sound" - top="214" + top="194" width="16" /> <check_box control_name="BulkChangeIncludeSounds" @@ -204,7 +186,7 @@ left="12" mouse_opaque="true" name="icon_texture" - top="234" + top="214" width="16" /> <check_box control_name="BulkChangeIncludeTextures" @@ -224,7 +206,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 +219,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" @@ -242,7 +230,7 @@ font="SansSerif" height="10" layout="topleft" - left="165" + left="140" name="newperms" top="30" width="206"> @@ -253,7 +241,7 @@ height="16" label="Share with group" layout="topleft" - left="170" + left="140" name="share_with_group" top="54" width="106" /> @@ -295,36 +283,42 @@ 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" layout="topleft" - left_delta="88" + left="145" name="next_owner_transfer" - top_delta="0" + top_delta="20" width="106" /> <scroll_list enabled="false" follows="left|top|right|bottom" height="130" layout="topleft" - left="130" + left="120" name="queue output" - top="170" - width="335" /> + top="185" + width="150" /> <button follows="left|top" height="20" label="Apply" layout="topleft" - left="265" + left="65" name="apply" - top="310" - width="100" /> + top_pad="10" + width="100"> + <button.commit_callback + function="BulkPermission.Apply"/> + </button> <button follows="left|top" height="20" @@ -333,5 +327,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_buy_contents.xml b/indra/newview/skins/default/xui/en/floater_buy_contents.xml index 174337480a..0930043659 100644 --- a/indra/newview/skins/default/xui/en/floater_buy_contents.xml +++ b/indra/newview/skins/default/xui/en/floater_buy_contents.xml @@ -1,14 +1,14 @@ <?xml version="1.0" encoding="utf-8" standalone="yes" ?> <floater can_resize="true" - height="250" + height="300" layout="topleft" min_height="150" min_width="200" name="floater_buy_contents" save_rect="true" title="Buy Contents" - width="300"> + width="280"> <floater.string name="no_copy_text"> (no copy) @@ -41,7 +41,7 @@ left_delta="0" name="item_list" top_pad="4" - width="281"> + width="250"> <scroll_list.columns name="icon" width="16" /> @@ -62,33 +62,33 @@ width="281"> Buy for L$[AMOUNT] from [NAME]? </text> - <button - follows="right|bottom" + <check_box + follows="left|bottom" height="20" - label="Cancel" - label_selected="Cancel" + label="Wear clothing now" layout="topleft" - left="216" - name="cancel_btn" + left_delta="0" + name="wear_check" top="224" - width="60" /> + width="135" /> <button follows="right|bottom" height="20" label="Buy" label_selected="Buy" layout="topleft" - left_delta="-64" + left_delta="0" name="buy_btn" - top_delta="0" - width="60" /> - <check_box - follows="left|bottom" + top_pad="10" + width="125" /> + <button + follows="right|bottom" height="20" - label="Wear clothing now" + label="Cancel" + label_selected="Cancel" layout="topleft" - left_delta="-139" - name="wear_check" + left_pad="5" + name="cancel_btn" top_delta="0" - width="135" /> + width="125" /> </floater> diff --git a/indra/newview/skins/default/xui/en/floater_buy_land.xml b/indra/newview/skins/default/xui/en/floater_buy_land.xml index e11534cc13..ca025346fd 100644 --- a/indra/newview/skins/default/xui/en/floater_buy_land.xml +++ b/indra/newview/skins/default/xui/en/floater_buy_land.xml @@ -104,7 +104,7 @@ Try selecting a smaller area. </floater.string> <floater.string name="land_holdings"> - You hold [BUYER] sq.m. of land. + You hold [BUYER] m² of land. </floater.string> <floater.string name="pay_to_for_land"> @@ -116,19 +116,19 @@ Try selecting a smaller area. </floater.string> <floater.string name="parcel_meters"> - This parcel is [AMOUNT] sq.m. + This parcel is [AMOUNT] m² </floater.string> <floater.string name="premium_land"> - This land is premium, and will charge as [AMOUNT] sq.m. + This land is premium, and will charge as [AMOUNT] m². </floater.string> <floater.string name="discounted_land"> - This land is discounted, and will charge as [AMOUNT] sq.m. + This land is discounted, and will charge as [AMOUNT] m². </floater.string> <floater.string name="meters_supports_object"> - [AMOUNT] sq.m. + [AMOUNT] m² supports [AMOUNT2] objects </floater.string> <floater.string @@ -142,7 +142,7 @@ supports [AMOUNT2] objects <floater.string name="info_price_string"> L$ [PRICE] -(L$ [PRICE_PER_SQM]/sq.m.) +(L$ [PRICE_PER_SQM]/m²) [SOLD_WITH_OBJECTS] </floater.string> <floater.string @@ -413,7 +413,7 @@ supports [AMOUNT2] objects name="info_size" top_delta="-1" width="180"> - 1024 sq.m. + 1024 m² </text> <text type="string" @@ -437,7 +437,7 @@ supports [AMOUNT2] objects top_delta="-1" width="180"> L$ 1500 -(L$ 1.1/sq.m.) +(L$ 1.1/m²) sold with objects </text> <text @@ -531,11 +531,14 @@ sold with objects name="account_level" width="336"> <combo_box.item - label="US$9.95/month, billed monthly" /> + label="US$9.95/month, billed monthly" + name="US$9.95/month,billedmonthly" /> <combo_box.item - label="US$7.50/month, billed quarterly" /> + label="US$7.50/month, billed quarterly" + name="US$7.50/month,billedquarterly" /> <combo_box.item - label="US$6.00/month, billed annually" /> + label="US$6.00/month, billed annually" + name="US$6.00/month,billedannually" /> </combo_box> <locate height="10" @@ -572,8 +575,8 @@ sold with objects name="land_use_reason" right="435" width="215"> - You hold 1309 sq.m. of land. - This parcel is 512 sq.m. of land. + You hold 1309 m² of land. + This parcel is 512 m² of land. </text> <locate height="10" @@ -668,7 +671,7 @@ sold with objects <check_box follows="bottom|left" height="20" - label="Remove [AMOUNT] square meters of contribution from group." + label="Remove [AMOUNT] m² of contribution from group." layout="topleft" left_delta="3" name="remove_contribution" diff --git a/indra/newview/skins/default/xui/en/floater_buy_object.xml b/indra/newview/skins/default/xui/en/floater_buy_object.xml index 44ef32ee36..24010dda93 100644 --- a/indra/newview/skins/default/xui/en/floater_buy_object.xml +++ b/indra/newview/skins/default/xui/en/floater_buy_object.xml @@ -8,7 +8,7 @@ name="contents" save_rect="true" title="Buy Copy of Object" - width="300"> + width="280"> <floater.string name="title_buy_text"> Buy @@ -36,13 +36,13 @@ left="15" name="object_list" top="24" - width="281"> + width="250"> <scroll_list.columns name="icon" width="16" /> <scroll_list.columns name="text" - width="300" /> + width="234" /> </scroll_list> <text type="string" @@ -54,7 +54,7 @@ left_delta="0" name="contents_text" top_pad="4" - width="281"> + width="250"> and its contents: </text> <scroll_list @@ -64,13 +64,13 @@ left_delta="0" name="item_list" top_pad="4" - width="281"> + width="250"> <scroll_list.columns name="icon" width="16" /> <scroll_list.columns name="text" - width="300" /> + width="234" /> </scroll_list> <text type="string" @@ -88,21 +88,21 @@ <button follows="right|bottom" height="20" - label="Cancel" - label_selected="Cancel" + label="Buy" + label_selected="Buy" layout="topleft" - left="216" - name="cancel_btn" - top="224" - width="60" /> + left="10" + name="buy_btn" + top_pad="5" + width="125" /> <button follows="right|bottom" height="20" - label="Buy" - label_selected="Buy" + label="Cancel" + label_selected="Cancel" layout="topleft" - left_delta="-64" - name="buy_btn" + left_pad="5" + name="cancel_btn" top_delta="0" - width="60" /> + width="125" /> </floater> diff --git a/indra/newview/skins/default/xui/en/floater_camera.xml b/indra/newview/skins/default/xui/en/floater_camera.xml index 7f24b11d14..343ff893e8 100644 --- a/indra/newview/skins/default/xui/en/floater_camera.xml +++ b/indra/newview/skins/default/xui/en/floater_camera.xml @@ -7,6 +7,7 @@ layout="topleft" name="camera_floater" save_rect="true" + save_visibility="true" width="176"> <floater.string name="rotate_tooltip"> diff --git a/indra/newview/skins/default/xui/en/floater_gesture.xml b/indra/newview/skins/default/xui/en/floater_gesture.xml index c4d024ae8b..f042385fb4 100644 --- a/indra/newview/skins/default/xui/en/floater_gesture.xml +++ b/indra/newview/skins/default/xui/en/floater_gesture.xml @@ -4,10 +4,10 @@ height="465" layout="topleft" min_height="200" - min_width="350" + min_width="280" name="gestures" title="Active Gestures" - width="350"> + width="280"> <floater.string name="loading"> Loading... @@ -24,7 +24,7 @@ layout="topleft" left="15" name="help_label"> - Double-click a gesture to play animations and sounds. + Double-click a gesture to play. </text> <scroll_list bottom_delta="390" @@ -36,21 +36,21 @@ name="gesture_list" right="-15"> <scroll_list.columns + label="Name" + name="name" + width="90" /> + <scroll_list.columns label="Trigger" name="trigger" - width="70" /> - <scroll_list.columns - label="Key" - name="shortcut" - width="70" /> - <scroll_list.columns + width="80" /> + <scroll_list.columns label="" name="key" width="-1" /> <scroll_list.columns - label="Name" - name="name" - width="160" /> + label="Key" + name="shortcut" + width="50" /> </scroll_list> <button follows="bottom|right" @@ -89,3 +89,4 @@ top_delta="0" width="83" /> </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..e421b1bb5d 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" @@ -352,7 +415,7 @@ name="land cost text" top_delta="0" width="110"> - L$ per sq. meter: + L$ per m²: </text> <button follows="top|right" @@ -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" @@ -609,9 +717,11 @@ width="290"> <combo_box.item label="Selection" + name="item1" value="Selection" /> <combo_box.item label="Agent Region" + name="item2" value="Agent Region" /> </combo_box> <text @@ -636,15 +746,19 @@ width="290"> <combo_box.item label="colliders <steps>" + name="item1" value="colliders <steps>" /> <combo_box.item label="scripts <count>,<optional pattern>" + name="item2" value="scripts <count>,<optional pattern>" /> <combo_box.item label="objects <pattern>" + name="item3" value="objects <pattern>" /> <combo_box.item label="rez <asset_id>" + name="item4" value="rez <asset_id>" /> </combo_box> <text @@ -679,7 +793,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_hardware_settings.xml b/indra/newview/skins/default/xui/en/floater_hardware_settings.xml index f0e2911fd8..19fba52500 100644 --- a/indra/newview/skins/default/xui/en/floater_hardware_settings.xml +++ b/indra/newview/skins/default/xui/en/floater_hardware_settings.xml @@ -50,18 +50,23 @@ width="64"> <combo_box.item label="Disabled" + name="FSAADisabled" value="0" /> <combo_box.item label="2x" + name="2x" value="2" /> <combo_box.item label="4x" + name="4x" value="4" /> <combo_box.item label="8x" + name="8x" value="8" /> <combo_box.item label="16x" + name="16x" value="16" /> </combo_box> <spinner diff --git a/indra/newview/skins/default/xui/en/floater_im.xml b/indra/newview/skins/default/xui/en/floater_im.xml index 7493a9a90d..e8b8fee678 100644 --- a/indra/newview/skins/default/xui/en/floater_im.xml +++ b/indra/newview/skins/default/xui/en/floater_im.xml @@ -24,7 +24,7 @@ </multi_floater.string> <multi_floater.string name="muted_message"> - You have muted this resident. Sending a message will automatically unmute them. + You have blocked this resident. Sending a message will automatically unblock them. </multi_floater.string> <multi_floater.string name="generic_request_error"> 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..44c56e4207 --- /dev/null +++ b/indra/newview/skins/default/xui/en/floater_im_session.xml @@ -0,0 +1,67 @@ +<?xml version="1.0" encoding="utf-8" standalone="yes" ?>
+<floater
+ background_visible="true"
+ follows="left|top|right|bottom"
+ height="250"
+ layout="topleft"
+ left="0"
+ name="panel_im"
+ top="0"
+ can_dock="true"
+ can_minimize="false"
+ visible="false"
+ width="315">
+ <layout_stack follows="left|top|right|bottom"
+ height="235"
+ width="315"
+ layout="topleft"
+ orientation="horizontal"
+ name="im_panels"
+ top="16"
+ left="2">
+ <layout_panel
+ class="panel_im_control_panel"
+ name="panel_im_control_panel"
+ filename="panel_im_control_panel.xml"
+ layout="topleft"
+ top_delta="-3"
+ min_width="96"
+ width="96"
+ height="225"
+ label="IM Control Panel"
+ user_resize="false" />
+ <layout_panel height="235"
+ width="200"
+ left_delta="96"
+ top="0"
+ user_resize="false">
+ <button height="12"
+ top="8"
+ label="<<"
+ layout="topleft"
+ width="35"
+ name="slide_left_btn" />
+ <button height="12"
+ top="8"
+ label=">>"
+ layout="topleft"
+ width="35"
+ name="slide_right_btn" />
+ <text_editor
+ enabled="false"
+ type="string"
+ length="1"
+ follows="left|top|right"
+ font="SansSerif"
+ height="185"
+ layout="topleft"
+ max_length="2147483647"
+ name="im_text"
+ width="195"
+ word_wrap="true">
+ </text_editor>
+ <line_editor name="chat_editor" height="20" layout="topleft" width="190">
+ </line_editor>
+ </layout_panel>
+ </layout_stack>
+</floater>
diff --git a/indra/newview/skins/default/xui/en/floater_image_preview.xml b/indra/newview/skins/default/xui/en/floater_image_preview.xml index 907376b1e9..6fface12a3 100644 --- a/indra/newview/skins/default/xui/en/floater_image_preview.xml +++ b/indra/newview/skins/default/xui/en/floater_image_preview.xml @@ -61,25 +61,35 @@ top_delta="3" width="160"> <combo_box.item - label="Image" /> + label="Image" + name="Image" /> <combo_box.item - label="Hair" /> + label="Hair" + name="Hair" /> <combo_box.item - label="Female Head" /> + label="Female Head" + name="FemaleHead" /> <combo_box.item - label="Female Upper Body" /> + label="Female Upper Body" + name="FemaleUpperBody" /> <combo_box.item - label="Female Lower Body" /> + label="Female Lower Body" + name="FemaleLowerBody" /> <combo_box.item - label="Male Head" /> + label="Male Head" + name="MaleHead" /> <combo_box.item - label="Male Upper Body" /> + label="Male Upper Body" + name="MaleUpperBody" /> <combo_box.item - label="Male Lower Body" /> + label="Male Lower Body" + name="MaleLowerBody" /> <combo_box.item - label="Skirt" /> + label="Skirt" + name="Skirt" /> <combo_box.item - label="Sculpted Prim" /> + label="Sculpted Prim" + name="SculptedPrim" /> </combo_box> <text type="string" diff --git a/indra/newview/skins/default/xui/en/floater_inspect.xml b/indra/newview/skins/default/xui/en/floater_inspect.xml index ed3b4f00f2..b43cdca0d1 100644 --- a/indra/newview/skins/default/xui/en/floater_inspect.xml +++ b/indra/newview/skins/default/xui/en/floater_inspect.xml @@ -25,21 +25,23 @@ tool_tip="Select an object from this list to highlight it in-world" top="20"> <scroll_list.columns - dynamicwidth="true" + dynamic_width="true" label="Object Name" name="object_name" /> <scroll_list.columns - dynamicwidth="true" + dynamic_width="true" label="Owner Name" name="owner_name" /> <scroll_list.columns - dynamicwidth="true" + dynamic_width="true" label="Creator Name" name="creator_name" /> <scroll_list.columns 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_inventory.xml b/indra/newview/skins/default/xui/en/floater_inventory.xml index eb05fe1883..6a54c187cb 100644 --- a/indra/newview/skins/default/xui/en/floater_inventory.xml +++ b/indra/newview/skins/default/xui/en/floater_inventory.xml @@ -23,7 +23,7 @@ name="Fetched"> Fetched </floater.string> - <search_editor + <filter_editor follows="left|top|right" height="16" label="Type here to search" diff --git a/indra/newview/skins/default/xui/en/floater_inventory_view_finder.xml b/indra/newview/skins/default/xui/en/floater_inventory_view_finder.xml index 8bff916f9d..f07a146471 100644 --- a/indra/newview/skins/default/xui/en/floater_inventory_view_finder.xml +++ b/indra/newview/skins/default/xui/en/floater_inventory_view_finder.xml @@ -5,7 +5,7 @@ layout="topleft" name="Inventory Finder" title="inventory_recent_items" - width="160"> + width="280"> <icon height="16" image_name="inv_item_animation.tga" diff --git a/indra/newview/skins/default/xui/en/floater_joystick.xml b/indra/newview/skins/default/xui/en/floater_joystick.xml index 032ff21b58..b9c1b08c68 100644 --- a/indra/newview/skins/default/xui/en/floater_joystick.xml +++ b/indra/newview/skins/default/xui/en/floater_joystick.xml @@ -121,21 +121,24 @@ label="Direct Zoom" layout="topleft" left="185" - name="ZoomDirect" /> + name="ZoomDirect" + width="60" /> <check_box bottom_delta="0" control_name="Cursor3D" label="3D Cursor" layout="topleft" left="310" - name="Cursor3D" /> + name="Cursor3D" + width="60" /> <check_box bottom_delta="0" control_name="AutoLeveling" label="Auto Level" layout="topleft" left="420" - name="AutoLeveling" /> + name="AutoLeveling" + width="60" /> <text type="string" length="1" 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_land_holdings.xml b/indra/newview/skins/default/xui/en/floater_land_holdings.xml index 0ed4bb4e07..0a97a96ee3 100644 --- a/indra/newview/skins/default/xui/en/floater_land_holdings.xml +++ b/indra/newview/skins/default/xui/en/floater_land_holdings.xml @@ -1,13 +1,13 @@ <?xml version="1.0" encoding="utf-8" standalone="yes" ?> <floater - height="383" + height="400" layout="topleft" name="land holdings floater" title="My Land" - width="600"> + width="280"> <floater.string name="area_string"> - [AREA] sq. meters + [AREA] m² </floater.string> <scroll_list draw_heading="true" @@ -16,23 +16,23 @@ left="8" name="parcel list" top="24" - width="584"> + width="270"> <scroll_list.columns - label="Parcel Name" + label="Parcel" name="name" - width="163" /> + width="69" /> <scroll_list.columns label="Region" name="location" - width="175" /> + width="74" /> <scroll_list.columns label="Type" name="type" - width="140" /> + width="55" /> <scroll_list.columns label="Area" name="area" - width="87" /> + width="10" /> <scroll_list.columns label="" name="hidden" @@ -40,6 +40,7 @@ </scroll_list> <button height="20" + font="SansSerifSmall" label="Teleport" label_selected="Teleport" layout="topleft" @@ -50,6 +51,7 @@ width="100" /> <button height="20" + font="SansSerifSmall" label="Show on Map" label_selected="Show on Map" layout="topleft" @@ -77,15 +79,15 @@ left_delta="-4" name="grant list" top_pad="4" - width="584"> + width="270"> <scroll_list.columns label="Group" name="group" - width="330" /> + width="125" /> <scroll_list.columns label="Area" name="area" - width="220" /> + width="125" /> </scroll_list> <text type="string" @@ -96,8 +98,9 @@ left_delta="4" name="allowed_label" top_pad="4" - width="348"> - Allowed land holdings at current payment plan: + width="150"> + Allowed land holdings at +current payment plan: </text> <text type="string" @@ -105,11 +108,11 @@ follows="left|top" height="16" layout="topleft" - left_delta="340" + left_pad="5" name="allowed_text" - top_delta="0" + top_delta="10" width="132"> - [AREA] sq. meters + [AREA] m² </text> <text type="string" @@ -119,8 +122,8 @@ layout="topleft" left="12" name="current_label" - top="341" - width="348"> + top_pad="5" + width="150"> Current land holdings: </text> <text @@ -129,11 +132,11 @@ follows="left|top" height="16" layout="topleft" - left_delta="340" + left_pad="5" name="current_text" top_delta="0" width="132"> - [AREA] sq. meters + [AREA] m² </text> <text type="string" @@ -144,9 +147,10 @@ layout="topleft" left="12" name="available_label" - top="361" - width="348"> - Available for land purchases: + top_pad="5" + width="150"> + Available for land +purchases: </text> <text type="string" @@ -155,10 +159,10 @@ font="SansSerifBold" height="16" layout="topleft" - left_delta="340" + left_pad="5" name="available_text" - top_delta="0" + top_delta="5" width="140"> - [AREA] sq. meters + [AREA] m² </text> -</floater> +</floater>
\ No newline at end of file diff --git a/indra/newview/skins/default/xui/en/floater_live_lsleditor.xml b/indra/newview/skins/default/xui/en/floater_live_lsleditor.xml index 0735ac160a..6d6c6c6644 100644 --- a/indra/newview/skins/default/xui/en/floater_live_lsleditor.xml +++ b/indra/newview/skins/default/xui/en/floater_live_lsleditor.xml @@ -14,7 +14,7 @@ width="500"> <floater.string name="not_allowed"> - You are not allowed to view this script. + You can not view or edit this script, since it has been set as "no copy". You need full permissions to view or edit a script inside an object. </floater.string> <floater.string name="script_running"> 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..a277294be1 100644 --- a/indra/newview/skins/default/xui/en/floater_media_browser.xml +++ b/indra/newview/skins/default/xui/en/floater_media_browser.xml @@ -9,41 +9,71 @@ save_rect="true" title="Media Browser" width="820"> + <!--TODO: ADD CLOSE X TO WINDOW--> + <!-- <button + follows="bottom|right" + height="20" + label="Close" + layout="topleft" + left_pad="80" + name="close" + top_delta="0" + width="70"> + <button.commit_callback + function="MediaBrowser.Close" /> + </button>--> <layout_stack - bottom="440" follows="left|right|top|bottom" layout="topleft" left="10" name="stack1" top="20" - width="800"> + width="800" + height="400" + > <layout_panel auto_resize="false" - height="20" layout="topleft" - left="0" name="nav_controls" - top="400" - user_resize="false" - width="800"> + user_resize="false"> <button - follows="left|top" - height="20" - label="Back" - layout="topleft" - left="0" - name="back" - top="0" - width="55" /> + left="1" + follows="left|top" + font="SansSerifSmall" + height="20" + image_disabled="PushButton_Disabled" + image_disabled_selected="PushButton_Disabled" + image_overlay="Arrow_Left_Off" + image_selected="PushButton_Selected" + image_unselected="PushButton_Off" + hover_glow_amount="0.15" + layout="topleft" + name="back" + picture_style="true" + tool_tip="Go back to previous location" + width="20"> + <button.commit_callback + function="MediaBrowser.Back" /> + </button> <button - follows="left|top" - height="20" - label="Forward" - layout="topleft" - left_pad="3" - name="forward" - top_delta="0" - width="68" /> + follows="left|top" + font="SansSerifSmall" + height="20" + image_disabled="PushButton_Disabled" + image_disabled_selected="PushButton_Disabled" + image_overlay="Arrow_Right_Off" + image_selected="PushButton_Selected" + image_unselected="PushButton_Off" + hover_glow_amount="0.15" + layout="topleft" + left_pad="2" + name="forward" + picture_style="true" + tool_tip="Go forward one location" + width="20"> + <button.commit_callback + function="MediaBrowser.Forward" /> + </button> <button enabled="false" follows="left|top" @@ -52,18 +82,26 @@ layout="topleft" 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" - height="20" - layout="topleft" - left_pad="5" - max_chars="255" name="address" - top_delta="0" - width="540" /> + follows="left|right|top" + halign="right" + height="20" + label="Location" + layout="topleft" + left_pad="5" + max_chars="254" + mouse_opaque="false" + top_delta="0" + width="340"> + <combo_box.commit_callback + function="MediaBrowser.EnterAddress" /> + </combo_box> <button enabled="false" follows="right|top" @@ -72,19 +110,31 @@ layout="topleft" left_pad="5" name="go" - top_delta="0" - width="55" /> - </layout_panel> - <layout_panel - auto_resize="false" - height="20" - layout="topleft" - left_delta="0" - name="parcel_owner_controls" - top_delta="0" - user_resize="false" - width="540"> + width="50"> + <button.commit_callback + function="MediaBrowser.Go" /> + </button> <button + follows="right|top" + height="20" + left_pad="20" + label="Open in My Browser" + layout="topleft" + name="open_browser" + width="145"> + <button.commit_callback + function="MediaBrowser.OpenWebBrowser" /> + </button> + <check_box + control_name="UseExternalBrowser" + follows="right|top" + label="Always" + layout="topleft" + left_pad="5" + width="140" + name="open_always" /> + <!-- + <button enabled="false" follows="left|top" height="20" @@ -93,52 +143,23 @@ left="0" name="assign" top="0" - width="200" /> - </layout_panel> + width="200"> + <button.commit_callback + function="MediaBrowser.Assign" /> + </button> + </layout_panel> <layout_panel - height="20" + auto_resize="false" layout="topleft" - left_delta="0" - name="external_controls" - top_delta="0" - user_resize="false" - width="540"> - <web_browser - bottom="-10" + name="browser" + left="0" + top="0" + user_resize="false">--> + <web_browser follows="left|right|top|bottom" layout="topleft" left="0" - name="browser" - top="0" - width="540" /> - <button - follows="bottom|left" - height="20" - label="Open in My Web Browser" - layout="topleft" - left_delta="0" - name="open_browser" - top_pad="5" - width="185" /> - <check_box - control_name="UseExternalBrowser" - follows="bottom|left" - height="20" - label="Always open in my web browser" - layout="topleft" - left_pad="5" - name="open_always" - top_delta="0" - width="200" /> - <button - follows="bottom|right" - height="20" - label="Close" - layout="topleft" - left_pad="80" - name="close" - top_delta="0" - width="70" /> + name="browser" /> </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_moveview.xml b/indra/newview/skins/default/xui/en/floater_moveview.xml index 47342ffc5b..7666a2494d 100644 --- a/indra/newview/skins/default/xui/en/floater_moveview.xml +++ b/indra/newview/skins/default/xui/en/floater_moveview.xml @@ -7,6 +7,7 @@ layout="topleft" name="move_floater" save_rect="true" + save_visibility="true" width="135"> <button follows="left|bottom" diff --git a/indra/newview/skins/default/xui/en/floater_mute_object.xml b/indra/newview/skins/default/xui/en/floater_mute_object.xml index 7a0ec8282c..6b6b2c80ba 100644 --- a/indra/newview/skins/default/xui/en/floater_mute_object.xml +++ b/indra/newview/skins/default/xui/en/floater_mute_object.xml @@ -4,7 +4,7 @@ height="140" layout="topleft" name="mute by name" - title="Mute object by name" + title="Block object by name" width="375"> <text type="string" @@ -18,7 +18,7 @@ left_delta="25" name="message" right="380"> - Mute by name only affects object chat and IM, not sounds. + Block by name only affects object chat and IM, not sounds. You must type the object's name exactly. </text> <line_editor diff --git a/indra/newview/skins/default/xui/en/floater_nearby_chat.xml b/indra/newview/skins/default/xui/en/floater_nearby_chat.xml index afac4a4051..2d67e3d5a9 100644 --- a/indra/newview/skins/default/xui/en/floater_nearby_chat.xml +++ b/indra/newview/skins/default/xui/en/floater_nearby_chat.xml @@ -28,5 +28,21 @@ color="1 1 1 1" enabled="true" image_name="closebox.tga" name="close_btn"/> </panel> - <chat_history_view bottom="0" width="250" height="320" follows="left|right|top|bottom" name="chat_scroll" /> + <text_editor + bg_readonly_color="ChatHistoryBgColor" + bg_writeable_color="ChatHistoryBgColor" + follows="left|top|right|bottom" + font="SansSerif" + layout="topleft" + height="320" + max_length="2147483647" + name="Chat History Editor" + read_only="true" + text_color="ChatHistoryTextColor" + text_readonly_color="ChatHistoryTextColor" + bottom="0" + track_bottom="true" + width="250" + word_wrap="true" /> + </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_preferences.xml b/indra/newview/skins/default/xui/en/floater_preferences.xml index 1760d5b818..8a76c2167f 100644 --- a/indra/newview/skins/default/xui/en/floater_preferences.xml +++ b/indra/newview/skins/default/xui/en/floater_preferences.xml @@ -15,7 +15,7 @@ label="OK" label_selected="OK" layout="topleft" - left="335" + left="427" name="OK" top="435" width="90"> @@ -35,44 +35,6 @@ <button.commit_callback function="Pref.Cancel" /> </button> - <button - follows="right|bottom" - height="20" - label="Apply" - label_selected="Apply" - layout="topleft" - left_pad="3" - name="Apply" - top_delta="0" - width="90"> - <button.commit_callback - function="Pref.Apply" /> - </button> - <button - follows="left|bottom" - height="20" - label="About" - label_selected="About" - layout="topleft" - left_delta="-512" - name="About..." - top_delta="0" - width="90"> - <button.commit_callback - function="Floater.Show" - parameter="sl_about" /> - </button> - <button - follows="left|bottom" - height="20" - help_url="https://support.secondlife.com/ics/support/default.asp?deptID=4417" - label="Help" - label_selected="Help" - layout="topleft" - left_pad="3" - name="Help" - top_delta="0" - width="90" /> <tab_container follows="left|top|right|bottom" height="410" @@ -91,64 +53,116 @@ layout="topleft" name="general" /> <panel + filename="panel_preferences_graphics1.xml" + label="Graphics" + layout="topleft" + name="display" /> + <panel class="panel_preference" - filename="panel_preferences_input.xml" - label="Input & Camera" + filename="panel_preferences_im.xml" + label="Privacy" layout="topleft" - name="input" /> + name="im" /> <panel class="panel_preference" - filename="panel_preferences_network.xml" - label="Network" + filename="panel_preferences_audio.xml" + label="Sound" layout="topleft" - name="network" /> + name="audio" /> <panel class="panel_preference" - filename="panel_preferences_web.xml" - label="Web" + filename="panel_preferences_chat.xml" + label="Chat" layout="topleft" - name="web" /> + name="chat" /> <panel class="panel_preference" - filename="panel_preferences_graphics1.xml" - label="Graphics" + filename="panel_preferences_popups.xml" + label="Alerts" layout="topleft" - name="display" /> + name="msgs" /> <panel class="panel_preference" - filename="panel_preferences_audio.xml" - label="Audio & Video" + filename="panel_preferences_input.xml" + label="Setup" layout="topleft" - name="audio" /> + name="input" /> + <!-- I put back the commented out panels for now, pending + implementation of new default settings. James --> <panel class="panel_preference" - filename="panel_preferences_chat.xml" - label="Text Chat" + filename="panel_preferences_advanced.xml" + label="Advanced" layout="topleft" - name="chat" /> + name="advanced1" /> <panel class="panel_preference" - filename="panel_preferences_voice.xml" - label="Voice Chat" + filename="panel_preferences_advanced2.xml" + label="Move, not to Advanced" layout="topleft" - name="voice" /> + name="advanced2" /> <panel class="panel_preference" - filename="panel_preferences_im.xml" - label="Communication" + filename="panel_preferences_advanced3.xml" + label="Not in specs" layout="topleft" - name="im" /> + name="advanced3" /> <panel class="panel_preference" - filename="panel_preferences_popups.xml" - label="Popups" + filename="panel_preferences_advanced4.xml" + label="Storage/Kill" layout="topleft" - name="msgs" /> + name="advanced4" /> + <!--panel + class="panel_preference" + filename="panel_preferences_network.xml" + label="Network" + layout="topleft" + name="network" /> + <panel + class="panel_preference" + filename="panel_preferences_web.xml" + label="Web" + layout="topleft" + name="web" /> + <panel + class="panel_preference" + filename="panel_preferences_voice.xml" + label="Voice Chat" + layout="topleft" + name="voice" /> <panel class="panel_preference" filename="panel_preferences_skins.xml" label="Skins" layout="topleft" - name="skins" /> + name="skins" /--> </tab_container> + + <!--button + follows="left|bottom" + height="20" + label="About" + label_selected="About" + layout="topleft" + left_delta="-512" + name="About..." + top_delta="0" + width="90"> + <button.commit_callback + function="Floater.Show" + parameter="sl_about" /> + </button--> + <!--bottom" + height="20" + help_url="https://support.secondlife.com/ics/support/default.asp?deptID=4417" + label="Help" + label_selected="Help" + layout="topleft" + left_pad="3" + name="Help" + top_delta="0" + width="90" /--> + + </floater> diff --git a/indra/newview/skins/default/xui/en/floater_preview_animation.xml b/indra/newview/skins/default/xui/en/floater_preview_animation.xml index 50aabfc895..e9342b772f 100644 --- a/indra/newview/skins/default/xui/en/floater_preview_animation.xml +++ b/indra/newview/skins/default/xui/en/floater_preview_animation.xml @@ -4,23 +4,11 @@ height="85" layout="topleft" name="preview_anim" - width="300"> + width="280"> <floater.string name="Title"> Animation: [NAME] </floater.string> - <line_editor - border_style="line" - border_thickness="1" - follows="left|top|right" - font="SansSerif" - height="19" - layout="topleft" - left="93" - max_length="127" - name="desc" - top="19" - width="194" /> <text type="string" length="1" @@ -28,30 +16,44 @@ font="SansSerif" height="19" layout="topleft" - left_delta="-80" + left="10" name="desc txt" - top_delta="0" + top="25" width="80"> Description: </text> - <button + <line_editor + border_style="line" + border_thickness="1" + follows="left|top|right" + font="SansSerifSmall" height="19" + layout="topleft" + left_delta="95" + max_length="127" + name="desc" + top="19" + width="170" /> + <button + height="20" + font="SansSerifSmall" label="Play in World" label_selected="Stop" layout="topleft" - left="27" + left="10" name="Anim play btn" tool_tip="Play this animation so that others can see it." top="47" - width="96" /> + width="125" /> <button - height="19" + height="20" + font="SansSerifSmall" label="Play Locally" label_selected="Stop" layout="topleft" - left_pad="54" + left_pad="5" name="Anim audition btn" tool_tip="Play this animation so that only you can see it." top_delta="0" - width="96" /> + width="125" /> </floater> diff --git a/indra/newview/skins/default/xui/en/floater_preview_gesture.xml b/indra/newview/skins/default/xui/en/floater_preview_gesture.xml index 9d183d8103..a463b2274d 100644 --- a/indra/newview/skins/default/xui/en/floater_preview_gesture.xml +++ b/indra/newview/skins/default/xui/en/floater_preview_gesture.xml @@ -1,10 +1,10 @@ <?xml version="1.0" encoding="utf-8" standalone="yes" ?> <floater auto_tile="true" - height="350" + height="400" layout="topleft" name="gesture_preview" - width="450"> + width="280"> <floater.string name="step_anim"> Animation to play: @@ -41,10 +41,10 @@ type="string" length="1" follows="top|left" - font="SansSerif" + font="SansSerifSmall" height="10" layout="topleft" - left="16" + left="10" name="desc_label" top="25" width="100"> @@ -57,15 +57,15 @@ left_delta="84" name="desc" top_delta="-4" - width="330" /> + width="180" /> <text type="string" length="1" follows="top|left" - font="SansSerif" + font="SansSerifSmall" height="10" layout="topleft" - left="16" + left="10" name="trigger_label" top="54" width="100"> @@ -79,18 +79,18 @@ max_length="31" name="trigger_editor" top_delta="-4" - width="105" /> + width="100" /> <text type="string" length="1" follows="top|left" - font="SansSerif" + font="SansSerifSmall" height="10" layout="topleft" - left_pad="15" + left="10" name="replace_text" tool_tip="Replace the trigger word(s) with these words. For example, trigger 'hello' replace with 'howdy' will turn the chat 'I wanted to say hello' into 'I wanted to say howdy' as well as playing the gesture!" - top_delta="4" + top="79" width="200"> Replace with: </text> @@ -98,7 +98,7 @@ follows="left|top" height="20" layout="topleft" - left_delta="80" + left_delta="84" max_length="31" name="replace_editor" tool_tip="Replace the trigger word(s) with these words. For example, trigger 'hello' replace with 'howdy' will turn the chat 'I wanted to say hello' into 'I wanted to say howdy' as well as playing the gesture" @@ -108,12 +108,12 @@ type="string" length="1" follows="top|left" - font="SansSerif" + font="SansSerifSmall" height="10" layout="topleft" - left="16" + left="10" name="key_label" - top="83" + top="104" width="100"> Shortcut Key: </text> @@ -137,12 +137,12 @@ type="string" length="1" follows="top|left" - font="SansSerif" + font="SansSerifSmall" height="10" layout="topleft" - left="16" + left="10" name="library_label" - top="112" + top="135" width="100"> Library: </text> @@ -150,10 +150,10 @@ type="string" length="1" follows="top|left" - font="SansSerif" + font="SansSerifSmall" height="10" layout="topleft" - left_pad="104" + left_pad="75" name="steps_label" top_delta="0" width="100"> @@ -163,10 +163,10 @@ follows="top|left" height="110" layout="topleft" - left="16" + left="10" name="library_list" - top="132" - width="100"> + top="150" + width="80"> <scroll_list.rows value="Animation" /> <scroll_list.rows @@ -179,57 +179,61 @@ <button follows="top|left" height="20" + font="SansSerifSmall" label="Add >>" layout="topleft" left_pad="14" name="add_btn" top_delta="0" - width="80" /> + width="70" /> <button follows="top|left" height="20" - label="Move Up" + font="SansSerifSmall" + label="Up" layout="topleft" left_delta="0" name="up_btn" top_pad="10" - width="80" /> + width="70" /> <button follows="top|left" height="20" - label="Move Down" + font="SansSerifSmall" + label="Down" layout="topleft" left_delta="0" name="down_btn" top_pad="10" - width="80" /> + width="70" /> <button follows="top|left" height="20" + font="SansSerifSmall" label="Remove" layout="topleft" left_delta="0" name="delete_btn" top_pad="10" - width="80" /> + width="70" /> <scroll_list follows="top|left" height="110" layout="topleft" - left="220" + left="185" name="step_list" - top="132" - width="210" /> + top="150" + width="85" /> <text type="string" length="1" follows="top|left" - font="SansSerif" + font="SansSerifSmall" height="60" layout="topleft" - left="16" + left="10" name="help_label" - top="252" + top="270" width="200"> All steps happen simultaneously, unless you add wait steps. @@ -238,9 +242,9 @@ unless you add wait steps. follows="top|left" height="60" layout="topleft" - left_pad="6" + left="10" name="options_text" - top_delta="0" + top="300" width="205" /> <combo_box follows="top|left" @@ -248,7 +252,7 @@ unless you add wait steps. layout="topleft" left_delta="10" name="animation_list" - top="272" + top="320" width="100" /> <combo_box follows="top|left" @@ -298,9 +302,9 @@ unless you add wait steps. height="20" label="until animations are done" layout="topleft" - left="232" + left="16" name="wait_anim_check" - top="267" + top="315" width="100" /> <check_box follows="top|left" @@ -325,10 +329,10 @@ unless you add wait steps. height="20" label="Active" layout="topleft" - left="140" + left="20" name="active_check" tool_tip="Active gestures can be triggered by chatting their trigger phrases or pressing their hot keys. Gestures usually become inactive when there is a key binding conflict." - top="323" + top="365" width="100" /> <button follows="top|left" @@ -348,4 +352,4 @@ unless you add wait steps. name="save_btn" top_delta="0" width="80" /> -</floater> +</floater>
\ No newline at end of file diff --git a/indra/newview/skins/default/xui/en/floater_preview_sound.xml b/indra/newview/skins/default/xui/en/floater_preview_sound.xml index 07a50ac589..19f21090ca 100644 --- a/indra/newview/skins/default/xui/en/floater_preview_sound.xml +++ b/indra/newview/skins/default/xui/en/floater_preview_sound.xml @@ -4,7 +4,7 @@ height="85" layout="topleft" name="preview_sound" - width="300"> + width="280"> <floater.string name="Title"> Sound: [NAME] @@ -16,11 +16,11 @@ font="SansSerif" height="19" layout="topleft" - left="95" + left="85" max_length="127" name="desc" top="19" - width="192" /> + width="127" /> <text type="string" length="1" @@ -28,7 +28,7 @@ font="SansSerif" height="19" layout="topleft" - left_delta="-82" + left="10" name="desc txt" top_delta="0" width="80"> @@ -37,10 +37,11 @@ <button follows="left|top" height="19" + font="SansSerifSmall" label="Play Locally" label_selected="Play Locally" layout="topleft" - left="168" + left="145" name="Sound audition btn" sound_flags="0" tool_tip="Play this sound so that only you can hear it." diff --git a/indra/newview/skins/default/xui/en/floater_region_info.xml b/indra/newview/skins/default/xui/en/floater_region_info.xml index 48694e5fb6..a890de3e28 100644 --- a/indra/newview/skins/default/xui/en/floater_region_info.xml +++ b/indra/newview/skins/default/xui/en/floater_region_info.xml @@ -5,7 +5,7 @@ name="regioninfo" save_rect="true" title="Region/Estate" - width="480"> + width="280"> <tab_container bottom="512" follows="left|right|top|bottom" diff --git a/indra/newview/skins/default/xui/en/floater_report_abuse.xml b/indra/newview/skins/default/xui/en/floater_report_abuse.xml index 4c036f98e5..fcbc27a5f9 100644 --- a/indra/newview/skins/default/xui/en/floater_report_abuse.xml +++ b/indra/newview/skins/default/xui/en/floater_report_abuse.xml @@ -178,120 +178,159 @@ width="356"> <combo_box.item label="Select category" + name="Select_category" value="0" /> <combo_box.item label="Age > Age play" + name="Age__Age_play" value="31" /> <combo_box.item label="Age > Adult resident on Teen Second Life" + name="Age__Adult_resident_on_Teen_Second_Life" value="32" /> <combo_box.item label="Age > Underage resident outside of Teen Second Life" + name="Age__Underage_resident_outside_of_Teen_Second_Life" value="33" /> <combo_box.item label="Assault > Combat sandbox / unsafe area" + name="Assault__Combat_sandbox___unsafe_area" value="34" /> <combo_box.item label="Assault > Safe area" + name="Assault__Safe_area" value="35" /> <combo_box.item label="Assault > Weapons testing sandbox" + name="Assault__Weapons_testing_sandbox" value="36" /> <combo_box.item label="Commerce > Failure to deliver product or service" + name="Commerce__Failure_to_deliver_product_or_service" value="38" /> <combo_box.item label="Disclosure > Real world information" + name="Disclosure__Real_world_information" value="39" /> <combo_box.item label="Disclosure > Remotely monitoring chat" + name="Disclosure__Remotely_monitoring chat" value="40" /> <combo_box.item label="Disclosure > Second Life information/chat/IMs" + name="Disclosure__Second_Life_information_chat_IMs" value="41" /> <combo_box.item label="Disturbing the peace > Unfair use of region resources" + name="Disturbing_the_peace__Unfair_use_of_region_resources" value="42" /> <combo_box.item label="Disturbing the peace > Excessive scripted objects" + name="Disturbing_the_peace__Excessive_scripted_objects" value="43" /> <combo_box.item label="Disturbing the peace > Object littering" + name="Disturbing_the_peace__Object_littering" value="44" /> <combo_box.item label="Disturbing the peace > Repetitive spam" + name="Disturbing_the_peace__Repetitive_spam" value="45" /> <combo_box.item label="Disturbing the peace > Unwanted advert spam" + name="Disturbing_the_peace__Unwanted_advert_spam" value="46" /> <combo_box.item label="Fraud > L$" + name="Fraud__L$" value="47" /> <combo_box.item label="Fraud > Land" + name="Fraud__Land" value="48" /> <combo_box.item label="Fraud > Pyramid scheme or chain letter" + name="Fraud__Pyramid_scheme_or_chain_letter" value="49" /> <combo_box.item label="Fraud > US$" + name="Fraud__US$" value="50" /> <combo_box.item label="Harassment > Advert farms / visual spam" + name="Harassment__Advert_farms___visual_spam" value="51" /> <combo_box.item label="Harassment > Defaming individuals or groups" + name="Harassment__Defaming_individuals_or_groups" value="52" /> <combo_box.item label="Harassment > Impeding movement" + name="Harassment__Impeding_movement" value="53" /> <combo_box.item label="Harassment > Sexual harassment" + name="Harassment__Sexual_harassment" value="54" /> <combo_box.item label="Harassment > Solicting/inciting others to violate ToS" + name="Harassment__Solicting_inciting_others_to_violate_ToS" value="55" /> <combo_box.item label="Harassment > Verbal abuse" + name="Harassment__Verbal_abuse" value="56" /> <combo_box.item label="Indecency > Broadly offensive content or conduct" + name="Indecency__Broadly_offensive_content_or_conduct" value="57" /> <combo_box.item label="Indecency > Inappropriate avatar name" + name="Indecency__Inappropriate_avatar_name" value="59" /> <combo_box.item label="Indecency > Inappropriate content or conduct in a PG region" + name="Indecency__Mature_content_in_PG_region" value="60" /> <combo_box.item label="Indecency > Inappropriate content or conduct in a Mature region" + name="Indecency__Inappropriate_content_in_Mature_region" value="69" /> <combo_box.item label="Intellectual property infringement > Content Removal" + name="Intellectual_property_infringement_Content_Removal" value="66" /> <combo_box.item label="Intellectual property infringement > CopyBot or Permissions Exploit" + name="Intellectual_property_infringement_CopyBot_or_Permissions_Exploit" value="37" /> <combo_box.item label="Intolerance" + name="Intolerance" value="61" /> <combo_box.item label="Land > Abuse of sandbox resources" + name="Land__Abuse_of_sandbox_resources" value="62" /> <combo_box.item label="Land > Encroachment > Objects/textures" + name="Land__Encroachment__Objects_textures" value="63" /> <combo_box.item label="Land > Encroachment > Particles" + name="Land__Encroachment__Particles" value="64" /> <combo_box.item label="Land > Encroachment > Trees/plants" + name="Land__Encroachment__Trees_plants" value="65" /> <combo_box.item label="Wagering/gambling" + name="Wagering_gambling" value="67" /> <combo_box.item label="Other" + name="Other" value="68" /> </combo_box> <text diff --git a/indra/newview/skins/default/xui/en/floater_sell_land.xml b/indra/newview/skins/default/xui/en/floater_sell_land.xml index 26c805c0f7..85e35926ab 100644 --- a/indra/newview/skins/default/xui/en/floater_sell_land.xml +++ b/indra/newview/skins/default/xui/en/floater_sell_land.xml @@ -1,25 +1,25 @@ <?xml version="1.0" encoding="utf-8" standalone="yes" ?> <floater can_minimize="false" - height="485" + height="600" layout="topleft" name="sell land" title="Sell Land" - width="450"> + width="280"> <texture_picker enabled="false" follows="top|left" height="135" layout="topleft" - left="244" + left="50" name="info_image" - right="424" - top="40" + right="230" + top="20" width="180" /> <text type="string" length="1" - bottom_delta="-144" + top="145" follows="top|left" layout="topleft" left="16" @@ -61,19 +61,19 @@ left="56" name="info_size" right="-20"> - [AREA] sq. m. + [AREA] m² </text> <text type="string" length="1" follows="top|left" - font="SansSerifHuge" + font="SansSerifBig" height="24" layout="topleft" left="16" name="info_action" text_color="white" - top="141" + top="190" width="200"> To sell this parcel: </text> @@ -84,14 +84,14 @@ layout="topleft" left="0" name="step_price" - top="167" + top="211" width="64" /> <text type="string" length="1" bottom_delta="-38" follows="top|left" - font="SansSerifBig" + font="SansSerif" height="16" layout="topleft" left="72" @@ -108,7 +108,7 @@ left="72" name="price_text" right="-20"> - Choose an appropriate price for this land. + Choose an appropriate price. </text> <text type="string" @@ -137,11 +137,11 @@ length="1" height="16" layout="topleft" - left_pad="10" + left="72" name="price_per_m" - top_delta="0" + top_delta="25" width="200"> - (L$[PER_METER] per square meter) + (L$[PER_METER] per m²) </text> <icon follows="top|left" @@ -156,7 +156,7 @@ length="1" bottom_delta="-38" follows="top|left" - font="SansSerifBig" + font="SansSerif" height="16" layout="topleft" left="72" @@ -173,7 +173,8 @@ left="72" name="sell_to_text" right="-20"> - Choose whether to sell to anyone or a particular buyer. + Choose whether to sell to anyone +or a particular buyer. </text> <combo_box follows="top|right" @@ -181,17 +182,20 @@ layout="topleft" left_delta="0" name="sell_to" - top_delta="16" - width="140"> + top_delta="32" + width="130"> <combo_box.item enabled="false" - label="select one --" + label="-- select one --" + name="--selectone--" value="select" /> <combo_box.item label="Anyone" + name="Anyone" value="anyone" /> <combo_box.item label="Specific user:" + name="Specificuser:" value="user" /> </combo_box> <line_editor @@ -202,10 +206,11 @@ left_delta="0" name="sell_to_agent" top_pad="4" - width="150" /> + width="130" /> <button height="16" - label="Select..." + font="SansSerifSmall" + label="Select" layout="topleft" left_pad="5" name="sell_to_select_agent" @@ -224,7 +229,7 @@ length="1" bottom_delta="-38" follows="top|left" - font="SansSerifBig" + font="SansSerif" height="16" layout="topleft" left="72" @@ -235,16 +240,18 @@ <text type="string" length="1" + font="SansSerifSmall" bottom_delta="20" follows="top|left" height="16" layout="topleft" left="72" name="sell_objects_text"> - Land owner's transferable objects on parcel will change ownership. + Land owner's transferable objects +on parcel will change ownership. </text> <radio_group - bottom_delta="44" + top_pad="15" follows="top|right" height="40" layout="topleft" @@ -275,21 +282,22 @@ </radio_group> <button height="16" + font="SansSerifSmall" label="Show Objects" layout="topleft" name="show_objects" - right="414" - top="393" + left="100" + top_pad="10" width="110" /> <text type="string" length="1" - bottom_delta="35" + bottom_delta="30" follows="top|left" font="SansSerifBig" height="16" layout="topleft" - left="72" + left="16" name="nag_message_label" right="-20"> REMEMBER: All sales are final. @@ -297,19 +305,21 @@ <button follows="bottom|left" height="20" + font="SansSerifSmall" label="Set Land For Sale" layout="topleft" left_delta="0" name="sell_btn" - top_pad="15" + top_pad="10" width="130" /> <button follows="bottom|right" height="20" + font="SansSerifSmall" label="Cancel" layout="topleft" - left_pad="152" + left_pad="30" name="cancel_btn" top_delta="0" width="90" /> -</floater> +</floater>
\ No newline at end of file diff --git a/indra/newview/skins/default/xui/en/floater_settings_debug.xml b/indra/newview/skins/default/xui/en/floater_settings_debug.xml index 9a73ffb1a2..3c046fa5d7 100644 --- a/indra/newview/skins/default/xui/en/floater_settings_debug.xml +++ b/indra/newview/skins/default/xui/en/floater_settings_debug.xml @@ -40,9 +40,11 @@ width="100"> <combo_box.item label="TRUE" + name="TRUE" value="true" /> <combo_box.item label="FALSE" + name="FALSE" value="" /> <combo_box.commit_callback function="CommitSettings" /> diff --git a/indra/newview/skins/default/xui/en/floater_snapshot.xml b/indra/newview/skins/default/xui/en/floater_snapshot.xml index f3d8938ea2..1d2978adb8 100644 --- a/indra/newview/skins/default/xui/en/floater_snapshot.xml +++ b/indra/newview/skins/default/xui/en/floater_snapshot.xml @@ -172,18 +172,23 @@ width="115"> <combo_box.item label="Current Window" + name="CurrentWindow" value="[i0,i0]" /> <combo_box.item label="640x480" + name="640x480" value="[i640,i480]" /> <combo_box.item label="800x600" + name="800x600" value="[i800,i600]" /> <combo_box.item label="1024x768" + name="1024x768" value="[i1024,i768]" /> <combo_box.item label="Custom" + name="Custom" value="[i-1,i-1]" /> </combo_box> <combo_box @@ -196,18 +201,23 @@ width="115"> <combo_box.item label="Current Window" + name="CurrentWindow" value="[i0,i0]" /> <combo_box.item label="Small (128x128)" + name="Small(128x128)" value="[i128,i128]" /> <combo_box.item label="Medium (256x256)" + name="Medium(256x256)" value="[i256,i256]" /> <combo_box.item label="Large (512x512)" + name="Large(512x512)" value="[i512,i512]" /> <combo_box.item label="Custom" + name="Custom" value="[i-1,i-1]" /> </combo_box> <combo_box @@ -220,27 +230,35 @@ width="115"> <combo_box.item label="Current Window" + name="CurrentWindow" value="[i0,i0]" /> <combo_box.item label="320x240" + name="320x240" value="[i320,i240]" /> <combo_box.item label="640x480" + name="640x480" value="[i640,i480]" /> <combo_box.item label="800x600" + name="800x600" value="[i800,i600]" /> <combo_box.item label="1024x768" + name="1024x768" value="[i1024,i768]" /> <combo_box.item label="1280x1024" + name="1280x1024" value="[i1280,i1024]" /> <combo_box.item label="1600x1200" + name="1600x1200" value="[i1600,i1200]" /> <combo_box.item label="Custom" + name="Custom" value="[i-1,i-1]" /> </combo_box> <combo_box @@ -252,11 +270,14 @@ top_delta="0" width="70"> <combo_box.item - label="PNG" /> + label="PNG" + name="PNG" /> <combo_box.item - label="JPEG" /> + label="JPEG" + name="JPEG" /> <combo_box.item - label="BMP" /> + label="BMP" + name="BMP" /> </combo_box> <spinner allow_text_entry="false" @@ -329,12 +350,15 @@ width="145"> <combo_box.item label="Colors" + name="Colors" value="colors" /> <combo_box.item label="Depth" + name="Depth" value="depth" /> <combo_box.item label="Object Mattes" + name="ObjectMattes" value="objects" /> </combo_box> <check_box diff --git a/indra/newview/skins/default/xui/en/floater_telehub.xml b/indra/newview/skins/default/xui/en/floater_telehub.xml index bcec046456..ef9aef7f6f 100644 --- a/indra/newview/skins/default/xui/en/floater_telehub.xml +++ b/indra/newview/skins/default/xui/en/floater_telehub.xml @@ -4,7 +4,7 @@ layout="topleft" name="telehub" title="Telehub" - width="272"> + width="280"> <text type="string" length="1" diff --git a/indra/newview/skins/default/xui/en/floater_test_checkbox.xml b/indra/newview/skins/default/xui/en/floater_test_checkbox.xml index 5a17ffefac..021474d7ab 100644 --- a/indra/newview/skins/default/xui/en/floater_test_checkbox.xml +++ b/indra/newview/skins/default/xui/en/floater_test_checkbox.xml @@ -69,15 +69,4 @@ name="font_checkbox" top_pad="14" width="150" /> - <check_box - height="16" - label="Custom Button" - layout="topleft" - left_delta="0" - name="check_button_checkbox" - top_pad="14" - width="150"> - <check_box.check_button - image_unselected="close_in_blue.tga" /> - </check_box> </floater> diff --git a/indra/newview/skins/default/xui/en/floater_test_combobox.xml b/indra/newview/skins/default/xui/en/floater_test_combobox.xml index 4bc1b8b644..06422d6a26 100644 --- a/indra/newview/skins/default/xui/en/floater_test_combobox.xml +++ b/indra/newview/skins/default/xui/en/floater_test_combobox.xml @@ -28,12 +28,15 @@ width="155"> <combo_box.item label="My Last Location" + name="MyLastLocation" value="last" /> <combo_box.item label="My Home" + name="MyHome" value="home" /> <combo_box.item label="<Type region name>" + name="Typeregionname" value="" /> </combo_box> <text @@ -55,9 +58,11 @@ width="150"> <combo_box.item label="First Item" + name="item1" value="first" /> <combo_box.item label="Second Item" + name="item2" value="second" /> </combo_box> <text @@ -80,9 +85,11 @@ width="150"> <combo_box.item label="First Item" + name="item1" value="first" /> <combo_box.item label="Second Item" + name="item2" value="second" /> </combo_box> <text @@ -101,14 +108,16 @@ initial_value="second" layout="topleft" left_delta="0" - name="text_entry_combo" + name="text_entry_combo2" top_pad="2" width="150"> <combo_box.item label="First Item" + name="item1" value="first" /> <combo_box.item label="Second Item" + name="item2" value="second" /> </combo_box> <text @@ -132,12 +141,15 @@ width="150"> <combo_box.item label="CA" + name="item1" value="ca" /> <combo_box.item label="NY" + name="item2" value="ny" /> <combo_box.item label="TX" + name="item3" value="tx" /> </combo_box> </floater> diff --git a/indra/newview/skins/default/xui/en/floater_test_line_editor.xml b/indra/newview/skins/default/xui/en/floater_test_line_editor.xml new file mode 100644 index 0000000000..a17e3ea949 --- /dev/null +++ b/indra/newview/skins/default/xui/en/floater_test_line_editor.xml @@ -0,0 +1,64 @@ +<?xml version="1.0" encoding="utf-8" standalone="yes" ?> +<floater + can_resize="true" + height="400" + layout="topleft" + name="floater_test_line_editor" + width="400"> + <line_editor + height="20" + layout="topleft" + left="10" + name="enabled_line_editor" + top="40" + tool_tip="enabled line editor" + width="200"> + Enabled line editor + </line_editor> + <line_editor + enabled="false" + height="20" + layout="topleft" + left_delta="0" + name="disabled_line_editor" + top_pad="10" + tool_tip="disabled line editor" + width="200"> + Disabled line editor + </line_editor> + <line_editor + height="20" + layout="topleft" + left_delta="0" + name="enabled_colored_line_editor" + text_color="1 0 0 1" + top_pad="10" + tool_tip="enabled colored line editor" + width="200"> + Enabled red-text line editor + </line_editor> + <line_editor + enabled="false" + height="20" + layout="topleft" + left_delta="0" + name="disabled_colored_line_editor" + text_readonly_color="1 0 0 1" + top_pad="10" + tool_tip="disabled colored line editor" + width="200"> + Disabled red-text line editor + </line_editor> + <!-- "search_editor" is a specialized line_editor that shows read-only + help text until the user clicks in the widget. --> + <search_editor + follows="left|top|right" + height="20" + label="Type here to search" + layout="topleft" + left_delta="0" + name="search editor" + tool_tip="search editor" + top_pad="10" + width="200" /> +</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_test_navigation_bar.xml b/indra/newview/skins/default/xui/en/floater_test_navigation_bar.xml new file mode 100644 index 0000000000..21956c2eac --- /dev/null +++ b/indra/newview/skins/default/xui/en/floater_test_navigation_bar.xml @@ -0,0 +1,17 @@ +<?xml version="1.0" encoding="utf-8" standalone="yes" ?> +<floater + can_resize="true" + height="200" + layout="topleft" + name="floater_test_navigation_bar" + width="900"> + <panel + name="navigation_bar" + filename="panel_navigation_bar.xml" + left="10" + right="-10" + top="30" + height="100" + border="true" + /> +</floater> diff --git a/indra/newview/skins/default/xui/en/floater_test_widgets.xml b/indra/newview/skins/default/xui/en/floater_test_widgets.xml index 9a2602db75..c6c561b497 100644 --- a/indra/newview/skins/default/xui/en/floater_test_widgets.xml +++ b/indra/newview/skins/default/xui/en/floater_test_widgets.xml @@ -126,8 +126,10 @@ tool_tip="combo box" name="test_combo_box"> <combo_box.item + name="item1" label="Combobox Item 1" /> <combo_box.item + name="item2" label="Combobox Item 2" /> </combo_box> <!-- "icon" is a read-only image. The image_name must match an entry @@ -154,9 +156,9 @@ width="200"> Line Editor Sample Text </line_editor> - <!-- "search_editor" is a specialized line_editor that shows read-only + <!-- "filter_editor" is a specialized line_editor that shows read-only help text until the user clicks in the widget. --> - <search_editor + <filter_editor follows="left|top|right" height="20" label="Type here to search" @@ -228,11 +230,11 @@ tool_tip="scroll list" layout="topleft"> <scroll_list.columns - dynamicwidth="true" + dynamic_width="true" name="first_column" label="Column A"/> <scroll_list.columns - dynamicwidth="true" + dynamic_width="true" name="second_column" label="Column B"/> </scroll_list> diff --git a/indra/newview/skins/default/xui/en/floater_texture_ctrl.xml b/indra/newview/skins/default/xui/en/floater_texture_ctrl.xml index 8d85519610..dc048eb352 100644 --- a/indra/newview/skins/default/xui/en/floater_texture_ctrl.xml +++ b/indra/newview/skins/default/xui/en/floater_texture_ctrl.xml @@ -86,7 +86,7 @@ name="show_folders_check" top="20" width="201" /> - <search_editor + <filter_editor follows="left|top|right" height="16" label="Type here to search" diff --git a/indra/newview/skins/default/xui/en/floater_tools.xml b/indra/newview/skins/default/xui/en/floater_tools.xml index 17b73b47ab..51e4d15e5d 100644 --- a/indra/newview/skins/default/xui/en/floater_tools.xml +++ b/indra/newview/skins/default/xui/en/floater_tools.xml @@ -1,14 +1,14 @@ <?xml version="1.0" encoding="utf-8" standalone="yes" ?> <floater - follows="left|top" - height="550" + follows="left|top|right" + height="615" layout="topleft" name="toolbox floater" save_rect="true" - short_title="Build" + short_title="Build Tools" single_instance="true" sound_flags="0" - width="272"> + width="280"> <floater.string name="status_rotate"> Drag colored bands to rotate object @@ -69,11 +69,10 @@ image_selected="tool_zoom_active.tga" image_unselected="tool_zoom.tga" layout="topleft" - left="4" + left="10" name="button focus" picture_style="true" tool_tip="Focus" - top="2" width="32" /> <button follows="left|top" @@ -83,11 +82,10 @@ image_selected="tool_grab_active.tga" image_unselected="tool_grab.tga" layout="topleft" - left_pad="4" + left_pad="8" name="button move" picture_style="true" tool_tip="Move" - top_delta="0" width="32" /> <button follows="left|top" @@ -97,11 +95,10 @@ image_selected="tool_face_active.tga" image_unselected="tool_face.tga" layout="topleft" - left_pad="4" + left_pad="8" name="button edit" picture_style="true" tool_tip="Edit" - top_delta="0" width="32" /> <button follows="left|top" @@ -111,11 +108,10 @@ image_selected="tool_create_active.tga" image_unselected="tool_create.tga" layout="topleft" - left_pad="4" + left_pad="8" name="button create" picture_style="true" tool_tip="Create" - top_delta="0" width="32" /> <button follows="left|top" @@ -125,221 +121,179 @@ image_selected="tool_dozer_active.tga" image_unselected="tool_dozer.tga" layout="topleft" - left_pad="4" + left_pad="8" name="button land" picture_style="true" tool_tip="Land" - top_delta="0" width="32" /> - <slider_bar + <text + type="string" + text_color="LabelSelectedDisabledColor" + length="1" follows="left|top" - height="14" - increment="0.01" - initial_value="0.125" layout="topleft" - left="114" - max_val="0.5" - name="slider zoom" - top="55" - width="134" /> - <radio_group - draw_border="false" - height="45" + left="8" + name="text status" + top_pad="3" + width="280"> + Drag to move, shift-drag to copy + </text> + <radio_group layout="topleft" - left_delta="-110" - name="focus_radio_group" - top_delta="0" - width="114"> + left="10" + height="70" + top="54" + name="focus_radio_group"> <radio_item - height="16" + top_pad="6" label="Zoom" layout="topleft" - left="0" - name="radio zoom" - top="-1" - width="114" /> + name="radio zoom" /> <radio_item - height="16" + top_pad="6" label="Orbit (Ctrl)" layout="topleft" - left_delta="0" - name="radio orbit" - top_delta="15" - width="114" /> + name="radio orbit" /> <radio_item - height="16" + top_pad="6" label="Pan (Ctrl-Shift)" layout="topleft" - left_delta="0" - name="radio pan" - top_delta="15" - width="114" /> + name="radio pan" /> </radio_group> - <radio_group - draw_border="false" - height="45" + <slider_bar + follows="left|top" + height="14" + increment="0.01" + initial_value="0.125" layout="topleft" - left_delta="0" - name="move_radio_group" - top_delta="0" - width="114"> + max_val="0.5" + top_delta="-2" + left_delta="100" + name="slider zoom" + width="134" /> + <radio_group + left="10" + height="70" + top="54" + layout="topleft" + name="move_radio_group"> <radio_item - height="16" + top_pad="6" label="Move" layout="topleft" - left="0" - name="radio move" - top="-1" - width="114" /> + name="radio move" /> <radio_item - height="16" + top_pad="6" label="Lift (Ctrl)" layout="topleft" - left_delta="0" - name="radio lift" - top_delta="15" - width="114" /> + name="radio lift" /> <radio_item - height="16" + top_pad="6" label="Spin (Ctrl-Shift)" layout="topleft" - left_delta="0" - name="radio spin" - top_delta="15" - width="114" /> - </radio_group> + name="radio spin" /> + </radio_group> <radio_group - draw_border="false" - height="60" + follows="left|top" + left="10" + top="54" + height="70" layout="topleft" - left_delta="0" - name="edit_radio_group" - top_delta="0" - width="114"> + name="edit_radio_group"> <radio_item - height="16" - label="Position" + label="Move" layout="topleft" - left="0" - name="radio position" - top="-1" - width="114" /> + name="radio position" /> <radio_item - height="16" + top_pad="6" label="Rotate (Ctrl)" layout="topleft" - left_delta="0" - name="radio rotate" - top_delta="15" - width="114" /> + name="radio rotate" /> <radio_item - height="16" + top_pad="6" label="Stretch (Ctrl-Shift)" layout="topleft" - left_delta="0" - name="radio stretch" - top_delta="15" - width="123" /> + name="radio stretch" /> <radio_item - height="16" + top_pad="6" label="Select Texture" layout="topleft" - left_delta="0" - name="radio select face" - top_delta="15" - width="114" /> + name="radio select face" /> </radio_group> <check_box - control_name="EditLinkedParts" - height="16" - label="Edit linked parts" - layout="topleft" - left_delta="0" - name="checkbox edit linked parts" - top_pad="3" - width="114" /> - <text - type="string" - length="1" + left="10" follows="left|top" - height="14" + control_name="EditLinkedParts" + label="Edit linked prims" layout="topleft" - left_delta="2" - name="text ruler mode" - top_pad="6" - width="68"> + name="checkbox edit linked parts" /> + <text + left="10" + type="string" + length="1" + follows="left|top" + layout="topleft" + name="text ruler mode"> Ruler: </text> <combo_box - height="20" + height="19" + left="30" layout="topleft" - left_delta="40" + follows="left|top" name="combobox grid mode" - top_delta="-2" - width="86"> + width="90"> <combo_box.item label="World" + name="World" value="World" /> <combo_box.item label="Local" + name="Local" value="Local" /> <combo_box.item label="Reference" + name="Reference" value="Reference" /> </combo_box> <check_box control_name="ScaleUniform" - height="16" + height="19" label="Stretch Both Sides" layout="topleft" left="143" name="checkbox uniform" - top="54" + top="54" width="134" /> <check_box control_name="ScaleStretchTextures" - height="16" + height="19" initial_value="true" label="Stretch Textures" layout="topleft" - left_delta="0" name="checkbox stretch textures" top_pad="1" width="134" /> <check_box control_name="SnapEnabled" - height="16" + height="19" initial_value="true" label="Use Grid" layout="topleft" - left_delta="0" name="checkbox snap to grid" top_pad="1" width="134" /> <button follows="left|top" font="SansSerifSmall" - height="20" + height="19" + left_delta="40" + top_delta="20" label="Options..." label_selected="Options..." layout="topleft" - left_delta="20" name="Options..." - top="103" - valign="center" - width="80" /> - <text - type="string" - length="1" - follows="left|top" - height="16" - layout="topleft" - left="4" - name="text status" - top="36" - width="264"> - Drag to move, shift-drag to copy - </text> + width="78" /> <button follows="left|top" height="24" @@ -348,11 +302,11 @@ image_selected="object_cube_active.tga" image_unselected="object_cube.tga" layout="topleft" - left_delta="0" + left="4" name="ToolCube" picture_style="true" tool_tip="Cube" - top_delta="15" + top="51" width="24" /> <button follows="left|top" @@ -552,8 +506,8 @@ width="24" /> <check_box control_name="CreateToolKeepSelected" - height="16" - label="Keep selected" + height="19" + label="Keep Tool selected" layout="topleft" left="4" name="checkbox sticky" @@ -561,8 +515,8 @@ width="128" /> <check_box control_name="CreateToolCopySelection" - height="16" - label="Copy selected" + height="19" + label="Copy selection" layout="topleft" left_delta="0" name="checkbox copy selection" @@ -570,9 +524,9 @@ width="134" /> <check_box control_name="CreateToolCopyCenters" - height="16" + height="19" initial_value="true" - label="Center" + label="Center Copy" layout="topleft" left_delta="18" name="checkbox copy centers" @@ -580,15 +534,14 @@ width="134" /> <check_box control_name="CreateToolCopyRotates" - height="16" - label="Rotate" + height="19" + label="Rotate Copy" layout="topleft" left_delta="0" name="checkbox copy rotates" top_delta="16" width="134" /> <radio_group - draw_border="false" height="105" layout="topleft" left="4" @@ -596,7 +549,7 @@ top="54" width="114"> <radio_item - height="16" + height="19" label="Select Land" layout="topleft" left="0" @@ -604,7 +557,7 @@ top="-1" width="114" /> <radio_item - height="16" + height="19" label="Flatten" layout="topleft" left_delta="0" @@ -612,7 +565,7 @@ top_delta="15" width="114" /> <radio_item - height="16" + height="19" label="Raise" layout="topleft" left_delta="0" @@ -620,7 +573,7 @@ top_delta="15" width="114" /> <radio_item - height="16" + height="19" label="Lower" layout="topleft" left_delta="0" @@ -628,7 +581,7 @@ top_delta="15" width="114" /> <radio_item - height="16" + height="19" label="Smooth" layout="topleft" left_delta="0" @@ -636,7 +589,7 @@ top_delta="15" width="114" /> <radio_item - height="16" + height="19" label="Roughen" layout="topleft" left_delta="0" @@ -644,7 +597,7 @@ top_delta="15" width="114" /> <radio_item - height="16" + height="19" label="Revert" layout="topleft" left_delta="0" @@ -652,27 +605,16 @@ top_delta="15" width="114" /> </radio_group> - <button - follows="left|top" - font="SansSerifSmall" - height="20" - label="Apply" - label_selected="Apply" - layout="topleft" - left_delta="112" - name="button apply to selection" - tool_tip="Modify Selected Land" - top_delta="-2" - width="78" /> + <text type="string" length="1" follows="left|top" height="12" layout="topleft" - left_delta="2" + left="125" name="Bulldozer:" - top_pad="4" + top="57" width="100"> Bulldozer: </text> @@ -682,22 +624,22 @@ follows="left|top" height="12" layout="topleft" - left="132" name="Dozer Size:" - top="94" - width="100"> + left="135" + top_pad="5" + width="50"> Size </text> <slider_bar follows="left|top" - height="16" + height="19" initial_value="2.0" layout="topleft" - left_delta="46" max_val="11" min_val="1" + left_pad="0" name="slider brush size" - top_delta="0" + top_delta="-3" width="80" /> <text type="string" @@ -705,71 +647,79 @@ follows="left|top" height="12" layout="topleft" - left="132" name="Strength:" - top="116" - width="100"> + left="135" + top_pad="5" + width="50"> Strength </text> <slider_bar follows="left|top" - height="16" + height="19" + left_pad="0" initial_value="0.00" layout="topleft" - left_delta="46" max_val="2" min_val="-1" name="slider force" - top_delta="0" + top_delta="-3" width="80" /> + <button + follows="left|top" + font="SansSerifSmall" + height="19" + label="Apply" + label_selected="Apply" + top_pad="5" + layout="topleft" + left="135" + name="button apply to selection" + tool_tip="Modify Selected Land" + width="78" /> <text type="string" + text_color="LabelSelectedDisabledColor" length="1" + top_pad="7" + height="12" follows="left|top" halign="right" - height="16" layout="topleft" - left="118" + left="115" name="obj_count" - top="135" width="143"> - Selected objects: [COUNT] + Objects: [COUNT] </text> <text type="string" + text_color="LabelSelectedDisabledColor" length="1" follows="left|top" halign="right" - height="16" layout="topleft" - left_delta="0" name="prim_count" - top_delta="12" width="143"> - primitives: [COUNT] + Prims: [COUNT] </text> <tab_container follows="left|top" - height="384" + height="400" layout="topleft" left="0" name="Object Info Tabs" - tab_max_width="52" + tab_max_width="55" tab_min_width="40" tab_position="top" - top="166" - width="272"> + top="180" + width="280"> <panel - border="true" + border="false" follows="left|top|right|bottom" - height="367" label="General" layout="topleft" - left="1" mouse_opaque="false" name="General" - top="16" - width="270"> + top="16"> <panel.string name="text deed continued"> Deed... @@ -780,35 +730,35 @@ </panel.string> <panel.string name="text modify info 1"> - You can modify this object. + You can modify this object </panel.string> <panel.string name="text modify info 2"> - You can modify these objects. + You can modify these objects </panel.string> <panel.string name="text modify info 3"> - You cannot modify this object. + You can't modify this object </panel.string> <panel.string name="text modify info 4"> - You cannot modify these objects. + You can't modify these objects </panel.string> <panel.string name="text modify warning"> - Must select entire object to set permissions. + This object has linked parts </panel.string> <panel.string name="Cost Default"> - Price: L$ + Price: L$ </panel.string> <panel.string name="Cost Total"> - Total Price: L$ + Total Price: L$ </panel.string> <panel.string name="Cost Per Unit"> - Price Per: L$ + Price Per: L$ </panel.string> <panel.string name="Cost Mixed"> @@ -826,17 +776,15 @@ layout="topleft" left="10" name="Name:" - top="10" - width="78"> + top_pad="8" + width="90"> Name: </text> <line_editor - border_style="line" - border_thickness="1" follows="left|top|right" - height="16" + height="19" layout="topleft" - left_delta="78" + left_pad="0" max_length="63" name="Object Name" select_on_focus="true" @@ -850,414 +798,447 @@ layout="topleft" left="10" name="Description:" - top="30" - width="78"> + top_pad="3" + width="90"> Description: </text> <line_editor - border_style="line" - border_thickness="1" follows="left|top|right" - height="16" + height="19" layout="topleft" - left_delta="78" + left_pad="0" max_length="127" name="Object Description" select_on_focus="true" top_delta="0" width="172" /> + <text type="string" + left="10" length="1" follows="left|top" - height="16" + height="19" layout="topleft" - left="10" name="Creator:" - top="50" - width="78"> + width="90"> Creator: </text> +<!-- TODO: add person inspector to creator name --> <text type="string" length="1" follows="left|top" - height="16" + left_pad="0" + height="19" layout="topleft" - left_delta="78" name="Creator Name" - top_delta="0" - width="88"> + width="150"> Thrax Linden </text> - <button +<!--TODO: Kill this--> +<!-- <button follows="top|right" font="SansSerifSmall" - height="20" + height="19" label="Profile..." label_selected="Profile..." layout="topleft" left_pad="6" name="button creator profile" - top_delta="-4" - width="78" /> + tool_tip="View creator profile" + width="78" />--> <text type="string" length="1" + left="10" follows="left|top" - height="16" + height="19" layout="topleft" - left="10" name="Owner:" - top="70" - width="78"> + width="90"> Owner: </text> +<!--TODO: add person inspector to creator name--> <text type="string" length="1" follows="left|top" - height="16" + height="19" layout="topleft" - left_delta="78" name="Owner Name" - top_delta="0" - width="88"> + left_pad="0" + width="150"> Thrax Linden </text> - <button +<!--TODO: Kill this--> +<!--<button follows="top|right" font="SansSerifSmall" - height="20" + height="19" label="Profile..." label_selected="Profile..." layout="topleft" left_pad="6" name="button owner profile" - top_delta="-4" - width="78" /> - <text + tool_tip="View owner profile" + width="78" />--> + <text type="string" length="1" follows="left|top" - height="16" layout="topleft" left="10" + height="19" name="Group:" - top="90" - width="78"> + width="90"> Group: </text> <name_box - follows="left|top" - height="16" - initial_value="(retrieving)" - layout="topleft" - left_delta="78" - name="Group Name Proxy" - top_delta="0" - width="88" /> - <button - follows="top|right" - font="SansSerifSmall" - height="20" - label="Set..." - label_selected="Set..." - layout="topleft" - left_pad="6" - name="button set group" - top_delta="-4" - width="78" /> - <text - type="string" - length="1" - follows="left|top" - height="16" - layout="topleft" - left="10" - name="Permissions:" - top="110" - width="85"> - Permissions: - </text> - <text - type="string" - length="1" follows="left|top|right" - height="16" + height="19" + initial_value="Loading..." layout="topleft" - left_delta="0" - name="perm_modify" - top_pad="4" - width="250"> - You can modify this object. - </text> - <check_box - height="16" - label="Share with group" - layout="topleft" - left_delta="0" - name="checkbox share with group" - tool_tip="Allow all members of the set group to share and use your permissions for this object. You must Deed to enable role restrictions." - top_pad="4" - width="166" /> + left_pad="0" + name="Group Name Proxy" + width="170" /> <button follows="top|right" font="SansSerifSmall" - height="20" + height="19" label="Deed..." label_selected="Deed..." layout="topleft" - left_delta="172" name="button deed" - tool_tip="Group shared objects can be deeded by a group officer." - top="166" - width="78" /> - <check_box - height="16" - label="Allow anyone to move" - layout="topleft" - left="10" - name="checkbox allow everyone move" - top="190" - width="142" /> - <check_box - height="16" - label="Allow anyone to copy" - layout="topleft" - left_delta="0" - name="checkbox allow everyone copy" - top_pad="4" - width="141" /> - <check_box - height="16" - label="Show in search" + top_pad="0" + left="102" + tool_tip="Deeding gives this item away with Next Owner permissions. Group shared objects can be deeded by a group officer." + width="80" /> + <button + follows="left|top" + font="SansSerifSmall" + height="19" + label="Set..." + label_selected="Set..." layout="topleft" - left_delta="0" - name="search_check" - tool_tip="Let people see this object in search results" - top_pad="4" - width="78" /> + left_pad="7" + name="button set group" + tool_tip="Choose a group to share this object's permissions" + width="80" /> <check_box - height="16" - label="For Sale" - layout="topleft" - left_delta="0" - name="checkbox for sale" - top_pad="4" - width="78" /> - <text - type="string" - length="1" + height="19" follows="left|top" - height="16" - layout="topleft" - left_pad="12" - name="Cost" - top_delta="0" - width="78"> - Price: L$ - </text> - <line_editor - border_style="line" - border_thickness="1" - follows="left|top|right" - height="16" - layout="topleft" - left_pad="2" - max_length="25" - name="Edit Cost" - top_delta="0" - width="75" /> - <radio_group - draw_border="false" - follows="left|top|right" - height="16" - layout="topleft" - left="42" - name="sale type" - top="270" - width="218"> - <radio_item - height="16" - label="Original" - layout="topleft" - left="0" - name="Original" - top="0" - width="70" /> - <radio_item - height="16" - label="Copy" - layout="topleft" - left_delta="70" - name="Copy" - top_delta="0" - width="70" /> - <radio_item - height="16" - label="Contents" - layout="topleft" - left_delta="70" - name="Contents" - top_delta="0" - width="76" /> - </radio_group> - <text - type="string" - length="1" - follows="left|top|right" - height="10" - layout="topleft" - left="10" - name="Next owner can:" - top="288" - width="250"> - Next owner can: - </text> - <check_box - follows="left|top|right" - height="16" - label="Modify" - layout="topleft" - left_delta="0" - name="checkbox next owner can modify" - top_pad="6" - width="250" /> - <check_box - follows="left|top|right" - height="16" - label="Copy" - layout="topleft" - left_delta="60" - name="checkbox next owner can copy" - top_delta="0" - width="190" /> - <check_box - follows="left|top|right" - height="16" - label="Resell/Give away" + label="Share" layout="topleft" - left_delta="60" - name="checkbox next owner can transfer" - top_delta="0" - width="130" /> + name="checkbox share with group" + tool_tip="Allow all members of the set group to share your modify permissions for this object. You must Deed to enable role restrictions." + left="100" + width="93" /> <text type="string" length="1" follows="left|top" - height="10" + height="19" layout="topleft" + top_pad="7" left="10" name="label click action" - top="322" - width="150"> - When Left-Clicked: + width="90"> + Click to: </text> <combo_box - height="18" + follows="left|top" + height="22" layout="topleft" - left_delta="0" name="clickaction" - top_pad="7" - width="150"> + width="170" + left_pad="0"> <combo_box.item - label="Touch/grab (default)" + label="Touch (default)" + name="Touch/grab(default)" value="Touch/grab (default)" /> <combo_box.item label="Sit on object" + name="Sitonobject" value="Sit on object" /> <combo_box.item label="Buy object" + name="Buyobject" value="Buy object" /> <combo_box.item label="Pay object" + name="Payobject" value="Pay object" /> <combo_box.item label="Open" + name="Open" value="Open" /> - <combo_box.item +<!--TODO: Kill this--> +<!-- <combo_box.item label="Play parcel media" + name="Play" value="Play" /> <combo_box.item label="Open parcel media" - value="Open Media" /> + name="Opemmedia" + value="Open Media" />--> </combo_box> + <check_box + height="20" + label="For Sale:" + layout="topleft" + name="checkbox for sale" + left="10" + width="90" /> +<!-- NEW SALE TYPE COMBO BOX --> + <combo_box + left_pad="0" + layout="topleft" + follows="left|top" + allow_text_entry="false" + height="22" + width="170" + max_chars="20" + mouse_opaque="true" + name="sale type" + intial_value="2"> + <combo_item + label="Copy" + value="2" /> + <combo_item + label="Contents" + value="3" /> + <combo_item + label="Original" + value="1" /> + </combo_box> +<!-- NEW PRICE SPINNER --> + <spinner + follows="left|top" + decimal_digits="0" + increment="1" + control_name="Edit Cost" + name="Edit Cost" + label="Price: L$" + label_width="60" + width="170" + min_val="1" + height="19" + max_val="999999999" /> + <panel + border="false" + follows="left|top|right" + layout="topleft" + mouse_opaque="false" + background_visible="true" + bg_alpha_color="FloaterUnfocusBorderColor" + name="perms_build" + left="0" + height="140" + width="280"> <text type="string" length="1" + left="10" + top_pad="6" + height="19" + follows="left|top|right" + layout="topleft" + name="perm_modify" + width="180"> + You can modify this object + </text> + <text + type="string" + text_color="LabelSelectedDisabledColor" + length="1" + top_pad="0" follows="left|top" - height="10" layout="topleft" - left="88" + left="17" name="B:" - top="105" - width="174"> + width="30"> B: </text> <text type="string" + text_color="LabelSelectedDisabledColor" length="1" follows="left|top" - height="10" layout="topleft" - left_delta="50" + left_pad="0" name="O:" - top_delta="0" - width="124"> - O; + width="30"> + O: </text> <text type="string" + text_color="LabelSelectedDisabledColor" length="1" follows="left|top" - height="10" layout="topleft" - left_delta="50" + left_pad="0" name="G:" - top_delta="0" - width="74"> + width="30"> G: </text> <text type="string" + text_color="LabelSelectedDisabledColor" length="1" follows="left|top" - height="10" + left_pad="0" layout="topleft" - left="88" name="E:" - top="117" - width="174"> + width="30"> E: </text> <text type="string" + text_color="LabelSelectedDisabledColor" length="1" follows="left|top" - height="10" layout="topleft" - left_delta="50" + left_pad="0" name="N:" - top_delta="0" - width="124"> + width="30"> N: </text> <text type="string" + text_color="LabelSelectedDisabledColor" length="1" follows="left|top" - height="10" layout="topleft" - left_delta="50" + left_pad="0" name="F:" - top_delta="0" - width="74"> + width="30"> F: </text> + <check_box + left="15" + height="19" + label="Show in search" + layout="topleft" + name="search_check" + tool_tip="Let people see this object in search results" + /> + <text + type="string" + follows="left|top" + name="Anyone can:" + width="250" + top_pad="7" + left="10"> + Anyone: + </text> + <check_box + height="19" + label="Move" + layout="topleft" + name="checkbox allow everyone move" + left="15" + width="85" /> + <check_box + height="19" + label="Copy" + layout="topleft" + left_pad="0" + name="checkbox allow everyone copy" + width="260" /> + <text + type="string" + follows="left|top" + height="19" + name="Next owner can:" + width="270" + left="10"> + Next owner: + </text> + <check_box + follows="left|top|right" + label="Modify" + layout="topleft" + left="15" + name="checkbox next owner can modify" + width="85" /> + <check_box + follows="left|top|right" + height="19" + label="Copy" + layout="topleft" + left_pad="0" + name="checkbox next owner can copy" + width="90" /> + <check_box + follows="left|top|right" + height="19" + label="Transfer" + layout="topleft" + name="checkbox next owner can transfer" + left_pad="0" + top_delta="0" + tool_tip="Next owner can give away or resell this object" + width="90" /> + </panel> +<!--TODO: KILL THIS--> +<!--<text + type="string" + length="1" + follows="left|top" + height="19" + layout="topleft" + left_pad="12" + name="Cost" + top_delta="0" + width="78"> + Price: L$ + </text> + <line_editor + follows="left|top|right" + height="19" + layout="topleft" + left_pad="0" + max_length="25" + name="Edit Cost" + top_delta="0" + width="75" />--> +<!--TODO: KILL THIS--> +<!--<radio_group + follows="left|top|right" + height="19" + left="15" + layout="topleft" + name="sale type" + width="218"> + <radio_item + height="19" + label="Original" + layout="topleft" + left="0" + name="Original" + top="0" + width="70" /> + <radio_item + height="19" + label="Copy" + layout="topleft" + left_delta="70" + name="Copy" + top_delta="0" + width="70" /> + <radio_item + height="19" + label="Contents" + layout="topleft" + left_delta="70" + name="Contents" + top_delta="0" + width="76" /> + </radio_group>--> </panel> <panel - border="true" + border="false" follows="left|top|right|bottom" height="367" label="Object" @@ -1266,7 +1247,7 @@ mouse_opaque="false" name="Object" top_delta="0" - width="270"> + width="280"> <text type="string" length="1" @@ -1292,7 +1273,7 @@ Edit object parameters: </text> <check_box - height="16" + height="19" label="Locked" layout="topleft" left_delta="-2" @@ -1301,7 +1282,7 @@ top_pad="10" width="123" /> <check_box - height="16" + height="19" label="Physical" layout="topleft" left_delta="0" @@ -1310,7 +1291,7 @@ top_pad="2" width="123" /> <check_box - height="16" + height="19" label="Temporary" layout="topleft" left_delta="0" @@ -1319,7 +1300,7 @@ top_pad="2" width="123" /> <check_box - height="16" + height="19" label="Phantom" layout="topleft" left_delta="0" @@ -1327,6 +1308,55 @@ tool_tip="Causes object to not collide with other objects or avatars" top_pad="2" width="123" /> + + <text + type="string" + length="1" + follows="left|top" + height="10" + layout="topleft" + left_delta="0" + name="label material" + top_pad="9" + width="121"> + Material + </text> + <combo_box + height="19" + layout="topleft" + left_delta="0" + name="material" + top_pad="4" + width="95"> + <combo_box.item + label="Stone" + name="Stone" + value="Stone" /> + <combo_box.item + label="Metal" + name="Metal" + value="Metal" /> + <combo_box.item + label="Glass" + name="Glass" + value="Glass" /> + <combo_box.item + label="Wood" + name="Wood" + value="Wood" /> + <combo_box.item + label="Flesh" + name="Flesh" + value="Flesh" /> + <combo_box.item + label="Plastic" + name="Plastic" + value="Plastic" /> + <combo_box.item + label="Rubber" + name="Rubber" + value="Rubber" /> + </combo_box> <text type="string" length="1" @@ -1335,13 +1365,13 @@ layout="topleft" left_delta="2" name="label position" - top_pad="4" + top_pad="8" width="121"> Position (meters) </text> <spinner follows="left|top" - height="16" + height="19" increment="0.01" initial_value="0" label="X" @@ -1352,11 +1382,11 @@ min_val="-256" name="Pos X" text_enabled_color="0.43 0.06 0.06 1" - top_pad="4" + top_pad="5" width="87" /> <spinner follows="left|top" - height="16" + height="19" increment="0.01" initial_value="0" label="Y" @@ -1367,11 +1397,11 @@ min_val="-256" name="Pos Y" text_enabled_color="0 0.39 0.15 1" - top_pad="2" + top_pad="3" width="87" /> <spinner follows="left|top" - height="16" + height="19" increment="0.01" initial_value="0" label="Z" @@ -1381,7 +1411,7 @@ max_val="4096" name="Pos Z" text_enabled_color="0 0.26 0.51 1" - top_pad="2" + top_pad="3" width="87" /> <text type="string" @@ -1397,7 +1427,7 @@ </text> <spinner follows="left|top" - height="16" + height="19" increment="0.01" initial_value="0" label="X" @@ -1408,11 +1438,11 @@ min_val="0.01" name="Scale X" text_enabled_color="1 1 1 1" - top_pad="4" + top_pad="5" width="87" /> <spinner follows="left|top" - height="16" + height="19" increment="0.01" initial_value="0" label="Y" @@ -1423,11 +1453,11 @@ min_val="0.01" name="Scale Y" text_enabled_color="1 1 1 1" - top_pad="2" + top_pad="3" width="87" /> <spinner follows="left|top" - height="16" + height="19" increment="0.01" initial_value="0" label="Z" @@ -1438,7 +1468,7 @@ min_val="0.01" name="Scale Z" text_enabled_color="1 1 1 1" - top_pad="2" + top_pad="3" width="87" /> <text type="string" @@ -1455,7 +1485,7 @@ <spinner decimal_digits="2" follows="left|top" - height="16" + height="19" increment="1" initial_value="0" label="X" @@ -1466,12 +1496,12 @@ min_val="-9999" name="Rot X" text_enabled_color="1 1 1 1" - top_pad="6" + top_pad="5" width="87" /> <spinner decimal_digits="2" follows="left|top" - height="16" + height="19" increment="1" initial_value="0" label="Y" @@ -1482,12 +1512,12 @@ min_val="-9999" name="Rot Y" text_enabled_color="1 1 1 1" - top_pad="2" + top_pad="3" width="87" /> <spinner decimal_digits="2" follows="left|top" - height="16" + height="19" increment="1" initial_value="0" label="Z" @@ -1498,91 +1528,59 @@ min_val="-9999" name="Rot Z" text_enabled_color="1 1 1 1" - top_pad="2" + top_pad="3" width="87" /> + <text type="string" length="1" follows="left|top" height="10" layout="topleft" - left_delta="0" - name="label material" - top_pad="6" - width="121"> - Material - </text> - <combo_box - height="18" - layout="topleft" - left_delta="0" - name="material" - top_pad="4" - width="87"> - <combo_box.item - label="Stone" - value="Stone" /> - <combo_box.item - label="Metal" - value="Metal" /> - <combo_box.item - label="Glass" - value="Glass" /> - <combo_box.item - label="Wood" - value="Wood" /> - <combo_box.item - label="Flesh" - value="Flesh" /> - <combo_box.item - label="Plastic" - value="Plastic" /> - <combo_box.item - label="Rubber" - value="Rubber" /> - </combo_box> - <text - type="string" - length="1" - follows="left|top" - height="10" - layout="topleft" - left="121" + left="125" name="label basetype" top="26" - width="141"> + width="150"> Building Block Type </text> <combo_box - height="18" + height="19" layout="topleft" left_delta="0" name="comboBaseType" - top_pad="6" - width="141"> + top_pad="4" + width="150"> <combo_box.item label="Box" + name="Box" value="Box" /> <combo_box.item label="Cylinder" + name="Cylinder" value="Cylinder" /> <combo_box.item label="Prism" + name="Prism" value="Prism" /> <combo_box.item label="Sphere" + name="Sphere" value="Sphere" /> <combo_box.item label="Torus" + name="Torus" value="Torus" /> <combo_box.item label="Tube" + name="Tube" value="Tube" /> <combo_box.item label="Ring" + name="Ring" value="Ring" /> <combo_box.item label="Sculpted" + name="Sculpted" value="Sculpted" /> </combo_box> <text @@ -1593,13 +1591,13 @@ layout="topleft" left_delta="0" name="text cut" - top_pad="2" - width="141"> + top_pad="6" + width="150"> Path Cut Begin and End </text> <spinner follows="left|top" - height="16" + height="19" increment="0.025" initial_value="0" label="B" @@ -1608,17 +1606,17 @@ left_delta="0" max_val="0.98" name="cut begin" - top_pad="6" + top_pad="4" width="68" /> <spinner follows="left|top" - height="16" + height="19" increment="0.025" initial_value="1" label="E" label_width="10" layout="topleft" - left_pad="5" + left_pad="10" min_val="0.02" name="cut end" top_delta="0" @@ -1629,9 +1627,9 @@ follows="left|top" height="10" layout="topleft" - left="121" + left="125" name="text hollow" - top="98" + top_pad="6" width="68"> Hollow </text> @@ -1650,23 +1648,23 @@ <spinner decimal_digits="1" follows="left|top" - height="16" + height="19" increment="5" initial_value="0" layout="topleft" - left="121" + left="125" max_val="95" name="Scale 1" - top="112" + top_pad="4" width="68" /> <spinner decimal_digits="2" follows="left|top" - height="16" + height="19" increment="0.05" initial_value="0" layout="topleft" - left_pad="5" + left_pad="10" max_val="0.95" min_val="-0.95" name="Skew" @@ -1678,30 +1676,34 @@ follows="left|top" height="10" layout="topleft" - left="121" + left="125" name="Hollow Shape" - top="133" - width="141"> + top_pad="6" + width="150"> Hollow Shape </text> <combo_box - height="18" + height="19" layout="topleft" left_delta="0" name="hole" - top_pad="6" - width="141"> + top_pad="4" + width="150"> <combo_box.item label="Default" + name="Default" value="Default" /> <combo_box.item label="Circle" + name="Circle" value="Circle" /> <combo_box.item label="Square" + name="Square" value="Square" /> <combo_box.item label="Triangle" + name="Triangle" value="Triangle" /> </combo_box> <text @@ -1712,14 +1714,14 @@ layout="topleft" left_delta="0" name="text twist" - top_pad="2" - width="141"> + top_pad="4" + width="150"> Twist Begin and End </text> <spinner decimal_digits="0" follows="left|top" - height="16" + height="19" increment="9" initial_value="0" label="B" @@ -1729,18 +1731,18 @@ max_val="180" min_val="-180" name="Twist Begin" - top_pad="6" + top_pad="4" width="68" /> <spinner decimal_digits="0" follows="left|top" - height="16" + height="19" increment="9" initial_value="0" label="E" label_width="10" layout="topleft" - left_pad="5" + left_pad="10" max_val="180" min_val="-180" name="Twist End" @@ -1752,10 +1754,10 @@ follows="left|top" height="10" layout="topleft" - left="121" + left="125" name="scale_taper" - top="205" - width="141"> + top_pad="6" + width="150"> Taper </text> <text @@ -1767,13 +1769,13 @@ left_delta="0" name="scale_hole" top_delta="0" - width="141"> + width="150"> Hole Size </text> <spinner decimal_digits="2" follows="left|top" - height="16" + height="19" increment="0.05" initial_value="0" label="X" @@ -1787,13 +1789,13 @@ <spinner decimal_digits="2" follows="left|top" - height="16" + height="19" increment="0.05" initial_value="0" label="Y" label_width="10" layout="topleft" - left_pad="5" + left_pad="10" min_val="-1" name="Taper Scale Y" top_delta="0" @@ -1804,16 +1806,16 @@ follows="left|top" height="10" layout="topleft" - left="121" + left="125" name="text topshear" - top="239" + top_pad="6" width="141"> Top Shear </text> <spinner decimal_digits="2" follows="left|top" - height="16" + height="19" increment="0.05" initial_value="0" label="X" @@ -1828,13 +1830,13 @@ <spinner decimal_digits="2" follows="left|top" - height="16" + height="19" increment="0.05" initial_value="0" label="Y" label_width="10" layout="topleft" - left_pad="5" + left_pad="10" max_val="0.5" min_val="-0.5" name="Shear Y" @@ -1846,10 +1848,10 @@ follows="left|top" height="10" layout="topleft" - left="121" + left="125" name="advanced_cut" - top="273" - width="141"> + top_pad="6" + width="150"> Profile Cut Begin and End </text> <text @@ -1861,7 +1863,7 @@ left_delta="0" name="advanced_dimple" top_delta="0" - width="141"> + width="150"> Dimple Begin and End </text> <text @@ -1873,12 +1875,12 @@ left_delta="0" name="advanced_slice" top_delta="0" - width="141"> + width="150"> Slice Begin and End </text> <spinner follows="left|top" - height="16" + height="19" increment="0.025" initial_value="0" label="B" @@ -1887,17 +1889,17 @@ left_delta="0" max_val="0.95" name="Path Limit Begin" - top_pad="3" + top_pad="4" width="68" /> <spinner follows="left|top" - height="16" + height="19" increment="0.025" initial_value="1" label="E" label_width="10" layout="topleft" - left_pad="5" + left_pad="10" min_val="0.05" name="Path Limit End" top_delta="0" @@ -1908,16 +1910,16 @@ follows="left|top" height="10" layout="topleft" - left="121" + left="125" name="text taper2" - top="306" - width="141"> + top_pad="6" + width="150"> Taper </text> <spinner decimal_digits="2" follows="left|top" - height="16" + height="19" increment="0.05" initial_value="0" label="X" @@ -1926,18 +1928,18 @@ left_delta="0" min_val="-1" name="Taper X" - top_pad="3" + top_pad="4" width="68" /> <spinner decimal_digits="2" follows="left|top" - height="16" + height="19" increment="0.05" initial_value="0" label="Y" label_width="10" layout="topleft" - left_pad="5" + left_pad="10" min_val="-1" name="Taper Y" top_delta="0" @@ -1948,9 +1950,9 @@ follows="left|top" height="10" layout="topleft" - left="121" + left="125" name="text radius delta" - top="337" + top_pad="6" width="78"> Radius </text> @@ -1960,7 +1962,7 @@ follows="left|top" height="10" layout="topleft" - left_delta="73" + left_delta="78" name="text revolutions" top_delta="0" width="68"> @@ -1968,22 +1970,22 @@ </text> <spinner follows="left|top" - height="16" + height="19" increment="0.05" initial_value="0" layout="topleft" - left="121" + left="125" min_val="-1" name="Radius Offset" - top="350" + top_pad="4" width="68" /> <spinner decimal_digits="2" follows="left|top" - height="16" + height="19" initial_value="1" layout="topleft" - left_pad="5" + left_pad="10" max_val="4" min_val="1" name="Revolutions" @@ -1996,14 +1998,14 @@ height="141" label="Sculpt Texture" layout="topleft" - left="121" + left="125" name="sculpt texture control" tool_tip="Click to choose a picture" top="70" visible="false" - width="141" /> + width="145" /> <check_box - height="16" + height="19" label="Mirror" layout="topleft" left_delta="0" @@ -2011,9 +2013,9 @@ tool_tip="Flips sculpted prim along the X axis." top_pad="8" visible="false" - width="121" /> + width="130" /> <check_box - height="16" + height="19" label="Inside-out" layout="topleft" left_delta="0" @@ -2032,36 +2034,42 @@ name="label sculpt type" top_pad="10" visible="false" - width="121"> + width="130"> Stitching type </text> <combo_box - height="18" + height="19" layout="topleft" left_delta="0" name="sculpt type control" - top_pad="6" + top_pad="4" visible="false" - width="141"> + width="150"> <combo_box.item - label="none)" + label="(none)" + name="None" value="None" /> <combo_box.item label="Sphere" + name="Sphere" value="Sphere" /> <combo_box.item label="Torus" + name="Torus" value="Torus" /> <combo_box.item label="Plane" + name="Plane" value="Plane" /> <combo_box.item label="Cylinder" + name="Cylinder" value="Cylinder" /> </combo_box> </panel> + <panel - border="true" + border="false" follows="left|top|right|bottom" height="367" label="Features" @@ -2070,7 +2078,7 @@ mouse_opaque="false" name="Features" top_delta="0" - width="270"> + width="280"> <text type="string" length="1" @@ -2096,7 +2104,7 @@ Edit object features: </text> <check_box - height="16" + height="19" label="Flexible Path" layout="topleft" left_delta="0" @@ -2106,7 +2114,7 @@ width="121" /> <spinner follows="left|top" - height="16" + height="19" increment="1" initial_value="2" label="Softness" @@ -2115,11 +2123,11 @@ left_delta="0" max_val="3" name="FlexNumSections" - top_pad="4" + top_pad="10" width="128" /> <spinner follows="left|top" - height="16" + height="19" increment="0.5" initial_value="0.3" label="Gravity" @@ -2133,7 +2141,7 @@ width="128" /> <spinner follows="left|top" - height="16" + height="19" increment="0.5" initial_value="2" label="Drag" @@ -2146,7 +2154,7 @@ width="128" /> <spinner follows="left|top" - height="16" + height="19" increment="0.5" initial_value="0" label="Wind" @@ -2159,7 +2167,7 @@ width="128" /> <spinner follows="left|top" - height="16" + height="19" increment="0.5" initial_value="1" label="Tension" @@ -2172,7 +2180,7 @@ width="128" /> <spinner follows="left|top" - height="16" + height="19" increment="0.01" initial_value="0" label="Force X" @@ -2186,7 +2194,7 @@ width="128" /> <spinner follows="left|top" - height="16" + height="19" increment="0.01" initial_value="0" label="Force Y" @@ -2200,7 +2208,7 @@ width="128" /> <spinner follows="left|top" - height="16" + height="19" increment="0.01" initial_value="0" label="Force Z" @@ -2213,7 +2221,7 @@ top_pad="4" width="128" /> <check_box - height="16" + height="19" label="Light" layout="topleft" left_delta="0" @@ -2229,7 +2237,7 @@ layout="topleft" left_delta="0" name="label color" - top_pad="11" + top_pad="15" width="58"> Color </text> @@ -2243,22 +2251,22 @@ left_delta="67" name="colorswatch" tool_tip="Click to open Color Picker" - top="237" + top_delta="-10" width="32" /> <spinner follows="left|top" - height="16" + height="19" initial_value="0.5" label="Intensity" label_width="65" layout="topleft" left="10" name="Light Intensity" - top="273" + top_pad="4" width="128" /> <spinner follows="left|top" - height="16" + height="19" initial_value="5" label="Radius" label_width="65" @@ -2266,11 +2274,11 @@ left_delta="0" max_val="20" name="Light Radius" - top_pad="4" + top_pad="0" width="128" /> <spinner follows="left|top" - height="16" + height="19" increment="0.25" initial_value="1" label="Falloff" @@ -2279,11 +2287,11 @@ left_delta="0" max_val="2" name="Light Falloff" - top_pad="4" + top_pad="0" width="128" /> </panel> <panel - border="true" + border="false" follows="left|top|right|bottom" height="367" label="Texture" @@ -2292,7 +2300,7 @@ mouse_opaque="false" name="Texture" top_delta="0" - width="270"> + width="280"> <panel.string name="string repeats per meter"> Repeats Per Meter @@ -2320,7 +2328,7 @@ height="80" label="Color" layout="topleft" - left_pad="26" + left_pad="25" name="colorswatch" tool_tip="Click to open Color Picker" top_delta="0" @@ -2331,16 +2339,16 @@ follows="left|top" height="10" layout="topleft" - left="180" + left_pad="20" name="color trans" - top="1" - width="80"> + top="10" + width="100"> Transparency % </text> <spinner decimal_digits="0" follows="left|top" - height="16" + height="19" increment="2" initial_value="0" layout="topleft" @@ -2357,14 +2365,14 @@ layout="topleft" left_delta="0" name="glow label" - top_pad="2" + top_pad="4" width="80"> Glow </text> <spinner decimal_digits="2" follows="left|top" - height="16" + height="19" initial_value="0" layout="topleft" left_delta="0" @@ -2372,7 +2380,7 @@ top_pad="4" width="80" /> <check_box - height="16" + height="19" label="Full Bright" layout="topleft" left_delta="0" @@ -2387,12 +2395,12 @@ layout="topleft" left="10" name="tex gen" - top="94" + top_pad="10" width="90"> Mapping </text> <combo_box - height="18" + height="19" layout="topleft" left_delta="0" name="combobox texgen" @@ -2400,9 +2408,11 @@ width="80"> <combo_box.item label="Default" + name="Default" value="Default" /> <combo_box.item label="Planar" + name="Planar" value="Planar" /> </combo_box> <text @@ -2413,12 +2423,12 @@ layout="topleft" left="100" name="label shininess" - top="94" + top_pad="-33" width="70"> Shininess </text> <combo_box - height="18" + height="19" layout="topleft" left_delta="0" name="combobox shininess" @@ -2426,15 +2436,19 @@ width="70"> <combo_box.item label="None" + name="None" value="None" /> <combo_box.item label="Low" + name="Low" value="Low" /> <combo_box.item label="Medium" + name="Medium" value="Medium" /> <combo_box.item label="High" + name="High" value="High" /> </combo_box> <text @@ -2445,12 +2459,12 @@ layout="topleft" left="180" name="label bumpiness" - top="94" + top_pad="-33" width="80"> Bumpiness </text> <combo_box - height="18" + height="19" layout="topleft" left_delta="0" name="combobox bumpiness" @@ -2458,57 +2472,75 @@ width="80"> <combo_box.item label="None" + name="None" value="None" /> <combo_box.item label="Brightness" + name="Brightness" value="Brightness" /> <combo_box.item label="Darkness" + name="Darkness" value="Darkness" /> <combo_box.item label="woodgrain" + name="woodgrain" value="woodgrain" /> <combo_box.item label="bark" + name="bark" value="bark" /> <combo_box.item label="bricks" + name="bricks" value="bricks" /> <combo_box.item label="checker" + name="checker" value="checker" /> <combo_box.item label="concrete" + name="concrete" value="concrete" /> <combo_box.item label="crustytile" + name="crustytile" value="crustytile" /> <combo_box.item label="cutstone" + name="cutstone" value="cutstone" /> <combo_box.item label="discs" + name="discs" value="discs" /> <combo_box.item label="gravel" + name="gravel" value="gravel" /> <combo_box.item label="petridish" + name="petridish" value="petridish" /> <combo_box.item label="siding" + name="siding" value="siding" /> <combo_box.item label="stonetile" + name="stonetile" value="stonetile" /> <combo_box.item label="stucco" + name="stucco" value="stucco" /> <combo_box.item label="suction" + name="suction" value="suction" /> <combo_box.item label="weave" + name="weave" value="weave" /> </combo_box> <text @@ -2519,13 +2551,13 @@ layout="topleft" left="10" name="tex scale" - top="148" + top_pad="15" width="160"> Repeats per Face </text> <spinner follows="left|top" - height="16" + height="19" initial_value="0" label="Horizontal (U)" label_width="90" @@ -2533,10 +2565,10 @@ left="20" max_val="100" name="TexScaleU" - top="162" + top_pad="10" width="160" /> <check_box - height="16" + height="19" label="Flip" layout="topleft" left_pad="10" @@ -2545,7 +2577,7 @@ width="70" /> <spinner follows="left|top" - height="16" + height="19" initial_value="0" label="Vertical (V)" label_width="90" @@ -2553,10 +2585,10 @@ left="20" max_val="100" name="TexScaleV" - top="180" + top_pad="0" width="160" /> <check_box - height="16" + height="19" label="Flip" layout="topleft" left_pad="10" @@ -2571,14 +2603,14 @@ layout="topleft" left="10" name="tex rotate" - top="218" + top_pad="20" width="102"> Rotation (degrees) </text> <spinner decimal_digits="2" follows="left|top" - height="16" + height="19" increment="1" initial_value="0" layout="topleft" @@ -2596,14 +2628,14 @@ layout="topleft" left="10" name="rpt" - top="240" + top_pad="0" width="160"> Repeats Per Meter </text> <spinner decimal_digits="1" follows="left|top" - height="16" + height="19" initial_value="1" layout="topleft" left_delta="102" @@ -2615,7 +2647,7 @@ <button follows="left|top" font="SansSerifSmall" - height="20" + height="19" label="Apply" label_selected="Apply" layout="topleft" @@ -2631,13 +2663,13 @@ layout="topleft" left="10" name="tex offset" - top="278" + top_pad="20" width="160"> Offset </text> <spinner follows="left|top" - height="16" + height="19" initial_value="0" label="Horizontal (U)" label_width="90" @@ -2645,11 +2677,11 @@ left="20" min_val="-1" name="TexOffsetU" - top="292" + top_pad="10" width="160" /> <spinner follows="left|top" - height="16" + height="19" initial_value="0" label="Vertical (V)" label_width="90" @@ -2659,11 +2691,12 @@ name="TexOffsetV" top_pad="2" width="160" /> - <text +<!--TODO: KILL THIS--> + <!-- <text type="string" length="1" follows="left|top" - height="20" + height="19" layout="topleft" left="10" name="textbox autofix" @@ -2675,17 +2708,17 @@ <button follows="left|top" font="SansSerifSmall" - height="20" + height="19" label="Align" label_selected="Align" layout="topleft" left="112" name="button align" top="340" - width="68" /> + width="68" />--> </panel> <panel - border="true" + border="false" follows="left|top|right|bottom" height="367" label="Content" @@ -2694,10 +2727,10 @@ mouse_opaque="false" name="Contents" top_delta="0" - width="270"> + width="280"> <button follows="left|top" - height="20" + height="19" label="New Script" label_selected="New Script..." layout="topleft" @@ -2707,7 +2740,7 @@ width="100" /> <button follows="left|top" - height="20" + height="19" label="Permissions..." layout="topleft" left_pad="10" @@ -2716,29 +2749,30 @@ width="100" /> <panel_inventory follows="left|top" - height="325" + height="300" layout="topleft" left="10" name="contents_inventory" top="35" - width="252" /> + width="260" /> </panel> </tab_container> <panel - follows="left|top" + follows="left|top" height="384" layout="topleft" left_delta="0" name="land info panel" top_delta="0" - width="272"> + width="280"> <text type="string" length="1" + font="SansSerifBig" follows="left|top" - height="16" + height="19" layout="topleft" - left="40" + left="20" name="label_parcel_info" top="24" width="150"> @@ -2748,29 +2782,29 @@ type="string" length="1" follows="left|top" - height="16" + height="19" layout="topleft" - left="48" + left="30" name="label_area_price" top="48" width="150"> - Price: L$[PRICE] for [AREA] sq. m. + Price: L$[PRICE] for [AREA] m² </text> <text type="string" length="1" follows="left|top" - height="16" + height="19" layout="topleft" left_delta="0" name="label_area" top_delta="0" width="150"> - Area: [AREA] sq. m. + Area: [AREA] m² </text> <button follows="left|top" - height="20" + height="19" label="About Land..." label_selected="About Land..." layout="topleft" @@ -2780,31 +2814,32 @@ width="112" /> <check_box control_name="ShowParcelOwners" - height="16" + height="19" label="Show owners" layout="topleft" left_delta="0" name="checkbox show owners" tool_tip="Colour parcels according to their ownership" top_pad="8" - width="100" /> + width="140" /> <button follows="left|top" - height="18" + height="19" label="?" label_selected="?" layout="topleft" - left_delta="94" + left_pad="5" name="button show owners help" top_delta="-2" width="18" /> <text type="string" length="1" + font="SansSerifBig" follows="left|top" - height="16" + height="19" layout="topleft" - left="40" + left="20" name="label_parcel_modify" top="152" width="150"> @@ -2812,17 +2847,17 @@ </text> <button follows="left|top" - height="20" + height="19" label="Subdivide..." label_selected="Subdivide..." layout="topleft" - left="48" + left="30" name="button subdivide land" top="172" width="112" /> <button follows="left|top" - height="20" + height="19" label="Join..." label_selected="Join..." layout="topleft" @@ -2833,10 +2868,11 @@ <text type="string" length="1" + font="SansSerifBig" follows="left|top" - height="16" + height="19" layout="topleft" - left="40" + left="20" name="label_parcel_trans" top="256" width="150"> @@ -2844,17 +2880,17 @@ </text> <button follows="left|top" - height="20" + height="19" label="Buy Land..." label_selected="Buy Land..." layout="topleft" - left="48" + left="30" name="button buy land" top="276" width="112" /> <button follows="left|top" - height="20" + height="19" label="Abandon Land..." label_selected="Abandon Land..." layout="topleft" 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_ui_preview.xml b/indra/newview/skins/default/xui/en/floater_ui_preview.xml index 10968364f3..bbb17dfb8f 100644 --- a/indra/newview/skins/default/xui/en/floater_ui_preview.xml +++ b/indra/newview/skins/default/xui/en/floater_ui_preview.xml @@ -41,6 +41,7 @@ width="55"> <combo_box.item label="en" + name="item1" value="en" /> </combo_box> <button @@ -136,6 +137,7 @@ width="55"> <combo_box.item label="en" + name="item1" value="en" /> </combo_box> <button @@ -161,6 +163,15 @@ tool_tip="Closes the currently-displayed floater, if one exists" top_delta="0" width="85" /> + <button + follows="left|top" + height="25" + label="Export Schema" + layout="topleft" + left_pad="10" + name="export_schema" + top_delta="0" + width="120" /> <scroll_list bottom="525" column_padding="0" @@ -183,7 +194,7 @@ name="file_column" width="150" /> <scroll_list.columns - dynamicwidth="true" + dynamic_width="true" label="Top-Level Node" name="top_level_node_column" /> </scroll_list> diff --git a/indra/newview/skins/default/xui/en/floater_url_entry.xml b/indra/newview/skins/default/xui/en/floater_url_entry.xml index 82a9750cda..cf59d44d01 100644 --- a/indra/newview/skins/default/xui/en/floater_url_entry.xml +++ b/indra/newview/skins/default/xui/en/floater_url_entry.xml @@ -4,7 +4,7 @@ height="87" layout="topleft" name="url_entry" - width="500"> + width="280"> <text type="string" length="1" @@ -12,7 +12,7 @@ follows="top|left" height="15" layout="topleft" - left="20" + left="10" name="media_label" top="20"> Media URL: @@ -26,44 +26,48 @@ max_chars="255" name="media_entry" top_delta="-4" - width="370" /> + width="190" /> <button follows="top|left" height="20" + font="SansSerifSmall" label="OK" layout="topleft" - left="20" + left="10" name="ok_btn" top="50" width="64" /> <button follows="top|left" height="20" + font="SansSerifSmall" label="Cancel" layout="topleft" - left_pad="28" + left_pad="5" name="cancel_btn" top_delta="0" width="64" /> <button follows="top|right" height="20" + font="SansSerifSmall" label="Clear" layout="topleft" - left_pad="220" + left_pad="65" name="clear_btn" top_delta="0" width="64" /> <text type="string" length="1" + font="SansSerifSmall" bottom_delta="-2" follows="bottom|left" height="15" layout="topleft" - left="220" + left="152" name="loading_label" - visible="false"> + visible="true"> Loading... </text> </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..6a022e8966 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" @@ -324,7 +327,10 @@ width="202"> <combo_box.item label="Online Friends" + name="item1" value="None" /> + <combo_box.commit_callback + function="WMap.AvatarCombo"/> </combo_box> <icon color="0.5 0 0 1" @@ -351,7 +357,10 @@ width="202"> <combo_box.item label="Landmarks" + name="item1" value="None" /> + <combo_box.commit_callback + function="WMap.Landmark" /> </combo_box> <icon color="0.5 0 0 1" @@ -384,7 +393,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 +427,8 @@ label="" name="sim_name" width="206" /> + <scroll_list.commit_callback + function="WMap.SearchResult" /> </scroll_list> <text type="string" @@ -441,7 +455,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 +471,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 +487,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 +501,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 +515,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 +529,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,18 +543,24 @@ 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" height="20" - label="Copy SLURL to clipboard" + label="Copy SLurl to clipboard" layout="topleft" left="-230" name="copy_slurl" - tool_tip="Copies current location as SLURL to be used on the web." + 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/fonts.xml b/indra/newview/skins/default/xui/en/fonts.xml index 483291044d..ced8ba83f7 100644 --- a/indra/newview/skins/default/xui/en/fonts.xml +++ b/indra/newview/skins/default/xui/en/fonts.xml @@ -19,13 +19,25 @@ </font> <font name="SansSerif" comment="Name of san-serif font (Truetype file name)"> - <file>"MtBkLfRg.ttf"</file> + <file>Helvetica.dfont</file> + <os name="Windows"> + <file>arial.ttf</file> + </os> + <os name="Mac"> + <file>Helvetica.dfont</file> + </os> </font> <font name="SansSerifBold" comment="Name of bold sans-serif font" font_style="Bold"> - <file>MtBdLfRg.ttf</file> + <file>Helvetica.dfont</file> + <os name="Windows"> + <file>arialbd.ttf</file> + </os> + <os name="Mac"> + <file>Helvetica.dfont</file> + </os> </font> <font name="Monospace" diff --git a/indra/newview/skins/default/xui/en/menu_imchiclet_group.xml b/indra/newview/skins/default/xui/en/menu_imchiclet_group.xml new file mode 100644 index 0000000000..542e319792 --- /dev/null +++ b/indra/newview/skins/default/xui/en/menu_imchiclet_group.xml @@ -0,0 +1,27 @@ +<?xml version="1.0" encoding="utf-8" standalone="yes" ?> +<menu + height="101" + layout="topleft" + left="100" + mouse_opaque="false" + name="IMChiclet Group Menu" + top="724" + visible="false" + width="128"> + <menu_item_call + label="Chat..." + layout="topleft" + name="Chat"> + <menu_item_call.on_click + function="IMChicletMenu.Action" + parameter="group chat" /> + </menu_item_call> + <menu_item_call + label="Info..." + layout="topleft" + name="Show Profile"> + <menu_item_call.on_click + function="IMChicletMenu.Action" + parameter="info" /> + </menu_item_call> +</menu> diff --git a/indra/newview/skins/default/xui/en/menu_imchiclet_p2p.xml b/indra/newview/skins/default/xui/en/menu_imchiclet_p2p.xml new file mode 100644 index 0000000000..bad6e1e212 --- /dev/null +++ b/indra/newview/skins/default/xui/en/menu_imchiclet_p2p.xml @@ -0,0 +1,43 @@ +<?xml version="1.0" encoding="utf-8" standalone="yes" ?> +<menu + height="101" + layout="topleft" + left="100" + mouse_opaque="false" + name="IMChiclet P2P Menu" + top="724" + visible="false" + width="128"> + <menu_item_call + label="Show Profile..." + layout="topleft" + name="Show Profile"> + <menu_item_call.on_click + function="IMChicletMenu.Action" + parameter="profile" /> + </menu_item_call> + <menu_item_call + label="Send IM..." + layout="topleft" + name="Send IM"> + <menu_item_call.on_click + function="IMChicletMenu.Action" + parameter="im" /> + </menu_item_call> + <menu_item_call + label="Add Friend..." + layout="topleft" + name="Add Friend"> + <menu_item_call.on_click + function="IMChicletMenu.Action" + parameter="add" /> + </menu_item_call> + <menu_item_call + label="Remove Friend..." + layout="topleft" + name="Remove Friend"> + <menu_item_call.on_click + function="IMChicletMenu.Action" + parameter="remove" /> + </menu_item_call> +</menu> diff --git a/indra/newview/skins/default/xui/en/menu_inventory.xml b/indra/newview/skins/default/xui/en/menu_inventory.xml index 6f2fd5e5e5..c788f8f095 100644 --- a/indra/newview/skins/default/xui/en/menu_inventory.xml +++ b/indra/newview/skins/default/xui/en/menu_inventory.xml @@ -77,6 +77,14 @@ parameter="category" /> </menu_item_call> <menu_item_call + label="New Current" + layout="topleft" + name="New Current"> + <menu_item_call.on_click + function="Inventory.DoCreate" + parameter="current" /> + </menu_item_call> + <menu_item_call label="New Script" layout="topleft" name="New Script"> @@ -230,6 +238,91 @@ parameter="eyes" /> </menu_item_call> </menu> + <menu + label="Change Type" + layout="topleft" + name="Change Type"> + <menu_item_call + label="Default" + layout="topleft" + name="Default"> + <menu_item_call.on_click + function="Inventory.DoToSelected" + parameter="change_folder_type_default" /> + </menu_item_call> + <menu_item_call + label="Gloves" + layout="topleft" + name="Gloves"> + <menu_item_call.on_click + function="Inventory.DoToSelected" + parameter="change_folder_type_gloves" /> + </menu_item_call> + <menu_item_call + label="Jacket" + layout="topleft" + name="Jacket"> + <menu_item_call.on_click + function="Inventory.DoToSelected" + parameter="change_folder_type_jacket" /> + </menu_item_call> + <menu_item_call + label="Pants" + layout="topleft" + name="Pants"> + <menu_item_call.on_click + function="Inventory.DoToSelected" + parameter="change_folder_type_pants" /> + </menu_item_call> + <menu_item_call + label="Shape" + layout="topleft" + name="Shape"> + <menu_item_call.on_click + function="Inventory.DoToSelected" + parameter="change_folder_type_shape" /> + </menu_item_call> + <menu_item_call + label="Shoes" + layout="topleft" + name="Shoes"> + <menu_item_call.on_click + function="Inventory.DoToSelected" + parameter="change_folder_type_shoes" /> + </menu_item_call> + <menu_item_call + label="Shirt" + layout="topleft" + name="Shirt"> + <menu_item_call.on_click + function="Inventory.DoToSelected" + parameter="change_folder_type_shirt" /> + </menu_item_call> + <menu_item_call + label="Skirt" + layout="topleft" + name="Skirt"> + <menu_item_call.on_click + function="Inventory.DoToSelected" + parameter="change_folder_type_skirt" /> + </menu_item_call> + <menu_item_call + label="Underpants" + layout="topleft" + name="Underpants"> + <menu_item_call.on_click + function="Inventory.DoToSelected" + parameter="change_folder_type_underpants" /> + </menu_item_call> + <menu_item_call + label="Undershirt" + layout="topleft" + name="Undershirt"> + <menu_item_call.on_click + function="Inventory.DoToSelected" + parameter="change_folder_type_undershirt" /> + </menu_item_call> + </menu> <menu_item_call label="Teleport" layout="topleft" @@ -271,6 +364,14 @@ parameter="restore" /> </menu_item_call> <menu_item_call + label="Goto Link" + layout="topleft" + name="Goto Link"> + <menu_item_call.on_click + function="Inventory.DoToSelected" + parameter="goto" /> + </menu_item_call> + <menu_item_call label="Open" layout="topleft" name="Open"> diff --git a/indra/newview/skins/default/xui/en/menu_login.xml b/indra/newview/skins/default/xui/en/menu_login.xml index eb3dcc225e..4e3c0d0c40 100644 --- a/indra/newview/skins/default/xui/en/menu_login.xml +++ b/indra/newview/skins/default/xui/en/menu_login.xml @@ -52,12 +52,12 @@ parameter="help f1" /> </menu_item_call> <menu_item_call - label="About Second Life..." + label="About Second Life" layout="topleft" - name="About Second Life..."> + name="About Second Life"> <menu_item_call.on_click function="ShowFloater" - parameter="about" /> + parameter="sl_about" /> </menu_item_call> </menu> <menu @@ -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_navbar.xml b/indra/newview/skins/default/xui/en/menu_navbar.xml index 725321648b..013136a593 100644 --- a/indra/newview/skins/default/xui/en/menu_navbar.xml +++ b/indra/newview/skins/default/xui/en/menu_navbar.xml @@ -9,7 +9,7 @@ visible="false" width="128"> <menu_item_call - label="Copy SLURL to Clipboard" + label="Copy SLurl to Clipboard" layout="topleft" name="Copy SLURL"> <menu_item_call.on_click @@ -23,6 +23,9 @@ <menu_item_call.on_click function="Navbar.Action" parameter="landmark" /> + <menu_item_call.on_enable + function="Navbar.EnableMenuItem" + parameter="can_landmark" /> </menu_item_call> <menu_item_separator layout="topleft" diff --git a/indra/newview/skins/default/xui/en/menu_nearby_chat.xml b/indra/newview/skins/default/xui/en/menu_nearby_chat.xml index 5eb4b10af9..02a2f83d14 100644 --- a/indra/newview/skins/default/xui/en/menu_nearby_chat.xml +++ b/indra/newview/skins/default/xui/en/menu_nearby_chat.xml @@ -1,10 +1,6 @@ <?xml version="1.0" encoding="utf-8" standalone="yes" ?> <menu bottom="100" color="MenuDefaultBgColor" drop_shadow="true" height="101" left="100" mouse_opaque="false" name="NearBy Chat Menu" opaque="true" width="128" visible="false"> - <menu_item_call bottom_delta="-18" height="18" label="Keep Visible" left="0" mouse_opaque="true" - name="keep_visible" width="128"> - <menu_item_call.on_click function="NearbyChat.Action" userdata="keep_visible" /> - </menu_item_call> <menu_item_call bottom_delta="-18" height="18" label="Show Nearby People..." left="0" mouse_opaque="true" name="nearby_people" width="128"> <menu_item_call.on_click function="NearbyChat.Action" userdata="nearby_people" /> diff --git a/indra/newview/skins/default/xui/en/menu_picks.xml b/indra/newview/skins/default/xui/en/menu_picks.xml new file mode 100644 index 0000000000..146d7d06fe --- /dev/null +++ b/indra/newview/skins/default/xui/en/menu_picks.xml @@ -0,0 +1,46 @@ +<?xml version="1.0" encoding="utf-8" standalone="yes" ?> +<context_menu + layout="topleft" + name="Picks"> + <menu_item_call + label="Info" + layout="topleft" + name="pick_info"> + <menu_item_call.on_click + function="Pick.Info" /> + </menu_item_call> + <menu_item_call + label="Edit" + layout="topleft" + name="pick_edit" + visible="false"> + <menu_item_call.on_click + function="Pick.Edit" /> + </menu_item_call> + <menu_item_call + label="Teleport" + layout="topleft" + name="pick_teleport"> + <menu_item_call.on_click + function="Pick.Teleport" /> + </menu_item_call> + <menu_item_call + label="Show on Map" + layout="topleft" + name="pick_map"> + <menu_item_call.on_click + function="Pick.Map" /> + </menu_item_call> + <menu_item_separator + layout="topleft" + name="pick_separator" + visible="false" /> + <menu_item_call + label="Delete" + layout="topleft" + name="pick_delete" + visible="false"> + <menu_item_call.on_click + function="Pick.Delete" /> + </menu_item_call> +</context_menu> diff --git a/indra/newview/skins/default/xui/en/menu_viewer.xml b/indra/newview/skins/default/xui/en/menu_viewer.xml index 926b51d4c1..fe1baf22d0 100644 --- a/indra/newview/skins/default/xui/en/menu_viewer.xml +++ b/indra/newview/skins/default/xui/en/menu_viewer.xml @@ -15,7 +15,7 @@ name="Preferences" shortcut="control|P"> <menu_item_call.on_click - function="ShowFloater" + function="Floater.Show" parameter="preferences" /> </menu_item_call> <menu_item_separator @@ -31,6 +31,7 @@ name="Account History"> <menu_item_call.on_click function="PromptShowURL" + name="AccountHistory_url" parameter="WebLaunchAccountHistory,http://secondlife.com/account/transactions.php" /> </menu_item_call> <menu_item_call @@ -39,6 +40,7 @@ name="Manage My Account"> <menu_item_call.on_click function="PromptShowURL" + name="ManageMyAccount_url" parameter="WebLaunchJoinNow,http://secondlife.com/account/" /> </menu_item_call> <menu_item_separator @@ -179,65 +181,64 @@ function="World.Chat" /> </menu_item_call> <menu_item_check - label="Local Chat" + label="Nearby Chat" layout="topleft" - name="Chat History" + name="Nearby Chat" shortcut="control|H"> <menu_item_check.on_check function="Floater.Visible" - parameter="chat" /> + parameter="nearby_chat" /> <menu_item_check.on_click function="Floater.Toggle" - parameter="chat" /> + parameter="nearby_chat" /> </menu_item_check> + <menu_item_separator + layout="topleft" /> <menu_item_check - label="Nearby Chat" + label="Active Speakers" layout="topleft" - name="Nearby Chat" - shortcut="control|N"> + name="Active Speakers"> <menu_item_check.on_check function="Floater.Visible" - parameter="nearby_chat" /> + parameter="active_speakers" /> <menu_item_check.on_click function="Floater.Toggle" - parameter="nearby_chat" /> + parameter="active_speakers" /> </menu_item_check> <menu_item_check - label="Communicate" + label="Block List" layout="topleft" - name="Instant Message" - shortcut="control|T"> + name="Mute List"> <menu_item_check.on_check function="Floater.Visible" - parameter="communicate" /> + parameter="mute" /> <menu_item_check.on_click function="Floater.Toggle" - parameter="communicate" /> + parameter="mute" /> </menu_item_check> <menu_item_separator layout="topleft" /> <menu_item_check - label="Active Speakers" + label="(Legacy) Communicate" layout="topleft" - name="Active Speakers"> + name="Instant Message" + shortcut="control|T"> <menu_item_check.on_check - function="FloaterVisible" - parameter="active speakers" /> + function="Floater.Visible" + parameter="communicate" /> <menu_item_check.on_click - function="ShowFloater" - parameter="active speakers" /> + function="Floater.Toggle" + parameter="communicate" /> </menu_item_check> - <menu_item_check - label="Mute List" + <menu_item_call + label="(Temp) Media Remote Ctrl" layout="topleft" - name="Mute List"> - <menu_item_check.on_check - function="FloaterVisible" - parameter="mute list" /> - <menu_item_check.on_click - function="ShowFloater" - parameter="mute list" /> - </menu_item_check> + name="Preferences" + shortcut="control|alt|M"> + <menu_item_call.on_click + function="Floater.Toggle" + parameter="media_remote_ctrl" /> + </menu_item_call> </menu> <menu label="World" @@ -249,22 +250,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 +274,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 +351,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.Toggle" parameter="mini_map" /> </menu_item_check> <menu_item_separator @@ -400,47 +402,36 @@ 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" - layout="topleft" - name="Report" - tear_off="true"> - <menu_item_call - label="Report Abuse" - layout="topleft" - name="Report Abuse"> - <menu_item_call.on_click - function="ShowFloater" - parameter="complaint reporter" /> - </menu_item_call> - <menu_item_call - label="Report Bug" + <menu_item_separator + layout="topleft" /> + <menu_item_call + label="Report Bug..." layout="topleft" - name="Report Bug"> - <menu_item_call.on_click + name="ReportBug"> + <menu_item_call.on_click function="PromptShowURL" - parameter="WebLaunchPublicIssue,http://jira.secondlife.com" /> - </menu_item_call> - <menu_item_call - label="Bumps, Pushes & Hits." - layout="topleft" - name="Bumps, Pushes &amp; Hits"> - <menu_item_call.on_click - function="ShowFloater" - parameter="mean events" /> - </menu_item_call> - <menu_item_call - label="About Second Life" + name="ReportBug_url" + parameter="hud,http://help.secondlife.com/en/bugreport/" /> + </menu_item_call> + <menu_item_call + label="Report Abuse..." layout="topleft" - name="About Second Life"> + name="Report Abuse"> <menu_item_call.on_click function="ShowFloater" - parameter="about" /> + parameter="complaint reporter" /> </menu_item_call> - </menu> + <menu_item_call + label="About Second Life" + layout="topleft" + name="About Second Life"> + <menu_item_call.on_click + function="Floater.Show" + parameter="sl_about" /> + </menu_item_call> </menu> <menu create_jump_keys="true" @@ -573,8 +564,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 +693,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 +711,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 @@ -838,6 +829,7 @@ function="Tools.BuyOrTake" /> <menu_item_call.on_enable function="Tools.EnableBuyOrTake" + name="EnableBuyOrTake" parameter="Buy,Take" /> </menu_item_call> <menu_item_call @@ -1312,8 +1304,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 +1886,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,9 +1991,17 @@ 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_call + label="Bumps, Pushes & Hits..." + layout="topleft" + name="Bumps, Pushes &amp; Hits"> + <menu_item_call.on_click + function="Floater.Show" + parameter="bumps" /> + </menu_item_call> <menu_item_separator layout="topleft" /> <menu @@ -2832,11 +2832,19 @@ name="XUI" tear_off="true"> <menu_item_call + label="Reload Color Settings" + layout="topleft" + name="Reload Color Settings"> + <menu_item_call.on_click + function="Advanced.ReloadColorSettings" /> + </menu_item_call> + <menu_item_call label="Show Font Test" 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..." @@ -2862,6 +2870,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" @@ -3092,7 +3107,8 @@ function="Advanced.ToggleInfoDisplay" parameter="agent target" /> </menu_item_check> - <!-- <menu_item_check +<!-- Appears not to exist anymore + <menu_item_check label="Debug Rotation" layout="topleft" name="Debug Rotation"> @@ -3103,6 +3119,7 @@ function="ToggleControl" parameter="DebugAvatarRotation" /> </menu_item_check> --> +--> <menu_item_call label="Dump Attachments" layout="topleft" @@ -3295,7 +3312,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> @@ -3481,6 +3499,7 @@ name="Official Linden Blog"> <menu_item_call.on_click function="PromptShowURL" + name="OfficialLindenBlog_url" parameter="WebLaunchSupportWiki,http://blog.secondlife.com/" /> </menu_item_call> <menu_item_call @@ -3489,6 +3508,7 @@ name="Scripting Portal"> <menu_item_call.on_click function="PromptShowURL" + name="ScriptingPortal_url" parameter="WebLaunchLSLWiki,http://wiki.secondlife.com/wiki/LSL_Portal" /> </menu_item_call> <menu @@ -3503,6 +3523,7 @@ name="Public Issue Tracker"> <menu_item_call.on_click function="PromptShowURL" + name="PublicIssueTracker_url" parameter="WebLaunchPublicIssue,http://jira.secondlife.com" /> </menu_item_call> <menu_item_call @@ -3511,6 +3532,7 @@ name="Publc Issue Tracker Help"> <menu_item_call.on_click function="PromptShowURL" + name="PublicIssueTrackerHelp_url" parameter="WebLaunchPublicIssueHelp,http://wiki.secondlife.com/wiki/Issue_tracker" /> </menu_item_call> <menu_item_separator @@ -3521,6 +3543,7 @@ name="Bug Reporing 101"> <menu_item_call.on_click function="PromptShowURL" + name="BugReporting101_url" parameter="WebLaunchBugReport101,http://wiki.secondlife.com/wiki/Bug_Reporting_101" /> </menu_item_call> <menu_item_call @@ -3529,6 +3552,7 @@ name="Security Issues"> <menu_item_call.on_click function="PromptShowURL" + name="SecurityIssues_url" parameter="WebLaunchSecurityIssues,http://wiki.secondlife.com/wiki/Security_issues" /> </menu_item_call> <menu_item_call @@ -3537,6 +3561,7 @@ name="QA Wiki"> <menu_item_call.on_click function="PromptShowURL" + name="QAWiki_url" parameter="WebLaunchQAWiki,http://wiki.secondlife.com/wiki/QA_Portal" /> </menu_item_call> </menu> diff --git a/indra/newview/skins/default/xui/en/notifications.xml b/indra/newview/skins/default/xui/en/notifications.xml index 47b21dc64d..17bb961308 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 @@ -102,7 +102,7 @@ name="MissingAlert" label="Unknown Alert Message" type="alertmodal"> -Your version of Second Life does not know how to display the alert message it just received. +Your version of Second Life does not know how to display the alert it just received. Please verify that you have the latest Viewer installed. Error details: The alert called '[_NAME]' was not found in notifications.xml. <usetemplate @@ -154,7 +154,7 @@ No tutorial is currently available. icon="alertmodal.tga" name="BadInstallation" type="alertmodal"> -An error occurred while updating Second Life. Please download the latest version from secondlife.com. + An error occurred while updating Second Life. Please download the latest version of the Viewer. http://get.secondlife.com <usetemplate name="okbutton" yestext="Ok"/> @@ -164,9 +164,9 @@ An error occurred while updating Second Life. Please download the latest version icon="alertmodal.tga" name="LoginFailedNoNetwork" type="alertmodal"> -Network Error: Could not establish a connection. +Could not connect to the Second Life Grid. '[DIAGNOSTIC]' -Please check your network connection. +Make sure your Internet connection is working properly. <usetemplate name="okbutton" yestext="Ok"/> @@ -443,6 +443,13 @@ Go to the Second Life web site for more information on partnering? Your default permissions may not work in older regions. </notification> +<notification + icon="alertmodal.tga" + name="ClickUnimplemented" + type="alertmodal"> +This feature is yet to be implemented. + </notification> + <notification icon="alertmodal.tga" name="ClickWebProfileHelpAvatar" @@ -2335,9 +2342,10 @@ You can use [SECOND_LIFE] normally and other users will see you correctly. icon="alertmodal.tga" name="FirstRun" type="alertmodal"> + [SECOND_LIFE] installation is complete. -If this is your first time using [SECOND_LIFE], you will need to create an account before you can log on. +If this is your first time using [SECOND_LIFE], you will need to create an account before you can log in. Return to www.secondlife.com to create a new account? <usetemplate name="okcancelbuttons" @@ -2399,7 +2407,7 @@ Please choose the male or female avatar. You can change your mind later. icon="alertmodal.tga" name="GrantedModifyRights" type="alertmodal"> -You have been granted the privilege to modify [FIRST_NAME] [LAST_NAME]'s objects. +[FIRST_NAME] [LAST_NAME] has given you permission to edit their objects. </notification> <notification @@ -2836,7 +2844,7 @@ Do you REALLY want to kick all users off the grid? icon="alertmodal.tga" name="MuteLinden" type="alertmodal"> -Sorry, you cannot mute a Linden. +Sorry, you cannot block a Linden. <usetemplate name="okbutton" yestext="OK"/> @@ -2851,10 +2859,10 @@ You cannot start an auction on a parcel which is already set for sale. Disable <notification icon="alertmodal.tga" - label="Mute object by name failed" + label="Block object by name failed" name="MuteByNameFailed" type="alertmodal"> -You already have muted this name. +You already have blocked this name. <usetemplate name="okbutton" yestext="OK"/> @@ -2907,8 +2915,7 @@ Chat and instant messages will be hidden. Instant messages will get your Busy mo icon="alert.tga" name="JoinedTooManyGroupsMember" type="alert"> -You are a member of too many groups to join another one. Please leave at least one group before joining this one, or decline the offer. -To leave a group select the 'Groups...' option from the 'Edit' menu. +You have reached your maximum number of groups. Please leave another group before joining this one, or decline the offer. [NAME] has invited you to join a group as a member. [INVITE] <usetemplate @@ -3056,6 +3063,18 @@ Are you sure you want to teleport? </notification> <notification + icon="alertmodal.tga" + name="TeleportToPick" + type="alertmodal"> +Teleport to [PICK]? + <usetemplate + ignoretext="When teleporting from double-clicking a pick" + name="okcancelignore" + notext="Cancel" + yestext="Teleport"/> + </notification> + + <notification icon="alert.tga" label="Message everyone in your Estate" name="MessageEstate" @@ -4154,7 +4173,7 @@ Go to the Second Life web site to see your account history? icon="alertmodal.tga" name="ClickOpenF1Help" type="alertmodal"> -Visit the Second Life Support Web site? +View Second Life help? <usetemplate ignoretext="When visiting the Second Life Support Website." name="okcancelignore" @@ -4170,8 +4189,9 @@ Are you sure you want to quit? <usetemplate ignoretext="When Quitting Second Life." name="okcancelignore" - notext="Continue" + notext="Don't Quit" yestext="Quit"/> + <unique/> </notification> <notification @@ -4366,7 +4386,7 @@ Would you like to leave Busy Mode before completing this transaction? icon="alertmodal.tga" name="ConfirmEmptyTrash" type="alertmodal"> -Are you sure you want to permanently remove the contents of your Trash folder? +Are you sure you want to permanently delete the contents of your Trash? <usetemplate ignoretext="When emptying your inventory trash folder" name="okcancelignore" @@ -4411,7 +4431,7 @@ Are you sure you want to clear your list of saved URLs? icon="alertmodal.tga" name="ConfirmEmptyLostAndFound" type="alertmodal"> -Are you sure you want to permanently remove the contents of your Lost And Found folder? +Are you sure you want to permanently delete the contents of your Lost And Found? <usetemplate ignoretext="When emptying your inventory Lost And Found folder" name="okcancelignore" @@ -4423,13 +4443,13 @@ Are you sure you want to permanently remove the contents of your Lost And Found icon="alertmodal.tga" name="CopySLURL" type="alertmodal"> -The following SLURL has been copied to your clipboard: +The following SLurl has been copied to your clipboard: [SLURL] Put it in a web page to give others easy access to this location or try it out yourself by pasting it into the address bar of your web browser. <form name="form"> <ignore name="ignore" - text="When copying a SLURL to your clipboard"/> + text="When copying a SLurl to your clipboard"/> </form> </notification> @@ -4905,7 +4925,7 @@ Your chat session with [NAME] must close. icon="alertmodal.tga" name="Cannot_Purchase_an_Attachment" type="alertmodal"> -Items may not be purchased while they are part of an attachment. +You can't buy an object while it is attached. </notification> <notification @@ -4923,7 +4943,7 @@ Granting this request gives a script ongoing permission to take Linden dollars ( icon="alertmodal.tga" name="AutoWearNewClothing" type="alertmodal"> -Would you like to automatically wear the clothing item you create? +Automatically wear the clothing you create? <usetemplate ignoretext="Automatically wear new clothing" name="okcancelignore" @@ -4935,13 +4955,12 @@ Would you like to automatically wear the clothing item you create? icon="alertmodal.tga" name="NotAgeVerified" type="alertmodal"> -You need to be age-verified in order to access this parcel. -Would you like to visit the Second Life website to verify your age? +You must be age-verified to visit this area. Visit the Second Life website and verify your age? [_URL] - <url option="0" name="url"> + <url option="0"> - https://secondlife.com/account/verification.php + https://secondlife.com/account/verification.php </url> <usetemplate ignoretext="Warn about lack of age verification" @@ -4954,8 +4973,7 @@ Would you like to visit the Second Life website to verify your age? icon="alertmodal.tga" name="Cannot enter parcel: no payment info on file" type="alertmodal"> -This parcel requires that you have payment information on file before you can access it. -Would you like to visit the Second Life website to set this up? +You must have payment information on file to visit this area. Visit the Second Life website and set this up? [_URL] <url option="0" name="url"> @@ -4973,354 +4991,354 @@ Would you like to visit the Second Life website to set this up? icon="alertmodal.tga" name="MissingString" type="alertmodal"> -The string [STRING_NAME] is missing from strings.xml +How odd. The string [STRING_NAME] is missing from strings.xml </notification> <notification 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. + Although you're very nice, you can't 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. + Hmm. Gesture [NAME] is missing from the 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. + This might affect your password. </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. + You don't have permission to view this 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. + You can only buy objects from one owner at a time. + Please select a single object. </notification> <notification icon="notifytip.tga" name="ObjectNotForSale" type="notifytip"> -Object does not appear to be for sale. + This object is not 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] + Now leaving god mode, level [LEVEL] </notification> <notification icon="notifytip.tga" name="CopyFailed" type="notifytip"> -Copy failed because you lack copy permission + You don't have permission to copy this. </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 +5355,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 +5386,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 +5401,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. + You can be hurt here. If you die, you will be teleported to your home location. <unique/> </notification> @@ -5445,8 +5463,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 area has flying disabled. + You can't fly here. <unique/> </notification> @@ -5454,8 +5472,7 @@ 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 area does not allow pushing. You can't push others here unless you own the land. <unique/> </notification> @@ -5463,7 +5480,7 @@ You cannot push others here unless you own the land. icon="notify.tga" name="NoVoice" type="notify"> -This land has voice disabled. + This area has voice chat disabled. You won't be able to hear anyone talking. <unique/> </notification> @@ -5471,8 +5488,7 @@ 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 area has building disabled. You can't build or rez objects here. <unique/> </notification> @@ -5480,222 +5496,223 @@ 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 scripts will work here 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. + You can only claim public land in the 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" @@ -5708,7 +5725,7 @@ An object named [OBJECTFROMNAME] owned by [FIRST] [LAST] has given you a [OBJECT <button index="2" name="Mute" - text="Mute"/> + text="Block"/> </form> </notification> @@ -5716,7 +5733,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" @@ -5729,7 +5746,7 @@ An object named [OBJECTFROMNAME] owned by (an unknown user) has given you a [OBJ <button index="2" name="Mute" - text="Mute"/> + text="Block"/> </form> </notification> @@ -5737,7 +5754,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" @@ -5750,7 +5767,7 @@ An object named [OBJECTFROMNAME] owned by (an unknown user) has given you a [OBJ <button index="2" name="Mute" - text="Mute"/> + text="Block"/> </form> </notification> @@ -5758,15 +5775,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 +5804,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 their location: -[MESSAGE] + [MESSAGE] <form name="form"> <button index="0" @@ -5806,8 +5823,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 +5841,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 +5862,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 +5881,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 +5915,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. + This region will restart in [MINUTES] minutes. + If you stay in this region you will be logged out. </notification> <notification @@ -5908,19 +5925,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. + This region will restart in [SECONDS] seconds. + If you stay 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 +5954,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 +5975,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" @@ -5974,7 +5991,7 @@ Is this OK? <button index="2" name="Mute" - text="Mute"/> + text="Block"/> </form> </notification> @@ -5983,12 +6000,12 @@ Is this OK? name="ScriptQuestionCaution" priority="high" type="notify"> -'[OBJECTNAME]', an object owned by '[NAME]', would like to: + An object named '[OBJECTNAME]', 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. -Grant this request? + Grant this request? <form name="form"> <button index="0" @@ -6010,8 +6027,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 +6041,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 +6055,137 @@ 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]. + Your L$ balance is shown in the upper-right. </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 L$ balance is shown in the upper-right. </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 your arrow keys (or AWSD) to look around. + Click the 'Stand Up' button to stand. </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 the map to look around. + 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 have opened the Build Tools. Every object you see around you was created using these tools. </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. + You can only teleport to certain areas in this region. The arrow points to your specific destination. Click to dismiss it. </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. +Use the arrow keys to look around. +When you are done, press 'Save All'. </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 items you own. + + * To wear something, drag it onto yourself. + * To rez something inworld, 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 area, and is meant to help Residents learn how to build. -Sandbox regions are uncommon, and are marked with signs. + Things you build here will be deleted after you leave, so don't forget to right-click and choose 'take' to move your creation to your Inventory. </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. Flexis must be phantom and not physical. </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 opened the Advanced menu. + + To toggle this menu, + Windows: Ctrl-Alt-D + Mac: ⌘-Opt-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. Sculpties require a special texture to define their shape. </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 @@ -6181,7 +6193,7 @@ You may only select up to [MAX_SELECT] items from this list. name="VoiceInviteP2P" type="notify"> [NAME] is inviting you to a Voice Chat call. -Click Accept to join the call or Decline to decline the invitation. Click Mute to mute this caller. +Click Accept to join the call or Decline to decline the invitation. Click Block to block this caller. <unique> <context key="NAME"/> </unique> @@ -6197,7 +6209,7 @@ Click Accept to join the call or Decline to decline the invitation. Click Mute t <button index="2" name="Mute" - text="Mute"/> + text="Block"/> </form> </notification> @@ -6205,21 +6217,21 @@ Click Accept to join the call or Decline to decline the invitation. Click Mute t icon="notify.tga" name="AutoUnmuteByIM" type="notify"> -[FIRST] [LAST] was sent an instant message and has been automatically unmuted. +[FIRST] [LAST] was sent an instant message and has been automatically unblocked. </notification> <notification icon="notify.tga" name="AutoUnmuteByMoney" type="notify"> -[FIRST] [LAST] was given money and has been automatically unmuted. +[FIRST] [LAST] was given money and has been automatically unblocked. </notification> <notification icon="notify.tga" name="AutoUnmuteByInventory" type="notify"> -[FIRST] [LAST] was offered inventory and has been automatically unmuted. +[FIRST] [LAST] was offered inventory and has been automatically unblocked. </notification> <notification @@ -6227,7 +6239,7 @@ Click Accept to join the call or Decline to decline the invitation. Click Mute t name="VoiceInviteGroup" type="notify"> [NAME] has joined a Voice Chat call with the group [GROUP]. -Click Accept to join the call or Decline to decline the invitation. Click Mute to mute this caller. +Click Accept to join the call or Decline to decline the invitation. Click Block to block this caller. <unique> <context key="NAME"/> <context key="GROUP"/> @@ -6244,7 +6256,7 @@ Click Accept to join the call or Decline to decline the invitation. Click Mute t <button index="2" name="Mute" - text="Mute"/> + text="Block"/> </form> </notification> @@ -6252,8 +6264,8 @@ Click Accept to join the call or Decline to decline the invitation. Click Mute t icon="notify.tga" name="VoiceInviteAdHoc" type="notify"> -[NAME] has joined a Voice Chat call with a conference chat... -Click Accept to join the call or Decline to decline the invitation. Click Mute to mute this user. +[NAME] has joined a voice chat call with a conference chat. +Click Accept to join the call or Decline to decline the invitation. Click Block to block this user. <unique> <context key="NAME"/> </unique> @@ -6269,7 +6281,7 @@ Click Accept to join the call or Decline to decline the invitation. Click Mute t <button index="2" name="Mute" - text="Mute"/> + text="Block"/> </form> </notification> @@ -6278,7 +6290,7 @@ Click Accept to join the call or Decline to decline the invitation. Click Mute t name="InviteAdHoc" type="notify"> [NAME] is inviting you to a conference chat. -Click Accept to join the chat or Decline to decline the invitation. Click Mute to mute this user. +Click Accept to join the chat or Decline to decline the invitation. Click Block to block this user. <unique> <context key="NAME"/> </unique> @@ -6294,7 +6306,7 @@ Click Accept to join the chat or Decline to decline the invitation. Click Mute t <button index="2" name="Mute" - text="Mute"/> + text="Block"/> </form> </notification> @@ -6302,7 +6314,7 @@ Click Accept to join the chat or Decline to decline the invitation. Click Mute t 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 +6324,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 +6332,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 +6342,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 +6352,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 +6362,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 +6372,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 +6383,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 +6391,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. + Only members of a certain group can visit this area. </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 +6422,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 +6434,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. + You just entered a region using a different server version, which may affect performance. Click to see the release notes. </notification> <notification @@ -6430,7 +6442,33 @@ 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 link you clicked cannot be opened from this web browser. + </notification> + + <notification name="IMToast" type="notifytoast"> + [MESSAGE] + <form name="form"> + <button index="0" name="respondbutton" text="Respond"/> + </form> + </notification> + + <notification + icon="alertmodal.tga" + name="CreateGroupCost" + type="alertmodal"> + Creating this group will cost L$100. + Groups need more than one member, or they are deleted forever. + Please invite members within 48 hours. + <usetemplate + canceltext="Cancel" + name="okcancelbuttons" + notext="Cancel" + yestext="Create group for L$100"/> + </notification> + + <notification icon="notifytip.tga" + name="AttachmentSaved" type="notifytip"> + Attachment has been saved. </notification> <global name="UnsupportedCPU"> diff --git a/indra/newview/skins/default/xui/en/panel_avatar_list_item.xml b/indra/newview/skins/default/xui/en/panel_avatar_list_item.xml index bf3f70f54b..3de3365539 100644 --- a/indra/newview/skins/default/xui/en/panel_avatar_list_item.xml +++ b/indra/newview/skins/default/xui/en/panel_avatar_list_item.xml @@ -47,9 +47,9 @@ <button bottom="5" left="260" width="20" height="20" follows="right" name="info_btn" label="" - image_unselected="info_btn.tga" image_disabled="info_btn.tga" - image_selected="info_btn_active.tga" image_hover_selected="info_btn_active.tga" - image_disabled_selected="info_btn.tga" font="SansSerifBigBold" + image_unselected="avatar_info_btn.tga" image_disabled="avatar_info_btn.tga" + image_selected="avatar_info_btn_active.tga" image_hover_selected="avatar_info_btn_active.tga" + image_disabled_selected="avatar_info_btn.tga" font="SansSerifBigBold" /> <button diff --git a/indra/newview/skins/default/xui/en/panel_bottomtray.xml b/indra/newview/skins/default/xui/en/panel_bottomtray.xml index 303487f21b..d42943d225 100644 --- a/indra/newview/skins/default/xui/en/panel_bottomtray.xml +++ b/indra/newview/skins/default/xui/en/panel_bottomtray.xml @@ -1,41 +1,234 @@ -<?xml version="1.0" encoding="utf-8" standalone="yes" ?> -<panel follows="left|bottom|right" name="bottom_tray" bg_opaque_color="0.25 0.25 0.25 1.0" - bg_alpha_color="0.25 0.25 0.25 1.0" background_visible="true" auto_resize="true" - left="0" bottom="0" width="1000" height="28" border_visible="false" has_border="false"> - <layout_stack name="toolbar_stack" follows="left|right|bottom|top" - bottom="0" left="0" width="1000" height="25" orientation="horizontal" border_size="0" auto_resize="false"> - - <icon image_name="spacer24.tga" left="0" width="5" height="10" bottom="0" follows="left|right" auto_resize="false" color="0 0 0 0"/> - <panel follows="left|right" auto_resize="true" width="250" height="28" min_height="28"> - <line_editor name="chat_box" follows="left|right" - width="250" height="20" left="0" bottom="6" - bevel_style="in" border_style="line" border_thickness="1"/> - </panel> - <icon image_name="spacer24.tga" left="0" width="5" height="10" bottom="0" follows="left|right" auto_resize="false" color="0 0 0 0"/> - <view_border bevel_style="in" bottom="0" height="28" min_height="28" width="1" follows="left|right" left="270" mouse_opaque="false" auto_resize="false"/> - <icon image_name="spacer24.tga" left="0" width="5" height="10" bottom="0" follows="left|right" auto_resize="false" color="0 0 0 0"/> - <panel follows="left|right" auto_resize="false" width="100" height="28" min_height="28"> - <chiclet_talk name="talk" left="0" bottom="6" width="100" height="20" follows="left|right" auto_resize="false"/> - </panel> - <icon name="DUMMY" image_name="spacer24.tga" left="0" width="150" height="10" bottom="0" follows="left|right" auto_resize="false" color="0 0 0 0"/> - <panel follows="left|right" auto_resize="true" width="250" height="28" min_height="28"> - <chiclet_panel name="chiclet_list" follows="left|right" - width="250" height="25" left="0" bottom="2"/> - </panel> - <icon image_name="spacer24.tga" left="0" width="5" height="10" bottom="0" follows="left|right" auto_resize="false" color="0 0 0 0"/> - <panel follows="left|right" auto_resize="false" width="40" height="28" min_height="28"> - <chiclet_notification name="im_well" follows="left|right" auto_resize="false" - left="0" bottom="4" width="40" height="25" - image_unselected="im_notifications.tga" image_selected="im_notifications.tga"/> - </panel> - <icon image_name="spacer24.tga" left="0" width="10" height="10" bottom="0" follows="left|right" auto_resize="false" color="0 0 0 0"/> - <view_border bevel_style="in" bottom="0" height="30" width="1" follows="left|right" left="270" mouse_opaque="false" auto_resize="false"/> - <icon image_name="spacer24.tga" left="0" width="10" height="10" bottom="0" follows="left|right" auto_resize="false" color="0 0 0 0"/> - <panel follows="left|right" auto_resize="false" width="48" height="28" min_height="28"> - <chiclet_notification name="sys_well" follows="left|right" auto_resize="false" - left="0" bottom="5" width="48" height="25" - image_unselected="sys_notifications.tga" image_selected="sys_notifications.tga"/> - </panel> - <icon image_name="spacer24.tga" left="0" width="5" height="10" bottom="0" follows="left|right" auto_resize="false" color="0 0 0 0"/> - </layout_stack> +<?xml version="1.0" encoding="utf-8" standalone="yes" ?> +<panel + background_visible="true" + bg_alpha_color="0.25 0.25 0.25 1" + bg_opaque_color="0.25 0.25 0.25 1" + follows="left|bottom|right" + height="28" + layout="topleft" + left="0" + name="bottom_tray" + top="28" + border_visible="true" + width="1000"> + <layout_stack + border_size="0" + clip="false" + follows="left|right|bottom|top" + height="28" + layout="topleft" + left="0" + name="toolbar_stack" + orientation="horizontal" + top="0" + width="1000"> + <icon + auto_resize="false" + color="0 0 0 0" + follows="left|right" + height="10" + image_name="spacer24.tga" + layout="topleft" + left="0" + top="0" + width="5" + min_width="5" /> + <layout_panel + follows="left|right" + height="28" + layout="topleft" + left="5" + min_height="28" + width="500" + top="0" + min_width="305" + name="chat_bar" + user_resize="false" + filename="panel_nearby_chat_bar.xml"/> + <icon + auto_resize="false" + color="0 0 0 0" + follows="left|right" + height="10" + image_name="spacer24.tga" + layout="topleft" + left="0" + name="DUMMY" + top="0" + width="5" + min_width="5"/> + <layout_panel + auto_resize="false" + follows="right" + height="28" + layout="topleft" + left="5" + min_height="28" + width="90" + top_delta="-10" + min_width="90" + user_resize="false"> + <button + bottom="22" + follows="right" + height="20" + label="Stand Up" + layout="topleft" + name="stand" + top="3" + width="90" /> + </layout_panel> + <icon + auto_resize="false" + color="0 0 0 0" + follows="left|right" + height="10" + image_name="spacer24.tga" + layout="topleft" + left="0" + name="DUMMY" + top="0" + width="5" + min_width="5" /> + <layout_panel + follows="left|right" + height="28" + layout="topleft" + min_height="28" + top="0" + name="chiclet_list_panel" + width="150" + user_resize="false"> + <chiclet_panel + follows="left|right" + height="25" + layout="topleft" + left="0" + name="chiclet_list" + top="1" + chiclet_padding="3" + scrolling_offset="40" + width="150" /> + </layout_panel> + <icon + auto_resize="false" + color="0 0 0 0" + follows="left|right" + height="10" + image_name="spacer24.tga" + layout="topleft" + left="0" + top="0" + width="5" + min_width="5" /> + <layout_panel + auto_resize="false" + follows="right" + height="28" + layout="topleft" + min_height="28" + name="im_well_panel" + width="40" + top="0" + min_width="40" + user_resize="false"> + <chiclet_notification + follows="right" + height="25" + layout="topleft" + left="0" + name="im_well" + top="2" + width="40"> + <button + image_selected="im_notifications.tga" + image_unselected="im_notifications.tga"/> + <unread_notifications + width="20" + height="20" + left="18" + top="23"/> + <chiclet_notification.commit_callback + function="Notification.Show" + parameter="ClickUnimplemented" /> + </chiclet_notification> + </layout_panel> + <icon + auto_resize="false" + color="0 0 0 0" + follows="left|right" + height="10" + image_name="spacer24.tga" + layout="topleft" + left="0" + top="0" + width="10" + min_width="10"/> + <view_border + auto_resize="false" + bevel_style="in" + follows="left|right" + height="28" + layout="topleft" + left="270" + name="well_separator" + top="0" + width="1" /> + <icon + auto_resize="false" + color="0 0 0 0" + follows="left|right" + height="10" + image_name="spacer24.tga" + layout="topleft" + left="0" + top="0" + width="10" + min_width="10" /> + <layout_panel + auto_resize="false" + follows="right" + height="28" + layout="topleft" + min_height="28" + top="0" + name="sys_well_panel" + width="48" + min_width="48" + user_resize="false"> + <chiclet_notification + follows="right" + height="25" + layout="topleft" + left="0" + name="sys_well" + top="2" + width="48"> + <button + image_selected="bottom_tray_sys_notifications.tga" + image_unselected="bottom_tray_sys_notifications.tga"/> + <unread_notifications + width="20" + height="20" + left="22" + top="23"/> +<!-- + <chiclet_notification.commit_callback + function="Notification.Show" + parameter="ClickUnimplemented" /> + --> + </chiclet_notification> + </layout_panel> + <icon + auto_resize="false" + color="0 0 0 0" + follows="left|right" + height="10" + image_name="spacer24.tga" + layout="topleft" + left="0" + top="0" + width="5" + min_width="5" /> + </layout_stack> </panel> diff --git a/indra/newview/skins/default/xui/en/panel_chat_item.xml b/indra/newview/skins/default/xui/en/panel_chat_item.xml new file mode 100644 index 0000000000..713c3a41a2 --- /dev/null +++ b/indra/newview/skins/default/xui/en/panel_chat_item.xml @@ -0,0 +1,38 @@ +<?xml version="1.0" encoding="utf-8" standalone="yes"?> +<!-- All our XML is utf-8 encoded. --> + +<panel + name="instant_message" + width="300" + height="180" + background_opaque="false" + background_visible="true" + follows="left|top|right|bottom" + bg_alpha_color="0.3 0.3 0.3 1.0"> + <panel width="250" height="30" background_visible="true" background_opaque="false" bg_alpha_color="0.0 0.0 0.0 1.0" name="msg_caption"> + <avatar_icon + top="25" left="10" width="20" height="20" follows="left|top" + color="1 1 1 1" enabled="true" name="avatar_icon" + /> + <text + width="130" top="25" left="40" height="20" follows="left|right|top" + font="SansSerifBigBold" text_color="white" word_wrap="true" + mouse_opaque="true" name="sender_name" > + Jerry Knight + </text> + <icon top="22" left="170" width="15" height="15" follows="top|right" + image_name="icn_voice-pvtfocus.tga" visible="false" name="msg_inspector"/> + <icon top="22" left="190" width="10" height="10" follows="top|right" + image_name="speaking_indicator.tga" name="msg_icon"/> + <text width="35" top="22" left="205" height="20" follows="right|top" + text_color="white" word_wrap="true" mouse_opaque="true" name="msg_time" > + 10:32 + </text> + </panel> + <text_chat + top="-35" left="10" right="-10" height="120" follows="left|right|bottom" + font="SansSerifSmall" text_color="white" word_wrap="true" + mouse_opaque="true" name="msg_text" > + </text_chat> +</panel> + diff --git a/indra/newview/skins/default/xui/en/panel_classified.xml b/indra/newview/skins/default/xui/en/panel_classified.xml index f2cec86b38..3acd8fae4b 100644 --- a/indra/newview/skins/default/xui/en/panel_classified.xml +++ b/indra/newview/skins/default/xui/en/panel_classified.xml @@ -108,13 +108,16 @@ width="130"> <combo_box.item label="- Select Mature -" + name="select_mature" value="Select" /> <combo_box.item label="Mature Content" + name="mature" value="Mature" /> <combo_box.item label="PG Content" - value="Not Mature" /> + name="pg" + value="PG" /> </combo_box> <combo_box bottom="45" diff --git a/indra/newview/skins/default/xui/en/panel_edit_pick.xml b/indra/newview/skins/default/xui/en/panel_edit_pick.xml index 967cf2f539..a74f560753 100644 --- a/indra/newview/skins/default/xui/en/panel_edit_pick.xml +++ b/indra/newview/skins/default/xui/en/panel_edit_pick.xml @@ -2,14 +2,13 @@ <panel background_visible="true" bevel_style="in" - bg_alpha_color="0.2 0.2 0.2 1" height="640" label="Edit Pick" layout="topleft" left="0" name="panel_edit_pick" top="0" - width="355"> + width="305"> <text type="string" length="1" @@ -21,26 +20,46 @@ name="title" text_color="white" top="0" - width="150"> + width="250"> Edit Pick </text> <panel background_visible="true" - bg_alpha_color="0.5 0.5 0.5 1" + bg_alpha_color="DkGray2" + width="280" follows="left|right|top|bottom" height="570" layout="topleft" left="10" right="-10" top="30"> - <texture_picker + <panel follows="left|top|right" height="150" layout="topleft" left="10" - name="pick_snapshot" right="-10" - top="10" /> + top="10"> + <panel + follows="left|top|right" + height="150" + layout="topleft" > + <texture_picker + follows="left|top|right" + height="150" + layout="topleft" + name="pick_snapshot" /> + </panel> + <icon + height="16" + image_name="image_edit_icon.tga" + layout="topleft" + name="edit_icon" + right="-25" + top="30" + visible="false" + width="16" /> + </panel> <text type="string" length="1" @@ -48,7 +67,8 @@ height="16" layout="topleft" left="10" - name="Name:"> + name="Name:" + text_color="white"> Name: </text> <line_editor @@ -57,8 +77,10 @@ height="20" layout="topleft" left="10" + max_length="63" name="pick_name" right="-10" + text_color="black" width="290" /> <text type="string" @@ -68,6 +90,7 @@ layout="topleft" left="10" name="description_label" + text_color="white" v_pad="15" valign="center"> Description: @@ -75,10 +98,12 @@ <text_editor follows="left|top|right" height="100" + hide_scrollbar="true" layout="topleft" left="10" max_length="1023" name="pick_desc" + text_color="black" right="-10" word_wrap="true" /> <text @@ -88,7 +113,8 @@ height="20" layout="topleft" left="10" - name="description_label" + name="location_label" + text_color="white" v_pad="15" valign="bottom"> Location: @@ -102,7 +128,9 @@ left="10" name="pick_location" right="-10" + text_color="white" v_pad="10" + width="250" valign="center" word_wrap="true"> loading... @@ -124,11 +152,11 @@ left="5" name="bottom_panel" top="605" - width="345"> + right="-10"> <button follows="bottom|left" height="20" - label="Save Changes" + label="Save [WHAT]" layout="topleft" name="save_changes_btn" right="-120" diff --git a/indra/newview/skins/default/xui/en/panel_edit_profile.xml b/indra/newview/skins/default/xui/en/panel_edit_profile.xml index e787d03eca..26354ce611 100644 --- a/indra/newview/skins/default/xui/en/panel_edit_profile.xml +++ b/indra/newview/skins/default/xui/en/panel_edit_profile.xml @@ -3,7 +3,6 @@ class="edit_profile_panel" background_visible="true" bevel_style="in" - bg_alpha_color="0.3 0.3 0.3 1" follows="left|top|right|bottom" height="690" label="Profile Edit" @@ -12,7 +11,7 @@ mouse_opaque="true" name="edit_profile_panel" top="10" - width="355"> + width="305"> <text top="0" left="9" @@ -22,19 +21,19 @@ layout="topleft" name="title_text" text_color="white" - width="350"> + width="250"> Edit Profile </text> <panel background_visible="true" - bg_alpha_color="0.6 0.6 0.6 1" + bg_alpha_color="DkGray2" follows="left|top|right|bottom" height="620" layout="topleft" left="9" name="data_panel" top_pad="10" - width="337"> + width="280"> <text top_pad="5" left="9" @@ -51,10 +50,10 @@ follows="left|top" height="120" layout="topleft" - left="9" + left="10" name="lifes_images_panel" top_pad="10" - width="250"> + width="265"> <panel height="120" layout="topleft" @@ -70,7 +69,7 @@ height="20" layout="topleft" left="0" - name="first_life_photo_title_text" + name="second_life_photo_title_text" text_color="white" top="0" width="125"> @@ -102,11 +101,11 @@ height="20" layout="topleft" left="0" - name="second_life_photo_title_text" + name="real_world_photo_title_text" text_color="white" top="0" width="125"> - First Life photo: + Real World photo: </text> <texture_picker allow_no_texture="true" @@ -115,10 +114,28 @@ height="105" layout="topleft" left="0" - name="1st_life_pic" + name="real_world_pic" top_pad="5" width="105" /> </panel> + <icon + height="16" + image_name="image_edit_icon.tga" + layout="topleft" + left="75" + name="2nd_life_edit_icon" + tool_tip="Click to select an image" + top="35" + width="16" /> + <icon + height="16" + image_name="image_edit_icon.tga" + layout="topleft" + left="200" + name="real_world_edit_icon" + tool_tip="Click to select an image" + top="35" + width="16" /> </panel> <text type="string" @@ -131,7 +148,7 @@ name="title_sl_descr_text" text_color="white" top_pad="10" - width="290"> + width="250"> Second Life description: </text> <text_editor @@ -144,7 +161,7 @@ left="9" name="sl_description_edit" text_color="0.1 0.1 0.1 1" - width="290" + width="265" word_wrap="true"> </text_editor> <text @@ -155,11 +172,11 @@ height="15" layout="topleft" left="9" - name="title_fl_descr_text" + name="title_rw_descr_text" text_color="white" top_pad="10" - width="290"> - First Life description: + width="250"> + Real World description: </text> <text_editor type="string" @@ -171,7 +188,7 @@ left="9" name="fl_description_edit" text_color="0.1 0.1 0.1 1" - width="290" + width="265" word_wrap="true"> </text_editor> <text @@ -189,8 +206,6 @@ Homepage: </text> <line_editor - type="string" - length="1" follows="left|top|right" font="SansSerif" font.style="UNDERLINE" @@ -199,23 +214,25 @@ left="9" name="homepage_edit" text_color="0.2 0.2 1 1" - width="290"> + width="265"> TODO </line_editor> <check_box follows="left|top" + font="SansSerifBold" label="Show me in Search results" layout="topleft" left="9" name="show_in_search_checkbox" height="16" + text_enabled_color="white" top_pad="10" width="250"/> </panel> <panel follows="bottom|right" height="30" - left="96" + left="10" name="profile_me_buttons_panel" top_pad="8" width="250"> diff --git a/indra/newview/skins/default/xui/en/panel_friends.xml b/indra/newview/skins/default/xui/en/panel_friends.xml index a151eed20f..3a35465df2 100644 --- a/indra/newview/skins/default/xui/en/panel_friends.xml +++ b/indra/newview/skins/default/xui/en/panel_friends.xml @@ -29,7 +29,7 @@ tool_tip="Online status" width="20" /> <scroll_list.columns - dynamicwidth="true" + dynamic_width="true" label="Name" name="friend_name" tool_tip="Name" /> diff --git a/indra/newview/skins/default/xui/en/panel_group_general.xml b/indra/newview/skins/default/xui/en/panel_group_general.xml index 10d10f60ff..71b5f78d59 100644 --- a/indra/newview/skins/default/xui/en/panel_group_general.xml +++ b/indra/newview/skins/default/xui/en/panel_group_general.xml @@ -2,13 +2,13 @@ <panel border="true" follows="all" - height="466" + height="514" label="General" layout="topleft" left="1" name="general_tab" - top="466" - width="418"> + top="514" + width="280"> <panel.string name="help_text"> The General tab contains general information about @@ -26,128 +26,127 @@ Hover your mouse over the options for more help. Retrieving member data </panel.string> <panel.string - name="confirm_group_create_str"> - Creating this group will cost L$100. -Are you really, really, REALLY sure you want to spend L$100 to create this group? -Be aware that if nobody else joins this group within 48 hours, it will be disbanded and the group's name will be unavailable for future use. - </panel.string> - <panel.string name="group_join_btn"> Join (L$[AMOUNT]) </panel.string> - <button + <!--<button follows="left|top" height="16" label="?" label_selected="?" layout="topleft" - left="391" + left="255" name="help_button" top="8" - width="20" /> + width="20" /> --> <line_editor follows="left|top" - font="SansSerif" + font="SansSerifSmall" halign="left" height="16" label="Type your new group name here" layout="topleft" - left_delta="-384" + left="10" max_length="35" name="group_name_editor" - top_delta="0" - width="300" /> + top="8" + width="235" /> <text type="string" length="1" follows="left|top" - font="SansSerifBig" + font="SansSerifSmall" height="16" layout="topleft" left_delta="0" name="group_name" - top_delta="-4" - width="300"> + top_delta="0" + width="240"> Type your new group name here </text> <text type="string" length="1" + follows="left|top" height="16" layout="topleft" left_delta="0" name="prepend_founded_by" top_pad="4" - width="100"> - Founded by + width="270"> + Founded by: </text> <name_box follows="left|top" height="16" initial_value="(retrieving)" layout="topleft" - left_delta="63" + left="30" name="founder_name" - top_delta="0" - width="200" /> - <text + top_pad="0" + width="133" /> + <text_editor type="string" length="1" - height="16" + follows="left|top" + halign="left" + height="125" + hide_scrollbar="true" layout="topleft" - name="group_charter_label" - right="410" - top="40" - width="265"> + max_length="511" + name="charter" + right="275" + top_pad="0" + width="170" + word_wrap="true"> Group Charter - </text> + </text_editor> <texture_picker follows="left|top" - height="144" - label="Group Insignia" + height="96" + label="" layout="topleft" - left_delta="-138" + left_delta="-95" name="insignia" tool_tip="Click to choose a picture" top_delta="1" - width="128" /> - <text_editor + width="85" /> + <text + follows="left|top" type="string" length="1" - follows="left|top" - halign="left" - height="160" - hide_scrollbar="true" + height="16" layout="topleft" - max_length="511" - name="charter" - right="410" - top="55" - width="265" - word_wrap="true"> + name="group_charter_label" + right="275" + top="190" + width="170"> Group Charter - </text_editor> + </text> <button follows="left|top" height="22" + font="SansSerifSmall" label="Join (L$0)" label_selected="Join (L$0)" layout="topleft" - left="7" + left="10" name="join_button" - top="193" - width="128" /> + top="160" + width="85" /> <button follows="left|top" height="22" - label="Detailed View" + font="SansSerifSmall" + label="Details" label_selected="Detailed View" layout="topleft" left_delta="0" name="info_button" top_delta="0" - width="128" /> + width="85" /> <text + follows="left|top" type="string" length="1" font="SansSerif" @@ -155,19 +154,20 @@ Be aware that if nobody else joins this group within 48 hours, it will be disban layout="topleft" left_delta="0" name="text_owners_and_visible_members" - top_pad="4" - width="160"> + top_pad="30" + width="270"> Owners & Visible Members </text> <text + follows="left|top" type="string" length="1" height="16" layout="topleft" left_delta="0" name="text_owners_are_shown_in_bold" - top_delta="16" - width="160"> + top_pad="0" + width="270"> (Owners are shown in bold) </text> <name_list @@ -179,8 +179,8 @@ Be aware that if nobody else joins this group within 48 hours, it will be disban layout="topleft" left_delta="0" name="visible_members" - top_pad="8" - width="404"> + top_pad="0" + width="263"> <name_list.columns label="Member Name" name="name" @@ -195,9 +195,11 @@ Be aware that if nobody else joins this group within 48 hours, it will be disban relative_width="0.25" /> </name_list> <text + follows="left|top" + height="16" type="string" length="1" - bottom_delta="18" + top_pad="10" font="SansSerif" layout="topleft" name="text_group_preferences"> @@ -208,12 +210,12 @@ Be aware that if nobody else joins this group within 48 hours, it will be disban bevel_style="in" border="true" follows="left|top" - height="96" + height="125" layout="topleft" left_delta="0" name="preferences_container" - top_pad="8" - width="404"> + top_pad="0" + width="263"> <check_box height="16" initial_value="true" @@ -223,7 +225,7 @@ Be aware that if nobody else joins this group within 48 hours, it will be disban name="show_in_group_list" tool_tip="Let people see this group in search results." top="4" - width="95" /> + width="90" /> <check_box follows="right|top" height="16" @@ -232,17 +234,17 @@ Be aware that if nobody else joins this group within 48 hours, it will be disban left_delta="0" name="open_enrollement" tool_tip="Sets whether this group allows new members to join without being invited." - top_pad="2" - width="95" /> + top_pad="5" + width="90" /> <check_box height="16" label="Enrollment fee: L$" layout="topleft" - left_delta="16" + left_delta="0" name="check_enrollment_fee" tool_tip="Sets whether to require an enrollment fee to join the group." - top="40" - width="95" /> + top_pad="5" + width="90" /> <spinner decimal_digits="0" follows="left|top" @@ -251,66 +253,71 @@ Be aware that if nobody else joins this group within 48 hours, it will be disban increment="1" label_width="10" layout="topleft" - left_pad="21" + left="25" max_val="99999" + top_pad="5" name="spin_enrollment_fee" tool_tip="New members must pay this fee to join the group when Enrollment Fee is checked." top_delta="-2" width="65" /> - <combo_box - height="20" + <check_box + height="16" + font="SansSerifSmall" + label="Receive notices" layout="topleft" - left="6" - name="group_mature_check" - tool_tip="Sets whether your group information is considered mature." - top="64" - width="130"> - <combo_box.item - label="Select Mature -" - value="Select" /> - <combo_box.item - label="Mature Content" - value="Mature" /> - <combo_box.item - label="PG Content" - value="Not Mature" /> - </combo_box> - <text + left="5" + name="receive_notices" + tool_tip="Sets whether you want to receive Notices from this group. Uncheck this box if this group is spamming you." + top_pad="5" + width="240" /> + <check_box + height="16" + label="List in my profile" + layout="topleft" + left="5" + name="list_groups_in_profile" + tool_tip="Sets whether you want to list this group in your Profile" + top_pad="5" + width="240" /> + <text type="string" length="1" height="16" layout="topleft" - left="225" + left="145" name="active_title_label" top="4" width="95"> My Active Title </text> <combo_box - height="16" + height="20" layout="topleft" left_delta="0" name="active_title" tool_tip="Sets the title that appears in your avatar's name tag when this group is active." - top_pad="6" - width="95" /> - <check_box - height="16" - label="Receive group notices" - layout="topleft" - left_delta="0" - name="receive_notices" - tool_tip="Sets whether you want to receive Notices from this group. Uncheck this box if this group is spamming you." - top_pad="9" - width="95" /> - <check_box - height="16" - label="List group in my profile" + top_pad="0" + width="110" /> + <combo_box + height="20" layout="topleft" left_delta="0" - name="list_groups_in_profile" - tool_tip="Sets whether you want to list this group in your Profile" - top_pad="2" - width="95" /> + name="group_mature_check" + tool_tip="Sets whether your group information is considered mature." + top_pad="10" + width="120"> + <combo_box.item + label="Select Mature -" + name="select_mature" + value="Select" /> + <combo_box.item + label="Mature Content" + name="mature" + value="Mature" /> + <combo_box.item + label="PG Content" + name="pg" + value="Not Mature" /> + </combo_box> </panel> -</panel> +</panel>
\ No newline at end of file diff --git a/indra/newview/skins/default/xui/en/panel_group_land_money.xml b/indra/newview/skins/default/xui/en/panel_group_land_money.xml index 35691661f1..b96421ca2f 100644 --- a/indra/newview/skins/default/xui/en/panel_group_land_money.xml +++ b/indra/newview/skins/default/xui/en/panel_group_land_money.xml @@ -2,13 +2,13 @@ <panel border="true" follows="all" - height="470" + height="514" label="Land & L$" layout="topleft" left="1" name="land_money_tab" top="470" - width="418"> + width="280"> <panel.string name="help_text"> Parcels owned by the group are listed along with contribution details. A warning appears until the Total Land in Use is less than or equal to the Total Contribution. The Planning, Details, and Sales tabs provide information about the group's finances. @@ -29,14 +29,17 @@ name="land_contrib_error"> Unable to set your land contribution. </panel.string> + <!-- <button + follows="left|top" height="16" label="?" layout="topleft" - left="391" + left="250" name="help_button" top="8" width="20" /> + --> <text type="string" length="1" @@ -44,10 +47,10 @@ font="SansSerifBig" height="16" layout="topleft" - left_delta="-384" + left="10" name="group_land_heading" - top_delta="-4" - width="150"> + top_pad="10" + width="260"> Group Owned Land </text> <scroll_list @@ -55,28 +58,28 @@ follows="top" font="SansSerifSmall" heading_height="14" - height="120" + height="100" layout="topleft" left_delta="0" name="group_parcel_list" - top_pad="6" - width="404"> + top_pad="4" + width="265"> <scroll_list.columns - label="Parcel Name" + label="Parcel" name="name" - width="100" /> + width="67" /> <scroll_list.columns label="Region" name="location" - width="120" /> + width="72" /> <scroll_list.columns label="Type" name="type" - width="100" /> + width="60" /> <scroll_list.columns label="Area" name="area" - width="61" /> + width="20" /> <scroll_list.columns label="" name="hidden" @@ -88,10 +91,10 @@ label="Show on Map" label_selected="Show on Map" layout="topleft" - left="312" + left="150" name="map_button" - top="150" - width="100" + top_pad="10" + width="125" enabled="false" /> <text type="string" @@ -100,10 +103,10 @@ halign="right" height="16" layout="topleft" - left_delta="-305" + left="5" name="total_contributed_land_label" - top_delta="4" - width="120"> + top_pad="10" + width="130"> Total Contribution: </text> <text @@ -115,8 +118,8 @@ left_pad="5" name="total_contributed_land_value" top_delta="0" - width="100"> - [AREA] sq. meters + width="120"> + [AREA] m² </text> <text type="string" @@ -125,10 +128,10 @@ halign="right" height="16" layout="topleft" - left="7" + left="5" name="total_land_in_use_label" - top="172" - width="120"> + top_pad="0" + width="130"> Total Land In Use: </text> <text @@ -140,8 +143,8 @@ left_pad="5" name="total_land_in_use_value" top_delta="0" - width="150"> - [AREA] sq. meters + width="120"> + [AREA] m² </text> <text type="string" @@ -150,10 +153,10 @@ halign="right" height="16" layout="topleft" - left="7" + left="5" name="land_available_label" - top="190" - width="120"> + top_pad="0" + width="130"> Land Available: </text> <text @@ -166,7 +169,7 @@ name="land_available_value" top_delta="0" width="120"> - [AREA] sq. meters + [AREA] m² </text> <text type="string" @@ -175,10 +178,10 @@ halign="right" height="16" layout="topleft" - left="7" + left="5" name="your_contribution_label" - top="208" - width="120"> + top_pad="0" + width="130"> Your Contribution: </text> <line_editor @@ -191,7 +194,7 @@ max_length="10" name="your_contribution_line_editor" top_delta="-2" - width="70" /> + width="95" /> <text type="string" length="1" @@ -199,10 +202,22 @@ height="16" layout="topleft" left_pad="5" + name="your_contribution_units" + top_delta="2"> + ( m² ) + </text> + <text + type="string" + length="1" + follows="left|top" + halign="right" + height="16" + layout="topleft" + left_pad="5" name="your_contribution_max_value" - top_delta="2" - width="200"> - sq. meters ([AMOUNT] max) + top_delta="0" + width="95"> + ([AMOUNT] max) </text> <icon height="16" @@ -210,21 +225,24 @@ layout="topleft" left="9" name="group_over_limit_icon" - top="235" + top_pad="0" visible="false" width="16" /> <text + follows="left|top" type="string" length="1" - height="16" + word_wrap="true" + font="SansSerifSmall" + height="40" layout="topleft" left_pad="5" name="group_over_limit_text" text_color="GroupOverTierColor" - top_delta="1" - width="400"> + top_delta="0" + width="250"> Group members must contribute more land credits to support land in use. - </text> + </text> <text type="string" length="1" @@ -232,31 +250,31 @@ font="SansSerifBig" height="16" layout="topleft" - left="12" + left="10" name="group_money_heading" - top="261" + top_pad="0" width="150"> Group L$ </text> <tab_container follows="all" - height="180" + height="100" layout="topleft" - left="6" + left="10" name="group_money_tab_container" tab_position="top" - top="286" - width="406"> + top_pad="10" + width="265"> <panel border="true" follows="left|top|right|bottom" - height="255" + height="180" label="Planning" layout="topleft" left="1" name="group_money_planning_tab" top="5" - width="398"> + width="270"> <text_editor type="string" length="1" @@ -269,105 +287,101 @@ max_length="4096" name="group_money_planning_text" top="5" - width="382"> + width="260"> Computing... </text_editor> </panel> - <panel + <panel border="true" - follows="all" - height="250" + follows="left|top|right|bottom" + height="180" label="Details" layout="topleft" left_delta="0" name="group_money_details_tab" - top_delta="163" - width="398"> - <text_editor + top_delta="0" + width="270"> + <text_editor type="string" length="1" bg_readonly_color="0.784314 0.819608 0.8 1" - follows="left|top" + follows="all" font="Monospace" - height="125" + height="140" layout="topleft" left="8" max_length="4096" name="group_money_details_text" top="7" - width="382"> + width="260"> Computing... - </text_editor> - <button - follows="left|top" + </text_editor> + <button height="20" label="< Earlier" label_selected="< Earlier" layout="topleft" - left="24" + left="5" name="earlier_details_button" tool_tip="Go back in time" - top="136" - width="80" /> + top_pad="10" + width="125" /> <button - follows="left|top" height="20" label="Later >" label_selected="Later >" layout="topleft" - left_pad="190" + left_pad="5" name="later_details_button" tool_tip="Go forward in time" top_delta="0" - width="80" /> + width="125" /> </panel> - <panel + <panel border="true" - follows="all" - height="164" + follows="left|top|right|bottom" + height="180" label="Sales" layout="topleft" left_delta="0" name="group_money_sales_tab" top_delta="-1" - width="398"> + width="270"> <text_editor type="string" length="1" bg_readonly_color="0.784314 0.819608 0.8 1" - follows="left|top" + follows="all" font="Monospace" - height="125" + height="140" layout="topleft" left="8" max_length="4096" name="group_money_sales_text" top="7" - width="382"> + width="260"> Computing... </text_editor> <button - follows="left|top" height="20" label="< Earlier" label_selected="< Earlier" layout="topleft" - left="24" + left="5" name="earlier_sales_button" tool_tip="Go back in time" - top="136" - width="80" /> + top_pad="10" + width="125" /> <button - follows="left|top" height="20" label="Later >" label_selected="Later >" layout="topleft" - left_pad="190" + left_pad="5" name="later_sales_button" tool_tip="Go forward in time" top_delta="0" - width="80" /> + width="125" /> </panel> </tab_container> -</panel> +</panel>
\ No newline at end of file diff --git a/indra/newview/skins/default/xui/en/panel_group_notices.xml b/indra/newview/skins/default/xui/en/panel_group_notices.xml index 345cc734e6..2e5f2dcb0b 100644 --- a/indra/newview/skins/default/xui/en/panel_group_notices.xml +++ b/indra/newview/skins/default/xui/en/panel_group_notices.xml @@ -2,13 +2,13 @@ <panel border="true" follows="all" - height="466" + height="530" label="Notices" layout="topleft" left="1" name="notices_tab" - top="466" - width="418"> + top="530" + width="280"> <panel.string name="help_text"> Notices are a quick way to communicate across a @@ -22,41 +22,44 @@ the General tab. name="no_notices_text"> There are no past notices. </panel.string> - <button + <!-- <button + follows="left|top" height="16" label="?" label_selected="?" layout="topleft" - left="391" + left="250" name="help_button" top="8" - width="20" /> - <text + width="20" /> --> + <text + follows="left|top" type="string" length="1" font="SansSerifBig" height="16" layout="topleft" - left_delta="-384" + left="10" name="lbl" - top_delta="-4" - width="436"> + top_pad="10" + width="269"> Group Notices Archive </text> <text + follows="left|top" type="string" length="1" - height="16" + word_wrap="true" + height="73" layout="topleft" left_delta="0" name="lbl2" top_pad="4" - width="436"> - Notices are kept for 14 days. Click the notice below you wish to view. -Click the 'Refresh' button to check if new notices have been received. -Notice lists are limited to 200 notices per group on a daily basis. + width="270"> + Notices are kept for 14 days. Click the notice below if you wish to view. Click the 'Refresh' button to check if new notices have been received. Notice lists are limited to 200 notices per group on a daily basis. </text> <scroll_list + follows="left|top" column_padding="0" draw_heading="true" heading_height="14" @@ -64,8 +67,8 @@ Notice lists are limited to 200 notices per group on a daily basis. layout="topleft" left_delta="0" name="notice_list" - top_pad="28" - width="404"> + top_pad="0" + width="265"> <scroll_list.columns label="" name="icon" @@ -73,20 +76,21 @@ Notice lists are limited to 200 notices per group on a daily basis. <scroll_list.columns label="Subject" name="subject" - width="171" /> + width="100" /> <scroll_list.columns label="From" name="from" - width="125" /> + width="83" /> <scroll_list.columns label="Date" name="date" - width="85" /> + width="50" /> <scroll_list.columns name="sort" width="-1" /> </scroll_list> <text + follows="left|top" type="string" length="1" layout="topleft" @@ -95,69 +99,74 @@ Notice lists are limited to 200 notices per group on a daily basis. None found. </text> <button + follows="left|top" height="20" - label="Create New Notice" + font="SansSerifSmall" + label="New Notice" label_selected="Create New Notice" layout="topleft" left_delta="0" name="create_new_notice" - top_delta="-2" - width="150" /> + top_delta="4" + width="125" /> <button + follows="left|top" height="20" + font="SansSerifSmall" label="Refresh" label_selected="Refresh List" layout="topleft" - left_pad="164" + left_pad="12" name="refresh_notices" top_delta="0" - width="90" /> + width="125" /> <panel - follows="all" + follows="left|top" height="268" label="Create New Notice" layout="topleft" - left="1" + left="0" name="panel_create_new_notice" - top="198" - width="418"> + top="250" + width="265"> <text + follows="left|top" type="string" length="1" font="SansSerifBig" height="16" layout="topleft" - left="7" + left="10" mouse_opaque="false" name="lbl" - top="2" - width="436"> + top_pad="0" + width="265"> Create a Notice </text> <text + follows="left|top" type="string" + word_wrap="true" length="1" - height="16" + height="90" layout="topleft" left_delta="0" name="lbl2" top_pad="4" - width="436"> - You must enter a subject to send a notice. You can add a single -item to a notice by dragging it from your inventory to this -panel. Attached items must be copiable and transferrable, -and you can't send a folder. + width="196"> + You must enter a subject to send a notice. You can add a single item to a notice by dragging it from your inventory to this panel. Attached items must be copiable and transferrable, and you can't send a folder. </text> <text + follows="left|top" type="string" length="1" - halign="right" + halign="left" height="16" layout="topleft" left_delta="0" name="lbl3" - top_pad="47" - width="55"> + top_pad="10" + width="60"> Subject: </text> <line_editor @@ -168,52 +177,54 @@ and you can't send a folder. left_pad="3" max_length="63" name="create_subject" - top_delta="0" - width="264" /> + top_delta="-1" + width="200" /> <text + follows="left|top" type="string" length="1" - halign="right" + halign="left" height="16" layout="topleft" - left="7" + left="10" name="lbl4" - top="103" - width="55"> + top_pad="10" + width="60"> Message: </text> <text_editor - height="120" + height="75" hide_scrollbar="true" layout="topleft" left_pad="3" max_length="511" name="create_message" - top_delta="2" - width="346" + top_delta="0" + width="200" word_wrap="true" /> <text + follows="left|top" type="string" length="1" - halign="right" + halign="left" height="16" layout="topleft" - left="7" + left="10" name="lbl5" - top="228" - width="55"> + top_pad="10" + width="60"> Attach: </text> <line_editor enabled="false" height="16" layout="topleft" - left_pad="4" + left_pad="3" max_length="63" mouse_opaque="false" name="create_inventory_name" - top_delta="2" - width="211" /> + top_delta="0" + width="200" /> <icon height="16" layout="topleft" @@ -222,41 +233,45 @@ and you can't send a folder. top_delta="0" width="16" /> <button + follows="left|top" height="20" + font="SansSerifSmall" label="Remove Attachment" label_selected="Remove Attachment" layout="topleft" - left_pad="197" + left="10" name="remove_attachment" - top_delta="-4" + top_pad="10" width="135" /> <button + follows="left|top" height="20" - label="Send Notice" + font="SansSerifSmall" + label="Send" label_selected="Send Notice" layout="topleft" - left_delta="0" + left_delta="138" name="send_notice" - top_delta="20" - width="135" /> + top_delta="0" + width="125" /> <panel bevel_style="in" border="true" - height="76" + height="71" layout="topleft" - left="335" + left="200" name="drop_target2" top="20" - width="76" /> + width="71" /> <icon - height="64" + height="59" image_name="icon_groupnoticeinventory.tga" layout="topleft" - left_delta="5" + left_delta="6" mouse_opaque="true" name="drop_icon" - top="25" - width="64" /> + top="26" + width="59" /> <group_drop_target height="466" layout="topleft" @@ -264,52 +279,53 @@ and you can't send a folder. name="drop_target" tool_tip="Drag an inventory item onto the message box to send it with the notice. You must have permission to copy and transfer the object to send it with the notice." top="-198" - width="422" /> - </panel> + width="280" /> + </panel> <panel - follows="all" + follows="left|top" height="268" label="View Past Notice" layout="topleft" - left_delta="0" + left="0" name="panel_view_past_notice" - top_delta="0" - width="418"> + top="250" + width="265"> <text type="string" length="1" font="SansSerifBig" height="16" layout="topleft" - left="7" + left="10" mouse_opaque="false" name="lbl" - top="2" - width="436"> + top_pad="0" + width="265"> Archived Notice </text> <text type="string" length="1" height="16" + word_wrap="true" layout="topleft" left_delta="0" name="lbl2" top_pad="4" - width="436"> + width="265"> To send a new notice, click the 'Create New Notice' button above. </text> <text type="string" length="1" - halign="right" + halign="left" height="16" layout="topleft" left_delta="0" name="lbl3" top_pad="24" visible="false" - width="55"> + width="60"> Subject: </text> <line_editor @@ -321,52 +337,43 @@ and you can't send a folder. left_pad="3" max_length="63" name="view_subject" - top_delta="0" + top_delta="-1" visible="false" - width="346" /> + width="200" /> <text type="string" length="1" - halign="right" + halign="left" height="16" layout="topleft" - left="7" + left="10" name="lbl4" - top="80" + top_pad="10" visible="false" - width="55"> + width="60"> Message: </text> <text_editor enabled="false" - height="206" + height="150" hide_scrollbar="true" layout="topleft" - left_delta="0" + left="10" max_length="511" name="view_message" - top_delta="-42" - width="404" + top_delta="-35" + width="260" word_wrap="true" /> - <button - height="20" - label="Open Attachment" - label_selected="Open Attachment" - layout="topleft" - left_delta="0" - name="open_attachment" - top_pad="4" - width="110" /> <line_editor enabled="false" height="16" layout="topleft" - left_pad="3" + left_delta="0" max_length="63" mouse_opaque="false" name="view_inventory_name" - top_delta="1" - width="264" /> + top_pad="10" + width="260" /> <icon height="16" layout="topleft" @@ -374,5 +381,16 @@ and you can't send a folder. name="view_inv_icon" top_delta="0" width="16" /> - </panel> -</panel> + <button + follows="left|top" + height="20" + font="SansSerifSmall" + label="Open Attachment" + label_selected="Open Attachment" + layout="topleft" + left_delta="0" + name="open_attachment" + top_pad="10" + width="135" /> + </panel> +</panel>
\ No newline at end of file diff --git a/indra/newview/skins/default/xui/en/panel_group_notify.xml b/indra/newview/skins/default/xui/en/panel_group_notify.xml new file mode 100644 index 0000000000..a39a681f83 --- /dev/null +++ b/indra/newview/skins/default/xui/en/panel_group_notify.xml @@ -0,0 +1,33 @@ +<?xml version="1.0" encoding="utf-8" standalone="yes" ?> +<panel background_visible="true" bevel_style="in" bg_alpha_color="0 0 0 0" + height="200" label="instant_message" layout="topleft" left="0" + name="panel_group_notify" top="0" width="350"> + <panel background_visible="true" bevel_style="in" bg_alpha_color="black" + height="50" label="header" layout="topleft" left="0" name="header" + top="0" width="350"> + <icon follows="left|top|right|bottom" height="40" width="40" layout="topleft" + top="5" left="5" mouse_opaque="true" name="group_icon"/> + <text type="string" length="1" follows="left|top|right|bottom" + font="SansSerifBigBold" height="20" layout="topleft" left="60" name="title" + text_color="GroupNotifyTextColor" top="20" width="300"> + Sender Name / Group Name + </text> + </panel> + <text_editor type="string" length="1" bg_readonly_color="0 0 0 0" + follows="left|top|right|bottom" height="70" hide_scrollbar="true" + hide_border="true" layout="topleft" top="55" left="25" name="message" + text_color="GroupNotifyTextColor" text_readonly_color="GroupNotifyTextColor" width="300" word_wrap="true"> + Message + Body + </text_editor> + <icon follows="left|top|right|bottom" height="16" width="16" + layout="topleft" top="135" left="25" mouse_opaque="true" name="attachment_icon" /> + <text font="SansSerif" font.style="UNDERLINE" font_shadow="hard" + type="string" length="1" follows="left|top|right|bottom" layout="topleft" + left="45" top="135" height="15" width="280" name="attachment" + text_color="GroupNotifyTextColor"> + Attachment + </text> + <button label="OK" layout="topleft" top="170" left="140" height="20" + width="70" name="btn_ok" /> +</panel> diff --git a/indra/newview/skins/default/xui/en/panel_group_roles.xml b/indra/newview/skins/default/xui/en/panel_group_roles.xml index c758da4b63..dd6cd8c95e 100644 --- a/indra/newview/skins/default/xui/en/panel_group_roles.xml +++ b/indra/newview/skins/default/xui/en/panel_group_roles.xml @@ -1,13 +1,13 @@ <?xml version="1.0" encoding="utf-8" standalone="yes" ?> <panel border="true" - height="466" + height="530" label="Members & Roles" layout="topleft" left="1" name="roles_tab" - top="466" - width="418"> + top="530" + width="280"> <panel.string name="default_needs_apply_text"> There are unapplied changes on the current sub-tab. @@ -18,21 +18,25 @@ </panel.string> <panel.string name="help_text" /> + <!-- <button + follows="left|top" height="16" label="?" layout="topleft" - left="391" + left="250" name="help_button" top="8" width="20" /> + --> <panel + follows="left|top" height="24" layout="topleft" - left="7" + left="10" name="members_header" - top="0" - width="380"> + top_pad="10" + width="270"> <text type="string" length="1" @@ -42,30 +46,31 @@ left="0" name="static" top="4" - width="150"> + width="270"> Members & Roles </text> <text type="string" length="1" - height="32" + word_wrap="true" + height="40" layout="topleft" left_delta="0" name="static2" top_pad="4" - width="400"> - Group Members are assigned Roles with Abilities. These settings can -easily be customized, allowing for greater organization and flexibility. + width="270"> + Group Members are assigned Roles with Abilities. These settings can easily be customized, allowing for greater organization and flexibility. </text> </panel> <panel + follows="left|top" height="24" layout="topleft" left_delta="0" name="roles_header" top_delta="0" visible="false" - width="380"> + width="270"> <text type="string" length="1" @@ -75,64 +80,69 @@ easily be customized, allowing for greater organization and flexibility. left="0" name="static" top="4" - width="100"> + width="270"> Roles </text> <text type="string" length="1" - height="16" + word_wrap="true" + height="40" layout="topleft" left_delta="0" name="role_properties_modifiable" top_pad="4" visible="false" - width="394"> + width="270"> Select a Role below. You can modify its Name, Description and Member Title. </text> <text type="string" length="1" - height="16" + word_wrap="true" + height="40" layout="topleft" left_delta="0" name="role_properties_not_modifiable" top_delta="0" - width="394"> + width="270"> Select a Role below to see its properties, Members and allowed Abilities. </text> <text type="string" length="1" + word_wrap="true" height="16" layout="topleft" left_delta="0" name="role_actions_modifiable" - top_delta="14" + top_delta="24" visible="false" - width="394"> + width="270"> You can also assign Abilities to the Role. </text> <text type="string" length="1" + word_wrap="true" height="16" layout="topleft" left_delta="0" name="role_actions_not_modifiable" top_delta="0" - width="394"> + width="270"> You may view, but not modify, assigned Abilities. </text> </panel> <panel + follows="left|top" height="24" layout="topleft" left_delta="0" name="actions_header" top_delta="20" visible="false" - width="380"> + width="270"> <text type="string" length="1" @@ -142,40 +152,40 @@ easily be customized, allowing for greater organization and flexibility. left="0" name="static" top="-16" - width="200"> + width="270"> Abilities </text> <text type="string" length="1" - height="32" + word_wrap="true" + height="40" layout="topleft" left_delta="0" name="static2" top_pad="4" - width="394"> - You can view an Ability's Description and which Roles and Members can -execute the Ability. + width="270"> + You can view an Ability's Description and which Roles and Members can execute the Ability. </text> </panel> <tab_container height="180" layout="topleft" - left_delta="-1" + left_delta="0" name="roles_tab_container" tab_position="top" - top_pad="10" - width="406"> + top="70" + width="265"> <panel border="true" - height="164" + height="165" label="Members" layout="topleft" left="1" name="members_sub_tab" tool_tip="Members" top="16" - width="406"> + width="265"> <panel.string name="help_text"> You can add or remove Roles assigned to Members. @@ -191,8 +201,8 @@ clicking on their names. left="4" max_length="63" name="search_text" - top="5" - width="100" /> + top="10" + width="90" /> <button font="SansSerifSmall" height="20" @@ -201,14 +211,14 @@ clicking on their names. left_pad="5" name="search_button" top_delta="-2" - width="60" /> + width="80" /> <button enabled="false" font="SansSerifSmall" height="20" label="Show All" layout="topleft" - left_pad="5" + left_pad="0" name="show_all_button" top_delta="0" width="80" /> @@ -216,42 +226,44 @@ clicking on their names. column_padding="0" draw_heading="true" heading_height="14" - height="120" + height="100" layout="topleft" left="4" multi_select="true" name="member_list" - top="24" - width="396"> + top_pad="4" + width="255"> <name_list.columns - label="Member Name" + label="Member" name="name" - width="136" /> + width="90" /> <name_list.columns - label="Donated Tier" + label="Donations" name="donated" - width="136" /> + width="95" /> <name_list.columns - label="Last Login" + label="Online" name="online" - width="116" /> + width="80" /> </name_list> <button - height="19" - label="Invite New Member ..." + height="20" + font="SansSerifSmall" + label="Invite" layout="topleft" left_delta="0" name="member_invite" - top_pad="1" - width="146" /> + top_pad="6" + width="125" /> <button - height="19" - label="Eject From Group" + height="20" + font="SansSerifSmall" + label="Eject" layout="topleft" - left_pad="103" + left_pad="5" name="member_eject" top_delta="0" - width="146" /> + width="125" /> <icon height="16" image_name="inv_folder_plain_closed.tga" @@ -268,7 +280,7 @@ clicking on their names. left_delta="0" name="roles_sub_tab" top_delta="0" - width="398"> + width="265"> <panel.string name="help_text"> Roles have a title and an allowed list of Abilities @@ -301,8 +313,8 @@ including the Everyone and Owner Roles. left="4" max_length="63" name="search_text" - top="5" - width="100" /> + top="10" + width="90" /> <button font="SansSerifSmall" height="20" @@ -311,14 +323,14 @@ including the Everyone and Owner Roles. left_pad="5" name="search_button" top_delta="-2" - width="60" /> + width="80" /> <button enabled="false" font="SansSerifSmall" height="20" label="Show All" layout="topleft" - left_pad="5" + left_pad="0" name="show_all_button" top_delta="0" width="80" /> @@ -327,41 +339,43 @@ including the Everyone and Owner Roles. draw_heading="true" follows="left|top" heading_height="14" - height="120" + height="100" layout="topleft" left="4" name="role_list" - top="23" - width="396"> + top_pad="4" + width="255"> <scroll_list.columns - label="Role Name" + label="Role" name="name" - width="126" /> + width="80" /> <scroll_list.columns label="Title" name="title" - width="186" /> + width="90" /> <scroll_list.columns label="Members" name="members" - width="76" /> + width="95" /> </scroll_list> <button - height="19" - label="Create New Role ..." + height="20" + font="SansSerifSmall" + label="Create New Role" layout="topleft" left_delta="0" name="role_create" - top_pad="2" - width="146" /> + top_pad="6" + width="125" /> <button - height="19" + height="20" + font="SansSerifSmall" label="Delete Role" layout="topleft" - left_pad="95" + left_pad="5" name="role_delete" top_delta="0" - width="146" /> + width="125" /> </panel> <panel border="true" @@ -371,7 +385,7 @@ including the Everyone and Owner Roles. left_delta="0" name="actions_sub_tab" top_delta="0" - width="398"> + width="265"> <panel.string name="help_text"> Abilities allow Members in Roles to do specific @@ -383,11 +397,11 @@ things in this group. There's a broad variety of Abilities. follows="left|top" height="16" layout="topleft" - left="6" + left="4" max_length="63" name="search_text" - top="5" - width="100" /> + top="10" + width="90" /> <button font="SansSerifSmall" height="20" @@ -396,14 +410,14 @@ things in this group. There's a broad variety of Abilities. left_pad="5" name="search_button" top_delta="-2" - width="60" /> + width="80" /> <button enabled="false" font="SansSerifSmall" height="20" label="Show All" layout="topleft" - left_pad="5" + left_pad="0" name="show_all_button" top_delta="0" width="80" /> @@ -411,15 +425,15 @@ things in this group. There's a broad variety of Abilities. column_padding="0" draw_stripes="false" follows="left|top" - height="134" + height="100" layout="topleft" left="6" multi_select="true" name="action_list" search_column="1" tool_tip="Select an Ability to view more details." - top="23" - width="392"> + top_pad="6" + width="255"> <scroll_list.columns label="" name="icon" @@ -427,7 +441,7 @@ things in this group. There's a broad variety of Abilities. <scroll_list.columns label="" name="action" - width="356" /> + width="247" /> </scroll_list> <icon height="16" @@ -439,12 +453,12 @@ things in this group. There's a broad variety of Abilities. </panel> </tab_container> <panel - height="215" + height="50" layout="topleft" - left_delta="1" + left="10" name="members_footer" - top_pad="20" - width="406"> + top_pad="10" + width="265"> <text type="string" length="1" @@ -453,7 +467,7 @@ things in this group. There's a broad variety of Abilities. layout="topleft" left="0" name="static" - top="-16" + top_pad="0" width="100"> Assigned Roles </text> @@ -463,21 +477,21 @@ things in this group. There's a broad variety of Abilities. font="SansSerif" height="16" layout="topleft" - left_pad="50" + left_pad="35" name="static2" top_delta="0" - width="150"> + width="100"> Allowed Abilities </text> <scroll_list draw_stripes="false" enabled="false" - height="198" + height="75" layout="topleft" left="0" name="member_assigned_roles" - top="1" - width="145"> + top_pad="5" + width="130"> <scroll_list.columns label="" name="checkbox" @@ -485,18 +499,18 @@ things in this group. There's a broad variety of Abilities. <scroll_list.columns label="" name="role" - width="109" /> + width="107" /> </scroll_list> <scroll_list draw_stripes="false" enabled="false" - height="198" + height="75" layout="topleft" left_pad="5" name="member_allowed_actions" tool_tip="For Details of each Allowed Ability see the Abilities tab." top_delta="0" - width="254"> + width="130"> <scroll_list.columns label="" name="icon" @@ -504,7 +518,7 @@ things in this group. There's a broad variety of Abilities. <scroll_list.columns label="" name="action" - width="224" /> + width="126" /> </scroll_list> </panel> <panel @@ -514,7 +528,7 @@ things in this group. There's a broad variety of Abilities. name="roles_footer" top_delta="0" visible="false" - width="406"> + width="270"> <text type="string" length="1" @@ -523,7 +537,7 @@ things in this group. There's a broad variety of Abilities. layout="topleft" left="0" name="static" - top="-16" + top="0" width="100"> Name </text> @@ -533,7 +547,7 @@ things in this group. There's a broad variety of Abilities. font="SansSerif" height="16" layout="topleft" - left_pad="50" + left_pad="35" name="static2" top_delta="0" width="100"> @@ -550,8 +564,8 @@ things in this group. There's a broad variety of Abilities. left="0" max_length="20" name="role_name" - top="0" - width="145"> + top_pad="0" + width="130"> Employees </line_editor> <text @@ -562,7 +576,7 @@ things in this group. There's a broad variety of Abilities. layout="topleft" left_delta="0" name="static3" - top_delta="16" + top_pad="10" width="100"> Title </text> @@ -577,8 +591,8 @@ things in this group. There's a broad variety of Abilities. left_delta="0" max_length="20" name="role_title" - top_delta="16" - width="145"> + top_pad="0" + width="130"> (waiting) </line_editor> <text_editor @@ -588,11 +602,11 @@ things in this group. There's a broad variety of Abilities. height="48" hide_scrollbar="true" layout="topleft" - left="150" + left="135" max_length="254" name="role_description" - top="0" - width="254" + top="16" + width="130" word_wrap="true"> (waiting) </text_editor> @@ -604,7 +618,7 @@ things in this group. There's a broad variety of Abilities. layout="topleft" left="0" name="static4" - top="58" + top="85" width="120"> Assigned Members </text> @@ -614,22 +628,22 @@ things in this group. There's a broad variety of Abilities. font="SansSerif" height="16" layout="topleft" - left_pad="30" + left_pad="15" name="static5" tool_tip="A list of Abilities the currently selected role can perform." top_delta="0" - width="240"> + width="100"> Allowed Abilities </text> <name_list draw_stripes="false" enabled="false" - height="105" + height="75" layout="topleft" left="0" name="role_assigned_members" - top="74" - width="145" /> + top_pad="0" + width="130" /> <check_box height="16" label="Members are visible" @@ -637,18 +651,18 @@ things in this group. There's a broad variety of Abilities. left_delta="0" name="role_visible_in_list" tool_tip="Sets whether members of this role are visible in the General tab to people outside of the group." - top_pad="4" - width="361" /> + top_pad="10" + width="130" /> <scroll_list draw_stripes="false" - height="125" + height="75" layout="topleft" - left="150" + left="135" name="role_allowed_actions" search_column="2" tool_tip="For Details of each Allowed Ability see the Abilities tab." - top="74" - width="254"> + top="101" + width="130"> <scroll_list.columns label="" name="icon" @@ -663,14 +677,14 @@ things in this group. There's a broad variety of Abilities. width="220" /> </scroll_list> </panel> - <panel + <panel height="215" layout="topleft" left_delta="0" name="actions_footer" top_delta="0" visible="false" - width="406"> + width="265"> <text type="string" length="1" @@ -679,8 +693,8 @@ things in this group. There's a broad variety of Abilities. layout="topleft" left="0" name="static" - top="-16" - width="100"> + top="0" + width="200"> Description </text> <text_editor @@ -694,8 +708,8 @@ things in this group. There's a broad variety of Abilities. left_delta="0" max_length="512" name="action_description" - top_delta="16" - width="404" + top_pad="0" + width="265" word_wrap="true"> This Ability is 'Eject Members from this Group'. Only an Owner can eject another Owner. </text_editor> @@ -708,7 +722,7 @@ things in this group. There's a broad variety of Abilities. left_delta="0" name="static2" top_pad="10" - width="145"> + width="125"> Roles with Ability </text> <text @@ -717,27 +731,27 @@ things in this group. There's a broad variety of Abilities. font="SansSerif" height="16" layout="topleft" - left_pad="5" + left_pad="10" name="static3" top_delta="0" - width="200"> + width="125"> Members with Ability </text> <scroll_list enabled="false" - height="125" + height="75" layout="topleft" left="0" name="action_roles" - top="74" - width="145" /> + top="90" + width="130" /> <name_list enabled="false" - height="125" + height="75" layout="topleft" left_pad="5" name="action_members" top_delta="0" - width="254" /> + width="130" /> </panel> -</panel> +</panel>
\ No newline at end of file diff --git a/indra/newview/skins/default/xui/en/panel_im_control_panel.xml b/indra/newview/skins/default/xui/en/panel_im_control_panel.xml new file mode 100644 index 0000000000..5067b4c1d8 --- /dev/null +++ b/indra/newview/skins/default/xui/en/panel_im_control_panel.xml @@ -0,0 +1,32 @@ +<?xml version="1.0" encoding="utf-8" standalone="yes" ?>
+<panel name="panel_im_control_panel"
+ width="96"
+ height="215"
+ border="false">
+
+ <avatar_icon name="avatar_icon"
+ width="96"
+ height="96" />
+
+ <button name="view_profile_btn"
+ label="View Profile"
+ left_delta="3"
+ width="90"
+ height="20" />
+
+ <button name="add_friend_btn"
+ label="Add Friend"
+ width="90"
+ height="20" />
+
+ <button name="call_btn"
+ label="Call"
+ width="90"
+ height="20" />
+
+ <button name="share_btn"
+ label="Share"
+ width="90"
+ height="20" />
+
+</panel>
diff --git a/indra/newview/skins/default/xui/en/panel_landmark_info.xml b/indra/newview/skins/default/xui/en/panel_landmark_info.xml deleted file mode 100644 index e252788c69..0000000000 --- a/indra/newview/skins/default/xui/en/panel_landmark_info.xml +++ /dev/null @@ -1,258 +0,0 @@ -<?xml version="1.0" encoding="utf-8" standalone="yes" ?> -<panel - background_visible="true" - bg_alpha_color="0.3 0.3 0.3 1" - height="560" - label="Landmark" - layout="topleft" - left="0" - name="landmark_info" - top="800" - width="355"> - <panel.string - name="not_available"> - (N\A) - </panel.string> - <panel.string - name="unknown"> - (unknown) - </panel.string> - <panel.string - name="public"> - (public) - </panel.string> - <panel.string - name="server_update_text"> - Place information not available without server update. - </panel.string> - <panel.string - name="server_error_text"> - Information about this location is unavailable at this time, please try again later. - </panel.string> - <panel.string - name="server_forbidden_text"> - Information about this location is unavailable due to access restrictions. Please check your permissions with the parcel owner. - </panel.string> - <panel.string - name="acquired_date"> - [wkday,datetime,local] [mth,datetime,local] [day,datetime,local] [hour,datetime,local]:[min,datetime,local]:[second,datetime,local] [year,datetime,local] - </panel.string> - <button - follows="top|left" - height="20" - image_overlay="navbar_back.tga" - image_selected="navbar_bg_button.tga" - image_unselected="navbar_bg_button.tga" - layout="topleft" - left="10" - name="back_btn" - picture_style="true" - top="20" - width="20" /> - <text - type="string" - length="1" - follows="left|top|right" - font="SansSerifHugeBold" - height="20" - layout="topleft" - left="50" - name="panel_title" - text_color="white" - top="20" - width="150"> - Landmark - </text> - <texture_picker - follows="top|left" - height="128" - layout="topleft" - left="10" - name="logo" - top="60" - width="128" /> - <text - follows="left|top|right" - font="SansSerifHugeBold" - height="20" - layout="topleft" - left="10" - name="region_name" - text_color="white" - top="180" - width="340" /> - <text - follows="left|top|right" - font="SansSerifBold" - height="20" - layout="topleft" - left="10" - name="parcel_name" - text_color="white" - top="205" - width="340" /> - <panel - follows="left|top|right|bottom" - height="335" - layout="topleft" - left="0" - name="info_panel" - top="225" - width="355"> - <text_editor - bg_focus_color="0.3 0.3 0.3 1" - bg_readonly_color="0.3 0.3 0.3 1" - follows="left|top|right" - font="SansSerif" - height="90" - hide_border="true" - hide_scrollbar="true" - layout="topleft" - left="10" - max_length="1000" - name="description" - read_only="true" - text_color="white" - top="0" - width="340" /> - <icon - follows="top|left" - height="30" - image_name="" - layout="topleft" - left="10" - mouse_opaque="true" - name="maturity" - top="95" - width="30" /> - <text - type="string" - length="1" - follows="left|top" - font="SansSerif" - height="15" - layout="topleft" - left="10" - name="owner_lable" - text_color="white" - top="130" - width="50" - word_wrap="true"> - Owner: - </text> - <text - follows="left|top|right" - font="SansSerif" - height="15" - layout="topleft" - left="80" - name="owner" - text_color="white" - top="130" - width="260" - word_wrap="true" /> - <text - type="string" - length="1" - follows="left|top" - font="SansSerif" - height="15" - layout="topleft" - left="10" - name="creator_lable" - text_color="white" - top="150" - width="50" - word_wrap="true"> - Creator: - </text> - <text - follows="left|top|right" - font="SansSerif" - height="15" - layout="topleft" - left="80" - name="creator" - text_color="white" - top="150" - width="260" - word_wrap="true" /> - <text - type="string" - length="1" - follows="left|top" - font="SansSerif" - height="15" - layout="topleft" - left="10" - name="created_lable" - text_color="white" - top="170" - width="50" - word_wrap="true"> - Created: - </text> - <text - follows="left|top|right" - font="SansSerif" - height="15" - layout="topleft" - left="80" - name="created" - text_color="white" - top="170" - width="260" - word_wrap="true" /> - <text - type="string" - length="1" - follows="left|top" - font="SansSerif" - height="15" - layout="topleft" - left="10" - name="title_lable" - text_color="white" - top="190" - width="50" - word_wrap="true"> - Title: - </text> - <line_editor - follows="left|top|right" - font="SansSerif" - height="22" - layout="topleft" - left="10" - max_length="255" - name="title_editor" - top="210" - width="330" /> - <text - type="string" - length="1" - follows="left|top" - font="SansSerif" - height="15" - layout="topleft" - left="10" - name="notes_lable" - text_color="white" - top="240" - width="90" - word_wrap="true"> - My Notes: - </text> - <text_editor - follows="left|top|bottom|right" - font="SansSerif" - height="70" - hide_scrollbar="true" - layout="topleft" - left="10" - max_length="1000" - name="notes_editor" - top="260" - width="330" /> - </panel> -</panel> diff --git a/indra/newview/skins/default/xui/en/panel_landmarks.xml b/indra/newview/skins/default/xui/en/panel_landmarks.xml index f27b584c51..9ee80a37d7 100644 --- a/indra/newview/skins/default/xui/en/panel_landmarks.xml +++ b/indra/newview/skins/default/xui/en/panel_landmarks.xml @@ -1,10 +1,34 @@ <?xml version="1.0" encoding="utf-8" standalone="yes" ?> -<panel name="Landmarks" bottom="0" height="326" left="0" width="380" - border="true" follows="left|top|right|bottom"> - <inventory_panel allow_multi_select="true" border="true" bottom="0" - follows="left|top|right|bottom" height="326" left="0" mouse_opaque="true" - name="landmarks_list" width="380"/> - <button bottom="0" halign="center" height="16" label=">" enabled="false" - mouse_opaque="false" name="selector" width="20" left="0" - follows="right|bottom" tool_tip="View landmark properties"/> +<panel + name="Landmarks" + bottom="0" + height="326" + left="0" + width="380" + border="true" + background_visible="true" + bg_alpha_color="DkGray2" + follows="left|top|right|bottom"> + <inventory_panel + allow_multi_select="true" + border="true" + bottom="0" + follows="left|top|right|bottom" + height="326" + left="0" + mouse_opaque="true" + name="landmarks_list" + width="380"/> + <button + bottom="0" + halign="center" + height="16" + label=">" + enabled="false" + mouse_opaque="false" + name="selector" + width="20" + left="0" + follows="right|bottom" + tool_tip="View landmark properties"/> </panel> diff --git a/indra/newview/skins/default/xui/en/panel_login.xml b/indra/newview/skins/default/xui/en/panel_login.xml index 20da8aa41e..5ee73c1242 100644 --- a/indra/newview/skins/default/xui/en/panel_login.xml +++ b/indra/newview/skins/default/xui/en/panel_login.xml @@ -136,12 +136,15 @@ width="155"> <combo_box.item label="My Last Location" + name="MyLastLocation" value="last" /> <combo_box.item label="My Home" + name="MyHome" value="home" /> <combo_box.item label="<Type region name>" + name="Typeregionname" value="" /> </combo_box> <check_box diff --git a/indra/newview/skins/default/xui/en/panel_navigation_bar.xml b/indra/newview/skins/default/xui/en/panel_navigation_bar.xml index fa1abaa595..c9a0b6bc38 100644 --- a/indra/newview/skins/default/xui/en/panel_navigation_bar.xml +++ b/indra/newview/skins/default/xui/en/panel_navigation_bar.xml @@ -8,15 +8,16 @@ layout="topleft" name="navigation_bar" width="600"> - <button + <button follows="left|top" font="SansSerifSmall" height="20" - image_disabled="navbar_bg_button.tga" - image_disabled_selected="navbar_bg_button.tga" - image_overlay="navbar_back.tga" - image_selected="navbar_bg_button.tga" - image_unselected="navbar_bg_button.tga" + image_disabled="PushButton_Disabled" + image_disabled_selected="PushButton_Disabled" + image_overlay="Arrow_Left_Off" + image_selected="PushButton_Selected" + image_unselected="PushButton_Off" + hover_glow_amount="0.15" layout="topleft" left="5" name="back_btn" @@ -24,15 +25,17 @@ tool_tip="Go back to previous location" top="8" width="20" /> + <button follows="left|top" font="SansSerifSmall" height="20" - image_disabled="navbar_bg_button.tga" - image_disabled_selected="navbar_bg_button.tga" - image_overlay="navbar_forward.tga" - image_selected="navbar_bg_button.tga" - image_unselected="navbar_bg_button.tga" + image_disabled="PushButton_Disabled" + image_disabled_selected="PushButton_Disabled" + image_overlay="Arrow_Right_Off" + image_selected="PushButton_Selected" + image_unselected="PushButton_Off" + hover_glow_amount="0.15" layout="topleft" left_pad="2" name="forward_btn" @@ -44,11 +47,12 @@ follows="left|top" font="SansSerifSmall" height="20" - image_disabled="navbar_bg_button.tga" - image_disabled_selected="navbar_bg_button.tga" - image_overlay="navbar_home.tga" - image_selected="navbar_bg_button.tga" - image_unselected="navbar_bg_button.tga" + image_disabled="PushButton_Disabled" + image_disabled_selected="PushButton_Disabled" + image_overlay="Home_Off" + image_selected="PushButton_Selected" + image_unselected="PushButton_Off" + hover_glow_amount="0.15" layout="topleft" left_pad="5" name="home_btn" @@ -68,69 +72,70 @@ name="location_combo" top_delta="0" width="320"> + <!-- *TODO: Delete. Let the location_input use the correct art sizes. + <location_input.add_landmark_button + height="18" + name="location_combo_add" + width="20" /> + <location_input.info_button + height="18" + name="location_combo_info" + width="20" /> + --> </location_input> - <button - follows="right|top" - height="20" - image_disabled="navbar_bg_center.tga" - image_disabled_selected="navbar_bg_center.tga" - image_hover_selected="navbar_bg_center.tga" - image_hover_unselected="navbar_bg_center.tga" - image_selected="navbar_bg_center.tga" - image_unselected="navbar_bg_center.tga" - layout="topleft" - left_pad="5" - mouse_opaque="false" - name="search_bg" - picture_style="true" - top_delta="0" - width="168" /> - <line_editor + +<!-- <button --> +<!-- follows="right|top" --> +<!-- height="20" --> +<!-- image_disabled="TextField_Search_Off" --> +<!-- image_disabled_selected="TextField_Search_Off" --> +<!-- image_hover_selected="TextField_Search_Off" --> +<!-- image_hover_unselected="TextField_Search_Off" --> +<!-- image_selected="TextField_Search_Off" --> +<!-- image_unselected="TextField_Search_Off" --> +<!-- layout="topleft" --> +<!-- left_pad="5" --> +<!-- mouse_opaque="false" --> +<!-- name="search_bg" --> +<!-- picture_style="true" --> +<!-- top_delta="0" --> +<!-- width="168" /> --> + + <search_editor bevel_style="none" border_style="line" + border.border_thickness="0" commit_on_focus_lost="false" follows="right|top" halign="right" - height="18" - label="Search" + height="20" + label="Search All" layout="topleft" - left_delta="0" + left_pad="5" mouse_opaque="false" name="search_input" - tool_tip="Search" - top_delta="1" - width="152" /> - <button - follows="right|top" - height="16" - image_disabled="status_search_btn.png" - image_disabled_selected="status_search_btn_pressed.png" - image_selected="status_search_btn_pressed.png" - image_unselected="status_search_btn.png" - layout="topleft" - left_delta="152" - name="search_btn" - picture_style="true" - scale_image="false" - tool_tip="Search" - top_delta="1" - width="16" /> + tool_tip="Search All" + top_delta="0" + width="135" /> + <button follows="right|top" font="SansSerifSmall" height="20" - image_disabled="navbar_bg_button.tga" - image_disabled_selected="navbar_bg_button.tga" - image_overlay="navbar_help.tga" - image_selected="navbar_bg_button.tga" - image_unselected="navbar_bg_button.tga" + image_disabled="PushButton_Disabled" + image_disabled_selected="PushButton_Disabled" + image_overlay="Help_Off" + image_selected="PushButton_Selected" + image_unselected="PushButton_Off" + hover_glow_amount="0.15" layout="topleft" - left_pad="5" + left_pad="15" name="help_btn" picture_style="true" tool_tip="Help" - top_delta="-2" + top_delta="0" width="20" /> + <favorites_bar follows="left|right|top" height="25" diff --git a/indra/newview/skins/default/xui/en/panel_nearby_chat_bar.xml b/indra/newview/skins/default/xui/en/panel_nearby_chat_bar.xml new file mode 100644 index 0000000000..8b19f9a515 --- /dev/null +++ b/indra/newview/skins/default/xui/en/panel_nearby_chat_bar.xml @@ -0,0 +1,51 @@ +<?xml version="1.0" encoding="utf-8" standalone="yes" ?> +<panel + default_tab_group="1" + follows="left|bottom|right" + height="25" + layout="topleft" + left="0" + name="chat_bar" + top="24" + width="500"> + <line_editor + border_style="line" + border_thickness="1" + follows="left|right" + height="20" + label="Click here to chat." + layout="topleft" + left_delta="7" + left="0" + name="chat_box" + tool_tip="Press Enter to say, Ctrl-Enter to shout." + top="3" + width="250" /> + <button + follows="right" + width="45" + top="3" + layout="topleft" + left_pad="5" + label="Log" + height="20"> + <button.commit_callback function="Floater.Toggle" parameter="nearby_chat"/> + </button> + <chiclet_talk + follows="right" + height="20" + layout="topleft" + left_pad="5" + name="talk" + top="3" + width="100" /> + <gesture_combo_box + follows="right" + height="20" + label="Gestures" + layout="topleft" + name="Gesture" + left_pad="5" + top="3" + width="90" /> +</panel> diff --git a/indra/newview/skins/default/xui/en/panel_notes.xml b/indra/newview/skins/default/xui/en/panel_notes.xml index 767432a522..a0ac9df8a5 100644 --- a/indra/newview/skins/default/xui/en/panel_notes.xml +++ b/indra/newview/skins/default/xui/en/panel_notes.xml @@ -1,168 +1,173 @@ <?xml version="1.0" encoding="utf-8" standalone="yes" ?> <panel follows="top|left|right|bottom" - background_visible="true" bevel_style="in" - bg_alpha_color="0.5 0.5 0.5 1" - height="705" + height="625" label="Notes and Privacy" layout="topleft" left="10" name="panel_notes" top="10" - width="355"> - <scroll_container - left="1" width="354" height="690" follows="left|top|right|bottom" - layout="topleft" - reserve_scroll_corner="false"> - <panel - layout="topleft" - width="320" - height="690" - left="0" - top="0"> - <text - type="string" - length="1" - follows="left|top" - font="SansSerifHugeBold" - height="35" + width="305"> + <scroll_container + left="8" + width="260" + height="570" + follows="left|top|right|bottom" layout="topleft" - left="10" - name="pick_title" - text_color="white" - top="10" - width="250" - word_wrap="true"> - Private Notes - </text> - <text - type="string" - length="1" - follows="left|top" - font="SansSerif" - font.style="ITALIC" - height="15" - layout="topleft" - left="10" - name="status_message" - text_color="0.1 0.1 0.1 1" - top="50" - width="300"> - Your notes about this user: - </text> - <text_editor - bg_focus_color="white" - bg_writeable_color="0.6 0.6 0.6 1" - follows="left|right" - font="SansSerif" - height="300" - hide_scrollbar="true" - layout="topleft" - left="10" - max_length="1000" - name="notes_edit" - text_color="black" - top="70" - width="280" - word_wrap="true" /> - <text - type="string" - length="1" - follows="left|top" - font="SansSerifHugeBold" - height="35" - layout="topleft" - left="10" - name="pick_title" - text_color="white" - top="410" - width="250" - word_wrap="true"> - Private Settings - </text> - <text - type="string" - length="1" - follows="left|top" - font="SansSerif" - font.style="ITALIC" - height="15" - layout="topleft" - left="10" - name="status_message" - text_color="0.1 0.1 0.1 1" - top="435" - width="300"> - This user can: - </text> - <check_box - enabled="false" - follows="left|top" - font="SansSerifBig" - height="20" - label="See my online status" - layout="topleft" - left="10" - name="status_check" - text_disabled_color="0.1 0.1 0.1 1" - text_enabled_color="white" - top="455" - width="300" /> - <check_box - enabled="false" - follows="left|top" - font="SansSerifBig" - height="20" - label="See me on the map" - layout="topleft" - left="10" - name="map_check" - text_disabled_color="0.1 0.1 0.1 1" - text_enabled_color="white" - top="480" - width="300" /> - <check_box - enabled="false" - follows="left|top" - font="SansSerifBig" - height="20" - label="Edit, delite or take my objects" - layout="topleft" - left="10" - name="objects_check" - text_disabled_color="0.1 0.1 0.1 1" - text_enabled_color="white" - top="505" - width="300" /> + name="profile_scroll" + opaque="true" + color="DkGray2" + reserve_scroll_corner="false"> + <panel + layout="topleft" + width="260" + height="530" + left="0" + follows="left|right" + top="0"> + <!-- <text + type="string" + length="1" + follows="left|top" + font="SansSerifHugeBold" + height="20" + layout="topleft" + left="10" + name="pick_title" + text_color="white" + top="10" + width="250" + word_wrap="true"> + Private Notes + </text>--> + <text + type="string" + length="1" + follows="left|top" + font="SansSerifBold" + height="15" + layout="topleft" + left="10" + name="status_message" + text_color="White" + top="20" + width="260"> + Your private notes: + </text> + <text_editor + bg_focus_color="LtGray" + bg_writeable_color="LtGray" + follows="left|right" + font="SansSerif" + height="200" + hide_scrollbar="true" + layout="topleft" + left="10" + max_length="1000" + name="notes_edit" + text_color="black" + top_pad="10" + width="240" + word_wrap="true" /> + <!-- <text + type="string" + length="1" + follows="left|top" + font="SansSerifHugeBold" + height="20" + layout="topleft" + left="10" + name="pick_title2" + text_color="white" + top_pad="10" + width="250" + word_wrap="true"> + Private Settings + </text> --> + <text + type="string" + length="1" + follows="left|top" + font="SansSerifBold" + height="15" + layout="topleft" + left="10" + name="status_message2" + text_color="white" + top_pad="30" + width="260"> + Allow this user to: + </text> + <check_box + enabled="false" + follows="left|top" + font="SansSerif" + height="20" + label="See my online status" + layout="topleft" + left="10" + name="status_check" + text_disabled_color="0.1 0.1 0.1 1" + text_enabled_color="white" + top_pad="10" + width="260" /> + <check_box + enabled="false" + follows="left|top" + font="SansSerif" + height="20" + label="See me on the map" + layout="topleft" + left="10" + name="map_check" + text_disabled_color="0.1 0.1 0.1 1" + text_enabled_color="white" + top_pad="10" + width="260" /> + <check_box + enabled="false" + follows="left|top" + font="SansSerif" + height="20" + label="Edit, delete or take my objects" + layout="topleft" + left="10" + name="objects_check" + text_disabled_color="0.1 0.1 0.1 1" + text_enabled_color="white" + top_pad="10" + width="260" /> + </panel> + </scroll_container> <panel layout="topleft" follows="bottom" height="30" - left="0" + left="8" name="notes_buttons_panel" - bottom="690" - width="350"> - <button + bottom="625" + width="280"> + <button follows="bottom|left" font="SansSerifSmallBold" height="25" label="Add Friend" layout="topleft" - left="5" + left="0" mouse_opaque="false" name="add_friend" top="0" - width="75" /> + width="90" /> <button follows="bottom|left" font="SansSerifSmallBold" height="25" label="IM" layout="topleft" - left_pad="5" + left_pad="0" name="im" - top_delta="0" + top="0" width="40" /> <button follows="bottom|left" @@ -170,9 +175,9 @@ height="25" label="Call" layout="topleft" - left_pad="5" + left_pad="0" name="call" - top_delta="0" + top="0" width="50" enabled="false"/> <button @@ -181,22 +186,20 @@ height="25" label="Teleport" layout="topleft" - left_pad="5" + left_pad="0" name="teleport" - top_delta="0" - width="65" /> + top="0" + width="75" /> <button follows="bottom|left" font="SansSerifSmallBold" height="25" label="Share" layout="topleft" - left_pad="15" + left_pad="0" name="share" - top_delta="0" - width="50" + top="0" + width="60" enabled="false"/> </panel> </panel> - </scroll_container> -</panel> diff --git a/indra/newview/skins/default/xui/en/panel_people.xml b/indra/newview/skins/default/xui/en/panel_people.xml index f53e06494f..f7b2481f1c 100644 --- a/indra/newview/skins/default/xui/en/panel_people.xml +++ b/indra/newview/skins/default/xui/en/panel_people.xml @@ -1,225 +1,300 @@ <?xml version="1.0" encoding="utf-8" standalone="yes" ?> <panel layout="topleft" - top="0" left="0" width="355" height="465" + top="0" + left="0" + width="305" + height="465" follows="left|top|right|bottom" - background_visible="true" bg_alpha_color="0.3 0.3 0.3 1" - label="People" name="people_panel" -> - <search_editor + background_visible="true" + bg_alpha_color="0.3 0.3 0.3 1" + label="People" + name="people_panel"> + <filter_editor layout="topleft" - top="3" left="10" width="335" height="16" + top="3" + left="15" + width="270" + height="20" follows="left|top|right" - max_length="300" - label="Filter" name="filter_input" - font="SansSerif" text_color="black" - /> + max_length="270" + label="Filter People" + name="filter_input" + font="SansSerif" + background_image="TextField_Search_Off" + text_pad_left="23" + text_color="black"/> + <button + name="people_search" + layout="topleft" + top="5" + left="23" + width="13" + height="13" + scale_image="false" + follows="left|top|right" + font="SansSerifBigBold" + image_selected="Search" + image_unselected="Search" + picture_style="true"/> <tab_container layout="topleft" - top="30" left="10" width="335" height="400" + top="30" + left="10" + width="280" + height="400" follows="left|top|right|bottom" name="tabs" - tab_position="top" - bg_alpha_color="0.7 0.7 0.1 1" - > - <panel + tab_position="top"> + <panel layout="topleft" - height="390" width="332" + height="390" + width="280" follows="left|top|right|bottom" - background_visible="true" bevel_style="bright" bg_alpha_color="0.7 0.7 0.7 1" - label="Nearby" name="nearby_panel" - > + background_visible="true" + bevel_style="bright" + label="Nearby" + name="nearby_panel"> <avatar_list layout="topleft" - top="2" left="0" width="332" height="357" + top="2" + left="0" + width="280" + height="357" follows="left|top|right|bottom" name="avatar_list" - /> + volume_column_width="20"/> <panel layout="topleft" - bottom="390" left="0" width="333" height="30" + bottom="390" + left="0" + width="280" + height="30" follows="left|right|bottom" - background_visible="true" bevel_style="bright" bg_alpha_color="black" - label="bottom_panel" name="bottom_panel" - > + background_visible="true" + bevel_style="bright" + label="bottom_panel" + name="bottom_panel"> <button name="gear_btn" enabled="false" layout="topleft" - top="9" left="305" width="16" height="16" + top="7" + left="20" + width="18" + height="18" follows="bottom|right" font="SansSerifBigBold" - image_hover_selected="gear.tga" - image_selected="gear.tga" - image_unselected="gear.tga" - picture_style="true" - /> - </panel> + hover_glow_amount="0.15" + image_selected="OptionsMenu_Press" + image_unselected="OptionsMenu_Off" + picture_style="true"/> + </panel> </panel> <panel layout="topleft" - height="390" width="332" + height="390" + width="280" follows="left|top|right|bottom" - background_visible="true" bevel_style="bright" bg_alpha_color="0.7 0.7 0.7 1" - label="Friends" name="friends_panel" - > + background_visible="true" + bevel_style="bright" + label="Friends" + name="friends_panel"> <avatar_list layout="topleft" - top="2" left="0" width="332" height="357" + top="2" + left="0" + width="280" + height="357" follows="left|top|right|bottom" - name="avatar_list" - /> + name="avatar_list"/> <panel layout="topleft" - bottom="390" left="0" width="333" height="30" + bottom="390" + left="0" + width="280" + height="30" follows="left|right|bottom" - background_visible="true" bevel_style="in" bg_alpha_color="black" - label="bottom_panel" name="bottom_panel" - > - <button + background_visible="true" + bevel_style="in" + label="bottom_panel" + name="bottom_panel"> + <button + name="gear_btn" + enabled="false" + layout="topleft" + top="7" + left="20" + width="18" + height="18" + follows="bottom|right" + font="SansSerifBigBold" + hover_glow_amount="0.15" + image_selected="OptionsMenu_Press" + image_unselected="OptionsMenu_Off" + picture_style="true"/> + <button name="add_btn" layout="topleft" - top="9" left="10" width="16" height="16" + top_delta="0" + left_pad="5" + width="18" + height="18" follows="bottom|left" font="SansSerifBigBold" - image_hover_selected="add_btn.tga" - image_selected="add_btn.tga" - image_unselected="add_btn.tga" picture_style="true" - /> + hover_glow_amount="0.15" + image_selected="AddItem_Press" + image_unselected="AddItem_Off" + picture_style="true"/> <button name="del_btn" layout="topleft" - top_delta="0" left_pad="24" width="16" height="16" + top_delta="0" + left_pad="180" + width="18" + height="18" follows="bottom|left" font="SansSerifBigBold" - image_hover_selected="del_btn.tga" - image_selected="del_btn.tga" - image_unselected="del_btn.tga" - picture_style="true" - /> - <button - name="gear_btn" - enabled="false" - layout="topleft" - top_delta="0" left_pad="239" width="16" height="16" - follows="bottom|right" - font="SansSerifBigBold" - image_hover_selected="gear.tga" - image_selected="gear.tga" - image_unselected="gear.tga" - picture_style="true" - /> - </panel> + hover_glow_amount="0.15" + image_selected="TrashItem_Press" + image_unselected="TrashItem_Off" + picture_style="true"/> + </panel> </panel> <panel layout="topleft" - height="390" width="332" + height="390" + width="280" follows="left|top|right|bottom" - background_visible="true" bevel_style="bright" bg_alpha_color="0.7 0.7 0.7 1" - label="Groups" name="groups_panel" - > + background_visible="true" + bevel_style="bright" + label="Groups" + name="groups_panel"> <group_list layout="topleft" - top="2" left="0" width="332" height="357" + top="2" + left="0" + width="280" + height="357" follows="left|top|right|bottom" - name="group_list" - /> + name="group_list"/> <panel layout="topleft" - bottom="390" left="0" width="333" height="30" + bottom="390" + left="0" + width="280" + height="30" follows="left|right|bottom" - background_visible="true" bevel_style="in" bg_alpha_color="black" - label="bottom_panel" name="bottom_panel" - > + background_visible="true" + bevel_style="in" + label="bottom_panel" + name="bottom_panel"> <button - name="plus_btn" + name="gear_btn" + enabled="false" layout="topleft" - top="9" left="10" width="16" height="16" - follows="bottom|left" + top="7" + left="20" + width="18" + height="18" + follows="bottom|right" font="SansSerifBigBold" - image_hover_selected="add_btn.tga" - image_selected="add_btn.tga" - image_unselected="add_btn.tga" - picture_style="true" - /> + hover_glow_amount="0.15" + image_selected="OptionsMenu_Press" + image_unselected="OptionsMenu_Off" + picture_style="true"/> <button - name="minus_btn" + name="plus_btn" layout="topleft" - top_delta="0" left_pad="24" width="16" height="16" + top_delta="0" + left_pad="5" + width="18" + height="18" follows="bottom|left" font="SansSerifBigBold" - image_hover_selected="del_btn.tga" - image_selected="del_btn.tga" - image_unselected="del_btn.tga" - picture_style="true" - /> + hover_glow_amount="0.15" + image_selected="AddItem_Press" + image_unselected="AddItem_Off" + picture_style="true"/> <button name="activate_btn" layout="topleft" - top_delta="0" left_pad="24" width="16" height="16" + top_delta="5" + left_pad="24" + width="10" + height="10" follows="bottom|left" font="SansSerifBigBold" - image_hover_selected="activate_btn.tga" - image_selected="activate_btn.tga" - image_unselected="activate_btn.tga" - picture_style="true" - /> + image_hover_selected="group_activate_btn.tga" + image_selected="group_activate_btn.tga" + image_unselected="group_activate_btn.tga" + picture_style="true"/> <button - name="gear_btn" - enabled="false" + name="minus_btn" layout="topleft" - top_delta="0" left="305" width="16" height="16" - follows="bottom|right" + top_delta="-5" + left_pad="146" + width="18" + height="18" + follows="bottom|left" font="SansSerifBigBold" - image_hover_selected="gear.tga" - image_selected="gear.tga" - image_unselected="gear.tga" - picture_style="true" - /> - </panel> + hover_glow_amount="0.15" + image_selected="TrashItem_Press" + image_unselected="TrashItem_Off" + picture_style="true"/> + </panel> </panel> <panel layout="topleft" - height="390" width="332" + height="390" + width="280" follows="left|top|right|bottom" - background_visible="true" bevel_style="bright" bg_alpha_color="0.7 0.7 0.7 1" - label="Recent" name="recent_panel" - > + background_visible="true" + bevel_style="bright" + label="Recent" + name="recent_panel"> <avatar_list layout="topleft" - top="2" left="0" width="332" height="357" + top="2" + left="0" + width="280" + height="357" follows="left|top|right|bottom" - name="avatar_list" - /> + name="avatar_list"/> <panel layout="topleft" - bottom="390" left="0" width="333" height="30" + bottom="390" + left="0" + width="280" + height="30" follows="left|right|bottom" - background_visible="true" bevel_style="in" bg_alpha_color="black" - label="bottom_panel" name="bottom_panel" - > + background_visible="true" + bevel_style="in" + label="bottom_panel" + name="bottom_panel"> <button name="gear_btn" enabled="false" layout="topleft" - top="9" left="305" width="16" height="16" + top="7" + left="20" + width="18" + height="18" follows="bottom|right" font="SansSerifBigBold" - image_hover_selected="gear.tga" - image_selected="gear.tga" - image_unselected="gear.tga" - picture_style="true" - /> + hover_glow_amount="0.15" + image_selected="OptionsMenu_Press" + image_unselected="OptionsMenu_Off" + picture_style="true"/> </panel> </panel> </tab_container> - - <layout_stack + <layout_stack name="button_bar" follows="left|right|bottom" bottom="6" left="6" - width="335" + width="280" height="27" orientation="horizontal" animate="false" @@ -234,16 +309,15 @@ left="0" min_width="85" width="85" - visible="true" - > + visible="true"> <button label="View Profile" name="view_profile_btn" layout="topleft" - width="85" height="25" + width="85" + height="25" follows="top|left|right" - font="SansSerifSmallBold" - /> + font="SansSerifSmallBold"/> </layout_panel> <layout_panel name="add_friend_btn_panel" @@ -255,16 +329,14 @@ left="0" min_width="85" width="85" - visible="true" - > + visible="true"> <button label="Add Friend" name="add_friend_btn" layout="topleft" width="85" height="25" follows="top|left|right" - font="SansSerifSmallBold" - /> + font="SansSerifSmallBold"/> </layout_panel> <layout_panel name="group_info_btn_panel" @@ -276,16 +348,15 @@ left="0" min_width="80" width="80" - visible="true" - > + visible="true"> <button label="Group Info" name="group_info_btn" layout="topleft" - width="80" height="25" + width="80" + height="25" follows="top|left|right" - font="SansSerifSmallBold" - /> + font="SansSerifSmallBold"/> </layout_panel> <layout_panel name="chat_btn_panel" border="false" @@ -296,16 +367,14 @@ left="0" min_width="45" width="45" - visible="true" - > + visible="true"> <button label="Chat" name="chat_btn" layout="topleft" width="45" height="25" follows="top|left|right" - font="SansSerifSmallBold" - /> + font="SansSerifSmallBold"/> </layout_panel> <layout_panel name="im_btn_panel" @@ -317,16 +386,15 @@ left="0" min_width="35" width="35" - visible="true" - > + visible="true"> <button label="IM" name="im_btn" layout="topleft" - width="35" height="25" + width="35" + height="25" follows="top|left|right" - font="SansSerifSmallBold" - /> + font="SansSerifSmallBold"/> </layout_panel> <layout_panel name="call_btn_panel" @@ -338,17 +406,16 @@ left="0" min_width="40" width="40" - visible="false" - > + visible="false"> <button label="Call" name="call_btn" enabled="false" layout="topleft" - width="40" height="25" + width="40" + height="25" follows="top|left|right" - font="SansSerifSmallBold" - /> + font="SansSerifSmallBold"/> </layout_panel> <layout_panel name="teleport_btn_panel" @@ -359,8 +426,7 @@ height="25" left="0" min_width="65" - width="65" - > + width="65"> <button label="Teleport" name="teleport_btn" @@ -368,8 +434,7 @@ height="25" layout="topleft" follows="left|top|right" - font="SansSerifSmallBold" - /> + font="SansSerifSmallBold"/> </layout_panel> <layout_panel name="share_btn_panel" @@ -382,8 +447,7 @@ left="0" min_width="50" width="50" - visible="false" - > + visible="false"> <button label="Share" name="share_btn" @@ -392,8 +456,7 @@ width="50" height="25" follows="top|left|right" - font="SansSerifSmallBold" - /> + font="SansSerifSmallBold"/> </layout_panel> <layout_panel name="more_btn_panel" @@ -405,8 +468,7 @@ left="0" min_width="40" width="40" - visible="true" - > + visible="true"> <button label=">>" name="more_btn" @@ -415,10 +477,9 @@ width="40" height="25" follows="top|right" - font="SansSerifSmallBold" - /> + font="SansSerifSmallBold"/> </layout_panel> - </layout_stack> + </layout_stack> <string name="no_people"> No people </string> @@ -428,14 +489,17 @@ <string name="no_friends"> No friends </string> + <string name="no_groups"> + No groups + </string> <panel layout="topleft" name="panel_profile_view" class="panel_profile_view" filename="panel_profile_view.xml" top="0" - left="5" - width="345" + left="0" + width="355" height="465" follows="left|right|top|bottom" visible="false" diff --git a/indra/newview/skins/default/xui/en/panel_pick_info.xml b/indra/newview/skins/default/xui/en/panel_pick_info.xml index fa04ba7f15..393521f1d2 100644 --- a/indra/newview/skins/default/xui/en/panel_pick_info.xml +++ b/indra/newview/skins/default/xui/en/panel_pick_info.xml @@ -1,14 +1,12 @@ <?xml version="1.0" encoding="utf-8" standalone="yes" ?> <panel - background_visible="true" bevel_style="in" - bg_alpha_color="0.2 0.2 0.2 1" - height="640" + height="660" layout="topleft" left="0" name="panel_pick_info" top="0" - width="355"> + width="305"> <button follows="top|left" height="20" @@ -36,11 +34,12 @@ Pick Info </text> <panel - background_visible="true" - bg_alpha_color="0.5 0.5 0.5 1" follows="left|right|top|bottom" - height="570" + height="580" + width="280" layout="topleft" + background_visible="true" + bg_alpha_color="DkGray2" left="10" right="-10" top="30"> @@ -57,17 +56,18 @@ type="string" length="1" follows="left|top" - height="16" + height="15" layout="topleft" left="10" - name="Name:"> + name="Name:" + text_color="white"> Name: </text> <text type="string" length="1" follows="left|top|right" - height="20" + height="15" layout="topleft" left="10" name="pick_name" @@ -78,13 +78,14 @@ </text> <text type="string" - length="1" follows="left|top" - height="20" + height="15" layout="topleft" left="10" name="description_label" - v_pad="15" + text_color="white" + top_pad="20" + v_pad="0" valign="center"> Description: </text> @@ -92,13 +93,12 @@ type="string" length="1" follows="left|top|right" - height="40" + height="60" layout="topleft" left="10" name="pick_desc" right="-10" text_color="white" - v_pad="15" valign="center" word_wrap="true"> [description] @@ -110,21 +110,20 @@ height="20" layout="topleft" left="10" - name="description_label" - v_pad="15" + name="location_label" + text_color="white" + top_pad="20" valign="bottom"> Location: </text> <text type="string" - length="1" follows="left|top" height="30" layout="topleft" left="10" name="pick_location" text_color="white" - v_pad="15" valign="center"> [loading...] </text> @@ -133,52 +132,50 @@ follows="left|right|bottom" height="30" layout="topleft" - left="10" + left="8" name="buttons" right="-10" - top_pad="2"> + bottom="660"> <button follows="bottom|left" font="SansSerifSmallBold" height="25" label="Edit" layout="topleft" - left="10" + left="0" name="edit_btn" - top="3" + top="0" width="50" /> <button - enabled="false" - follows="bottom|left" + follows="bottom|left" font="SansSerifSmallBold" height="25" label="Teleport" layout="topleft" - left="65" + left_pad="0" name="teleport_btn" - top="3" - width="70" /> + top="0" + width="80" /> <button - enabled="false" - follows="bottom|left" + follows="bottom|left" font="SansSerifSmallBold" height="25" label="Show on Map" layout="topleft" - left="140" + left_pad="0" name="show_on_map_btn" - top="3" - width="90" /> + top="0" + width="100" /> <button - enabled="false" - follows="bottom|right" + enabled="false" + follows="bottom|left" font="SansSerifSmallBold" height="25" label="Verb" layout="topleft" - left="270" + left_pad="0" name="verb_btn" - top="3" + top="0" width="50" /> </panel> </panel> diff --git a/indra/newview/skins/default/xui/en/panel_pick_list_item.xml b/indra/newview/skins/default/xui/en/panel_pick_list_item.xml new file mode 100644 index 0000000000..1a06e2bb06 --- /dev/null +++ b/indra/newview/skins/default/xui/en/panel_pick_list_item.xml @@ -0,0 +1,63 @@ +<?xml version="1.0" encoding="utf-8" standalone="yes" ?> +<panel + bg_alpha_color="0.4 0.4 0.4 1" + bg_opaque_color="0.4 0.4 0.4 1" + border="true" + follows="top|left|right" + height="80" + layout="topleft" + left="0" + name="picture_item" + top="80" + width="245"> + <texture_picker + allow_no_texture="true" + default_image_name="None" + enabled="false" + follows="left|top" + height="80" + layout="topleft" + left="5" + mouse_opaque="false" + name="picture" + tab_stop="false" + top="7" + width="70" /> + <text + follows="top|left|right" + font="SansSerif" + height="20" + layout="topleft" + left="80" + name="picture_name" + text_color="black" + top="5" + use_ellipses="true" + width="150"/> + <text + follows="top|left|right" + font="SansSerifSmall" + height="40" + layout="topleft" + name="picture_descr" + text_color="white" + top="25" + use_ellipses="true" + width="150" + word_wrap="true" /> + <button + follows="top|right" + height="20" + image_disabled="navbar_bg_button.tga" + image_disabled_selected="navbar_bg_button.tga" + image_overlay="navbar_forward.tga" + image_selected="navbar_bg_button.tga" + image_unselected="navbar_bg_button.tga" + layout="topleft" + name="info_chevron" + picture_style="true" + right="-5" + tab_stop="false" + top="28" + width="20" /> +</panel> diff --git a/indra/newview/skins/default/xui/en/panel_picks.xml b/indra/newview/skins/default/xui/en/panel_picks.xml index 95055f43dc..5b66026f48 100644 --- a/indra/newview/skins/default/xui/en/panel_picks.xml +++ b/indra/newview/skins/default/xui/en/panel_picks.xml @@ -1,163 +1,166 @@ <?xml version="1.0" encoding="utf-8" standalone="yes" ?> <panel - background_visible="true" bevel_style="in" - bg_alpha_color="0.5 0.5 0.5 1" - height="690" + follows="left|top|right|bottom" + height="625" label="Picks" layout="topleft" left="0" name="panel_picks" top="0" - width="355"> - <text + width="305"> + <!--<text type="string" length="1" follows="top|left|right" font="SansSerifHugeBold" - height="55" + height="50" layout="topleft" left="10" name="pick_title" text_color="white" top="10" - width="330" + width="270" word_wrap="true"> [NAME]'s favorite places in Second Life... - </text> + </text>--> <!-- below is a special title shown for the Agent on the "Picks" tab--> <text type="string" length="1" follows="top" - font="SansSerifHugeBold" - height="55" + font="SansSerifBold" + height="35" layout="topleft" left="10" name="pick_title_agent" text_color="white" top="10" visible="false" - width="330" + width="270" word_wrap="true"> Tell everyone about your favorite Second Life places... </text> <scroll_container follows="left|top|right|bottom" - height="550" + height="495" layout="topleft" - left="5" - reserve_scroll_corner="true" - width="345"> + left="8" + name="profile_scroll" + opaque="true" + color="DkGray2" + reserve_scroll_corner="false" + top_pad="0" + width="260"> <panel - background_visible="true" bevel_style="in" - bg_alpha_color="0.6 0.6 0.6 1" - follows="left|top|right|bottom" - height="600" + height="40" layout="topleft" left="0" name="back_panel" top="0" - width="325" /> + width="260" /> </scroll_container> <panel background_visible="true" bevel_style="in" - bg_alpha_color="black" enabled="false" follows="left|right|bottom" height="25" label="bottom_panel" layout="topleft" - left="5" + left="8" name="edit_panel" visible="false" - width="345"> + top_pad="0" + width="260"> <button enabled="false" follows="bottom|left" font="SansSerifBigBold" - height="16" - image_hover_selected="gear.tga" - image_selected="gear.tga" - image_unselected="gear.tga" + height="18" + hover_glow_amount="0.15" + image_selected="OptionsMenu_Press" + image_unselected="OptionsMenu_Off" layout="topleft" - left="5" + left="10" name="gear_menu_btn" picture_style="true" top="5" - width="16" /> + width="18" /> <button follows="bottom|left" font="SansSerifBigBold" - height="16" - image_disabled="add_btn.tga" - image_disabled_selected="add_btn.tga" - image_hover_selected="add_btn.tga" - image_selected="add_btn.tga" - image_unselected="add_btn.tga" + height="18" + image_disabled="AddItem_Off" + image_disabled_selected="AddItem_Press" + hover_glow_amount="0.15" + image_selected="AddItem_Press" + image_unselected="AddItem_Off" layout="topleft" left="35" name="new_btn" picture_style="true" - tool_tip="Create New Pick at Current Location" + tool_tip="Create New Pick at Current Location" top="5" - width="16" /> + width="18" /> <button follows="bottom|right" font="SansSerifBigBold" - height="16" - image_disabled="del_btn.tga" - image_disabled_selected="del_btn.tga" - image_hover_selected="del_btn.tga" - image_selected="del_btn.tga" - image_unselected="del_btn.tga" + height="18" + image_disabled="TrashItem_Off" + image_disabled_selected="TrashItem_Press" + hover_glow_amount="0.15" + image_selected="TrashItem_Press" + image_unselected="TrashItem_Off" layout="topleft" name="trash_btn" picture_style="true" right="-10" top="5" - width="16" /> + width="18" /> </panel> <panel - follows="left|right" - height="25" + follows="bottom|left" + height="30" layout="topleft" - left="0" + left="8" name="buttons_cucks" - top_pad="10" - width="345"> + bottom="625" + width="280"> <button follows="bottom|left" font="SansSerifSmallBold" height="25" label="Info" layout="topleft" - left="10" + left="0" name="info_btn" + enabled="false" top="0" - width="50" /> + width="60" /> <button follows="bottom|left" font="SansSerifSmallBold" height="25" label="Teleport" layout="topleft" - left="65" + left_pad="0" name="teleport_btn" + enabled="false" top="0" - width="70" /> + width="75" /> <button follows="bottom|left" font="SansSerifSmallBold" height="25" label="Show on Map" layout="topleft" - left="140" + left_pad="0" name="show_on_map_btn" + enabled="false" top="0" - width="90" /> + width="105" /> <button enabled="false" follows="bottom|right" @@ -165,9 +168,9 @@ height="25" label="Verb" layout="topleft" - left="270" + left_pad="0" name="verb_btn" top="0" - width="50" /> + width="60" /> </panel> </panel> diff --git a/indra/newview/skins/default/xui/en/panel_places.xml b/indra/newview/skins/default/xui/en/panel_places.xml index 66bb38b45e..c91cb2394c 100644 --- a/indra/newview/skins/default/xui/en/panel_places.xml +++ b/indra/newview/skins/default/xui/en/panel_places.xml @@ -1,7 +1,6 @@ <?xml version="1.0" encoding="utf-8" standalone="yes" ?> <panel background_visible="true" - bg_alpha_color="0.3 0.3 0.3 1" follows="left|top|right|bottom" height="400" label="Places" @@ -11,53 +10,78 @@ min_width="240" name="places panel" top="400" - width="355"> - <search_editor + width="305"> + <panel.string + name="landmarks_tab_title"> + Landmarks + </panel.string> + <panel.string + name="teleport_history_tab_title"> + Teleport History + </panel.string> + <filter_editor follows="left|top|right" - height="16" + height="20" label="Filter" layout="topleft" - left="10" + left="15" name="Filter" - top="4" - width="335" /> + top="3" + width="270" + font="SansSerif" + background_image="TextField_Search_Off" + text_pad_left="23" + text_color="black"/> + <button + name="landmark_search" + layout="topleft" + top="5" + left="23" + width="13" + height="13" + scale_image="false" + follows="left|top|right" + font="SansSerifBigBold" + image_selected="Search" + image_unselected="Search" + picture_style="true"/> <tab_container follows="left|top|right|bottom" height="326" layout="topleft" - left_delta="0" + left="10" name="Places Tabs" tab_position="top" top_pad="19" - width="335" /> + width="280" /> <panel - class="panel_landmark_info" - filename="panel_landmark_info.xml" + class="panel_place_info" + filename="panel_place_info.xml" follows="left|top|right|bottom" height="675" layout="topleft" left="0" - name="panel_landmark_info" + name="panel_place_info" top="-310" visible="false" - width="355" /> + width="280" /> <button follows="bottom|left" font="SansSerifSmallBold" height="25" - label="TELEPORT" + label="Teleport" layout="topleft" left_delta="10" name="teleport_btn" top_pad="5" - width="90" /> + width="80" /> <button follows="bottom|left" font="SansSerifSmallBold" height="25" - label="SHOW ON MAP" + label="Show on Map" layout="topleft" - left_pad="5" + left_pad="0" name="map_btn" top_delta="0" width="110" /> @@ -66,20 +90,20 @@ follows="bottom|left" font="SansSerifSmallBold" height="25" - label="SHARE" + label="Share" layout="topleft" - left_pad="5" + left_pad="0" name="share_btn" top_delta="0" width="60" /> <button - enabled="false" + enabled="true" follows="bottom|right" font="SansSerifSmallBold" height="25" label="▼" layout="topleft" - left_pad="35" + left_pad="0" name="overflow_btn" top_delta="0" width="30" /> diff --git a/indra/newview/skins/default/xui/en/panel_preferences_advanced.xml b/indra/newview/skins/default/xui/en/panel_preferences_advanced.xml new file mode 100644 index 0000000000..624345367f --- /dev/null +++ b/indra/newview/skins/default/xui/en/panel_preferences_advanced.xml @@ -0,0 +1,270 @@ +<?xml version="1.0" encoding="UTF-8"?> + +<panel + border="true" + background_visible="true" + follows="left|top|right|bottom" + height="408" + layout="topleft" + left="102" + name="advanced" + top="1" + width="517"> + <text + type="string" + text_color="LabelSelectedDisabledColor" + length="1" + follows="left|top" + layout="topleft" + left="8" + name="text status" + top_pad="3" + width="280"> +Beware the Trout! + </text> + + <!-- ADVANCED --> + + <check_box + control_name="SmallAvatarNames" + height="16" + initial_value="true" + label="Small Avatar Names" + layout="topleft" + left_delta="30" + name="small_avatar_names_checkbox" + top="20" + width="200" /> + <check_box + control_name="ArrowKeysMoveAvatar" + height="16" + label="Arrow keys always move avatar when chatting" + layout="topleft" + left_delta="0" + name="arrow_keys_move_avatar_check" + top_pad="10" + width="237" /> + <text + type="string" + length="1" + follows="left|top" + height="10" + layout="topleft" + left_delta="0" + mouse_opaque="false" + name="text_box7" + top_pad="10" + width="128"> + Bubble Chat: + </text> + <slider + control_name="ChatBubbleOpacity" + follows="left|top" + height="12" + increment="0.05" + initial_value="1" + label="Opacity" + layout="topleft" + left_delta="0" + name="bubble_chat_opacity" + top_pad="10" + width="200" /> + + <check_box + control_name="UIAutoScale" + height="16" + label="Resolution independent scale" + layout="topleft" + left="30" + name="ui_auto_scale" + top_pad="10" + width="256" /> + <!--text + type="string" + length="1" + follows="left|top" + height="12" + layout="topleft" + left="30" + name="DisplayResLabel" + top_pad="10" + width="128"> + Display Resolution: + </text> + <combo_box + height="18" + layout="topleft" + left_pad="5" + name="fullscreen combo" + top_delta="-1" + width="150" /--> + <text + type="string" + length="1" + follows="left|top" + height="12" + layout="topleft" + left="30" + name="AspectRatioLabel1" + tool_tip="width / height" + top_pad="5" + width="160"> + Aspect Ratio: + </text> + <combo_box + allow_text_entry="true" + height="16" + layout="topleft" + left_pad="0" + max_chars="100" + name="aspect_ratio" + tool_tip="width / height" + top_delta="0" + width="150"> + <combo_box.item + enabled="true" + label="4:3 (Standard CRT)" + name="item1" + value="1.333333" /> + <combo_box.item + enabled="true" + label="5:4 (1280x1024 LCD)" + name="item2" + value="1.25" /> + <combo_box.item + enabled="true" + label="8:5 (Widescreen)" + name="item3" + value="1.6" /> + <combo_box.item + enabled="true" + label="16:9 (Widescreen)" + name="item4" + value="1.7777777" /> + </combo_box> + <check_box + control_name="FullScreenAutoDetectAspectRatio" + height="16" + label="Auto-detect ratio" + layout="topleft" + left_pad="5" + name="aspect_auto_detect" + top_delta="1" + width="256"> + <check_box.commit_callback + function="Pref.AutoDetectAspect" /> + </check_box> + <text + type="string" + length="1" + follows="left|top" + height="10" + layout="topleft" + left="30" + name=" Camera Options:" + top_pad="10" + width="266"> + Camera Options: + </text> + <text + type="string" + length="1" + follows="left|top" + height="10" + layout="topleft" + left="30" + name="camera_fov_label" + top_pad="10" + width="128"> + Camera View Angle: + </text> + <slider + can_edit_text="true" + control_name="CameraAngle" + decimal_digits="2" + follows="left|top" + height="16" + increment="0.025" + initial_value="1.57" + layout="topleft" + left="128" + max_val="2.97" + min_val="0.17" + name="camera_fov" + show_text="false" + top_delta="0" + width="128" /> + <text + type="string" + length="1" + follows="left|top" + height="10" + layout="topleft" + left="30" + name="Camera Follow Distance:" + top_pad="10" + width="128"> + Camera Follow Distance: + </text> + <slider + can_edit_text="true" + control_name="CameraOffsetScale" + decimal_digits="2" + follows="left|top" + height="16" + increment="0.025" + initial_value="1" + layout="topleft" + left_delta="128" + max_val="3" + min_val="0.5" + name="camera_offset_scale" + show_text="false" + top_delta="0" + width="128" /> + + <check_box + control_name="EditCameraMovement" + height="16" + label="Automatic Edit Camera Movement" + layout="topleft" + left="10" + name="edit_camera_movement" + tool_tip="Use automatic camera positioning when entering and exiting edit mode" + top_pad="5" + width="201" /> + <check_box + control_name="AppearanceCameraMovement" + height="16" + label="Automatic Appearance Camera Movement" + layout="topleft" + left_pad="5" + name="appearance_camera_movement" + tool_tip="Use automatic camera positioning while in edit mode" + top_delta="0" + width="242" /> + + <text + type="string" + length="1" + follows="left|top" + height="12" + layout="topleft" + left="10" + name="text2" + top_pad="5" + width="128"> + Avatar Display Options: + </text> + <check_box + control_name="FirstPersonAvatarVisible" + height="16" + label="Show Avatar in Mouselook" + layout="topleft" + left_pad="10" + name="first_person_avatar_visible" + top_delta="0" + width="256" /> + + +</panel>
\ No newline at end of file diff --git a/indra/newview/skins/default/xui/en/panel_preferences_chat.xml b/indra/newview/skins/default/xui/en/panel_preferences_chat.xml index bda437ab29..89d96b015f 100644 --- a/indra/newview/skins/default/xui/en/panel_preferences_chat.xml +++ b/indra/newview/skins/default/xui/en/panel_preferences_chat.xml @@ -9,25 +9,13 @@ name="chat" top="1" width="517"> - <text - type="string" - length="1" - follows="left|top" - height="10" - layout="topleft" - left="12" - mouse_opaque="false" - top="10" - width="128"> - Chat Font Size: - </text> <radio_group height="30" layout="topleft" - left_pad="8" + left="30" control_name="ChatFontSize" name="chat_font_size" - top_delta="0" + top="10" width="331"> <radio_item height="16" @@ -35,8 +23,8 @@ layout="topleft" left="0" name="radio" - top="8" - width="98" /> + top="10" + width="125" /> <radio_item height="16" label="Medium" @@ -44,7 +32,7 @@ left_pad="12" name="radio2" top_delta="0" - width="98" /> + width="125" /> <radio_item height="16" label="Large" @@ -52,45 +40,56 @@ left_pad="12" name="radio3" top_delta="0" - width="98" /> + width="125" /> </radio_group> - <text - type="string" - length="1" - follows="left|top" - height="10" - layout="topleft" - left="12" - mouse_opaque="false" - name="text_box2" - top="54" - width="128"> - Chat Color: - </text> <color_swatch border_color="0.45098 0.517647 0.607843 1" can_apply_immediately="true" control_name="UserChatColor" follows="left|top" height="47" - label="You" layout="topleft" - left_pad="8" + left="30" name="user" - top_delta="-1" + top_pad="10" width="44" /> + <text + type="string" + length="1" + follows="left|top" + height="10" + layout="topleft" + left_pad="5" + mouse_opaque="false" + name="text_box1" + top_delta="5" + width="95"> + Me + </text> <color_swatch border_color="0.45098 0.517647 0.607843 1" can_apply_immediately="true" control_name="AgentChatColor" follows="left|top" height="47" - label="Others" layout="topleft" - left_pad="10" + left="180" name="agent" - top_delta="0" + top_pad="-17" width="44" /> + <text + type="string" + length="1" + follows="left|top" + height="10" + layout="topleft" + left_pad="5" + mouse_opaque="false" + name="text_box2" + top_delta="5" + width="95"> + Others + </text> <color_swatch border_color="0.45098 0.517647 0.607843 1" can_apply_immediately="true" @@ -98,13 +97,25 @@ control_name="IMChatColor" follows="left|top" height="47" - label="IM" label_width="60" layout="topleft" - left_pad="10" + left="350" name="im" - top_delta="0" + top_pad="-17" width="44" /> + <text + type="string" + length="1" + follows="left|top" + height="10" + layout="topleft" + left_pad="5" + mouse_opaque="false" + name="text_box3" + top_delta="5" + width="95"> + IM + </text> <color_swatch border_color="0.45098 0.517647 0.607843 1" can_apply_immediately="true" @@ -112,13 +123,25 @@ control_name="SystemChatColor" follows="left|top" height="47" - label="System" label_width="44" layout="topleft" - left_pad="10" + left="30" name="system" - top_delta="0" + top_pad="40" width="44" /> + <text + type="string" + length="1" + follows="left|top" + height="10" + layout="topleft" + left_pad="5" + mouse_opaque="false" + name="text_box4" + top_delta="5" + width="95"> + System + </text> <color_swatch border_color="0.45098 0.517647 0.607843 1" can_apply_immediately="true" @@ -126,63 +149,35 @@ control_name="ScriptErrorColor" follows="left|top" height="47" - label="Errors" layout="topleft" - left_pad="10" + left="180" name="script_error" - top_delta="0" + top_pad="-17" width="44" /> - <color_swatch - border_color="0.45098 0.517647 0.607843 1" - can_apply_immediately="true" - color="0.7 0.9 0.7 1" - control_name="ObjectChatColor" + <text + type="string" + length="1" follows="left|top" - height="47" - label="Objects" + height="10" layout="topleft" - left="148" - name="objects" - top="103" - width="44" /> + left_pad="5" + mouse_opaque="false" + name="text_box5" + top_delta="5" + width="95"> + Errors + </text> <color_swatch border_color="0.45098 0.517647 0.607843 1" can_apply_immediately="true" color="0.7 0.9 0.7 1" - control_name="llOwnerSayChatColor" - follows="left|top" - height="47" - label="Owner" - layout="topleft" - left_pad="10" - name="owner" - top_delta="0" - width="44" /> - <color_swatch - border_color="0.45098 0.517647 0.607843 1" - can_apply_immediately="true" - color="0 0 0 1" - control_name="BackgroundChatColor" - follows="left|top" - height="47" - label="Bubble" - layout="topleft" - left_pad="10" - name="background" - top_delta="0" - width="44" /> - <color_swatch - border_color="0.45098 0.517647 0.607843 1" - can_apply_immediately="true" - color="0.6 0.6 1 1" - control_name="HTMLLinkColor" + control_name="ObjectChatColor" follows="left|top" height="47" - label="URLs" layout="topleft" - left_pad="10" - name="links" - top_delta="0" + left="350" + name="objects" + top_pad="-17" width="44" /> <text type="string" @@ -190,56 +185,50 @@ follows="left|top" height="10" layout="topleft" - left="12" + left_pad="5" mouse_opaque="false" - name="text_box3" - top="168" - width="135"> - Chat Console: + name="text_box6" + top_delta="5" + width="95"> + Objects </text> - <spinner - control_name="ChatPersistTime" - decimal_digits="0" + <color_swatch + border_color="0.45098 0.517647 0.607843 1" + can_apply_immediately="true" + color="0.7 0.9 0.7 1" + control_name="llOwnerSayChatColor" follows="left|top" - height="16" - increment="1" - initial_value="10" - label="Fade chat after" - label_width="80" + height="47" layout="topleft" - left_pad="1" - max_val="60" - min_val="2" - name="fade_chat_time" - top_delta="2" - width="130" /> + left="30" + name="owner" + top_pad="40" + width="44" /> <text type="string" length="1" follows="left|top" height="10" layout="topleft" - left_pad="4" + left_pad="5" mouse_opaque="false" - name="text_box4" - top_delta="0" - width="80"> - (seconds) + name="text_box7" + top_delta="5" + width="95"> + Owner </text> - <spinner - control_name="ConsoleMaxLines" - decimal_digits="0" + <color_swatch + border_color="0.45098 0.517647 0.607843 1" + can_apply_immediately="true" + color="0 0 0 1" + control_name="BackgroundChatColor" follows="left|top" - height="16" - increment="1" - initial_value="10" + height="47" layout="topleft" - left_delta="58" - max_val="50" - min_val="1" - name="max_chat_count" - top_delta="0" - width="60" /> + left="180" + name="background" + top_pad="-17" + width="44" /> <text type="string" length="1" @@ -248,123 +237,62 @@ layout="topleft" left_pad="5" mouse_opaque="false" - name="text_box5" - top_delta="0" - width="60"> - (# lines) + name="text_box8" + top_delta="5" + width="95"> + Bubble </text> - <slider - control_name="ConsoleBackgroundOpacity" + <color_swatch + border_color="0.45098 0.517647 0.607843 1" + can_apply_immediately="true" + color="0.6 0.6 1 1" + control_name="HTMLLinkColor" follows="left|top" - height="12" - increment="0.05" - initial_value="1" - label="Opacity" - layout="topleft" - left="148" - name="console_opacity" - top="193" - width="200" /> - <check_box - control_name="ChatFullWidth" - height="16" - label="Use full screen width (Requires restart)" + height="47" layout="topleft" - left_delta="0" - name="chat_full_width_check" - top_pad="9" - width="239" /> + left="350" + name="links" + top_pad="-17" + width="44" /> <text type="string" length="1" follows="left|top" height="10" layout="topleft" - left="12" + left_pad="5" mouse_opaque="false" - name="text_box6" - top="245" - width="135"> - Chat Options: + name="text_box9" + top_delta="5" + width="95"> + URLs </text> <check_box - control_name="CloseChatOnReturn" - height="16" - label="Close chat bar after hitting return" - layout="topleft" - left_pad="1" - name="close_chat_on_return_check" - top_delta="2" - width="237" /> - <check_box - control_name="ArrowKeysMoveAvatar" - height="16" - label="Arrow keys always move avatar when chatting" - layout="topleft" - left_delta="0" - name="arrow_keys_move_avatar_check" - top_pad="4" - width="237" /> - <check_box - control_name="ChatShowTimestamps" - height="16" - label="Show timestamps in Local Chat" - layout="topleft" - left_delta="0" - name="show_timestamps_check" - top_pad="4" - width="237" /> - <check_box - control_name="ScriptErrorsAsChat" - height="16" - label="Show script errors and warnings as regular chat" - layout="topleft" - left_delta="0" - name="script_errors_as_chat" - top_pad="4" - width="275" /> - <check_box control_name="PlayTypingAnim" height="16" initial_value="true" label="Play typing animation when chatting" layout="topleft" - left_delta="0" + left="30" name="play_typing_animation" - top_pad="4" - width="237" /> - <text - type="string" - length="1" - follows="left|top" - height="10" - layout="topleft" - left="12" - mouse_opaque="false" - name="text_box7" - top="359" - width="128"> - Bubble Chat: - </text> + top_pad="40" + width="400" /> <check_box control_name="UseChatBubbles" height="16" label="Show chat bubbles" layout="topleft" - left_pad="8" + left_delta="0" name="bubble_text_chat" - top_delta="1" - width="237" /> - <slider - control_name="ChatBubbleOpacity" - follows="left|top" - height="12" - increment="0.05" - initial_value="1" - label="Opacity" + top_pad="5" + width="400" /> + <check_box + enabled="false" + height="16" + label="Email me IMs when I'm offline" layout="topleft" left_delta="0" - name="bubble_chat_opacity" - top_pad="4" - width="200" /> + name="send_im_to_email" + top_pad="5" + width="400" /> </panel> diff --git a/indra/newview/skins/default/xui/en/panel_preferences_general.xml b/indra/newview/skins/default/xui/en/panel_preferences_general.xml index b30bda3e59..70d15c237b 100644 --- a/indra/newview/skins/default/xui/en/panel_preferences_general.xml +++ b/indra/newview/skins/default/xui/en/panel_preferences_general.xml @@ -9,419 +9,293 @@ name="general_panel" top="1" width="517"> - <combo_box - control_name="LoginLocation" - follows="left|bottom" - height="18" - layout="topleft" - left_delta="151" - name="start_location_combo" - top="7" - width="155"> - <combo_box.item - label="My Last Location" - value="last" /> - <combo_box.item - label="My Home" - value="home" /> - </combo_box> - <check_box - control_name="ShowStartLocation" - height="16" - initial_value="true" - label="Show Start Location on Login Screen" - layout="topleft" - left_delta="0" - name="show_location_checkbox" - top_pad="3" - width="256" /> - <combo_box - control_name="RenderName" - height="18" - layout="topleft" - left_delta="4" - name="fade_out_combobox" - top_pad="7" - width="146"> - <combo_box.item - label="Never" - value="0" /> - <combo_box.item - label="Show Temporarily" - value="1" /> - <combo_box.item - label="Always" - value="2" /> - </combo_box> - <check_box - control_name="SmallAvatarNames" - height="16" - initial_value="true" - label="Small Avatar Names" - layout="topleft" - left_delta="-4" - name="small_avatar_names_checkbox" - top_pad="9" - width="200" /> - <check_box - control_name="RenderNameHideSelf" - height="16" - label="Hide My Name On My Screen" - layout="topleft" - left_delta="0" - name="show_my_name_checkbox" - top_pad="2" - width="200" /> - <text - type="string" - length="1" - follows="left|top" - height="16" - layout="topleft" - left="10" - name="group_titles_textbox" - top="120" - width="394"> - Group Titles: - </text> - <check_box - control_name="RenderHideGroupTitleAll" - height="16" - label="Hide All Group Titles" - layout="topleft" - left_delta="141" - name="show_all_title_checkbox" - top_delta="0" - width="256" /> - <check_box - control_name="RenderHideGroupTitle" - height="16" - label="Hide My Group Title" - layout="topleft" - left_delta="0" - name="show_my_title_checkbox" - top_pad="2" - width="256" /> - <color_swatch - border_color="0.45098 0.517647 0.607843 1" - control_name="EffectColor" - follows="left|top" - height="48" - layout="topleft" - left_delta="2" - name="effect_color_swatch" - tool_tip="Click to open Color Picker" - top_pad="8" - width="32" /> - <text - type="string" - length="1" - follows="left|top" - height="12" - layout="topleft" - left="10" - name="UI Size:" - top="203" - width="128"> - UI Size: - </text> - <spinner - control_name="UIScaleFactor" - height="16" - increment="0.025" - initial_value="1" - layout="topleft" - left_pad="16" - max_val="1.4" - min_val="0.75" - name="ui_scale_slider" - top_delta="-2" - width="58" /> - <check_box - control_name="UIAutoScale" - height="16" - label="Use resolution independent scale" - layout="topleft" - left_delta="-3" - name="ui_auto_scale" - top_pad="3" - width="256" /> - <spinner - control_name="AFKTimeout" - decimal_digits="0" - follows="left|top" - height="16" - increment="1" - initial_value="300" - label="Away Timeout:" - label_width="141" - layout="topleft" - left="10" - max_val="600" - min_val="30" - name="afk_timeout_spinner" - top="244" - width="202" /> - <check_box - control_name="NotifyMoneyChange" - height="16" - label="Notify when Linden dollars (L$) spent or received" - layout="topleft" - left="151" - name="notify_money_change_checkbox" - top="270" - width="256" /> - <text - type="string" - length="1" - follows="left|top" - height="10" - layout="topleft" - left="10" - name="maturity_desired_label" - top="312" - width="394"> - Rating: - </text> - <text - type="string" - length="1" - follows="left|top" - height="10" - layout="topleft" - left_delta="141" - name="maturity_desired_prompt" - top_delta="0" - width="394"> - I want to access content rated: - </text> - <combo_box - control_name="PreferredMaturity" - height="18" - layout="topleft" - left_delta="164" - name="maturity_desired_combobox" - top_delta="-2" - width="150"> - <combo_box.item - label="PG, Mature and Adult" - value="42" /> - <combo_box.item - label="PG and Mature" - value="21" /> - <combo_box.item - label="PG only" - value="13" /> - </combo_box> - <text - type="string" - length="1" - follows="left|top" - height="10" - layout="topleft" - left_delta="0" - name="maturity_desired_textbox" - top_delta="2" - width="150"> - PG only - </text> - <text - type="string" - length="1" - follows="left|top" - height="10" - layout="topleft" - left="10" - name="start_location_textbox" - top="10" - width="394"> - Start Location: - </text> - <text - type="string" - length="1" - follows="left|top" - height="10" - layout="topleft" - left_delta="0" - name="show_names_textbox" - top_pad="34" - width="394"> - Show Names: - </text> - <text + <text type="string" length="1" follows="left|top" height="10" layout="topleft" - left_delta="0" - name="effects_color_textbox" - top_pad="110" - width="394"> - Color For My Effects: - </text> - <text - type="string" - length="1" - follows="left|top" - height="10" - layout="topleft" - left="220" - name="seconds_textbox" - top="244" - width="128"> - seconds - </text> - <text - type="string" - length="1" - follows="left|top" - height="18" - layout="topleft" - left="10" - name="crash_report_textbox" - top="344" - width="394"> - Crash reports: - </text> - <text - type="string" - length="1" - follows="left|top" - height="18" - layout="topleft" - left_delta="0" + left="30" name="language_textbox" - top_pad="4" - width="394"> - Language: - </text> - <text - type="string" - length="1" - follows="left|top" - height="18" - layout="topleft" - left_delta="293" - name="language_textbox2" - top_delta="1" + top="10" width="400"> - (Requires restart for full effect) + Language: </text> <combo_box - control_name="CrashSubmitBehavior" - height="18" - layout="topleft" - left="153" - name="crash_behavior_combobox" - top="344" - width="146"> - <combo_box.item - enabled="true" - label="Ask before sending" - value="Ask before sending" /> - <combo_box.item - enabled="true" - label="Always send" - value="Always send" /> - <combo_box.item - enabled="true" - label="Never send" - value="Never send" /> - </combo_box> - <combo_box - allow_text_entry="true" control_name="Language" follows="left|bottom" - height="16" + height="18" layout="topleft" - left_delta="0" + left_delta="50" max_chars="135" name="language_combobox" - top_pad="4" - width="146"> + top_pad="10" + width="155"> <combo_box.item enabled="true" label="System Default" + name="System Default Language" value="default" /> <combo_box.item enabled="true" label="English" + name="English" value="en" /> <combo_box.item enabled="true" label="Dansk (Danish) - Beta" + name="Danish" value="da" /> <combo_box.item enabled="true" label="Deutsch (German) - Beta" + name="Deutsch(German)" value="de" /> <combo_box.item enabled="true" label="Español (Spanish) - Beta" + name="Spanish" value="es" /> <combo_box.item enabled="true" label="Français (French) - Beta" + name="French" value="fr" /> <combo_box.item enabled="true" label="Italiano (Italian) - Beta" + name="Italian" value="it" /> <combo_box.item enabled="true" label="Magyar (Hungarian) - Beta" + name="Hungarian" value="hu" /> <combo_box.item enabled="true" label="Nederlands (Dutch) - Beta" + name="Dutch" value="nl" /> <combo_box.item enabled="true" label="Polski (Polish) - Beta" + name="Polish" value="pl" /> <combo_box.item enabled="true" label="Portugués (Portuguese) - Beta" + name="Portugese" value="pt" /> <combo_box.item enabled="true" label="Русский (Russian) - Beta" + name="Russian" value="ru" /> <combo_box.item enabled="true" label="Türkçe (Turkish) - Beta" + name="Turkish" value="tr" /> <combo_box.item enabled="true" label="Українська (Ukrainian) - Beta" + name="Ukrainian" value="uk" /> <combo_box.item enabled="true" label="中文 (简体) (Chinese) - Beta" + name="Chinese" value="zh" /> <combo_box.item enabled="true" label="日本語 (Japanese) - Beta" + name="(Japanese)" value="ja" /> <combo_box.item enabled="true" label="한국어 (Korean) - Beta" + name="(Korean)" value="ko" /> <combo_box.item enabled="true" label="Test Language" + name="TestLanguage" value="test" /> </combo_box> + <text + type="string" + length="1" + follows="left|top" + height="10" + layout="topleft" + left_delta="175" + name="language_textbox2" + top_delta="1" + width="400"> + (Requires restart) + </text> + <text + type="string" + length="1" + follows="left|top" + height="10" + layout="topleft" + left="30" + name="maturity_desired_prompt" + top_pad="10" + width="400"> + I want to access content rated: + </text> + <combo_box + control_name="PreferredMaturity" + follows="left|bottom" + height="18" + layout="topleft" + left_delta="50" + name="maturity_desired_combobox" + top_pad="10" + width="155"> + <combo_box.item + label="PG, Mature and Adult" + name="Desired_Adult" + value="42" /> + <combo_box.item + label="PG and Mature" + name="Desired_Mature" + value="21" /> + <combo_box.item + label="PG" + name="Desired_PG" + value="13" /> + </combo_box> + <text + type="string" + length="1" + follows="left|top" + height="10" + layout="topleft" + left="30" + name="start_location_textbox" + top_delta="20" + width="394"> + Start Location: + </text> + <combo_box + control_name="LoginLocation" + follows="left|bottom" + height="18" + layout="topleft" + left_delta="50" + name="start_location_combo" + top_pad="10" + width="155"> + <combo_box.item + label="My Last Location" + name="MyLastLocation" + value="last" /> + <combo_box.item + label="My Home" + name="MyHome" + value="home" /> + </combo_box> + <check_box + control_name="ShowStartLocation" + height="16" + initial_value="true" + label="Show on Login" + layout="topleft" + left_delta="175" + name="show_location_checkbox" + top_delta="1" + width="256" /> + + <text + type="string" + length="1" + follows="left|top" + height="10" + layout="topleft" + left="30" + name="name_tags_textbox" + top_pad="10" + width="400"> + Name tags: + </text> + <!-- THIS IS A NEW RADIO GROUP ADDED BY LIS --> + <radio_group + control_name="AvatarNameTagMode" + height="30" + layout="topleft" + left_delta="50" + name="Name_Tag_Preference" + top_pad="10"> + <radio_item + height="16" + label="Off" + layout="topleft" + left="0" + name="radio" + top_pad="0" + width="98" /> + <radio_item + height="16" + label="On" + layout="topleft" + left_pad="12" + name="radio2" + top_delta="0" + width="98" /> + <radio_item + height="16" + label="Show briefly" + layout="topleft" + left_pad="12" + name="radio3" + top_delta="0" + width="98" /> + </radio_group> <check_box - control_name="LanguageIsPublic" + enabled_control="AvatarNameTagMode" + control_name="RenderNameShowSelf" height="16" - label="Share language with objects" + label="Show my name" layout="topleft" - left_delta="-2" - name="language_is_public" - tool_tip="This lets in-world objects know your preferred language." - top_pad="2" + left_delta="0" + name="show_my_name_checkbox" + top_pad="5" + width="300" /> + <check_box + enabled_control="AvatarNameTagMode" + control_name="RenderShowGroupTitleAll" + height="16" + label="Show group titles" + layout="topleft" + left_delta="0" + name="show_all_title_checkbox" + top_pad="5" width="256" /> + <text + type="string" + length="1" + follows="left|top" + height="10" + layout="topleft" + left="30" + name="effects_color_textbox" + top_pad="10" + width="400"> + My Effects: + </text> + <color_swatch + border_color="0.45098 0.517647 0.607843 1" + control_name="EffectColor" + follows="left|top" + height="48" + layout="topleft" + left_delta="50" + name="effect_color_swatch" + tool_tip="Click to open Color Picker" + top_pad="10" + width="32" /> + </panel> 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 8db8c8f31d..563056890a 100644 --- a/indra/newview/skins/default/xui/en/panel_preferences_graphics1.xml +++ b/indra/newview/skins/default/xui/en/panel_preferences_graphics1.xml @@ -17,133 +17,34 @@ name="aspect_ratio_text"> [NUM]:[DEN] </panel.string> - <button - follows="left|top" - height="18" - label="?" - layout="topleft" - left="470" - name="GraphicsPreferencesHelpButton" - top="4" - width="22"> - <button.commit_callback - function="Pref.OpenHelp" /> - </button> - <check_box - control_name="NotFullScreen" - height="16" - label="Run Second Life in a window" - layout="topleft" - left_delta="-460" - name="windowed mode" - top_delta="3" - width="100"> - <check_box.commit_callback - function="Pref.OpenHelp" /> - </check_box> - <text_editor - make_visible_control="NotFullScreen" - type="string" - length="1" - bg_readonly_color="0 0 0 0" - enabled="false" - follows="left|top" - height="20" - hide_border="true" - hide_scrollbar="true" - layout="topleft" - left_delta="0" - max_length="65535" - name="FullScreenInfo" - tab_stop="false" - top_delta="16" - width="350" - word_wrap="true"> - If unchecked, viewer will display full-screen when logged in. - </text_editor> <text - make_visible_control="NotFullScreen" type="string" length="1" follows="left|top" height="12" layout="topleft" - left_delta="0" + left="30" name="WindowSizeLabel" - top_pad="7" - width="128"> - Window Size: - </text> - <combo_box - make_visible_control="NotFullScreen" - height="18" - layout="topleft" - left_pad="47" - name="windowsize combo" - top_delta="-1" - width="150"> - <combo_box.item - enabled="true" - label="640x480" - value="640 x 480" /> - <combo_box.item - enabled="true" - label="800x600 " - value="800 x 600" /> - <combo_box.item - enabled="true" - label="720x480 (NTSC)" - value="720 x 480" /> - <combo_box.item - enabled="true" - label="768x576 (PAL)" - value="768 x 576" /> - <combo_box.item - enabled="true" - label="1024x768" - value="1024 x 768" /> - </combo_box> - <text - make_invisible_control="NotFullScreen" - type="string" - length="1" - follows="left|top" - height="12" - layout="topleft" - left_delta="-175" - name="DisplayResLabel" - top_delta="1" + top="10" width="128"> - Display Resolution: + Window size: </text> - <combo_box - make_invisible_control="NotFullScreen" - height="18" - layout="topleft" - left_pad="47" - name="fullscreen combo" - top_delta="-1" - width="150" /> - <text - make_invisible_control="NotFullScreen" - type="string" - length="1" - follows="left|top" - height="12" + <check_box + control_name="WindowFullScreen" + height="16" + label="Use fullscreen" layout="topleft" - left="10" - name="AspectRatioLabel1" - tool_tip="width / height" - top="27" - width="160"> - Aspect Ratio: - </text> + left_delta="30" + name="windowed mode" + top_pad="4" + width="100"> + </check_box> <combo_box - make_invisible_control="NotFullScreen" + visiblity_control="WindowFullScreen" allow_text_entry="true" height="16" layout="topleft" - left_pad="15" + left_delta="175" max_chars="100" name="aspect_ratio" tool_tip="width / height" @@ -152,131 +53,91 @@ <combo_box.item enabled="true" label="4:3 (Standard CRT)" + name="item1" value="1.333333" /> <combo_box.item enabled="true" label="5:4 (1280x1024 LCD)" + name="item2" value="1.25" /> <combo_box.item enabled="true" label="8:5 (Widescreen)" + name="item3" value="1.6" /> <combo_box.item enabled="true" label="16:9 (Widescreen)" + name="item4" value="1.7777777" /> <combo_box.commit_callback function="setControlFalse" parameter="FullScreenAutoDetectAspectRatio" /> </combo_box> - <check_box - make_invisible_control="NotFullScreen" - control_name="FullScreenAutoDetectAspectRatio" - height="16" - label="Auto-detect ratio" - layout="topleft" - left_pad="23" - name="aspect_auto_detect" - top_delta="1" - width="256"> - <check_box.commit_callback - function="Pref.AutoDetectAspect" /> - </check_box> - <text + <text type="string" length="1" follows="left|top" height="12" layout="topleft" - left="10" - name="HigherText" - top="73" - width="80"> - Quality and + left="30" + name="UI Size:" + top_pad="4" + width="100"> + UI Size: </text> - <text - type="string" - length="1" + <slider + can_edit_text="true" + control_name="UIScaleFactor" + decimal_digits="2" follows="left|top" - height="12" + height="15" + increment="0.025" + initial_value="1" layout="topleft" - left_delta="0" - name="QualityText" + left_delta="32" + max_val="1.4" + min_val="0.75" + name="ui_scale_slider" top_pad="2" - width="95"> - Performance: - </text> - <text - type="string" - length="1" - follows="left|top" - height="12" - layout="topleft" - left="115" - name="FasterText" - top="74" - width="80"> - Faster - </text> - <text - type="string" - length="1" - follows="left|top" - height="12" - layout="topleft" - left="158" - name="ShadersPrefText" - top="93" - width="40"> - Low - </text> - <text - type="string" - length="1" - follows="left|top" - height="12" - layout="topleft" - left_pad="7" - name="ShadersPrefText2" - top_delta="0" - width="40"> - Mid - </text> - <text - type="string" - length="1" - follows="left|top" - height="12" + width="180" /> + <spinner + control_name="UIScaleFactor" + height="16" + increment="0.025" + initial_value="1" layout="topleft" - left_pad="7" - name="ShadersPrefText3" + left_pad="10" + max_val="1.4" + min_val="0.75" + name="ui_scale_slider" top_delta="0" - width="40"> - High - </text> - <text + width="58" /> + + <text type="string" length="1" follows="left|top" height="12" layout="topleft" - left_pad="7" - name="ShadersPrefText4" - top_delta="0" - width="40"> - Ultra + left="30" + name="QualitySpeed" + top_pad="4" + width="400"> + Quality and speed: </text> <text type="string" length="1" follows="left|top" + halign="right" height="12" layout="topleft" - left="334" - name="HigherText2" - top="68" + left="35" + name="FasterText" + top_pad="4" width="80"> - Higher + Faster </text> <text type="string" @@ -284,27 +145,27 @@ follows="left|top" height="12" layout="topleft" - left_delta="0" - name="QualityText2" - top_pad="2" - width="95"> - Quality + left_delta="360" + name="BetterText" + top_delta="0" + width="80"> + Better </text> <icon color="0.12 0.12 0.12 1" height="14" image_name="rounded_square.tga" layout="topleft" - left="173" + left="128" name="LowGraphicsDivet" - top="75" + top_delta="-2" width="2" /> <icon color="0.12 0.12 0.12 1" height="14" image_name="rounded_square.tga" layout="topleft" - left_pad="42" + left_pad="83" name="MidGraphicsDivet" top_delta="0" width="2" /> @@ -313,7 +174,7 @@ height="14" image_name="rounded_square.tga" layout="topleft" - left_pad="42" + left_pad="85" name="HighGraphicsDivet" top_delta="0" width="2" /> @@ -322,7 +183,7 @@ height="14" image_name="rounded_square.tga" layout="topleft" - left_pad="42" + left_pad="83" name="UltraGraphicsDivet" top_delta="0" width="2" /> @@ -334,38 +195,77 @@ increment="1" initial_value="0" layout="topleft" - left_delta="-140" + left="120" max_val="3" name="QualityPerformanceSelection" show_text="false" - top_delta="-1" - width="150"> + top_delta="-2" + width="275"> <slider.commit_callback function="Pref.QualityPerformance"/> </slider> - <check_box - control_name="RenderCustomSettings" - height="16" - initial_value="true" - label="Custom" + <text + type="string" + length="1" + follows="left|top" + halign="center" + height="12" layout="topleft" - left_pad="70" - name="CustomSettings" - top_delta="1" - width="256"> - <check_box.commit_callback - function="Pref.ChangeCustom" /> - </check_box> - <panel - make_visible_control="RenderCustomSettings" - border="true" + left="88" + name="ShadersPrefText" + top_delta="20" + width="80"> + Low + </text> + <text + type="string" + length="1" + follows="left|top" + halign="center" + height="12" + layout="topleft" + left_delta="87" + name="ShadersPrefText2" + top_delta="0" + width="80"> + Mid + </text> + <text + type="string" + length="1" + follows="left|top" + halign="center" + height="12" + layout="topleft" + left_delta="87" + name="ShadersPrefText3" + top_delta="0" + width="80"> + High + </text> + <text + type="string" + length="1" + follows="left|top" + halign="center" + height="12" + layout="topleft" + left_delta="85" + name="ShadersPrefText4" + top_delta="0" + width="80"> + Ultra + </text> + <panel + visiblity_control="ShowAdvancedGraphicsSettings" + border="false" follows="top|left" height="260" label="CustomGraphics" layout="topleft" left="5" name="CustomGraphics Panel" - top="115" + top="124" width="485"> <text type="string" @@ -895,26 +795,55 @@ width="315" /> </radio_group> </panel> + <button + follows="left|bottom" + height="20" + label="Apply" + label_selected="Apply" + layout="topleft" + left="10" + name="Apply" + top="383" + width="115"> + <button.commit_callback + function="Pref.Apply" /> + </button> <button + follows="left|bottom" height="20" - label="Recommended Settings" + label="Reset" layout="topleft" - left="130" + left_pad="3" name="Defaults" - top="380" - width="170"> + top="383" + width="115"> <button.commit_callback function="Pref.HardwareDefaults" /> </button> <button + control_name="ShowAdvancedGraphicsSettings" + follows="right|bottom" height="20" - label="Hardware Options" - label_selected="Hardware Options" + is_toggle="true" + label="Advanced" layout="topleft" - left_pad="10" + left_pad="35" + name="Advanced" + top_delta="0" + width="115"> + <button.commit_callback + function="Pref.ChangeCustom" /> + </button> + <button + follows="right|bottom" + height="20" + label="Hardware" + label_selected="Hardware" + layout="topleft" + left_pad="3" name="GraphicsHardwareButton" top_delta="0" - width="170"> + width="115"> <button.commit_callback function="Pref.HardwareSettings" /> </button> diff --git a/indra/newview/skins/default/xui/en/panel_profile.xml b/indra/newview/skins/default/xui/en/panel_profile.xml index a4363d5858..4f559394a6 100644 --- a/indra/newview/skins/default/xui/en/panel_profile.xml +++ b/indra/newview/skins/default/xui/en/panel_profile.xml @@ -1,17 +1,15 @@ <?xml version="1.0" encoding="utf-8" standalone="yes" ?> <panel - background_visible="true" bevel_style="in" - bg_alpha_color="0.5 0.5 0.5 1" follows="left|top|right|bottom" - height="705" + height="625" label="Profile" layout="topleft" left="10" mouse_opaque="false" name="panel_profile" top="10" - width="355"> + width="305"> <panel.string name="CaptionTextAcctInfo"> [ACCTTYPE] [PAYMENTINFO] [AGEVERIFICATION] @@ -52,269 +50,171 @@ name="NotAgeVerified"> Not Age-verified </panel.string> + <panel.string + name="payment_update_link_url"> + http://www.secondlife.com/account/billing.php?lang=en + </panel.string> + <panel.string + name="my_account_link_url"> + http://secondlife.com/account + </panel.string> + <panel.string + name="partner_edit_link_url"> + http://www.secondlife.com/account/partners.php?lang=en + </panel.string> + <panel.string + name="no_partner_text"> + None + </panel.string> <scroll_container + color="DkGray2" follows="left|top|right|bottom" - height="690" + height="570" layout="topleft" - left="1" - name="profile_scroll" - width="354"> - <panel - height="710" + left="8" + name="profile_scroll" + opaque="true" + reserve_scroll_corner="false" + width="260"> + <panel + height="680" layout="topleft" left="0" top="0" - width="320"> - <panel - follows="left|top" - height="120" - layout="topleft" - left="9" - name="lifes_images_panel" - top_pad="15" + width="280"> + <text + type="string" + follows="top|left|right" + font="SansSerifHugeBold" + height="20" + layout="topleft" + left="9" + name="user_name" + text_color="white" + top="0" + mouse_opaque="true" width="250"> - <panel + (Loading...) + </text> + <panel follows="left|top" - height="120" + height="100" layout="topleft" - left="0" + left="10" name="second_life_image_panel" - top="0" - width="125"> - <text - type="string" - follows="left|top|right|bottom" - font="SansSerifBold" - height="20" - layout="topleft" - left="0" - name="first_life_photo_title_text" - text_color="white" - top="0" - width="125"> - Second Life photo: - </text> + top="20" + width="250"> <texture_picker allow_no_texture="true" default_image_name="None" enabled="false" follows="top|left" - height="105" + height="100" layout="topleft" left="0" name="2nd_life_pic" - top_pad="5" - width="105" /> - </panel> - <panel - follows="left|top" - height="120" - layout="topleft" - left_pad="1" - name="first_life_image_panel" - top="0" - width="125"> - <text - type="string" - follows="left|top|right|bottom" - font="SansSerifBold" - height="20" - layout="topleft" - left="0" - name="second_life_photo_title_text" - text_color="white" top="0" - width="125"> - First Life photo: - </text> - <texture_picker - allow_no_texture="true" - default_image_name="None" - enabled="false" - follows="top|left" - height="105" - layout="topleft" - left="0" - name="1st_life_pic" - top_pad="5" - width="105" /> - </panel> - </panel> - <panel - follows="left|top|right" - height="30" - layout="topleft" - left="0" - name="status_panel" - top="135" - width="300"> - <text - follows="left|top" - font="SansSerifBold" - font.style="ITALIC" - height="15" - layout="topleft" - left="9" - name="online_status" - text_color="green" - width="100" /> - <text - type="string" - length="1" - follows="left|top" - font="SansSerifBold" - font.style="ITALIC" - height="15" - layout="topleft" - left="9" - name="status_message" - text_color="0.1 0.1 0.1 1" - width="300"> - <!--TBD--> - </text> - </panel> - <panel - follows="left|top|right" - height="80" - layout="topleft" - left="0" - name="status_me_panel" - top="135" - width="300"> - <text - type="string" - follows="left|top" - font="SansSerifBold" - height="15" - layout="topleft" - left="9" - name="online_me_status_text" - text_color="white" - width="100"> - Status: - </text> - <combo_box - font="SansSerifBold" - height="18" - layout="topleft" - left="10" - name="status_combo" - width="150"> - <combo_box.item - label="Online" - value="online" /> - <combo_box.item - label="Away" - value="away" /> - <combo_box.item - label="Busy" - value="busy" /> - </combo_box> - <text - type="string" - follows="left|top" - font="SansSerifBold" - height="15" - layout="topleft" - left="9" - name="status_me_message_text" - text_color="white" - width="300"> - What're you up to? - </text> - <line_editor - type="string" - border_style="line" - border_thickness="1" - follows="left|top|right" - font="SansSerifBold" - font.style="ITALIC" - height="20" - layout="topleft" - left="9" - name="status_me_message_edit" - select_on_focus="true" - text_color="0.5 0.5 0.5 1" - width="300"> - Type a message about what you're doing in SL! - </line_editor> - </panel> - <text + width="100" /> + <text type="string" - follows="left|top" font="SansSerifBold" height="15" layout="topleft" - left="9" + left_pad="10" name="title_sl_descr_text" text_color="white" - top_pad="10" - width="290"> - Second Life description: + top_delta="0" + width="125"> + Second Life: </text> <text type="string" + top_pad="4" follows="left|top|right" - font="SansSerif" - height="45" + font="SansSerifSmall" + height="75" layout="topleft" - left="9" + left_delta="0" name="sl_description_edit" - text_color="0.1 0.1 0.1 1" - width="290" + text_color="LtGray" + width="125" word_wrap="true"> Lorem ipsum dolor sit amet, consectetur adipiscing elit. Aenean viverra orci et justo sagittis aliquet. Nullam malesuada mauris sit amet ipsum. </text> - <text + </panel> + <panel + follows="left|top" + height="100" + layout="topleft" + left="10" + name="first_life_image_panel" + top_pad="20" + width="125"> + <texture_picker + allow_no_texture="true" + default_image_name="None" + enabled="false" + follows="top|left" + height="100" + layout="topleft" + left="0" + name="real_world_pic" + top_pad="0" + width="100" /> + <text type="string" follows="left|top" font="SansSerifBold" height="15" layout="topleft" - left="9" - name="title_fl_descr_text" + left_pad="10" + name="title_rw_descr_text" text_color="white" - top_pad="10" - width="290"> - First Life description: + top_delta="0" + width="125"> + Real World: </text> <text type="string" follows="left|top|right" - font="SansSerif" + font="SansSerifSmall" height="45" layout="topleft" - left="9" + left_delta="0" + top_pad="10" name="fl_description_edit" - text_color="0.1 0.1 0.1 1" - width="290" + text_color="LtGray" + width="125" word_wrap="true"> Lorem ipsum dolor sit amet, consectetur adipiscing elit. Aenean viverra orci et justo sagittis aliquet. Nullam malesuada mauris sit amet ipsum. </text> + </panel> <text type="string" follows="left|top" font="SansSerifBold" height="15" layout="topleft" - left="9" + halign="right" + left="10" name="title_groups_text" text_color="white" - top_pad="10" - width="290"> - Second Life groups: + top_pad="20" + width="100"> + Groups: </text> <text type="string" follows="left|top|right" - font="SansSerif" + font="SansSerifSmall" height="45" layout="topleft" - left="9" + left_pad="10" + top_delta="0" name="sl_groups" - text_color="0.1 0.1 0.1 1" - width="290" + text_color="LtGray" + width="125" word_wrap="true"> Lorem ipsum dolor sit amet, consectetur adipiscing elit. Aenean viverra orci et justo sagittis aliquet. Nullam malesuada mauris sit amet ipsum. </text> @@ -323,25 +223,28 @@ follows="left|top" font="SansSerifBold" height="15" + halign="right" layout="topleft" - left="9" + left="10" name="title_homepage_text" text_color="white" - top_pad="10" + top_pad="20" width="100"> Homepage: </text> <text type="string" follows="left|top|right" - font="SansSerif" + font="SansSerifSmall" font.style="UNDERLINE" + font_shadow="hard" height="15" + top_delta="0" layout="topleft" - left="9" + left_pad="10" name="homepage_edit" text_color="0.2 0.2 1 1" - width="290"> + width="125"> TODO </text> <text @@ -349,24 +252,26 @@ follows="left|top" font="SansSerifBold" height="15" + halign="right" layout="topleft" - left="9" + left="10" name="title_member_text" text_color="white" - top_pad="10" + top_pad="20" width="100"> Member since: </text> <text type="string" follows="left|top|right" - font="SansSerif" + font="SansSerifSmall" height="15" layout="topleft" - left="9" + left_pad="10" + top_delta="0" name="register_date" - text_color="0.1 0.1 0.1 1" - width="290" + text_color="LtGray" + width="125" word_wrap="true"> 05/31/1976 </text> @@ -375,72 +280,40 @@ follows="left|top" font="SansSerifBold" height="15" + halign="right" layout="topleft" - left="9" + left="10" + top_pad="20" name="title_acc_status_text" text_color="white" - top_pad="10" width="100"> Account status: </text> <text type="string" follows="left|top|right" - font="SansSerif" + font="SansSerifSmall" height="30" layout="topleft" - left="9" + left_pad="10" + top_delta="0" name="acc_status_text" - text_color="0.1 0.1 0.1 1" - width="290" + text_color="LtGray" + width="125" word_wrap="true"> Resident. No payment info on file. </text> - <panel - follows="left|top|right" - height="15" - layout="topleft" - left="9" - name="account_actions_panel" - width="335"> - <text - type="string" - follows="left|top" - font="SansSerif" - font.style="UNDERLINE" - height="15" - layout="topleft" - left="0" - name="my_account_link" - text_color="0.2 0.2 1 1" - top="0" - width="65"> - Update - </text> - <text - type="string" - follows="left|top" - font="SansSerif" - font.style="UNDERLINE" - height="15" - layout="topleft" - left="70" - name="my_account_link" - text_color="0.2 0.2 1 1" - top="0" - width="80"> - My Account - </text> - </panel> - <text + <text type="string" follows="left|top" font="SansSerifBold" height="15" + halign="right" layout="topleft" name="title_partner_text" text_color="white" - top_pad="10" + top_pad="20" + left="10" width="100"> Partner: </text> @@ -448,127 +321,285 @@ follows="left|top|right" height="15" layout="topleft" - left="9" + left_pad="10" + top_delta="0" name="partner_data_panel" - width="335"> + width="125"> <text type="string" follows="left|top|right" - font="SansSerif" + font="SansSerifSmall" height="15" layout="topleft" left="0" name="partner_text" - text_color="0.1 0.1 0.1 1" + text_color="LtGray" top="0" - width="290" + width="125" word_wrap="true"> [FIRST] [LAST] </text> <text type="string" follows="top|right" - font="SansSerif" + font="SansSerifSmall" font.style="UNDERLINE" - halign="right" + font_shadow="hard" height="15" layout="topleft" - left="270" + left_delta="0" name="partner_edit_link" text_color="0.2 0.2 1 1" - top="0" + top_delta="15" width="40"> Edit </text> </panel> - <panel - follows="left|top" - height="30" + + <panel + follows="left|top|right" + height="15" layout="topleft" - name="profile_buttons_panel" - width="350"> - <button - follows="bottom|left" - font="SansSerifSmallBold" - height="25" - label="Add Friend" + left="50" + top_pad="40" + name="account_actions_panel" + width="200"> + <text + type="string" + follows="left|top" + font="SansSerif" + font.style="UNDERLINE" + font_shadow="hard" + height="15" layout="topleft" - left="5" - mouse_opaque="false" - name="add_friend" + left="0" + name="payment_update_link" + text_color="0.2 0.2 1 1" top="0" - width="75" /> - <button - follows="bottom|left" - font="SansSerifSmallBold" - height="25" - label="IM" - layout="topleft" - left_pad="5" - name="im" - top_delta="0" - width="40" /> - <button - enabled="false" - follows="bottom|left" - font="SansSerifSmallBold" - height="25" - label="Call" + width="100"> + Update + </text> + <text + type="string" + follows="left|top" + font="SansSerif" + font.style="UNDERLINE" + font_shadow="hard" + height="15" layout="topleft" - left_pad="5" - name="call" - top_delta="0" - width="50" /> - <button - follows="bottom|left" - font="SansSerifSmallBold" - height="25" - label="Teleport" + left="70" + name="my_account_link" + text_color="0.2 0.2 1 1" + top="0" + width="80"> + My Account + </text> + </panel> + + + + <!-- + <panel + follows="left|top|right" + height="30" + layout="topleft" + left="0" + name="status_panel" + top="155" + width="260"> + <text + follows="left|top" + font="SansSerifBold" + font.style="ITALIC" + height="15" layout="topleft" - left_pad="5" - name="teleport" - top_delta="0" - width="65" /> - <button - enabled="false" - follows="bottom|left" - font="SansSerifSmallBold" - height="25" - label="Share" + left="9" + name="online_status" + text_color="green" + width="100" /> + <text + type="string" + follows="left|top" + font="SansSerifBold" + font.style="ITALIC" + height="15" layout="topleft" - left_pad="15" - name="share" - top_delta="0" - width="50" /> - </panel> + left="9" + name="status_message" + text_color="0.1 0.1 0.1 1" + width="280"> + TBD + </text> + </panel> --> <panel - follows="left|top" - height="30" + follows="left|top|right" + height="80" layout="topleft" - name="profile_me_buttons_panel" - visible="false" - width="350"> - <button - follows="bottom|left" - font="SansSerifSmallBold" - height="25" - label="Edit Profile" + left="0" + name="status_me_panel" + top_pad="20" + width="125"> + <text + type="string" + follows="left|top" + font="SansSerifBold" + height="15" + halign="right" layout="topleft" - left="0" - name="edit_profile_btn" - top="0" - width="105" /> - <button - follows="bottom|left" - font="SansSerifSmallBold" - height="25" - label="Edit Appearance" + left="10" + name="online_me_status_text" + text_color="white" + width="100"> + Status: + </text> + <combo_box + font="SansSerifBold" + height="18" layout="topleft" - left_pad="15" - name="edit_appearance_btn" + left_pad="10" top_delta="0" - width="130" /> + name="status_combo" + width="100"> + <combo_box.item + label="Online" + name="online" + value="online" /> + <combo_box.item + label="Away" + name="away" + value="away" /> + <combo_box.item + label="Busy" + name="busy" + value="busy" /> + </combo_box> + <text + type="string" + follows="left|top" + font="SansSerifBold" + height="15" + layout="topleft" + left="10" + top_pad="20" + name="status_me_message_text" + text_color="white" + width="250"> + What're you up to? + </text> + <line_editor + border_style="line" + border_thickness="1" + follows="left|top|right" + font="SansSerifBold" + font.style="ITALIC" + height="20" + layout="topleft" + left="10" + top_pad="10" + name="status_me_message_edit" + select_on_focus="true" + text_color="0.5 0.5 0.5 1" + width="250"> + Type a message about what you're doing in SL! + </line_editor> + </panel> + + + + </panel> - </panel> + </scroll_container> + <panel + bottom="625" + follows="bottom|left" + height="30" + layout="topleft" + left="8" + name="profile_buttons_panel" + width="280"> + <button + follows="bottom|left" + font="SansSerifSmallBold" + height="25" + label="Add Friend" + layout="topleft" + left="0" + mouse_opaque="false" + name="add_friend" + top="0" + width="90" /> + <button + follows="bottom|left" + font="SansSerifSmallBold" + height="25" + label="IM" + layout="topleft" + left_pad="0" + name="im" + top="0" + width="40" /> + <button + enabled="false" + follows="bottom|left" + font="SansSerifSmallBold" + height="25" + label="Call" + layout="topleft" + left_pad="0" + name="call" + top="0" + width="50" /> + <button + follows="bottom|left" + font="SansSerifSmallBold" + height="25" + label="Teleport" + layout="topleft" + left_pad="0" + name="teleport" + top="0" + width="75" /> + <button + enabled="false" + follows="bottom|left" + font="SansSerifSmallBold" + height="25" + label="Share" + layout="topleft" + left_pad="0" + name="share" + top="0" + width="60" /> + </panel> + <panel + bottom="625" + follows="bottom|left" + height="30" + layout="topleft" + left="8" + name="profile_me_buttons_panel" + visible="false" + width="345"> + <button + follows="bottom|left" + font="SansSerifSmallBold" + height="25" + label="Edit Profile" + layout="topleft" + left="0" + name="edit_profile_btn" + top="0" + width="105" /> + <button + follows="bottom|left" + font="SansSerifSmallBold" + height="25" + label="Edit Appearance" + layout="topleft" + left_pad="5" + name="edit_appearance_btn" + top="0" + width="130" /> + </panel> </panel> diff --git a/indra/newview/skins/default/xui/en/panel_profile_view.xml b/indra/newview/skins/default/xui/en/panel_profile_view.xml index fa919776a7..cd46ccb0bc 100644 --- a/indra/newview/skins/default/xui/en/panel_profile_view.xml +++ b/indra/newview/skins/default/xui/en/panel_profile_view.xml @@ -1,7 +1,6 @@ <?xml version="1.0" encoding="utf-8" standalone="yes" ?> <panel background_visible="true" - bg_alpha_color="0.3 0.3 0.3 1" follows="left|top|right|bottom" height="660" label="Me" @@ -9,39 +8,39 @@ left="0" name="panel_target_profile" top="0" - width="355"> - <button - layout="topleft" - name="back" - left="0" - top="5" - width="20" - height="20" - label="" - follows="top|left" - image_selected="navbar_bg_button.tga" - image_unselected="navbar_bg_button.tga" - image_overlay="navbar_back.tga"/> - <text - layout="topleft" - top="0" - left="30" - width="150" - height="20" - font="SansSerifHugeBold" - text_color="white" - follows="top|left" - mouse_opaque="true" - name="user_name">(Loading...)</text> + width="305"> + <button + layout="topleft" + name="back" + left="5" + top="5" + width="20" + height="20" + label="" + follows="top|left" + image_selected="navbar_bg_button.tga" + image_unselected="navbar_bg_button.tga" + image_overlay="navbar_back.tga"/> + <text + layout="topleft" + top="0" + left_pad="15" + width="125" + height="20" + font="SansSerifHugeBold" + text_color="white" + follows="top|left|right" + mouse_opaque="true" + name="user_name">(Loading...)</text> <tab_container follows="left|top|right|bottom" - height="600" + height="625" layout="topleft" left="0" - name="profile_tabs" + name="tabs" tab_position="top" top="35" - width="355"> + width="280"> <panel class="panel_profile" filename="panel_profile.xml" @@ -54,7 +53,7 @@ label="Picks" layout="topleft" name="panel_picks"/> - <panel + <panel class="panel_notes" filename="panel_notes.xml" label="Notes" diff --git a/indra/newview/skins/default/xui/en/panel_progress.xml b/indra/newview/skins/default/xui/en/panel_progress.xml index 6139bae874..4f23c4d26d 100644 --- a/indra/newview/skins/default/xui/en/panel_progress.xml +++ b/indra/newview/skins/default/xui/en/panel_progress.xml @@ -61,28 +61,28 @@ width="640" /> <text follows="left|right|top" - font="SansSerif" + font="SansSerifHuge" font_shadow="hard" - halign="center" + halign="left" height="20" layout="topleft" - left_delta="0" + left_delta="47" name="title_text" text_color="LoginProgressBoxTextColor" top_delta="50" - width="640" /> + width="593" /> <text follows="left|right|top" font="SansSerif" font_shadow="hard" - halign="center" + halign="left" height="20" layout="topleft" left_delta="0" name="progress_text" text_color="LoginProgressBoxTextColor" top_pad="5" - width="640" /> + width="593" /> <progress_bar bottom="115" color_bar="1 1 1 0.96" @@ -94,17 +94,17 @@ right="-45" /> <text follows="left|right|top|bottom" - font="SansSerif" + font="SansSerifLarge" font_shadow="hard" - halign="center" + halign="left" height="100" layout="topleft" - left="20" - line_spacing="8" + left="30" + line_spacing="2" name="message_text" text_color="LoginProgressBoxTextColor" top="145" - width="600" /> + width="610" /> </layout_panel> <layout_panel height="200" @@ -125,9 +125,9 @@ follows="right|bottom" height="22" layout="topleft" - left="-86" + left="-106" name="cancel_btn" picture_style="true" - top="730" - width="70" /> + top="700" + width="90" /> </panel> diff --git a/indra/newview/skins/default/xui/en/panel_region_covenant.xml b/indra/newview/skins/default/xui/en/panel_region_covenant.xml index 7bd548d464..8265ab3227 100644 --- a/indra/newview/skins/default/xui/en/panel_region_covenant.xml +++ b/indra/newview/skins/default/xui/en/panel_region_covenant.xml @@ -2,13 +2,13 @@ <panel border="true" follows="top|left" - height="320" + height="350" label="Covenant" layout="topleft" left="0" name="Covenant" top="320" - width="480"> + width="280"> <panel.string name="can_resell"> Purchased land in this region may be resold. @@ -49,7 +49,7 @@ mouse_opaque="false" name="estate_name_lbl" top_pad="5" - width="100"> + width="75"> Name: </text> <text @@ -58,7 +58,7 @@ follows="left|top" height="20" layout="topleft" - left_pad="10" + left_pad="0" mouse_opaque="false" name="estate_name_text" top_delta="0" @@ -75,7 +75,7 @@ mouse_opaque="false" name="estate_owner_lbl" top_pad="5" - width="100"> + width="75"> Owner: </text> <text @@ -84,7 +84,7 @@ follows="left|top" height="20" layout="topleft" - left_pad="10" + left_pad="0" mouse_opaque="false" name="estate_owner_text" top_delta="0" @@ -102,7 +102,7 @@ mouse_opaque="false" name="estate_cov_lbl" top_pad="5" - width="100"> + width="75"> Covenant: </text> <text @@ -111,11 +111,11 @@ follows="left|top" height="20" layout="topleft" - left_pad="10" + left_pad="0" mouse_opaque="false" name="covenant_timestamp_text" top_delta="0" - width="308"> + width="167"> Last Modified Wed Dec 31 16:00:00 1969 </text> <button @@ -136,11 +136,11 @@ follows="left|top" height="100" layout="topleft" - left="110" + left="80" max_length="65535" name="covenant_editor" top_delta="30" - width="340" + width="193" word_wrap="true"> There is no Covenant provided for this Estate. </text_editor> @@ -150,7 +150,7 @@ height="18" label="Reset" layout="topleft" - left_delta="250" + left_delta="75" name="reset_covenant" top_pad="5" width="90" /> @@ -161,11 +161,12 @@ follows="left|top" height="20" layout="topleft" - left="120" + left="85" name="covenant_help_text" top_pad="10" - width="460"> - Changes to the covenant will show on all parcels in the estate. + width="190"> + Changes to the covenant will show +on all parcels in the estate. </text> <text type="string" @@ -175,9 +176,10 @@ layout="topleft" left_delta="0" name="covenant_instructions" - top_pad="5" - width="465"> - Drag and drop a notecard to change the Covenant for this Estate. + top_pad="15" + width="190"> + Drag and drop a notecard to change +the Covenant for this Estate. </text> <text @@ -190,7 +192,7 @@ left="5" mouse_opaque="false" name="region_section_lbl" - top_pad="5" + top_pad="10" width="100"> Region </text> @@ -204,7 +206,7 @@ mouse_opaque="false" name="region_name_lbl" top_pad="5" - width="100"> + width="75"> Name: </text> <text @@ -213,7 +215,7 @@ follows="left|top" height="20" layout="topleft" - left_pad="10" + left_pad="0" mouse_opaque="false" name="region_name_text" top_delta="0" @@ -230,7 +232,7 @@ mouse_opaque="false" name="region_landtype_lbl" top_pad="5" - width="100"> + width="75"> Type: </text> <text @@ -239,7 +241,7 @@ follows="left|top" height="20" layout="topleft" - left_pad="10" + left_pad="0" mouse_opaque="false" name="region_landtype_text" top_delta="0" @@ -256,7 +258,7 @@ mouse_opaque="false" name="region_maturity_lbl" top_pad="5" - width="100"> + width="75"> Rating: </text> <text @@ -265,7 +267,7 @@ follows="left|top" height="20" layout="topleft" - left_pad="10" + left_pad="0" mouse_opaque="false" name="region_maturity_text" top_delta="0" @@ -282,7 +284,7 @@ mouse_opaque="false" name="resellable_lbl" top_pad="5" - width="100"> + width="75"> Resale: </text> <text @@ -291,12 +293,13 @@ follows="left|top" height="20" layout="topleft" - left_pad="10" + left_pad="0" mouse_opaque="false" name="resellable_clause" top_delta="0" - width="330"> - Land in this region may not be resold. + width="190"> + Land in this region may not be +resold. </text> <text type="string" @@ -307,8 +310,8 @@ left="10" mouse_opaque="false" name="changeable_lbl" - top_pad="5" - width="100"> + top_pad="10" + width="75"> Subdivide: </text> <text @@ -317,12 +320,13 @@ follows="left|top" height="30" layout="topleft" - left_pad="10" + left_pad="0" mouse_opaque="false" name="changeable_clause" top_delta="0" - width="330"> - Land in this region may not be joined/subdivided. + width="190"> + Land in this region may not be +joined/subdivided. </text> </panel> diff --git a/indra/newview/skins/default/xui/en/panel_region_debug.xml b/indra/newview/skins/default/xui/en/panel_region_debug.xml index 22dc0aa0d0..6a43bf3c4b 100644 --- a/indra/newview/skins/default/xui/en/panel_region_debug.xml +++ b/indra/newview/skins/default/xui/en/panel_region_debug.xml @@ -8,7 +8,7 @@ left="0" name="Debug" top="320" - width="480"> + width="280"> <text type="string" length="1" @@ -32,7 +32,7 @@ left_delta="50" name="region_text" top_delta="0" - width="400"> + width="220"> unknown </text> <check_box @@ -96,12 +96,13 @@ enabled="false" follows="left|top" height="20" + font="SansSerifSmall" label="Apply" layout="topleft" left="60" name="apply_btn" top="100" - width="100" /> + width="80" /> <text type="string" length="1" @@ -120,7 +121,7 @@ follows="left|top" height="20" layout="topleft" - left="30" + left="20" name="resident_text_lbl" top="175" width="60"> @@ -139,25 +140,26 @@ mouse_opaque="false" name="target_avatar_name" top_delta="-2" - width="180"> + width="115"> (none) </line_editor> <button follows="left|top" height="20" - label="Choose..." + font="SansSerifSmall" + label="Choose" layout="topleft" - left_pad="10" + left_pad="5" name="choose_avatar_btn" top_delta="0" - width="80" /> - <text + width="70" /> + <text type="string" length="1" follows="left|top" height="20" layout="topleft" - left="30" + left="20" name="options_text_lbl" top="198" width="60"> @@ -165,7 +167,7 @@ </text> <check_box height="20" - label="Return only those objects with scripts" + label="With scripts" layout="topleft" left_delta="60" name="return_scripts" @@ -174,7 +176,7 @@ width="80" /> <check_box height="20" - label="Return only those objects on someone else's land" + label="On someone else's land" layout="topleft" left_delta="0" name="return_other_land" @@ -183,7 +185,7 @@ width="80" /> <check_box height="20" - label="Return objects in every region of this estate" + label="In every region of this estate" layout="topleft" left_delta="0" name="return_estate_wide" @@ -193,22 +195,24 @@ <button follows="left|top" height="20" + font="SansSerifSmall" label="Return" layout="topleft" - left="30" + left="20" name="return_btn" top="263" width="80" /> <button follows="left|top" height="20" + font="SansSerifSmall" label="Get Top Colliders..." layout="topleft" left="10" name="top_colliders_btn" tool_tip="List of objects experiencing the most potential collisions" top="313" - width="150" /> + width="130" /> <button follows="left|top" font="SansSerifSmall" @@ -222,13 +226,14 @@ <button follows="left|top" height="20" + font="SansSerifSmall" label="Get Top Scripts..." layout="topleft" left="10" name="top_scripts_btn" tool_tip="List of objects spending the most time running scripts" top_pad="5" - width="150" /> + width="130" /> <button follows="left|top" font="SansSerifSmall" @@ -242,13 +247,14 @@ <button follows="left|top" height="20" + font="SansSerifSmall" label="Restart Region" layout="topleft" left="10" name="restart_btn" tool_tip="Give 2 minute countdown and restart region" top_pad="5" - width="130" /> + width="110" /> <button follows="left|top" font="SansSerifSmall" @@ -262,11 +268,12 @@ <button follows="left|top" height="20" + font="SansSerifSmall" label="Delay Restart" layout="topleft" left="10" name="cancel_restart_btn" tool_tip="Delay region restart by one hour" top_pad="5" - width="130" /> + width="110" /> </panel> diff --git a/indra/newview/skins/default/xui/en/panel_region_estate.xml b/indra/newview/skins/default/xui/en/panel_region_estate.xml index 95e1456c6e..1dafd50cdb 100644 --- a/indra/newview/skins/default/xui/en/panel_region_estate.xml +++ b/indra/newview/skins/default/xui/en/panel_region_estate.xml @@ -2,13 +2,13 @@ <panel border="true" follows="top|left" - height="320" + height="950" label="Estate" layout="topleft" left="0" name="Estate" top="320" - width="480"> + width="280"> <panel.string name="email_unsupported"> Feature unsupported @@ -287,16 +287,15 @@ regions in the estate. name="kick_user_from_estate_btn" top_pad="5" width="250" /> - <text type="string" length="1" - bottom="34" + top="490" follows="left|top" height="20" layout="topleft" name="estate_manager_label" - right="470" + left="8" width="200"> Estate Managers: </text> @@ -306,7 +305,7 @@ regions in the estate. height="18" label="?" layout="topleft" - left_delta="182" + left_delta="232" name="estate_manager_help" top_delta="-1" width="18" /> @@ -315,9 +314,9 @@ regions in the estate. follows="top|left" height="60" layout="topleft" - right="470" + left="8" top_pad="5" - width="200" /> + width="250" /> <name_list follows="left|top" height="60" @@ -326,23 +325,23 @@ regions in the estate. multi_select="true" name="estate_manager_name_list" top_delta="0" - width="200" /> + width="250" /> <button follows="left|top" height="20" - label="Remove..." + label="Add..." layout="topleft" - name="remove_estate_manager_btn" - right="470" + left="8" + name="add_estate_manager_btn" top_pad="5" width="90" /> <button follows="left|top" height="20" - label="Add..." + label="Remove..." layout="topleft" - left_delta="-110" - name="add_estate_manager_btn" + name="remove_estate_manager_btn" + left_pad="70" top_delta="0" width="90" /> <text @@ -351,7 +350,7 @@ regions in the estate. follows="left|top" height="20" layout="topleft" - left_delta="0" + left="8" name="allow_resident_label" top_pad="5" width="200"> @@ -363,7 +362,7 @@ regions in the estate. height="18" label="?" layout="topleft" - left_delta="182" + left_delta="232" name="allow_resident_help" top_delta="-1" width="18" /> @@ -372,9 +371,9 @@ regions in the estate. follows="top|left" height="60" layout="topleft" - right="470" + left="8" top_pad="5" - width="200" /> + width="250" /> <name_list follows="left|top" height="60" @@ -383,23 +382,23 @@ regions in the estate. multi_select="true" name="allowed_avatar_name_list" top_delta="0" - width="200" /> + width="250" /> <button follows="left|top" height="20" - label="Remove..." + label="Add..." layout="topleft" - name="remove_allowed_avatar_btn" - right="470" + left="8" + name="add_allowed_avatar_btn" top_pad="5" width="90" /> <button follows="left|top" height="20" - label="Add..." + label="Remove..." layout="topleft" - left_delta="-110" - name="add_allowed_avatar_btn" + name="remove_allowed_avatar_btn" + left_pad="70" top_delta="0" width="90" /> <text @@ -408,7 +407,7 @@ regions in the estate. follows="left|top" height="20" layout="topleft" - left_delta="0" + left="8" name="allow_group_label" top_pad="5" width="200"> @@ -420,7 +419,7 @@ regions in the estate. height="18" label="?" layout="topleft" - left_delta="182" + left_delta="232" name="allow_group_help" top_delta="-1" width="18" /> @@ -429,9 +428,9 @@ regions in the estate. follows="top|left" height="60" layout="topleft" - right="470" + left="8" top_pad="5" - width="200" /> + width="250" /> <name_list follows="left|top" height="60" @@ -440,23 +439,23 @@ regions in the estate. multi_select="true" name="allowed_group_name_list" top_delta="0" - width="200" /> + width="250" /> <button follows="left|top" height="20" - label="Remove..." + label="Add..." layout="topleft" - name="remove_allowed_group_btn" - right="470" + left="8" + name="add_allowed_group_btn" top_pad="5" width="90" /> <button follows="left|top" height="20" - label="Add..." + label="Remove..." layout="topleft" - left_delta="-110" - name="add_allowed_group_btn" + name="remove_allowed_group_btn" + left_pad="70" top_delta="0" width="90" /> <text @@ -465,7 +464,7 @@ regions in the estate. follows="left|top" height="20" layout="topleft" - left_delta="0" + left="8" name="ban_resident_label" top_pad="5" width="200"> @@ -477,7 +476,7 @@ regions in the estate. height="18" label="?" layout="topleft" - left_delta="182" + left_delta="232" name="ban_resident_help" top_delta="-1" width="18" /> @@ -486,9 +485,9 @@ regions in the estate. follows="top|left" height="60" layout="topleft" - right="470" + left="8" top_pad="5" - width="200" /> + width="250" /> <name_list follows="left|top" height="60" @@ -497,23 +496,23 @@ regions in the estate. multi_select="true" name="banned_avatar_name_list" top_delta="0" - width="200" /> + width="250" /> <button follows="left|top" height="20" - label="Remove..." + label="Add..." layout="topleft" - name="remove_banned_avatar_btn" - right="470" + left="8" + name="add_banned_avatar_btn" top_pad="5" width="90" /> <button follows="left|top" height="20" - label="Add..." + label="Remove..." layout="topleft" - left_delta="-110" - name="add_banned_avatar_btn" + name="remove_banned_avatar_btn" + left_pad="70" top_delta="0" width="90" /> </panel> 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 661cb97c66..b7a32213cf 100644 --- a/indra/newview/skins/default/xui/en/panel_region_general.xml +++ b/indra/newview/skins/default/xui/en/panel_region_general.xml @@ -2,13 +2,13 @@ <panel border="true" follows="top|left" - height="320" + height="360" label="Region" layout="topleft" left="0" name="General" - top="320" - width="480"> + top="360" + width="280"> <text type="string" length="1" @@ -32,7 +32,7 @@ left_delta="50" name="region_text" top_delta="0" - width="400"> + width="200"> unknown </text> <text @@ -283,14 +283,17 @@ width="85"> <combo_box.item label="Adult" + name="Adult" value="42" /> <combo_box.item label="Mature" + name="Mature" value="21" /> <combo_box.item label="PG" + name="PG" value="13" /> - </combo_box> + </combo_box> <button follows="left|top" font="SansSerifSmall" @@ -310,8 +313,11 @@ left="108" name="apply_btn" top="320" - width="100" /> - <button + width="100"> + <button.commit_callback + function="RegionInfo.Cancel" /> + </button> + <button follows="left|top" height="20" label="Teleport Home One User..." @@ -343,8 +349,8 @@ height="20" label="Manage Telehub..." layout="topleft" - left="250" + left_delta="0" name="manage_telehub_btn" - top="70" - width="150" /> + top_pad="20" + width="150" /> </panel> diff --git a/indra/newview/skins/default/xui/en/panel_region_terrain.xml b/indra/newview/skins/default/xui/en/panel_region_terrain.xml index ae3b650774..bdf74c5621 100644 --- a/indra/newview/skins/default/xui/en/panel_region_terrain.xml +++ b/indra/newview/skins/default/xui/en/panel_region_terrain.xml @@ -2,13 +2,13 @@ <panel border="true" follows="top|left" - height="320" + height="340" label="Terrain" layout="topleft" left="0" name="Terrain" top="320" - width="480"> + width="280"> <text type="string" length="1" @@ -32,7 +32,7 @@ left_delta="50" name="region_text" top_delta="0" - width="400"> + width="200"> unknown </text> <spinner @@ -105,9 +105,9 @@ height="20" label="Use Estate Sun" layout="topleft" - left="250" + left="15" name="use_estate_sun_check" - top="35" + top="105" width="100" /> <button follows="left|top" @@ -115,7 +115,7 @@ height="18" label="?" layout="topleft" - left_pad="70" + left_pad="85" name="use_estate_sun_help" top_delta="2" width="18" /> @@ -123,9 +123,9 @@ height="20" label="Fixed Sun" layout="topleft" - left="250" + left="15" name="fixed_sun_check" - top="55" + top_pad="0" width="100" /> <button follows="left|top" @@ -133,7 +133,7 @@ height="18" label="?" layout="topleft" - left_pad="70" + left_pad="85" name="fixed_sun_help" top_delta="2" width="18" /> @@ -141,9 +141,9 @@ height="20" image_name="icon_day_cycle.tga" layout="topleft" - left="285" + left="50" name="daycycle" - top="80" + top_delta="25" width="165" /> <slider follows="left|top" @@ -151,12 +151,12 @@ increment="0.001" label="Phase" layout="topleft" - left="250" + left="15" max_val="30" min_val="6" name="sun_hour_slider" show_text="false" - top="105" + top_delta="30" width="200" /> <button enabled="false" @@ -164,18 +164,18 @@ height="20" label="Apply" layout="topleft" - left="350" + left="130" name="apply_btn" - top="135" + top_delta="30" width="90" /> <view_border bevel_style="none" follows="top|left" - height="130" + height="210" layout="topleft" left="8" top="30" - width="460" /> + width="240" /> <button follows="left|top" height="20" @@ -184,7 +184,7 @@ left_delta="2" name="download_raw_btn" tool_tip="Available only to estate owners, not managers" - top_pad="60" + top_pad="15" width="170" /> <button follows="left|top" @@ -204,7 +204,7 @@ left="10" name="upload_raw_btn" tool_tip="Available only to estate owners, not managers" - top="243" + top_pad="0" width="170" /> <button follows="left|top" @@ -224,7 +224,7 @@ left="10" name="bake_terrain_btn" tool_tip="Set current terrain as mid-point for raise/lower limits" - top="283" + top_pad="15" width="100" /> <button follows="left|top" diff --git a/indra/newview/skins/default/xui/en/panel_region_texture.xml b/indra/newview/skins/default/xui/en/panel_region_texture.xml index f24630f4e3..bf63bb0cb6 100644 --- a/indra/newview/skins/default/xui/en/panel_region_texture.xml +++ b/indra/newview/skins/default/xui/en/panel_region_texture.xml @@ -2,13 +2,13 @@ <panel border="true" follows="top|left" - height="320" + height="575" label="Ground Textures" layout="topleft" left="0" name="Textures" top="320" - width="480"> + width="280"> <text type="string" length="1" @@ -32,7 +32,7 @@ left_delta="50" name="region_text" top_delta="0" - width="400"> + width="200"> unknown </text> <text @@ -45,7 +45,8 @@ name="detail_texture_text" top="36" width="300"> - Terrain Textures (requires 512x512, 24 bit .tga files) + Terrain Textures +(requires 512x512, 24 bit .tga files) </text> <texture_picker follows="left|top" @@ -53,7 +54,7 @@ layout="topleft" left_delta="0" name="texture_detail_0" - top_delta="20" + top_delta="30" width="100" /> <texture_picker follows="left|top" @@ -67,9 +68,9 @@ follows="left|top" height="100" layout="topleft" - left_pad="10" + left="10" name="texture_detail_2" - top_delta="0" + top_delta="105" width="100" /> <texture_picker follows="left|top" @@ -87,7 +88,7 @@ layout="topleft" left="10" name="height_text_lbl" - top="146" + top="157" width="65"> 1 (Low) </text> @@ -109,9 +110,9 @@ follows="left|top" height="20" layout="topleft" - left_pad="10" + left="10" name="height_text_lbl3" - top_delta="0" + top_delta="105" width="100"> 3 </text> @@ -135,7 +136,7 @@ layout="topleft" left="10" name="height_text_lbl5" - top="186" + top_delta="25" width="300"> Texture Elevation Ranges </text> @@ -147,7 +148,7 @@ layout="topleft" left="51" name="height_text_lbl6" - top="201" + top_delta="20" width="100"> Southwest </text> @@ -163,31 +164,7 @@ width="100"> Northwest </text> - <text - type="string" - length="1" - follows="left|top" - height="20" - layout="topleft" - left_pad="10" - name="height_text_lbl8" - top_delta="0" - width="100"> - Southeast - </text> - <text - type="string" - length="1" - follows="left|top" - height="20" - layout="topleft" - left_pad="10" - name="height_text_lbl9" - top_delta="0" - width="100"> - Northeast - </text> - <spinner + <spinner follows="left|top" height="20" increment="0.5" @@ -198,7 +175,7 @@ max_val="500" min_val="-500" name="height_start_spin_0" - top="221" + top_delta="20" width="100" /> <spinner follows="left|top" @@ -217,52 +194,76 @@ follows="left|top" height="20" increment="0.5" - label="Low" + label="High" label_width="37" layout="topleft" - left_pad="10" + left="10" max_val="500" min_val="-500" - name="height_start_spin_2" - top_delta="0" + name="height_range_spin_0" + top_delta="20" width="100" /> <spinner follows="left|top" height="20" increment="0.5" - label="Low" + label="High" label_width="37" layout="topleft" left_pad="10" max_val="500" min_val="-500" - name="height_start_spin_3" + name="height_range_spin_1" top_delta="0" width="100" /> + <text + type="string" + length="1" + follows="left|top" + height="20" + layout="topleft" + left="51" + name="height_text_lbl8" + top_delta="30" + width="100"> + Southeast + </text> + <text + type="string" + length="1" + follows="left|top" + height="20" + layout="topleft" + left_pad="10" + name="height_text_lbl9" + top_delta="0" + width="100"> + Northeast + </text> <spinner follows="left|top" height="20" increment="0.5" - label="High" + label="Low" label_width="37" layout="topleft" left="10" max_val="500" min_val="-500" - name="height_range_spin_0" - top="241" + name="height_start_spin_2" + top_delta="20" width="100" /> <spinner follows="left|top" height="20" increment="0.5" - label="High" + label="Low" label_width="37" layout="topleft" left_pad="10" max_val="500" min_val="-500" - name="height_range_spin_1" + name="height_start_spin_3" top_delta="0" width="100" /> <spinner @@ -272,11 +273,11 @@ label="High" label_width="37" layout="topleft" - left_pad="10" + left="10" max_val="500" min_val="-500" name="height_range_spin_2" - top_delta="0" + top_delta="20" width="100" /> <spinner follows="left|top" @@ -297,11 +298,12 @@ follows="left|top" height="20" layout="topleft" - left="25" + left="10" name="height_text_lbl10" - top="281" - width="480"> - These values represent the blend range for the textures above. + top_delta="30" + width="270"> + These values represent the blend range +for the textures above. </text> <text type="string" @@ -311,30 +313,22 @@ layout="topleft" left_delta="0" name="height_text_lbl11" - top_delta="16" - width="450"> - Measured in meters, the LOW value is the MAXIMUM height of Texture #1, - </text> - <text - type="string" - length="1" - follows="left|top" - height="20" - layout="topleft" - left_delta="0" - name="height_text_lbl12" - top_delta="16" - width="480"> - and the HIGH value is the MINIMUM height of Texture #4. + top_delta="32" + width="270"> + Measured in meters, the LOW value +is the MAXIMUM height of Texture #1, +and the HIGH value is the MINIMUM +height of Texture #4. </text> + <button enabled="false" follows="left|bottom" height="20" label="Apply" layout="topleft" - left="350" + left="120" name="apply_btn" - top="290" - width="100" /> + top_delta="60" + width="100" /> </panel> diff --git a/indra/newview/skins/default/xui/en/panel_script_ed.xml b/indra/newview/skins/default/xui/en/panel_script_ed.xml index f059f4f3c1..9fd075f79b 100644 --- a/indra/newview/skins/default/xui/en/panel_script_ed.xml +++ b/indra/newview/skins/default/xui/en/panel_script_ed.xml @@ -15,7 +15,7 @@ </panel.string> <panel.string name="can_not_view"> - You are not allowed to view this script. + You can not view or edit this script, since it has been set as "no copy". You need full permissions to view or edit a script inside an object. </panel.string> <panel.string name="public_objects_can_not_run"> diff --git a/indra/newview/skins/default/xui/en/panel_scrolling_param.xml b/indra/newview/skins/default/xui/en/panel_scrolling_param.xml index 2805ace906..21ecd01839 100644 --- a/indra/newview/skins/default/xui/en/panel_scrolling_param.xml +++ b/indra/newview/skins/default/xui/en/panel_scrolling_param.xml @@ -49,10 +49,10 @@ <button enabled="false" height="132" - image_disabled="square_btn_32x128.tga" - image_disabled_selected="square_btn_selected_32x128.tga" - image_selected="square_btn_selected_32x128.tga" - image_unselected="square_btn_32x128.tga" + image_disabled="PushButton_Disabled" + image_disabled_selected="PushButton_Disabled_Selected" + image_selected="PushButton_Selected" + image_unselected="PushButton_Off" layout="topleft" left="2" name="less" @@ -63,10 +63,10 @@ <button enabled="false" height="132" - image_disabled="square_btn_32x128.tga" - image_disabled_selected="square_btn_selected_32x128.tga" - image_selected="square_btn_selected_32x128.tga" - image_unselected="square_btn_32x128.tga" + image_disabled="PushButton_Disabled" + image_disabled_selected="PushButton_Disabled_Selected" + image_selected="PushButton_Selected" + image_unselected="PushButton_Off" layout="topleft" left_pad="2" name="more" diff --git a/indra/newview/skins/default/xui/en/panel_side_tray.xml b/indra/newview/skins/default/xui/en/panel_side_tray.xml index 220191ddaa..096b60adb1 100644 --- a/indra/newview/skins/default/xui/en/panel_side_tray.xml +++ b/indra/newview/skins/default/xui/en/panel_side_tray.xml @@ -4,57 +4,60 @@ background_visible="false" bg_opaque_color="0.0 0.0 0.0 0.0" mouse_opaque="true" - collapsed="true" + width="305" + collapsed="true" > <sidetray_tab - name="sidebarpanel2" + name="sidebar_home" + tab_title="Home" + description="Home." + image="icn_voice-groupfocus.tga" mouse_opaque="false" background_opaque="false" background_visible="true" bg_opaque_color="0.5 0.5 0.5 1.0" - image="icn_voice-groupfocus.tga" + > + <panel + name="panel_home" + filename="panel_sidetray_home_tab.xml" + width="355" + height="465" + label="home" + border="true" + /> + </sidetray_tab> + + <sidetray_tab + name="sidebar_people" tab_title="People" description="Find your friends, contacts and people nearby." + image="icn_voice-groupfocus.tga" + mouse_opaque="false" + background_opaque="false" + background_visible="true" + bg_opaque_color="0.5 0.5 0.5 1.0" > - <collapsible_ctrl - name="people_accordion" - title="People" - collapsable="true" - min_width="200" - min_height="200" - expanded="true" - header_visible="false" - > <panel class="panel_people" name="panel_people" filename="panel_people.xml" - width="355" + width="280" height="465" label="People" border="true" /> - </collapsible_ctrl> </sidetray_tab> - + <!-- *TODO Vadim: isn't the sidetray_tab "label" attribute redundant since we have "tab_title" ? --> <sidetray_tab - name="sidebarpanel1" + name="sidebar_places" + tab_title="Places" + label="Places" + description="Find places to go and places you've been." + image="inv_item_landmark.tga" mouse_opaque="false" background_visible="true" - label="Places" bg_opaque_color="0.5 0.5 0.5 1.0" - image="inv_item_landmark.tga" - tab_title="Places" - description="Find places to go and places you've been." > - <collapsible_ctrl - name="places_accordian" - title="Places" - collapsable="true" - min_width="355" - min_height="570" - header_visible="false" - > <panel class="panel_places" name="panel_places" @@ -62,34 +65,594 @@ label="Places" border="true" /> - </collapsible_ctrl> </sidetray_tab> <sidetray_tab name="sidebar_me" + tab_title="Me" + description="Change your profile, your look and quick links to your outfits." + image="icn_voice-pvtfocus.tga" mouse_opaque="false" background_visible="true" bg_opaque_color="0.5 0.5 0.5 1.0" - image="icn_voice-pvtfocus.tga" - tab_title="Me" - description="Change your profile, your look and quick links to your outfits." > - <collapsible_ctrl - name="me_accordion" - title="Me" - collapsable="false" - min_width="200" - min_height="200" - header_visible="false" - > <panel class="panel_me_profile" name="panel_me_profile" - filename="panel_me_profile.xml" + filename="panel_me_profile.xml" label="Me" border="true" /> - </collapsible_ctrl> + </sidetray_tab> + + <!-- + <sidetray_tab + name="sidebar_group" + mouse_opaque="false" + background_visible="true" + bg_opaque_color="0.5 0.5 0.5 1.0" + image="icn_voice-groupfocus.tga" + tab_title="Groups" + description="Manage Groups." + > + <accordion_tab + name="group_accordion" + title="Group General" + expanded="true" + collapsible="true" + min_width="200" + min_height="200" + header_visible="true" + > + <panel + class="panel_group_general" + name="panel_group_general" + filename="panel_group_general.xml" + label="Group" + border="true" + /> + </accordion_tab> + <accordion_tab + name="groupland_accordion" + title="Group Land and Money" + expanded="false" + collapsible="true" + min_width="200" + min_height="200" + header_visible="true" + > + <panel + class="panel_group_land" + name="panel_group_land" + filename="panel_group_land_money.xml" + label="Group" + border="true" + /> + </accordion_tab> + <accordion_tab + name="groupnotices_accordion" + title="Group Notices" + expanded="false" + collapsible="true" + min_width="200" + min_height="200" + header_visible="true" + > + <panel + class="panel_group_roles" + name="panel_group_roles" + filename="panel_group_roles.xml" + label="Group" + border="true" + /> + </accordion_tab> + <accordion_tab + name="grouproles_accordion" + title="Group Roles" + expanded="false" + collapsible="true" + min_width="200" + min_height="200" + header_visible="true" + > + <panel + class="panel_group_roles" + name="panel_group_roles" + filename="panel_group_roles.xml" + label="Group" + border="true" + /> + </accordion_tab> </sidetray_tab> + + + <sidetray_tab + name="sidebar_previews" + mouse_opaque="false" + background_opaque="false" + background_visible="true" + bg_opaque_color="0.5 0.5 0.5 1.0" + image="icn_voice-groupfocus.tga" + tab_title="Previews" + description="Previews." + > + <accordion_tab + name="floater_preview_animation" + title="Preview Animation" + collapsible="true" + expanded="false" + min_width="200" + min_height="200" + header_visible="true" + > + <panel + class="floater_preview_animation" + name="floater_preview_animation" + filename="floater_preview_animation.xml" + width="280" + height="85" + label="Preview_Animation" + border="true" + /> + </accordion_tab> + <accordion_tab + name="floater_preview_gesture" + title="Preview Gesture" + collapsible="true" + expanded="false" + min_width="200" + min_height="200" + header_visible="true" + > + <panel + class="floater_preview_gesture" + name="floater_preview_gesture" + filename="floater_preview_gesture.xml" + width="280" + height="400" + label="Preview_Gesture" + border="true" + /> + </accordion_tab> + <accordion_tab + name="floater_preview_existing_landmark" + title="Preview Existing Landmark" + collapsible="true" + expanded="false" + min_width="200" + min_height="200" + header_visible="true" + > + <panel + class="floater_preview_existing_landmark" + name="floater_preview_existing_landmark" + filename="floater_preview_existing_landmark.xml" + width="280" + height="495" + label="Preview_Existing_Landmark" + border="true" + /> + </accordion_tab> + <accordion_tab + name="floater_preview_sound" + title="Preview Sound" + collapsible="true" + expanded="false" + min_width="200" + min_height="200" + header_visible="true" + > + <panel + class="floater_preview_sound" + name="floater_preview_sound" + filename="floater_preview_sound.xml" + width="280" + height="85" + label="Preview_Sound" + border="true" + /> + </accordion_tab> + <accordion_tab + name="floater_preview_url" + title="Preview URL" + collapsible="true" + expanded="false" + min_width="200" + min_height="200" + header_visible="true" + > + <panel + class="floater_preview_url" + name="floater_preview_url" + filename="floater_preview_url.xml" + width="280" + height="465" + label="Preview_URL" + border="true" + /> + </accordion_tab> + <accordion_tab + name="floater_URL_entry" + title="URL Entry" + collapsible="true" + expanded="false" + min_width="200" + min_height="200" + header_visible="true" + > + <panel + class="floater_URL_entry" + name="floater_URL_entry" + filename="floater_URL_entry.xml" + width="280" + height="87" + label="URL_entry" + border="true" + /> + </accordion_tab> + </sidetray_tab> + + <sidetray_tab + name="sidebar_region" + mouse_opaque="false" + background_opaque="false" + background_visible="true" + bg_opaque_color="0.5 0.5 0.5 1.0" + image="icn_voice-groupfocus.tga" + tab_title="Region" + description="Region." + > + <accordion_tab + name="panel_region_covenant" + title="Region Covenant" + collapsible="true" + min_width="200" + min_height="200" + expanded="false" + header_visible="true" + > + <panel + class="panel_region_covenant" + name="panel_region_covenant" + filename="panel_region_covenant.xml" + width="280" + height="350" + label="Panel_Region_Covenant" + border="true" + /> + </accordion_tab> + <accordion_tab + name="panel_region_debug" + title="Region Debug" + collapsible="true" + min_width="200" + min_height="200" + expanded="false" + header_visible="true" + > + <panel + class="panel_region_debug" + name="panel_region_debug" + filename="panel_region_debug.xml" + width="280" + height="500" + label="Panel_Region_Debug" + border="true" + /> + </accordion_tab> + <accordion_tab + name="panel_region_estate" + title="Region Estate" + collapsible="true" + min_width="200" + min_height="200" + expanded="false" + header_visible="true" + > + <panel + class="panel_region_estate" + name="panel_region_estate" + filename="panel_region_estate.xml" + width="280" + height="950" + label="Panel_Region_Estate" + border="true" + /> + </accordion_tab> + <accordion_tab + name="panel_region_general" + title="Region General" + collapsible="true" + min_width="200" + min_height="200" + expanded="false" + header_visible="true" + > + <panel + class="panel_region_general" + name="panel_region_general" + filename="panel_region_general.xml" + width="280" + height="500" + label="Panel_Region_General" + border="true" + /> + </accordion_tab> + <accordion_tab + name="panel_region_terrain" + title="Region Terrain" + collapsible="true" + min_width="200" + min_height="200" + expanded="false" + header_visible="true" + > + <panel + class="panel_region_terrain" + name="panel_region_terrain" + filename="panel_region_terrain.xml" + width="280" + height="340" + label="Panel_Region_Terrain" + border="true" + /> + </accordion_tab> + <accordion_tab + name="panel_region_texture" + title="Region Texture" + collapsible="true" + min_width="200" + min_height="200" + expanded="false" + header_visible="true" + > + <panel + class="panel_region_texture" + name="panel_region_texture" + filename="panel_region_texture.xml" + width="280" + height="575" + label="Panel_Region_Texture" + border="true" + /> + </accordion_tab> + <accordion_tab + name="floater_region_info" + title="Region Info" + collapsible="true" + min_width="200" + min_height="200" + expanded="false" + header_visible="true" + > + <panel + class="floater_region_info" + name="floater_region_info" + filename="floater_region_info.xml" + width="280" + height="512" + label="Floater_Region_Info" + border="true" + /> + </accordion_tab> + </sidetray_tab> + + <sidetray_tab + name="Build" + mouse_opaque="false" + background_opaque="false" + background_visible="true" + bg_opaque_color="0.5 0.5 0.5 1.0" + image="icn_voice-groupfocus.tga" + tab_title="Build" + description="Build" + > + <accordion_tab + name="floater_tools" + title="Tools" + collapsible="true" + min_width="200" + min_height="200" + expanded="false" + header_visible="true" + > + <panel + class="floater_tools" + name="floater_tools" + filename="floater_tools.xml" + width="280" + height="550" + label="Tools" + border="true" + /> + </accordion_tab> + <accordion_tab + name="floater_bulk_perms" + title="Bulk Perms" + collapsible="true" + min_width="200" + min_height="200" + expanded="false" + header_visible="true" + > + <panel + class="floater_bulk_perms" + name="floater_bulk_perms" + filename="floater_bulk_perms.xml" + width="280" + height="360" + label="Tools" + border="true" + /> + </accordion_tab> + <accordion_tab + name="floater_build_options" + title="Build Options" + collapsible="true" + min_width="200" + min_height="200" + expanded="false" + header_visible="true" + > + <panel + class="floater_build_options" + name="floater_build_options" + filename="floater_build_options.xml" + width="280" + height="151" + label="Tools" + border="true" + /> + </accordion_tab> + + </sidetray_tab> + + <sidetray_tab + name="othertools" + mouse_opaque="false" + background_opaque="false" + background_visible="true" + bg_opaque_color="0.5 0.5 0.5 1.0" + image="icn_voice-groupfocus.tga" + tab_title="Other Tools" + description="Other Tools" + > + <accordion_tab + name="floater_gesture" + title="Gestures" + collapsible="true" + min_width="200" + min_height="200" + expanded="false" + header_visible="true" + > + <panel + class="floater_gesture" + name="floater_gesture" + filename="floater_gesture.xml" + width="280" + height="465" + label="Gesture" + border="true" + /> + </accordion_tab> + + <accordion_tab + name="floater_buy_contents" + title="Buy Contents" + collapsible="true" + min_width="200" + min_height="200" + expanded="false" + header_visible="true" + > + <panel + class="floater_buy_contents" + name="floater_buy_contents" + filename="floater_buy_contents.xml" + width="280" + height="250" + label="buy_contents" + border="true" + /> + </accordion_tab> + <accordion_tab + name="floater_buy_object" + title="Buy Object" + collapsible="true" + min_width="200" + min_height="200" + expanded="false" + header_visible="true" + > + <panel + class="floater_buy_object" + name="floater_buy_object" + filename="floater_buy_object.xml" + width="280" + height="250" + label="buy_object" + border="true" + /> + </collapsible_ctrl> + <accordion_tab + name="floater_inventory_view_finder" + title="Inventory View Finder" + collapsible="true" + min_width="200" + min_height="200" + expanded="false" + header_visible="true" + > + <panel + class="floater_inventory_view_finder" + name="floater_inventory_view_finder" + filename="floater_inventory_view_finder.xml" + width="280" + height="408" + label="view_finder" + border="true" + /> + </accordion_tab> + <accordion_tab + name="floater_mute" + title="Mute" + collapsible="true" + min_width="200" + min_height="200" + expanded="false" + header_visible="true" + > + <panel + class="floater_mute" + name="floater_mute" + filename="floater_mute.xml" + width="280" + height="300" + label="mute" + border="true" + /> + </accordion_tab> + <accordion_tab + name="floater_sell_land" + title="Sell Land" + collapsible="true" + min_width="200" + min_height="200" + expanded="false" + header_visible="true" + > + <panel + class="floater_sell_land" + name="floater_sell_land" + filename="floater_sell_land.xml" + width="280" + height="600" + label="sell_land" + border="true" + /> + </accordion_tab> + <accordion_tab + name="floater_telehub" + title="Telehub" + collapsible="true" + min_width="200" + min_height="200" + expanded="false" + header_visible="true" + > + <panel + class="floater_telehub" + name="floater_telehub" + filename="floater_telehub.xml" + width="280" + height="250" + label="telehub" + border="true" + /> + </accordion_tab> + + </sidetray_tab> + --> </side_tray> diff --git a/indra/newview/skins/default/xui/en/panel_sidetray_home_tab.xml b/indra/newview/skins/default/xui/en/panel_sidetray_home_tab.xml new file mode 100644 index 0000000000..a85662603d --- /dev/null +++ b/indra/newview/skins/default/xui/en/panel_sidetray_home_tab.xml @@ -0,0 +1,90 @@ +<?xml version="1.0" encoding="utf-8" standalone="yes"?> +<!-- All our XML is utf-8 encoded. --> + +<panel + name="home_tab" + title="home_tab" + visible="true" + width="300" + height="420" + background_opaque="false" + background_visible="true" + bevel_style="in" + follows="left|top|right|bottom"> + <panel + left="10" width="280" height="130" + background_visible="true" + background_opaque="false" + bg_alpha_color="0.3 0.3 0.3 1.0" + name="sidebar_people" + follows="left|top|right" + class="panel_sidetray_home_info"> + <text + top="-10" width="200" left="5" height="30" follows="left|right|top" + font="SansSerifHugeBold" text_color="white" word_wrap="true" + mouse_opaque="false" name="tab_name" > + People + </text> + <icon + top="-10" right="-10" width="20" height="20" follows="top|right" + color="1 1 1 1" enabled="true" image_name="icn_voice-groupfocus.tga" + mouse_opaque="false" name="tab_icon"/> + <text + top="-40" left="10" right="-10" height="120" follows="left|right|bottom" + font="SansSerifBig" text_color="white" word_wrap="true" + mouse_opaque="false" name="tab_description" > + Find your friends, contacts and people nearby. + </text> + </panel> + <panel + left="10" width="280" height="130" + background_visible="true" + background_opaque="false" + bg_alpha_color="0.3 0.3 0.3 1.0" + name="sidebar_places" + follows="left|top|right" + class="panel_sidetray_home_info"> + <text + top="-10" width="200" left="5" height="30" follows="left|right|top" + font="SansSerifHugeBold" text_color="white" word_wrap="true" + mouse_opaque="false" name="tab_name" > + Places + </text> + <icon + top="-10" right="-10" width="20" height="20" follows="top|right" + color="1 1 1 1" enabled="true" image_name="inv_item_landmark.tga" + mouse_opaque="false" name="tab_icon"/> + <text + top="-40" left="10" right="-10" height="120" follows="left|right|bottom|top" + font="SansSerifBig" text_color="white" word_wrap="true" + mouse_opaque="false" name="tab_description" > + Find your friends, contacts and people nearby. + </text> + </panel> + <panel + left="10" width="280" height="130" + background_visible="true" + background_opaque="false" + bg_alpha_color="0.3 0.3 0.3 1.0" + name="sidebar_me" + follows="left|top|right" + class="panel_sidetray_home_info"> + <text + top="-10" width="200" left="5" height="30" follows="left|right|top" + font="SansSerifHugeBold" text_color="white" word_wrap="true" + mouse_opaque="false" name="tab_name" > + Me + </text> + <icon + top="-10" right="-10" width="20" height="20" follows="top|right" + color="1 1 1 1" enabled="true" image_name="icn_voice-pvtfocus.tga" + mouse_opaque="false" name="tab_icon"/> + <text + top="-40" left="10" right="-10" height="120" follows="left|right|bottom" + font="SansSerifBig" text_color="white" word_wrap="true" + mouse_opaque="false" name="tab_description" > + Change your profile, your look and quick links to your outfits. + </text> + </panel> +</panel> +
\ No newline at end of file diff --git a/indra/newview/skins/default/xui/en/panel_status_bar.xml b/indra/newview/skins/default/xui/en/panel_status_bar.xml index 3709514147..9bf401d817 100644 --- a/indra/newview/skins/default/xui/en/panel_status_bar.xml +++ b/indra/newview/skins/default/xui/en/panel_status_bar.xml @@ -41,7 +41,7 @@ font="SansSerifSmall" height="16" layout="topleft" - left="-130" + left="-150" name="buycurrency" picture_style="true" tool_tip="Account Balance / Buy currency" @@ -61,7 +61,7 @@ tool_tip="Current Time (Pacific)" top_delta="-1" v_pad="2" - width="60"> + width="80"> 12:00 AM </text> <button @@ -70,7 +70,7 @@ image_selected="status_script_debug.tga" image_unselected="status_script_debug.tga" layout="topleft" - left_delta="-557" + left_delta="-537" name="scriptout" picture_style="true" scale_image="false" diff --git a/indra/newview/skins/default/xui/en/panel_teleport_history.xml b/indra/newview/skins/default/xui/en/panel_teleport_history.xml index b7ce812dc8..05ebcbb50b 100644 --- a/indra/newview/skins/default/xui/en/panel_teleport_history.xml +++ b/indra/newview/skins/default/xui/en/panel_teleport_history.xml @@ -1,12 +1,12 @@ <?xml version="1.0" encoding="utf-8" standalone="yes" ?> <panel name="Teleport History" bottom="0" height="326" left="0" width="380" border="true" follows="left|top|right|bottom"> - <scroll_list bottom="0" can_resize="true" column_padding="0" draw_heading="true" + <scroll_list bottom="0" column_padding="0" draw_heading="true" draw_stripes="false" follows="left|top|bottom|right" left="0" multi_select="false" name="history_items" search_column="1" sort_column="1" height="326" width="380" > <column name="landmark_icon" width="20" /> - <column dynamicwidth="true" label="Region" name="region" /> + <column dynamic_width="true" label="Region" name="region" /> <column name="index" width="0" /> </scroll_list> </panel> diff --git a/indra/newview/skins/default/xui/en/panel_toast.xml b/indra/newview/skins/default/xui/en/panel_toast.xml new file mode 100644 index 0000000000..ba4915e074 --- /dev/null +++ b/indra/newview/skins/default/xui/en/panel_toast.xml @@ -0,0 +1,65 @@ +<?xml version="1.0" encoding="utf-8" standalone="yes"?> +<!-- All our XML is utf-8 encoded. --> + +<panel + name="toast" + title="toast" + visible="false" + layout="topleft" + width="350" + height="72" + left="100" + top="500" + follows="right|bottom" + background_opaque="true" + background_visible="true" + bevel_style="in" + bg_alpha_color="0.3 0.3 0.3 1.0"> + + <text + visible="false" + follows="left|top|right|bottom" + font="SansSerifBold" + height="40" + layout="topleft" + left="60" + name="toast_text" + word_wrap="true" + text_color="white" + top="20" + width="290"> + Toast text; + </text> + <icon + top="20" + left="10" + width="32" + height="32" + follows="top|left" + layout="topleft" + visible="false" + color="1 1 1 1" + enabled="true" + image_name="notify_tip_icon.tga" + mouse_opaque="true" + name="icon" + /> + <button + layout="topleft" + top="-5" + left="335" + width="20" + height="20" + follows="top|right" + visible="false" + enabled="true" + mouse_opaque="true" + name="hide_btn" + label="" + image_unselected="toast_hide_btn.tga" + image_disabled="toast_hide_btn.tga" + image_selected="toast_hide_btn.tga" + image_hover_selected="toast_hide_btn.tga" + image_disabled_selected="toast_hide_btn.tga" + /> +</panel> diff --git a/indra/newview/skins/default/xui/en/strings.xml b/indra/newview/skins/default/xui/en/strings.xml index 58bb16581a..e5665b0194 100644 --- a/indra/newview/skins/default/xui/en/strings.xml +++ b/indra/newview/skins/default/xui/en/strings.xml @@ -76,12 +76,14 @@ <string name="TooltipAltRight">Alt-Right arrow for next tab</string> <!-- ButtonToolTips, llfloater.cpp --> - <string name="BUTTON_CLOSE_DARWIN">Close (Cmd-W)</string> + <string name="BUTTON_CLOSE_DARWIN">Close (⌘-W)</string> <string name="BUTTON_CLOSE_WIN">Close (Ctrl-W)</string> <string name="BUTTON_RESTORE">Restore</string> <string name="BUTTON_MINIMIZE">Minimize</string> <string name="BUTTON_TEAR_OFF">Tear Off</string> <string name="BUTTON_EDIT">Edit</string> + <string name="BUTTON_DOCK">Dock</string> + <string name="BUTTON_UNDOCK">Undock</string> <!-- searching - generic --> <string name="Searching">Searching...</string> @@ -152,7 +154,7 @@ <string name="AvatarEditingAppearance">(Editing Appearance)</string> <string name="AvatarAway">Away</string> <string name="AvatarBusy">Busy</string> - <string name="AvatarMuted">Muted</string> + <string name="AvatarMuted">Blocked</string> <!-- animations --> <string name="anim_express_afraid">Afraid</string> @@ -341,36 +343,41 @@ 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="link" value=" (link)" /> + <string name="broken_link" value=" (broken_link)" /> <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 +404,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 +489,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 +545,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> @@ -651,6 +652,7 @@ Expected .wav, .tga, .bmp, .jpg, .jpeg, or .bvh <string name="Stage">Stage</string> <string name="Other">Other</string> <string name="Any">Any</string> + <string name="You">You</string> <!-- puncutations --> <string name=":">:</string> @@ -775,7 +777,6 @@ If you continue to receive this message, contact customer support. <string name="LTimeHour">hour,datetime,local</string> <string name="LTimeMin">min,datetime,local</string> <string name="LTimeYear">year,datetime,local</string> - <string name="LTimeSec">second,datetime,local</string> <string name="UTCTimeWeek">weekday,datetime,utc</string> <string name="UTCTimeDay">day,datetime,utc</string> @@ -785,4 +786,6 @@ If you continue to receive this message, contact customer support. <string name="UTCTimeMin">min,datetime,utc</string> <string name="UTCTimeSec">second,datetime,utc</string> <string name="UTCTimeTimezone">timezone,datetime,utc</string> + + </strings> diff --git a/indra/newview/skins/default/xui/en/widgets/button.xml b/indra/newview/skins/default/xui/en/widgets/button.xml index a1e074fae2..3e7e07749a 100644 --- a/indra/newview/skins/default/xui/en/widgets/button.xml +++ b/indra/newview/skins/default/xui/en/widgets/button.xml @@ -1,8 +1,8 @@ <?xml version="1.0" encoding="utf-8" standalone="yes" ?> -<button image_unselected="button_enabled_32x128.tga" - image_selected="button_enabled_selected_32x128.tga" - image_disabled_selected="button_disabled_32x128.tga" - image_disabled="button_disabled_32x128.tga" +<button image_unselected="PushButton_Off" + image_selected="PushButton_Selected" + image_disabled_selected="PushButton_Selected_Disabled" + image_disabled="PushButton_Disabled" label_color="ButtonLabelColor" label_color_selected="ButtonLabelSelectedColor" label_color_disabled="ButtonLabelDisabledColor" diff --git a/indra/newview/skins/default/xui/en/widgets/check_box.xml b/indra/newview/skins/default/xui/en/widgets/check_box.xml index ff01dcebd8..97060fb161 100644 --- a/indra/newview/skins/default/xui/en/widgets/check_box.xml +++ b/indra/newview/skins/default/xui/en/widgets/check_box.xml @@ -3,16 +3,15 @@ text_disabled_color="LabelDisabledColor" font="SansSerifSmall" follows="left|top"> - <check_box.label_text name="checkbox label"/> + <check_box.label_text name="checkbox label" /> <check_box.check_button name="CheckboxCtrl Button" - commit_on_return="false" + commit_on_return="false" label="" is_toggle="true" - hover_glow_amount="0.35" font="SansSerif" scale_image="false" - image_unselected="checkbox_enabled_false.tga" - image_selected="checkbox_enabled_true.tga" - image_disabled="checkbox_disabled_false.tga" - image_disabled_selected="checkbox_disabled_true.tga"/> + image_unselected="Checkbox_Off" + image_selected="Checkbox_On" + image_disabled="Checkbox_Off_Disabled" + image_disabled_selected="Checkbox_On_Disabled" /> </check_box> diff --git a/indra/newview/skins/default/xui/en/widgets/color_swatch.xml b/indra/newview/skins/default/xui/en/widgets/color_swatch.xml index 304eda2d97..178c890c61 100644 --- a/indra/newview/skins/default/xui/en/widgets/color_swatch.xml +++ b/indra/newview/skins/default/xui/en/widgets/color_swatch.xml @@ -5,6 +5,4 @@ <color_swatch.caption_text name="caption" font="SansSerifSmall" follows="left|right|bottom"/> - <color_swatch.border name="border" - bevel_type="in"/> </color_swatch> diff --git a/indra/newview/skins/default/xui/en/widgets/combo_box.xml b/indra/newview/skins/default/xui/en/widgets/combo_box.xml index 8a8f3f7f2c..a042a61a26 100644 --- a/indra/newview/skins/default/xui/en/widgets/combo_box.xml +++ b/indra/newview/skins/default/xui/en/widgets/combo_box.xml @@ -1,22 +1,29 @@ <?xml version="1.0" encoding="utf-8" standalone="yes" ?> <combo_box font="SansSerifSmall" - arrow_image="combobox_arrow.tga" - list_position="below" - max_chars="20" - follows="left|top"> + list_position="below" + max_chars="20" + follows="right|top"> <combo_box.combo_button name="Combobox Button" + label="" hover_glow_amount="0.15" font="SansSerifSmall" - halign="left" scale_image="true" - image_unselected="square_btn_32x128.tga" - image_selected="square_btn_selected_32x128.tga" - image_disabled="square_btn_32x128.tga" - image_disabled_selected="square_btn_selected_32x128.tga" - image_overlay="combobox_arrow.tga" - image_overlay_alignment="right"/> - <combo_box.combo_list bg_writeable_color="white"/> + image_unselected="ComboButton_Off" + image_selected="ComboButton_Selected" + image_disabled="ComboButton_Disabled" + image_disabled_selected="ComboButton_Disabled_Selected" /> + <combo_box.drop_down_button name="Drop Down Button" + label="" + hover_glow_amount="0.15" + font="SansSerifSmall" + scale_image="true" + pad_right="24" + image_unselected="DropDown_Off" + image_selected="DropDown_Selected" + image_disabled="DropDown_Disabled" + image_disabled_selected="DropDown_Disabled_Selected" /> + <combo_box.combo_list bg_writeable_color="MenuDefaultBgColor" /> <combo_box.combo_editor name="Combo Text Entry" select_on_focus="true" - font="SansSerifSmall"/> + font="SansSerifSmall" /> </combo_box> diff --git a/indra/newview/skins/default/xui/en/widgets/drop_down.xml b/indra/newview/skins/default/xui/en/widgets/drop_down.xml index c35d15ec92..602250ace6 100644 --- a/indra/newview/skins/default/xui/en/widgets/drop_down.xml +++ b/indra/newview/skins/default/xui/en/widgets/drop_down.xml @@ -2,19 +2,19 @@ <drop_down text_enabled_color="LabelTextColor" text_disabled_color="LabelDisabledColor" font="SansSerifSmall" - allow_text_entry="false" + allow_text_entry="false" follows="left|top"> <drop_down.combo_button name="Combobox Button" hover_glow_amount="0.15" font="SansSerifSmall" halign="left" scale_image="true" - image_unselected="square_btn_32x128.tga" - image_selected="square_btn_selected_32x128.tga" - image_disabled="square_btn_32x128.tga" - image_disabled_selected="square_btn_selected_32x128.tga" - image_overlay="combobox_arrow.tga" - image_overlay_alignment="right"/> - <drop_down.combo_list bg_writeable_color="white"/> - <drop_down.combo_editor name="Combo Text Entry" visible="false" select_on_focus="true"/> + image_unselected="PushButton_Off" + image_selected="PushButton_Selected" + image_disabled="PushButton_Disabled" + image_disabled_selected="PushButton_Disabled_Selected" + image_overlay="Combobox_Over" + image_overlay_alignment="right" /> + <drop_down.combo_list bg_writeable_color="white" /> + <drop_down.combo_editor name="Combo Text Entry" visible="false" select_on_focus="true" /> </drop_down> diff --git a/indra/newview/skins/default/xui/en/widgets/filter_editor.xml b/indra/newview/skins/default/xui/en/widgets/filter_editor.xml new file mode 100644 index 0000000000..f77aa396ec --- /dev/null +++ b/indra/newview/skins/default/xui/en/widgets/filter_editor.xml @@ -0,0 +1,7 @@ +<?xml version="1.0" encoding="utf-8" standalone="yes" ?>
+<filter_editor select_on_focus="true"
+ background="TextField_Search_Off" >
+ <clear_filter_button label=""
+ image_unselected="Icon_Close_Foreground"
+ image_selected="Icon_Close_Press" />
+</filter_editor>
diff --git a/indra/newview/skins/default/xui/en/widgets/flyout_button.xml b/indra/newview/skins/default/xui/en/widgets/flyout_button.xml index e0033058c8..a5043c5c14 100644 --- a/indra/newview/skins/default/xui/en/widgets/flyout_button.xml +++ b/indra/newview/skins/default/xui/en/widgets/flyout_button.xml @@ -1,13 +1,12 @@ <?xml version="1.0" encoding="utf-8" standalone="yes" ?> <flyout_button list_position="below"> <action_button scale_image="true" - image_selected="flyout_btn_left_selected.tga" - image_unselected="flyout_btn_left.tga" - image_disabled="flyout_btn_left_disabled.tga"/> - <combo_button image_selected="flyout_btn_right_selected.tga" - image_unselected="flyout_btn_right.tga" - image_disabled="flyout_btn_right_disabled.tga" + image_selected="SegmentedBtn_Left_Selected" + image_unselected="SegmentedBtn_Left_Off" + image_disabled="SegmentedBtn_Left_Disabled"/> + <combo_button image_selected="ComboButton_Selected" + image_unselected="ComboButton_Off" + image_disabled="ComboButton_Disabled" pad_right="6" tab_stop="false"/> -</flyout_button> - +</flyout_button>
\ No newline at end of file diff --git a/indra/newview/skins/default/xui/en/widgets/gesture_combo_box.xml b/indra/newview/skins/default/xui/en/widgets/gesture_combo_box.xml new file mode 100644 index 0000000000..45b1e1eb9f --- /dev/null +++ b/indra/newview/skins/default/xui/en/widgets/gesture_combo_box.xml @@ -0,0 +1,29 @@ +<?xml version="1.0" encoding="utf-8" standalone="yes" ?> +<combo_box font="SansSerifSmall" + list_position="below" + max_chars="20" + follows="right|top"> + <combo_box.combo_button name="Combobox Button" + label="" + hover_glow_amount="0.15" + font="SansSerifSmall" + scale_image="true" + image_unselected="ComboButton_Off" + image_selected="ComboButton_Selected" + image_disabled="ComboButton_Disabled" + image_disabled_selected="ComboButton_Disabled_Selected" /> + <combo_box.drop_down_button name="Drop Down Button" + label="" + hover_glow_amount="0.15" + font="SansSerifSmall" + scale_image="true" + pad_right="24" + image_unselected="DropDown_Off" + image_selected="DropDown_Selected" + image_disabled="DropDown_Disabled" + image_disabled_selected="DropDown_Disabled_Selected" /> + <combo_box.combo_list bg_writeable_color="white" /> + <combo_box.combo_editor name="Combo Text Entry" + select_on_focus="true" + font="SansSerifSmall" /> +</combo_box> diff --git a/indra/newview/skins/default/xui/en/widgets/line_editor.xml b/indra/newview/skins/default/xui/en/widgets/line_editor.xml index 11081ae308..08205cacbc 100644 --- a/indra/newview/skins/default/xui/en/widgets/line_editor.xml +++ b/indra/newview/skins/default/xui/en/widgets/line_editor.xml @@ -1,18 +1,19 @@ <?xml version="1.0" encoding="utf-8" standalone="yes" ?> -<line_editor background_image="sm_rounded_corners_simple.tga" +<line_editor + background_image="TextField_Off" + background_image_disabled="TextField_Disabled" + background_image_focused="TextField_Active" select_on_focus="false" handle_edit_keys_directly="false" commit_on_focus_lost="true" ignore_tab="true" cursor_color="TextCursorColor" text_color="TextFgColor" - text_readonly_color="TextFgReadOnlyColor" + text_readonly_color="Green" text_tentative_color="TextFgTentativeColor" - bg_readonly_color="TextBgReadOnlyColor" - bg_writeable_color="TextBgWriteableColor" - bg_focus_color="TextBgFocusColor" + highlight_color="EmphasisColor" + preedit_bg_color="White" mouse_opaque="true" name="line_editor" font="SansSerifSmall"> - <line_editor.border bevel_style="in"/> </line_editor> 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"
+ />
diff --git a/indra/newview/skins/default/xui/en/widgets/location_input.xml b/indra/newview/skins/default/xui/en/widgets/location_input.xml index 32f5a18d1c..eb9bb99b20 100644 --- a/indra/newview/skins/default/xui/en/widgets/location_input.xml +++ b/indra/newview/skins/default/xui/en/widgets/location_input.xml @@ -3,64 +3,48 @@ *TODO: Replace hardcoded buttons width/height with getting this info from the button images. Currently that doesn't work because LLUIImage::getWidth/getHeight() return 1 for the images. --> + + + <location_input font="SansSerifSmall" - add_landmark_image_enabled="icon_event_adult.tga" - add_landmark_image_disabled="icon_event.tga" - add_landmark_hpad="4" - allow_text_entry="true" - arrow_image="combobox_arrow.tga" - list_position="below" - show_text_as_tentative="false" - max_chars="20" - follows="left|top"> - <location_input.background name="Background" - visible="true" - label="" - follows="left|top|right" - image_unselected="navbar_bg_center.tga" - image_selected="navbar_bg_center.tga" - image_disabled="navbar_bg_center.tga" - image_disabled_selected="navbar_bg_center.tga" - image_hover_selected="navbar_bg_center.tga" - image_hover_unselected="navbar_bg_center.tga" /> - <location_input.info_button name="Place Information" + add_landmark_image_enabled="Favorite_Star_Active" + add_landmark_image_disabled="Favorite_Star_Off" + hover_glow_amount="0.15" + add_landmark_hpad="2" + allow_text_entry="true" + list_position="below" + show_text_as_tentative="false" + max_chars="20" + follows="left|top" + > + <info_button name="Place Information" label="" tool_tip="About current location" - width="20" - height="20" + width="16" + height="16" follows="left|top" - image_overlay="map_infohub.tga" - image_unselected="navbar_bg_left.tga" - image_selected="navbar_bg_left.tga" - image_hover_selected="navbar_bg_left.tga" - image_hover_unselected="navbar_bg_left.tga" - image_disabled_selected="navbar_bg_left.tga" - image_disabled="navbar_bg_left.tga" /> - <location_input.add_landmark_button name="Add Landmark" + hover_glow_amount="0.15" + image_unselected="Info_Off" + image_selected="Info_Off" + image_disabled_selected="Info_Off" + image_disabled="Info_Off" /> + <add_landmark_button name="Add Landmark" label="" width="16" height="16" tool_tip="Add to My Landmarks" follows="right|top" scale_image="false" /> - <location_input.combo_button name="Location History" + <combo_button name="Location History" label="" - tool_tip="My Location History" - width="20" - height="20" - image_overlay="navbar_history.tga" - image_overlay_alignment="center" - image_unselected="navbar_bg_right.tga" - image_selected="navbar_bg_right.tga" - image_disabled="navbar_bg_right.tga" - image_disabled_selected="navbar_bg_right.tga" - image_hover_selected="navbar_bg_right.tga" - image_hover_unselected="navbar_bg_right.tga" /> - <location_input.combo_list bg_writeable_color="white"/> - <location_input.combo_editor name="Combo Text Entry" - select_on_focus="true" - font="SansSerifSmall" - bevel_style="none" - border_style="line" - border_thickness="0" /> + pad_right="0" + tool_tip="My Location History"/> + <combo_list bg_writeable_color="MenuDefaultBgColor"/> + <combo_editor name="Combo Text Entry" + text_pad_left="20" + select_on_focus="true" + font="SansSerifSmall" + bevel_style="none" + border_style="line" + border.border_thickness="0"/> </location_input> diff --git a/indra/newview/skins/default/xui/en/widgets/output_monitor.xml b/indra/newview/skins/default/xui/en/widgets/output_monitor.xml new file mode 100644 index 0000000000..2f6d808125 --- /dev/null +++ b/indra/newview/skins/default/xui/en/widgets/output_monitor.xml @@ -0,0 +1,9 @@ +<?xml version="1.0" encoding="utf-8" standalone="yes" ?> +<output_monitor + image_mute="mute_icon.tga" + image_off="icn_voice_ptt-off.tga" + image_on="icn_voice_ptt-on.tga" + image_level_1="icn_voice_ptt-on-lvl1.tga" + image_level_2="icn_voice_ptt-on-lvl2.tga" + image_level_3="icn_voice_ptt-on-lvl3.tga" + /> diff --git a/indra/newview/skins/default/xui/en/widgets/progress_bar.xml b/indra/newview/skins/default/xui/en/widgets/progress_bar.xml index 3344de06b0..39cd464872 100644 --- a/indra/newview/skins/default/xui/en/widgets/progress_bar.xml +++ b/indra/newview/skins/default/xui/en/widgets/progress_bar.xml @@ -1,6 +1,6 @@ <?xml version="1.0" encoding="utf-8" standalone="yes" ?> -<progress_bar image_bar="rounded_square.tga" - image_fill="progressbar_fill.tga" +<progress_bar image_bar="ProgressTrack" + image_fill="ProgressBar" image_shadow="rounded_square_soft.tga" color_bar.red="0.5764" color_bar.green="0.6627" diff --git a/indra/newview/skins/default/xui/en/widgets/radio_group.xml b/indra/newview/skins/default/xui/en/widgets/radio_group.xml index 2d851042a5..ad7ef5bffc 100644 --- a/indra/newview/skins/default/xui/en/widgets/radio_group.xml +++ b/indra/newview/skins/default/xui/en/widgets/radio_group.xml @@ -1,6 +1,6 @@ <?xml version="1.0" encoding="utf-8" standalone="yes" ?> -<radio_group draw_border="true" +<radio_group draw_border="false" name="radio_group" - mouse_opaque="true" + mouse_opaque="false" follows="left|top" font="SansSerifSmall"/> diff --git a/indra/newview/skins/default/xui/en/widgets/radio_item.xml b/indra/newview/skins/default/xui/en/widgets/radio_item.xml index 0a27ca509b..281a55d5e2 100644 --- a/indra/newview/skins/default/xui/en/widgets/radio_item.xml +++ b/indra/newview/skins/default/xui/en/widgets/radio_item.xml @@ -2,8 +2,9 @@ <radio_item follows="left|top"> <radio_item.label_text name="Radio Item label"/> <radio_item.check_button name="Radio control button" - image_unselected="radio_active_false.tga" - image_selected="radio_active_true.tga" - image_disabled="radio_inactive_false.tga" - image_disabled_selected="radio_inactive_true.tga"/> + image_unselected="RadioButton_Off" + image_selected="RadioButton_On" + image_disabled="RadioButton_Disabled" + image_disabled_selected="RadioButton_On_Disabled"/> </radio_item> + diff --git a/indra/newview/skins/default/xui/en/widgets/scroll_bar.xml b/indra/newview/skins/default/xui/en/widgets/scroll_bar.xml index a6c9a56dfd..3b195c6b33 100644 --- a/indra/newview/skins/default/xui/en/widgets/scroll_bar.xml +++ b/indra/newview/skins/default/xui/en/widgets/scroll_bar.xml @@ -1,19 +1,23 @@ <?xml version="1.0" encoding="utf-8" standalone="yes" ?> -<scroll_bar thumb_image="rounded_square.tga" - track_image="rounded_square.tga" - track_color="ScrollbarTrackColor" +<scroll_bar thumb_image="ScrollThumb_Vert" + track_image="ScrollTrack_Vert" + track_color="ScrollbarTrackColor" thumb_color="ScrollbarThumbColor" - thickness="16"> - <up_button image_unselected="scrollbutton_up_out_blue.tga" - image_selected="scrollbutton_up_in_blue.tga" - scale_image="true"/> - <down_button image_unselected="scrollbutton_down_out_blue.tga" - image_selected="scrollbutton_down_in_blue.tga" - scale_image="true"/> - <left_button image_unselected="scrollbutton_left_out_blue.tga" - image_selected="scrollbutton_left_in_blue.tga" - scale_image="true"/> - <right_button image_unselected="scrollbutton_right_out_blue.tga" - image_selected="scrollbutton_right_in_blue.tga" - scale_image="true"/> + thickness="15"> + <up_button image_unselected="ScrollArrow_Up" + image_selected="ScrollArrow_Up" + scale_image="true" thickness="15" + hover_glow_amount="0.15"/> + <down_button image_unselected="ScrollArrow_Down" + image_selected="ScrollArrow_Down" + scale_image="true" thickness="15" + hover_glow_amount="0.15"/> + <left_button image_unselected="ScrollArrow_Left" + image_selected="ScrollArrow_Left" + scale_image="true" thickness="15" + hover_glow_amount="0.15"/> + <right_button image_unselected="ScrollArrow_Right" + image_selected="ScrollArrow_Right" + scale_image="true" thickness="15" + hover_glow_amount="0.15"/> </scroll_bar> diff --git a/indra/newview/skins/default/xui/en/widgets/scroll_list.xml b/indra/newview/skins/default/xui/en/widgets/scroll_list.xml index 9e2c52acca..e3a53eee4d 100644 --- a/indra/newview/skins/default/xui/en/widgets/scroll_list.xml +++ b/indra/newview/skins/default/xui/en/widgets/scroll_list.xml @@ -4,7 +4,7 @@ bg_selected_color="ScrollSelectedBGColor" fg_disable_color="ScrollDisabledColor" bg_writeable_color="ScrollBgWriteableColor" - bg_read_only_color="ScrollBgReadOnlyColor" + bg_readonly_color="ScrollBgReadOnlyColor" bg_stripe_color="ScrollBGStripeColor" hovered_color="ScrollHoveredColor" highlighted_color="ScrollHighlightedColor" diff --git a/indra/newview/skins/default/xui/en/widgets/search_editor.xml b/indra/newview/skins/default/xui/en/widgets/search_editor.xml index 10080e5e39..6f557e239d 100644 --- a/indra/newview/skins/default/xui/en/widgets/search_editor.xml +++ b/indra/newview/skins/default/xui/en/widgets/search_editor.xml @@ -1,6 +1,10 @@ <?xml version="1.0" encoding="utf-8" standalone="yes" ?> -<search_editor select_on_focus="true"> - <clear_search_button image_unselected="icn_clear_lineeditor.tga" - image_selected="close_inactive_blue.tga" - image_color="TextFgTentativeColor"/> +<search_editor + select_on_focus="true" + background_image="TextField_Search_Off" + background_image_disabled="TextField_Search_Disabled" + background_image_focused="TextField_Search_Active" > + <search_button label="" + image_unselected="Search" + image_selected="Search" /> </search_editor> diff --git a/indra/newview/skins/default/xui/en/widgets/side_tray.xml b/indra/newview/skins/default/xui/en/widgets/side_tray.xml index e3b70ba6e2..8b4a5afbe9 100644 --- a/indra/newview/skins/default/xui/en/widgets/side_tray.xml +++ b/indra/newview/skins/default/xui/en/widgets/side_tray.xml @@ -1,8 +1,8 @@ -<?xml version="1.0" encoding="utf-8" standalone="yes" ?>
-<side_tray tab_btn_image="sidebar_tab_left.tga"
- tab_btn_image_selected="sidebar_tab_left_selected.tga"
- tab_btn_width = "32"
- tab_btn_height = "32"
- tab_btn_margin = "0"
- >
-</side_tray>
+<?xml version="1.0" encoding="utf-8" standalone="yes" ?> +<side_tray tab_btn_image="TaskPanel_Tab_Off" + tab_btn_image_selected="TaskPanel_Tab_Selected" + tab_btn_width="32" + tab_btn_height="40" + tab_btn_margin="1" + > +</side_tray> diff --git a/indra/newview/skins/default/xui/en/widgets/simple_text_editor.xml b/indra/newview/skins/default/xui/en/widgets/simple_text_editor.xml index 20af3bb58f..960c4e81e5 100644 --- a/indra/newview/skins/default/xui/en/widgets/simple_text_editor.xml +++ b/indra/newview/skins/default/xui/en/widgets/simple_text_editor.xml @@ -1,11 +1,23 @@ <?xml version="1.0" encoding="utf-8" standalone="yes" ?> -<simple_text_editor cursor_color="TextCursorColor" - default_color="TextDefaultColor" - text_color="TextFgColor" - text_readonly_color="TextFgReadOnlyColor" - bg_readonly_color="TextBgReadOnlyColor" - bg_writeable_color="TextBgWriteableColor" - bg_focus_color="TextBgFocusColor" - hide_border="false" - hide_scrollbar="false" - font="SansSerif"/> +<simple_text_editor + mouse_opaque="true" + font="SansSerifSmall" + max_length="255" + embedded_items="false" + hide_scrollbar="false" + hide_border="true" + word_wrap="false" + ignore_tab="true" + track_bottom="false" + takes_non_scroll_clicks="true" + cursor_color="TextCursorColor" + default_color="TextDefaultColor" + text_color="TextFgColor" + text_readonly_color="TextFgReadOnlyColor" + bg_readonly_color="TextBgReadOnlyColor" + bg_writeable_color="TextBgWriteableColor" + bg_focus_color="TextBgFocusColor"> + <simple_text_editor.border + bevel_style="in" + follows="all" /> +</simple_text_editor> diff --git a/indra/newview/skins/default/xui/en/widgets/slider_bar.xml b/indra/newview/skins/default/xui/en/widgets/slider_bar.xml index ba9ad21cc0..b33acf81cc 100644 --- a/indra/newview/skins/default/xui/en/widgets/slider_bar.xml +++ b/indra/newview/skins/default/xui/en/widgets/slider_bar.xml @@ -2,6 +2,6 @@ <slider_bar track_color="SliderTrackColor" thumb_outline_color="SliderThumbOutlineColor" thumb_center_color="SliderThumbCenterColor" - thumb_image="icn_slide-thumb_dark.tga" - track_image="icn_slide-groove_dark.tga" - track_highlight_image="icn_slide-highlight.tga"/> + thumb_image="SliderThumb_Off" + track_image="SliderTrack_Horiz" + track_highlight_image="SliderTrack_Horiz" /> diff --git a/indra/newview/skins/default/xui/en/widgets/spinner.xml b/indra/newview/skins/default/xui/en/widgets/spinner.xml index 29bf1e8052..7d1a5118cb 100644 --- a/indra/newview/skins/default/xui/en/widgets/spinner.xml +++ b/indra/newview/skins/default/xui/en/widgets/spinner.xml @@ -1,5 +1,16 @@ <?xml version="1.0" encoding="utf-8" standalone="yes" ?> <spinner text_enabled_color="LabelTextColor" text_disabled_color="LabelDisabledColor" - decimal_digits="3" - label_width="40"/>
\ No newline at end of file + decimal_digits="3" + label_width="40" > + <spinner.up_button name="SpinCtrl Up" + image_unselected="Stepper_Up_Off" + image_selected="Stepper_Up_Press" + tab_stop="false" + follows="left|bottom" /> + <spinner.down_button name="SpinCtrl Down" + image_unselected="Stepper_Down_Off" + image_selected="Stepper_Down_Press" + tab_stop="false" + follows="left|bottom" /> +</spinner>
\ No newline at end of file diff --git a/indra/newview/skins/default/xui/en/widgets/tab_container.xml b/indra/newview/skins/default/xui/en/widgets/tab_container.xml index 8245e5ff23..7aad55fb37 100644 --- a/indra/newview/skins/default/xui/en/widgets/tab_container.xml +++ b/indra/newview/skins/default/xui/en/widgets/tab_container.xml @@ -1,9 +1,9 @@ <?xml version="1.0" encoding="utf-8" standalone="yes" ?> <tab_container tab_min_width="60" tab_max_width="150" - tab_top_image_unselected="tab_top_blue.tga" - tab_top_image_selected="tab_top_selected_blue.tga" + tab_top_image_unselected="TabTop_Middle_Off" + tab_top_image_selected="TabTop_Middle_Selected" tab_bottom_image_unselected="tab_bottom_blue.tga" tab_bottom_image_selected="tab_bottom_selected_blue.tga" - tab_left_image_unselected="tab_left.tga" - tab_left_image_selected="tab_left_selected.tga"/>
\ No newline at end of file + tab_left_image_unselected="TabTop_Left_Off" + tab_left_image_selected="TabTop_Left_Selected"/>
\ No newline at end of file diff --git a/indra/newview/skins/default/xui/en/widgets/text_editor.xml b/indra/newview/skins/default/xui/en/widgets/text_editor.xml index dc4c430546..deaade04f8 100644 --- a/indra/newview/skins/default/xui/en/widgets/text_editor.xml +++ b/indra/newview/skins/default/xui/en/widgets/text_editor.xml @@ -1,19 +1,4 @@ <?xml version="1.0" encoding="utf-8" standalone="yes" ?> -<line_editor background_image="sm_rounded_corners_simple.tga" - select_on_focus="false" - handle_edit_keys_directly="false" - commit_on_focus_lost="true" - ignore_tab="true" - cursor_color="TextCursorColor" - text_color="TextFgColor" - text_readonly_color="TextFgReadOnlyColor" - text_tentative_color="TextFgTentativeColor" - bg_readonly_color="TextBgReadOnlyColor" - bg_writeable_color="TextBgWriteableColor" - bg_focus_color="TextBgFocusColor" - mouse_opaque="true" - name="line_editor" - font="SansSerifSmall"> - <line_editor.border bevel_style="in" - follows="all"/> -</line_editor> +<!-- Core parameters are in simple_text_editor.xml --> +<text_editor + allow_html="false" /> diff --git a/indra/newview/skins/default/xui/fr/menu_viewer.xml b/indra/newview/skins/default/xui/fr/menu_viewer.xml index 959cc5764c..98f08452ff 100644 --- a/indra/newview/skins/default/xui/fr/menu_viewer.xml +++ b/indra/newview/skins/default/xui/fr/menu_viewer.xml @@ -120,10 +120,10 @@ <menu_item_call label="Reprendre le contrôle" name="Release Keys"/> <menu_item_separator label="-----------" name="separator4"/> <menu_item_call label="Historique de mon compte..." name="Account History..."> - <on_click name="AccountHistory_url" userdata="WebLaunchAccountHistory,http://secondlife.com/account/transactions.php?lang=fr"/> + <menu_item_call.on_click name="AccountHistory_url" userdata="WebLaunchAccountHistory,http://secondlife.com/account/transactions.php?lang=fr"/> </menu_item_call> <menu_item_call label="Gérer mon compte..." name="Manage My Account..."> - <on_click name="ManageMyAccount_url" userdata="WebLaunchJoinNow,http://secondlife.com/account/index.php?lang=fr"/> + <menu_item_call.on_click name="ManageMyAccount_url" userdata="WebLaunchJoinNow,http://secondlife.com/account/index.php?lang=fr"/> </menu_item_call> <menu_item_call label="Acheter des L$..." name="Buy and Sell L$..."/> <menu_item_separator label="-----------" name="separator5"/> @@ -169,7 +169,9 @@ <menu_item_separator label="-----------" name="separator4"/> <menu_item_call label="Mise au point sur la sélection" name="Focus on Selection"/> <menu_item_call label="Zoom sur la sélection" name="Zoom to Selection"/> - <menu_item_call label="Acheter l'objet" name="Menu Object Take"/> + <menu_item_call label="Acheter l'objet" name="Menu Object Take"> + <menu_item_call.on_enable parameter="Acheter,Prendre" name="EnableBuyOrTake"/> + </menu_item_call> <menu_item_call label="Prendre une copie" name="Take Copy"/> <menu_item_call label="Remplacer l'objet dans le contenu de l'objet" name="Save Object Back to Object Contents"/> <menu_item_separator label="-----------" name="separator6"/> @@ -189,7 +191,7 @@ <menu_item_call label="Blog officiel..." name="Official Linden Blog..."/> <menu_item_separator label="-----------" name="separator2"/> <menu_item_call label="Aide sur le LSL..." name="Scripting Portal..."> - <on_click name="ScriptingPortal_url" userdata="WebLaunchLSLWiki,http://wiki.secondlife.com/wiki/LSL_Portal/fr" /> + <menu_item_call.on_click name="ScriptingPortal_url" userdata="WebLaunchLSLWiki,http://wiki.secondlife.com/wiki/LSL_Portal/fr" /> </menu_item_call> <menu_item_separator label="-----------" name="separator3"/> <menu_item_call label="Signaler une infraction..." name="Report Abuse..."/> @@ -199,14 +201,14 @@ <menu label="Signaler des bugs" name="Bug Reporting"> <menu_item_call label="Ouvrir un JIRA..." name="Public Issue Tracker..."/> <menu_item_call label="Comment utiliser JIRA ?" name="Publc Issue Tracker Help..."> - <on_click name="PublicIssueTrackerHelp_url" userdata="WebLaunchPublicIssueHelp,http://wiki.secondlife.com/wiki/Issue_tracker/fr" /> + <menu_item_call.on_click name="PublicIssueTrackerHelp_url" userdata="WebLaunchPublicIssueHelp,http://wiki.secondlife.com/wiki/Issue_tracker/fr" /> </menu_item_call> <menu_item_separator label="-----------" name="separator7"/> <menu_item_call label="Comment signaler des bugs ?" name="Bug Reporing 101..."> - <on_click name="BugReporting101_url" userdata="WebLaunchBugReport101,http://wiki.secondlife.com/wiki/Bug_Reporting_101/fr"/> + <menu_item_call.on_click name="BugReporting101_url" userdata="WebLaunchBugReport101,http://wiki.secondlife.com/wiki/Bug_Reporting_101/fr"/> </menu_item_call> <menu_item_call label="Comment signaler un problème de sécurité ?" name="Security Issues..."> - <on_click name="SecurityIssues_url" userdata="WebLaunchSecurityIssues,http://wiki.secondlife.com/wiki/Security_issues/fr"/> + <menu_item_call.on_click name="SecurityIssues_url" userdata="WebLaunchSecurityIssues,http://wiki.secondlife.com/wiki/Security_issues/fr"/> </menu_item_call> <menu_item_call label="Wiki Assurance Qualité…" name="QA Wiki..."/> <menu_item_separator label="-----------" name="separator9"/> |
