diff options
author | Jacek Antonelli | 2009-05-30 23:47:17 -0500 |
---|---|---|
committer | Jacek Antonelli | 2009-05-30 23:47:17 -0500 |
commit | 45beb0b1d8a16522dfc33894f4b69ee9a4b33efc (patch) | |
tree | a97bc1c5898eba957e4031d03b36324373fbd8f4 /linden/indra | |
parent | Scripting Guide was removed in 1.22. (diff) | |
download | meta-impy-45beb0b1d8a16522dfc33894f4b69ee9a4b33efc.zip meta-impy-45beb0b1d8a16522dfc33894f4b69ee9a4b33efc.tar.gz meta-impy-45beb0b1d8a16522dfc33894f4b69ee9a4b33efc.tar.bz2 meta-impy-45beb0b1d8a16522dfc33894f4b69ee9a4b33efc.tar.xz |
Converted more files to Unix line endings.
linden/LICENSE-libraries-win32.txt
linden/indra/newview/SecondLife.nib/objects.xib
linden/indra/newview/app_settings/cmd_line.xml
linden/indra/newview/installers/windows/FILES_ARE_UNICODE_UTF-16LE.txt
linden/indra/newview/skins/default/html/en-us/loading/loading.html
Diffstat (limited to 'linden/indra')
4 files changed, 611 insertions, 611 deletions
diff --git a/linden/indra/newview/SecondLife.nib/objects.xib b/linden/indra/newview/SecondLife.nib/objects.xib index 07af643..553b6f3 100644 --- a/linden/indra/newview/SecondLife.nib/objects.xib +++ b/linden/indra/newview/SecondLife.nib/objects.xib | |||
@@ -1,259 +1,259 @@ | |||
1 | <?xml version="1.0" standalone="yes"?> | 1 | <?xml version="1.0" standalone="yes"?> |
2 | <object class="NSIBObjectData"> | 2 | <object class="NSIBObjectData"> |
3 | <string name="targetFramework">IBCarbonFramework</string> | 3 | <string name="targetFramework">IBCarbonFramework</string> |
4 | <object name="rootObject" class="NSCustomObject" id="1"> | 4 | <object name="rootObject" class="NSCustomObject" id="1"> |
5 | <string name="customClass">NSApplication</string> | 5 | <string name="customClass">NSApplication</string> |
6 | </object> | 6 | </object> |
7 | <array count="31" name="allObjects"> | 7 | <array count="31" name="allObjects"> |
8 | <object class="IBCarbonMenu" id="29"> | 8 | <object class="IBCarbonMenu" id="29"> |
9 | <string name="title">Imprudence</string> | 9 | <string name="title">Imprudence</string> |
10 | <array count="4" name="items"> | 10 | <array count="4" name="items"> |
11 | <object class="IBCarbonMenuItem" id="182"> | 11 | <object class="IBCarbonMenuItem" id="182"> |
12 | <string name="title">Imprudence</string> | 12 | <string name="title">Imprudence</string> |
13 | <object name="submenu" class="IBCarbonMenu" id="181"> | 13 | <object name="submenu" class="IBCarbonMenu" id="181"> |
14 | <string name="title">Imprudence</string> | 14 | <string name="title">Imprudence</string> |
15 | <array count="1" name="items"> | 15 | <array count="1" name="items"> |
16 | <object class="IBCarbonMenuItem" id="183"> | 16 | <object class="IBCarbonMenuItem" id="183"> |
17 | <boolean name="disabled">TRUE</boolean> | 17 | <boolean name="disabled">TRUE</boolean> |
18 | <boolean name="updateSingleItem">TRUE</boolean> | 18 | <boolean name="updateSingleItem">TRUE</boolean> |
19 | <string name="title">About Imprudence</string> | 19 | <string name="title">About Imprudence</string> |
20 | <int name="keyEquivalentModifier">0</int> | 20 | <int name="keyEquivalentModifier">0</int> |
21 | <ostype name="command">abou</ostype> | 21 | <ostype name="command">abou</ostype> |
22 | </object> | 22 | </object> |
23 | </array> | 23 | </array> |
24 | <string name="name">_NSAppleMenu</string> | 24 | <string name="name">_NSAppleMenu</string> |
25 | </object> | 25 | </object> |
26 | </object> | 26 | </object> |
27 | <object class="IBCarbonMenuItem" id="127"> | 27 | <object class="IBCarbonMenuItem" id="127"> |
28 | <string name="title">File</string> | 28 | <string name="title">File</string> |
29 | <object name="submenu" class="IBCarbonMenu" id="131"> | 29 | <object name="submenu" class="IBCarbonMenu" id="131"> |
30 | <string name="title">File</string> | 30 | <string name="title">File</string> |
31 | </object> | 31 | </object> |
32 | </object> | 32 | </object> |
33 | <object class="IBCarbonMenuItem" id="152"> | 33 | <object class="IBCarbonMenuItem" id="152"> |
34 | <string name="title">Edit</string> | 34 | <string name="title">Edit</string> |
35 | <object name="submenu" class="IBCarbonMenu" id="147"> | 35 | <object name="submenu" class="IBCarbonMenu" id="147"> |
36 | <string name="title">Edit</string> | 36 | <string name="title">Edit</string> |
37 | <array count="10" name="items"> | 37 | <array count="10" name="items"> |
38 | <object class="IBCarbonMenuItem" id="141"> | 38 | <object class="IBCarbonMenuItem" id="141"> |
39 | <boolean name="updateSingleItem">TRUE</boolean> | 39 | <boolean name="updateSingleItem">TRUE</boolean> |
40 | <string name="title">Undo</string> | 40 | <string name="title">Undo</string> |
41 | <string name="keyEquivalent">z</string> | 41 | <string name="keyEquivalent">z</string> |
42 | <ostype name="command">undo</ostype> | 42 | <ostype name="command">undo</ostype> |
43 | </object> | 43 | </object> |
44 | <object class="IBCarbonMenuItem" id="146"> | 44 | <object class="IBCarbonMenuItem" id="146"> |
45 | <boolean name="updateSingleItem">TRUE</boolean> | 45 | <boolean name="updateSingleItem">TRUE</boolean> |
46 | <string name="title">Redo</string> | 46 | <string name="title">Redo</string> |
47 | <string name="keyEquivalent">Z</string> | 47 | <string name="keyEquivalent">Z</string> |
48 | <ostype name="command">redo</ostype> | 48 | <ostype name="command">redo</ostype> |
49 | </object> | 49 | </object> |
50 | <object class="IBCarbonMenuItem" id="142"> | 50 | <object class="IBCarbonMenuItem" id="142"> |
51 | <boolean name="separator">TRUE</boolean> | 51 | <boolean name="separator">TRUE</boolean> |
52 | </object> | 52 | </object> |
53 | <object class="IBCarbonMenuItem" id="143"> | 53 | <object class="IBCarbonMenuItem" id="143"> |
54 | <boolean name="updateSingleItem">TRUE</boolean> | 54 | <boolean name="updateSingleItem">TRUE</boolean> |
55 | <string name="title">Cut</string> | 55 | <string name="title">Cut</string> |
56 | <string name="keyEquivalent">x</string> | 56 | <string name="keyEquivalent">x</string> |
57 | <ostype name="command">cut </ostype> | 57 | <ostype name="command">cut </ostype> |
58 | </object> | 58 | </object> |
59 | <object class="IBCarbonMenuItem" id="149"> | 59 | <object class="IBCarbonMenuItem" id="149"> |
60 | <boolean name="updateSingleItem">TRUE</boolean> | 60 | <boolean name="updateSingleItem">TRUE</boolean> |
61 | <string name="title">Copy</string> | 61 | <string name="title">Copy</string> |
62 | <string name="keyEquivalent">c</string> | 62 | <string name="keyEquivalent">c</string> |
63 | <ostype name="command">copy</ostype> | 63 | <ostype name="command">copy</ostype> |
64 | </object> | 64 | </object> |
65 | <object class="IBCarbonMenuItem" id="144"> | 65 | <object class="IBCarbonMenuItem" id="144"> |
66 | <boolean name="updateSingleItem">TRUE</boolean> | 66 | <boolean name="updateSingleItem">TRUE</boolean> |
67 | <string name="title">Paste</string> | 67 | <string name="title">Paste</string> |
68 | <string name="keyEquivalent">v</string> | 68 | <string name="keyEquivalent">v</string> |
69 | <ostype name="command">past</ostype> | 69 | <ostype name="command">past</ostype> |
70 | </object> | 70 | </object> |
71 | <object class="IBCarbonMenuItem" id="151"> | 71 | <object class="IBCarbonMenuItem" id="151"> |
72 | <boolean name="updateSingleItem">TRUE</boolean> | 72 | <boolean name="updateSingleItem">TRUE</boolean> |
73 | <string name="title">Delete</string> | 73 | <string name="title">Delete</string> |
74 | <ostype name="command">clea</ostype> | 74 | <ostype name="command">clea</ostype> |
75 | </object> | 75 | </object> |
76 | <object class="IBCarbonMenuItem" id="148"> | 76 | <object class="IBCarbonMenuItem" id="148"> |
77 | <boolean name="updateSingleItem">TRUE</boolean> | 77 | <boolean name="updateSingleItem">TRUE</boolean> |
78 | <string name="title">Select All</string> | 78 | <string name="title">Select All</string> |
79 | <string name="keyEquivalent">a</string> | 79 | <string name="keyEquivalent">a</string> |
80 | <ostype name="command">sall</ostype> | 80 | <ostype name="command">sall</ostype> |
81 | </object> | 81 | </object> |
82 | <object class="IBCarbonMenuItem" id="188"> | 82 | <object class="IBCarbonMenuItem" id="188"> |
83 | <boolean name="separator">TRUE</boolean> | 83 | <boolean name="separator">TRUE</boolean> |
84 | </object> | 84 | </object> |
85 | <object class="IBCarbonMenuItem" id="187"> | 85 | <object class="IBCarbonMenuItem" id="187"> |
86 | <boolean name="updateSingleItem">TRUE</boolean> | 86 | <boolean name="updateSingleItem">TRUE</boolean> |
87 | <string name="title">Special Characters…</string> | 87 | <string name="title">Special Characters…</string> |
88 | <ostype name="command">chrp</ostype> | 88 | <ostype name="command">chrp</ostype> |
89 | </object> | 89 | </object> |
90 | </array> | 90 | </array> |
91 | </object> | 91 | </object> |
92 | </object> | 92 | </object> |
93 | <object class="IBCarbonMenuItem" id="153"> | 93 | <object class="IBCarbonMenuItem" id="153"> |
94 | <string name="title">Window</string> | 94 | <string name="title">Window</string> |
95 | <object name="submenu" class="IBCarbonMenu" id="154"> | 95 | <object name="submenu" class="IBCarbonMenu" id="154"> |
96 | <string name="title">Window</string> | 96 | <string name="title">Window</string> |
97 | <array count="6" name="items"> | 97 | <array count="6" name="items"> |
98 | <object class="IBCarbonMenuItem" id="155"> | 98 | <object class="IBCarbonMenuItem" id="155"> |
99 | <boolean name="dynamic">TRUE</boolean> | 99 | <boolean name="dynamic">TRUE</boolean> |
100 | <boolean name="updateSingleItem">TRUE</boolean> | 100 | <boolean name="updateSingleItem">TRUE</boolean> |
101 | <string name="title">Minimize Window</string> | 101 | <string name="title">Minimize Window</string> |
102 | <string name="keyEquivalent">m</string> | 102 | <string name="keyEquivalent">m</string> |
103 | <ostype name="command">mini</ostype> | 103 | <ostype name="command">mini</ostype> |
104 | </object> | 104 | </object> |
105 | <object class="IBCarbonMenuItem" id="184"> | 105 | <object class="IBCarbonMenuItem" id="184"> |
106 | <boolean name="dynamic">TRUE</boolean> | 106 | <boolean name="dynamic">TRUE</boolean> |
107 | <boolean name="updateSingleItem">TRUE</boolean> | 107 | <boolean name="updateSingleItem">TRUE</boolean> |
108 | <string name="title">Minimize All Windows</string> | 108 | <string name="title">Minimize All Windows</string> |
109 | <string name="keyEquivalent">m</string> | 109 | <string name="keyEquivalent">m</string> |
110 | <int name="keyEquivalentModifier">1572864</int> | 110 | <int name="keyEquivalentModifier">1572864</int> |
111 | <ostype name="command">mina</ostype> | 111 | <ostype name="command">mina</ostype> |
112 | </object> | 112 | </object> |
113 | <object class="IBCarbonMenuItem" id="186"> | 113 | <object class="IBCarbonMenuItem" id="186"> |
114 | <boolean name="updateSingleItem">TRUE</boolean> | 114 | <boolean name="updateSingleItem">TRUE</boolean> |
115 | <string name="title">Zoom</string> | 115 | <string name="title">Zoom</string> |
116 | <ostype name="command">zoom</ostype> | 116 | <ostype name="command">zoom</ostype> |
117 | </object> | 117 | </object> |
118 | <object class="IBCarbonMenuItem" id="156"> | 118 | <object class="IBCarbonMenuItem" id="156"> |
119 | <boolean name="separator">TRUE</boolean> | 119 | <boolean name="separator">TRUE</boolean> |
120 | </object> | 120 | </object> |
121 | <object class="IBCarbonMenuItem" id="157"> | 121 | <object class="IBCarbonMenuItem" id="157"> |
122 | <boolean name="dynamic">TRUE</boolean> | 122 | <boolean name="dynamic">TRUE</boolean> |
123 | <boolean name="updateSingleItem">TRUE</boolean> | 123 | <boolean name="updateSingleItem">TRUE</boolean> |
124 | <string name="title">Bring All to Front</string> | 124 | <string name="title">Bring All to Front</string> |
125 | <ostype name="command">bfrt</ostype> | 125 | <ostype name="command">bfrt</ostype> |
126 | </object> | 126 | </object> |
127 | <object class="IBCarbonMenuItem" id="185"> | 127 | <object class="IBCarbonMenuItem" id="185"> |
128 | <boolean name="dynamic">TRUE</boolean> | 128 | <boolean name="dynamic">TRUE</boolean> |
129 | <boolean name="updateSingleItem">TRUE</boolean> | 129 | <boolean name="updateSingleItem">TRUE</boolean> |
130 | <string name="title">Arrange in Front</string> | 130 | <string name="title">Arrange in Front</string> |
131 | <int name="keyEquivalentModifier">1572864</int> | 131 | <int name="keyEquivalentModifier">1572864</int> |
132 | <ostype name="command">frnt</ostype> | 132 | <ostype name="command">frnt</ostype> |
133 | </object> | 133 | </object> |
134 | </array> | 134 | </array> |
135 | <string name="name">_NSWindowsMenu</string> | 135 | <string name="name">_NSWindowsMenu</string> |
136 | </object> | 136 | </object> |
137 | </object> | 137 | </object> |
138 | </array> | 138 | </array> |
139 | <string name="name">_NSMainMenu</string> | 139 | <string name="name">_NSMainMenu</string> |
140 | </object> | 140 | </object> |
141 | <reference idRef="127"/> | 141 | <reference idRef="127"/> |
142 | <reference idRef="131"/> | 142 | <reference idRef="131"/> |
143 | <reference idRef="141"/> | 143 | <reference idRef="141"/> |
144 | <reference idRef="142"/> | 144 | <reference idRef="142"/> |
145 | <reference idRef="143"/> | 145 | <reference idRef="143"/> |
146 | <reference idRef="144"/> | 146 | <reference idRef="144"/> |
147 | <reference idRef="146"/> | 147 | <reference idRef="146"/> |
148 | <reference idRef="147"/> | 148 | <reference idRef="147"/> |
149 | <reference idRef="148"/> | 149 | <reference idRef="148"/> |
150 | <reference idRef="149"/> | 150 | <reference idRef="149"/> |
151 | <reference idRef="151"/> | 151 | <reference idRef="151"/> |
152 | <reference idRef="152"/> | 152 | <reference idRef="152"/> |
153 | <reference idRef="153"/> | 153 | <reference idRef="153"/> |
154 | <reference idRef="154"/> | 154 | <reference idRef="154"/> |
155 | <reference idRef="155"/> | 155 | <reference idRef="155"/> |
156 | <reference idRef="156"/> | 156 | <reference idRef="156"/> |
157 | <reference idRef="157"/> | 157 | <reference idRef="157"/> |
158 | <reference idRef="181"/> | 158 | <reference idRef="181"/> |
159 | <reference idRef="182"/> | 159 | <reference idRef="182"/> |
160 | <reference idRef="183"/> | 160 | <reference idRef="183"/> |
161 | <reference idRef="184"/> | 161 | <reference idRef="184"/> |
162 | <reference idRef="185"/> | 162 | <reference idRef="185"/> |
163 | <reference idRef="186"/> | 163 | <reference idRef="186"/> |
164 | <reference idRef="187"/> | 164 | <reference idRef="187"/> |
165 | <reference idRef="188"/> | 165 | <reference idRef="188"/> |
166 | <object class="IBCarbonRootControl" id="190"> | 166 | <object class="IBCarbonRootControl" id="190"> |
167 | <string name="bounds">0 0 482 694 </string> | 167 | <string name="bounds">0 0 482 694 </string> |
168 | <string name="viewFrame">0 0 694 482 </string> | 168 | <string name="viewFrame">0 0 694 482 </string> |
169 | <array count="2" name="subviews"> | 169 | <array count="2" name="subviews"> |
170 | <object class="IBCarbonButton" id="192"> | 170 | <object class="IBCarbonButton" id="192"> |
171 | <string name="bounds">442 604 462 674 </string> | 171 | <string name="bounds">442 604 462 674 </string> |
172 | <string name="viewFrame">604 442 70 20 </string> | 172 | <string name="viewFrame">604 442 70 20 </string> |
173 | <string name="title">OK</string> | 173 | <string name="title">OK</string> |
174 | <ostype name="command">ok </ostype> | 174 | <ostype name="command">ok </ostype> |
175 | <object name="layoutInfo" class="IBCarbonHILayoutInfo"> | 175 | <object name="layoutInfo" class="IBCarbonHILayoutInfo"> |
176 | <int name="bindingBottomKind">2</int> | 176 | <int name="bindingBottomKind">2</int> |
177 | <int name="bindingRightKind">2</int> | 177 | <int name="bindingRightKind">2</int> |
178 | </object> | 178 | </object> |
179 | <int name="buttonType">1</int> | 179 | <int name="buttonType">1</int> |
180 | </object> | 180 | </object> |
181 | <object class="IBCarbonScrollView" id="201"> | 181 | <object class="IBCarbonScrollView" id="201"> |
182 | <string name="bounds">20 20 422 674 </string> | 182 | <string name="bounds">20 20 422 674 </string> |
183 | <string name="viewFrame">20 20 654 402 </string> | 183 | <string name="viewFrame">20 20 654 402 </string> |
184 | <array count="1" name="subviews"> | 184 | <array count="1" name="subviews"> |
185 | <object class="IBCarbonTextView" id="200"> | 185 | <object class="IBCarbonTextView" id="200"> |
186 | <string name="bounds">20 20 422 659 </string> | 186 | <string name="bounds">20 20 422 659 </string> |
187 | <string name="viewFrame">0 0 639 402 </string> | 187 | <string name="viewFrame">0 0 639 402 </string> |
188 | <ostype name="controlSignature">text</ostype> | 188 | <ostype name="controlSignature">text</ostype> |
189 | <int name="fontStyle">5</int> | 189 | <int name="fontStyle">5</int> |
190 | <boolean name="readOnly">TRUE</boolean> | 190 | <boolean name="readOnly">TRUE</boolean> |
191 | </object> | 191 | </object> |
192 | </array> | 192 | </array> |
193 | <boolean name="scrollHorizontally">FALSE</boolean> | 193 | <boolean name="scrollHorizontally">FALSE</boolean> |
194 | </object> | 194 | </object> |
195 | </array> | 195 | </array> |
196 | </object> | 196 | </object> |
197 | <object class="IBCarbonWindow" id="191"> | 197 | <object class="IBCarbonWindow" id="191"> |
198 | <string name="windowRect">84 72 566 766 </string> | 198 | <string name="windowRect">84 72 566 766 </string> |
199 | <string name="title">Release Notes</string> | 199 | <string name="title">Release Notes</string> |
200 | <reference name="rootControl" idRef="190"/> | 200 | <reference name="rootControl" idRef="190"/> |
201 | <boolean name="receiveUpdates">FALSE</boolean> | 201 | <boolean name="receiveUpdates">FALSE</boolean> |
202 | <boolean name="hasCloseBox">FALSE</boolean> | 202 | <boolean name="hasCloseBox">FALSE</boolean> |
203 | <boolean name="hasCollapseBox">FALSE</boolean> | 203 | <boolean name="hasCollapseBox">FALSE</boolean> |
204 | <boolean name="hasHorizontalZoom">FALSE</boolean> | 204 | <boolean name="hasHorizontalZoom">FALSE</boolean> |
205 | <boolean name="isResizable">FALSE</boolean> | 205 | <boolean name="isResizable">FALSE</boolean> |
206 | <boolean name="hasVerticalZoom">FALSE</boolean> | 206 | <boolean name="hasVerticalZoom">FALSE</boolean> |
207 | <boolean name="liveResize">TRUE</boolean> | 207 | <boolean name="liveResize">TRUE</boolean> |
208 | <boolean name="compositing">TRUE</boolean> | 208 | <boolean name="compositing">TRUE</boolean> |
209 | <int name="carbonWindowClass">4</int> | 209 | <int name="carbonWindowClass">4</int> |
210 | <int name="windowPosition">1</int> | 210 | <int name="windowPosition">1</int> |
211 | <boolean name="isConstrained">FALSE</boolean> | 211 | <boolean name="isConstrained">FALSE</boolean> |
212 | </object> | 212 | </object> |
213 | <reference idRef="192"/> | 213 | <reference idRef="192"/> |
214 | <reference idRef="200"/> | 214 | <reference idRef="200"/> |
215 | <reference idRef="201"/> | 215 | <reference idRef="201"/> |
216 | </array> | 216 | </array> |
217 | <array count="31" name="allParents"> | 217 | <array count="31" name="allParents"> |
218 | <reference idRef="1"/> | 218 | <reference idRef="1"/> |
219 | <reference idRef="29"/> | 219 | <reference idRef="29"/> |
220 | <reference idRef="127"/> | 220 | <reference idRef="127"/> |
221 | <reference idRef="147"/> | 221 | <reference idRef="147"/> |
222 | <reference idRef="147"/> | 222 | <reference idRef="147"/> |
223 | <reference idRef="147"/> | 223 | <reference idRef="147"/> |
224 | <reference idRef="147"/> | 224 | <reference idRef="147"/> |
225 | <reference idRef="147"/> | 225 | <reference idRef="147"/> |
226 | <reference idRef="152"/> | 226 | <reference idRef="152"/> |
227 | <reference idRef="147"/> | 227 | <reference idRef="147"/> |
228 | <reference idRef="147"/> | 228 | <reference idRef="147"/> |
229 | <reference idRef="147"/> | 229 | <reference idRef="147"/> |
230 | <reference idRef="29"/> | 230 | <reference idRef="29"/> |
231 | <reference idRef="29"/> | 231 | <reference idRef="29"/> |
232 | <reference idRef="153"/> | 232 | <reference idRef="153"/> |
233 | <reference idRef="154"/> | 233 | <reference idRef="154"/> |
234 | <reference idRef="154"/> | 234 | <reference idRef="154"/> |
235 | <reference idRef="154"/> | 235 | <reference idRef="154"/> |
236 | <reference idRef="182"/> | 236 | <reference idRef="182"/> |
237 | <reference idRef="29"/> | 237 | <reference idRef="29"/> |
238 | <reference idRef="181"/> | 238 | <reference idRef="181"/> |
239 | <reference idRef="154"/> | 239 | <reference idRef="154"/> |
240 | <reference idRef="154"/> | 240 | <reference idRef="154"/> |
241 | <reference idRef="154"/> | 241 | <reference idRef="154"/> |
242 | <reference idRef="147"/> | 242 | <reference idRef="147"/> |
243 | <reference idRef="147"/> | 243 | <reference idRef="147"/> |
244 | <reference idRef="191"/> | 244 | <reference idRef="191"/> |
245 | <reference idRef="1"/> | 245 | <reference idRef="1"/> |
246 | <reference idRef="190"/> | 246 | <reference idRef="190"/> |
247 | <reference idRef="201"/> | 247 | <reference idRef="201"/> |
248 | <reference idRef="190"/> | 248 | <reference idRef="190"/> |
249 | </array> | 249 | </array> |
250 | <dictionary count="3" name="nameTable"> | 250 | <dictionary count="3" name="nameTable"> |
251 | <string>Files Owner</string> | 251 | <string>Files Owner</string> |
252 | <reference idRef="1"/> | 252 | <reference idRef="1"/> |
253 | <string>MenuBar</string> | 253 | <string>MenuBar</string> |
254 | <reference idRef="29"/> | 254 | <reference idRef="29"/> |
255 | <string>Release Notes</string> | 255 | <string>Release Notes</string> |
256 | <reference idRef="191"/> | 256 | <reference idRef="191"/> |
257 | </dictionary> | 257 | </dictionary> |
258 | <unsigned_int name="nextObjectID">202</unsigned_int> | 258 | <unsigned_int name="nextObjectID">202</unsigned_int> |
259 | </object> | 259 | </object> |
diff --git a/linden/indra/newview/app_settings/cmd_line.xml b/linden/indra/newview/app_settings/cmd_line.xml index db665b7..5f11ed8 100644 --- a/linden/indra/newview/app_settings/cmd_line.xml +++ b/linden/indra/newview/app_settings/cmd_line.xml | |||
@@ -1,337 +1,337 @@ | |||
1 | <?xml version="1.0"?> | 1 | <?xml version="1.0"?> |
2 | <llsd> | 2 | <llsd> |
3 | <map> | 3 | <map> |
4 | <key>help</key> | 4 | <key>help</key> |
5 | <map> | 5 | <map> |
6 | <key>desc</key> | 6 | <key>desc</key> |
7 | <string>display this help message</string> | 7 | <string>display this help message</string> |
8 | 8 | ||
9 | <key>short</key> | 9 | <key>short</key> |
10 | <string>h</string> | 10 | <string>h</string> |
11 | </map> | 11 | </map> |
12 | 12 | ||
13 | <key>port</key> | 13 | <key>port</key> |
14 | <map> | 14 | <map> |
15 | <key>count</key> | 15 | <key>count</key> |
16 | <integer>1</integer> | 16 | <integer>1</integer> |
17 | <key>map-to</key> | 17 | <key>map-to</key> |
18 | <string>UserConnectionPort</string> | 18 | <string>UserConnectionPort</string> |
19 | </map> | 19 | </map> |
20 | 20 | ||
21 | <key>drop</key> | 21 | <key>drop</key> |
22 | <map> | 22 | <map> |
23 | <key>count</key> | 23 | <key>count</key> |
24 | <integer>1</integer> | 24 | <integer>1</integer> |
25 | <key>map-to</key> | 25 | <key>map-to</key> |
26 | <string>PacketDropPercentage</string> | 26 | <string>PacketDropPercentage</string> |
27 | </map> | 27 | </map> |
28 | 28 | ||
29 | <key>inbw</key> | 29 | <key>inbw</key> |
30 | <map> | 30 | <map> |
31 | <key>count</key> | 31 | <key>count</key> |
32 | <integer>1</integer> | 32 | <integer>1</integer> |
33 | <key>map-to</key> | 33 | <key>map-to</key> |
34 | <string>InBandwidth</string> | 34 | <string>InBandwidth</string> |
35 | </map> | 35 | </map> |
36 | 36 | ||
37 | <key>outbw</key> | 37 | <key>outbw</key> |
38 | <map> | 38 | <map> |
39 | <key>count</key> | 39 | <key>count</key> |
40 | <integer>1</integer> | 40 | <integer>1</integer> |
41 | <key>map-to</key> | 41 | <key>map-to</key> |
42 | <string>OutBandwidth</string> | 42 | <string>OutBandwidth</string> |
43 | </map> | 43 | </map> |
44 | 44 | ||
45 | <key>grid</key> | 45 | <key>grid</key> |
46 | <map> | 46 | <map> |
47 | <key>desc</key> | 47 | <key>desc</key> |
48 | <string>Specify the name of the grid, local, or an IP address to connect to.</string> | 48 | <string>Specify the name of the grid, local, or an IP address to connect to.</string> |
49 | <key>count</key> | 49 | <key>count</key> |
50 | <integer>1</integer> | 50 | <integer>1</integer> |
51 | <key>map-to</key> | 51 | <key>map-to</key> |
52 | <string>CmdLineGridChoice</string> | 52 | <string>CmdLineGridChoice</string> |
53 | </map> | 53 | </map> |
54 | 54 | ||
55 | <key>loginuri</key> | 55 | <key>loginuri</key> |
56 | <map> | 56 | <map> |
57 | <key>desc</key> | 57 | <key>desc</key> |
58 | <string>login server and CGI script to use</string> | 58 | <string>login server and CGI script to use</string> |
59 | <key>count</key> | 59 | <key>count</key> |
60 | <integer>1</integer> | 60 | <integer>1</integer> |
61 | <key>compose</key> | 61 | <key>compose</key> |
62 | <boolean>true</boolean> | 62 | <boolean>true</boolean> |
63 | <key>map-to</key> | 63 | <key>map-to</key> |
64 | <string>CmdLineLoginURI</string> | 64 | <string>CmdLineLoginURI</string> |
65 | </map> | 65 | </map> |
66 | 66 | ||
67 | <key>helperuri</key> | 67 | <key>helperuri</key> |
68 | <map> | 68 | <map> |
69 | <key>desc</key> | 69 | <key>desc</key> |
70 | <string>helper web CGI prefix to use</string> | 70 | <string>helper web CGI prefix to use</string> |
71 | <key>count</key> | 71 | <key>count</key> |
72 | <integer>1</integer> | 72 | <integer>1</integer> |
73 | <key>map-to</key> | 73 | <key>map-to</key> |
74 | <string>CmdLineHelperURI</string> | 74 | <string>CmdLineHelperURI</string> |
75 | </map> | 75 | </map> |
76 | 76 | ||
77 | <key>debugviews</key> | 77 | <key>debugviews</key> |
78 | <map> | 78 | <map> |
79 | <key>map-to</key> | 79 | <key>map-to</key> |
80 | <string>DebugViews</string> | 80 | <string>DebugViews</string> |
81 | </map> | 81 | </map> |
82 | 82 | ||
83 | <key>skin</key> | 83 | <key>skin</key> |
84 | <map> | 84 | <map> |
85 | <key>desc</key> | 85 | <key>desc</key> |
86 | <string>ui/branding skin folder to use</string> | 86 | <string>ui/branding skin folder to use</string> |
87 | <key>count</key> | 87 | <key>count</key> |
88 | <integer>1</integer> | 88 | <integer>1</integer> |
89 | <key>map-to</key> | 89 | <key>map-to</key> |
90 | <string>SkinFolder</string> | 90 | <string>SkinFolder</string> |
91 | </map> | 91 | </map> |
92 | 92 | ||
93 | <key>autologin</key> | 93 | <key>autologin</key> |
94 | <map> | 94 | <map> |
95 | <key>desc</key> | 95 | <key>desc</key> |
96 | <string>log in as last saved user</string> | 96 | <string>log in as last saved user</string> |
97 | <key>map-to</key> | 97 | <key>map-to</key> |
98 | <string>AutoLogin</string> | 98 | <string>AutoLogin</string> |
99 | </map> | 99 | </map> |
100 | 100 | ||
101 | <key>quitafter</key> | 101 | <key>quitafter</key> |
102 | <map> | 102 | <map> |
103 | <key>count</key> | 103 | <key>count</key> |
104 | <integer>1</integer> | 104 | <integer>1</integer> |
105 | <key>map-to</key> | 105 | <key>map-to</key> |
106 | <string>QuitAfterSeconds</string> | 106 | <string>QuitAfterSeconds</string> |
107 | </map> | 107 | </map> |
108 | 108 | ||
109 | <key>rotate</key> | 109 | <key>rotate</key> |
110 | <map> | 110 | <map> |
111 | <key>map-to</key> | 111 | <key>map-to</key> |
112 | <string>RotateRight</string> | 112 | <string>RotateRight</string> |
113 | </map> | 113 | </map> |
114 | 114 | ||
115 | <key>noaudio</key> | 115 | <key>noaudio</key> |
116 | <map> | 116 | <map> |
117 | <key>map-to</key> | 117 | <key>map-to</key> |
118 | <string>NoAudio</string> | 118 | <string>NoAudio</string> |
119 | </map> | 119 | </map> |
120 | 120 | ||
121 | <key>nosound</key> | 121 | <key>nosound</key> |
122 | <map> | 122 | <map> |
123 | <key>map-to</key> | 123 | <key>map-to</key> |
124 | <string>NoAudio</string> | 124 | <string>NoAudio</string> |
125 | </map> | 125 | </map> |
126 | 126 | ||
127 | <key>noprobe</key> | 127 | <key>noprobe</key> |
128 | <map> | 128 | <map> |
129 | <key>map-to</key> | 129 | <key>map-to</key> |
130 | <string>NoHardwareProbe</string> | 130 | <string>NoHardwareProbe</string> |
131 | </map> | 131 | </map> |
132 | 132 | ||
133 | <key>noquicktime</key> | 133 | <key>noquicktime</key> |
134 | <map> | 134 | <map> |
135 | <key>map-to</key> | 135 | <key>map-to</key> |
136 | <string>NoQuickTime</string> | 136 | <string>NoQuickTime</string> |
137 | </map> | 137 | </map> |
138 | 138 | ||
139 | <key>nopreload</key> | 139 | <key>nopreload</key> |
140 | <map> | 140 | <map> |
141 | <key>map-to</key> | 141 | <key>map-to</key> |
142 | <string>NoPreload</string> | 142 | <string>NoPreload</string> |
143 | </map> | 143 | </map> |
144 | 144 | ||
145 | <key>purge</key> | 145 | <key>purge</key> |
146 | <map> | 146 | <map> |
147 | <key>desc</key> | 147 | <key>desc</key> |
148 | <string>Delete files in the cache.</string> | 148 | <string>Delete files in the cache.</string> |
149 | <key>map-to</key> | 149 | <key>map-to</key> |
150 | <string>PurgeCacheOnNextStartup</string> | 150 | <string>PurgeCacheOnNextStartup</string> |
151 | </map> | 151 | </map> |
152 | 152 | ||
153 | <key>noinvlib</key> | 153 | <key>noinvlib</key> |
154 | <map> | 154 | <map> |
155 | <key>desc</key> | 155 | <key>desc</key> |
156 | <string>Do not request the inventory library.</string> | 156 | <string>Do not request the inventory library.</string> |
157 | <key>map-to</key> | 157 | <key>map-to</key> |
158 | <string>NoInventoryLibrary</string> | 158 | <string>NoInventoryLibrary</string> |
159 | </map> | 159 | </map> |
160 | 160 | ||
161 | <key>logfile</key> | 161 | <key>logfile</key> |
162 | <map> | 162 | <map> |
163 | <key>count</key> | 163 | <key>count</key> |
164 | <integer>1</integer> | 164 | <integer>1</integer> |
165 | <key>map-to</key> | 165 | <key>map-to</key> |
166 | <string>UserLogFile</string> | 166 | <string>UserLogFile</string> |
167 | </map> | 167 | </map> |
168 | 168 | ||
169 | <key>setdefault</key> | 169 | <key>setdefault</key> |
170 | <map> | 170 | <map> |
171 | <key>desc</key> | 171 | <key>desc</key> |
172 | <string> specify the value of a particular | 172 | <string> specify the value of a particular |
173 | configuration variable which can be | 173 | configuration variable which can be |
174 | overridden by settings.xml | 174 | overridden by settings.xml |
175 | </string> | 175 | </string> |
176 | <key>count</key> | 176 | <key>count</key> |
177 | <integer>2</integer> | 177 | <integer>2</integer> |
178 | <!-- Special case. Mapped to settings procedurally. --> | 178 | <!-- Special case. Mapped to settings procedurally. --> |
179 | </map> | 179 | </map> |
180 | 180 | ||
181 | <key>set</key> | 181 | <key>set</key> |
182 | <map> | 182 | <map> |
183 | <key>desc</key> | 183 | <key>desc</key> |
184 | <string> specify the value of a particular | 184 | <string> specify the value of a particular |
185 | configuration variable that | 185 | configuration variable that |
186 | overrides all other settings | 186 | overrides all other settings |
187 | </string> | 187 | </string> |
188 | <key>count</key> | 188 | <key>count</key> |
189 | <integer>2</integer> | 189 | <integer>2</integer> |
190 | <key>compose</key> | 190 | <key>compose</key> |
191 | <boolean>true</boolean> | 191 | <boolean>true</boolean> |
192 | <!-- Special case. Mapped to settings procedurally. --> | 192 | <!-- Special case. Mapped to settings procedurally. --> |
193 | </map> | 193 | </map> |
194 | 194 | ||
195 | <key>settings</key> | 195 | <key>settings</key> |
196 | <map> | 196 | <map> |
197 | <key>desc</key> | 197 | <key>desc</key> |
198 | <string>Specify the filename of a configuration file.</string> | 198 | <string>Specify the filename of a configuration file.</string> |
199 | <key>count</key> | 199 | <key>count</key> |
200 | <integer>1</integer> | 200 | <integer>1</integer> |
201 | <!-- Special case. Mapped to settings procedurally. --> | 201 | <!-- Special case. Mapped to settings procedurally. --> |
202 | </map> | 202 | </map> |
203 | 203 | ||
204 | <key>login</key> | 204 | <key>login</key> |
205 | <map> | 205 | <map> |
206 | <key>desc</key> | 206 | <key>desc</key> |
207 | <string>3 tokens: first, last and password</string> | 207 | <string>3 tokens: first, last and password</string> |
208 | <key>count</key> | 208 | <key>count</key> |
209 | <integer>3</integer> | 209 | <integer>3</integer> |
210 | <key>map-to</key> | 210 | <key>map-to</key> |
211 | <string>UserLoginInfo</string> | 211 | <string>UserLoginInfo</string> |
212 | </map> | 212 | </map> |
213 | 213 | ||
214 | <key>god</key> | 214 | <key>god</key> |
215 | <map> | 215 | <map> |
216 | <key>desc</key> | 216 | <key>desc</key> |
217 | <string>Log in a god if you have god access.</string> | 217 | <string>Log in a god if you have god access.</string> |
218 | <key>map-to</key> | 218 | <key>map-to</key> |
219 | <string>ConnectAsGod</string> | 219 | <string>ConnectAsGod</string> |
220 | </map> | 220 | </map> |
221 | 221 | ||
222 | <key>console</key> | 222 | <key>console</key> |
223 | <map> | 223 | <map> |
224 | <key>count</key> | 224 | <key>count</key> |
225 | <integer>1</integer> | 225 | <integer>1</integer> |
226 | <key>map-to</key> | 226 | <key>map-to</key> |
227 | <string>ShowConsoleWindow</string> | 227 | <string>ShowConsoleWindow</string> |
228 | </map> | 228 | </map> |
229 | 229 | ||
230 | <key>safe</key> | 230 | <key>safe</key> |
231 | <map> | 231 | <map> |
232 | <key>desc</key> | 232 | <key>desc</key> |
233 | <string>Reset preferences, run in safe mode.</string> | 233 | <string>Reset preferences, run in safe mode.</string> |
234 | <key>map-to</key> | 234 | <key>map-to</key> |
235 | <string>SafeMode</string> | 235 | <string>SafeMode</string> |
236 | </map> | 236 | </map> |
237 | 237 | ||
238 | <key>multiple</key> | 238 | <key>multiple</key> |
239 | <map> | 239 | <map> |
240 | <key>desc</key> | 240 | <key>desc</key> |
241 | <string>Allow multple viewers.</string> | 241 | <string>Allow multple viewers.</string> |
242 | <key>map-to</key> | 242 | <key>map-to</key> |
243 | <string>AllowMultipleViewers</string> | 243 | <string>AllowMultipleViewers</string> |
244 | </map> | 244 | </map> |
245 | 245 | ||
246 | <key>novoice</key> | 246 | <key>novoice</key> |
247 | <map> | 247 | <map> |
248 | <key>desc</key> | 248 | <key>desc</key> |
249 | <string>Disable voice.</string> | 249 | <string>Disable voice.</string> |
250 | <key>map-to</key> | 250 | <key>map-to</key> |
251 | <string>CmdLineDisableVoice</string> | 251 | <string>CmdLineDisableVoice</string> |
252 | </map> | 252 | </map> |
253 | 253 | ||
254 | <key>url</key> | 254 | <key>url</key> |
255 | <map> | 255 | <map> |
256 | <key>desc</key> | 256 | <key>desc</key> |
257 | <string>Startup location</string> | 257 | <string>Startup location</string> |
258 | <key>count</key> | 258 | <key>count</key> |
259 | <integer>1</integer> | 259 | <integer>1</integer> |
260 | <key>last_option</key> | 260 | <key>last_option</key> |
261 | <boolean>true</boolean> | 261 | <boolean>true</boolean> |
262 | <!-- Special case. Not mapped to a setting. --> | 262 | <!-- Special case. Not mapped to a setting. --> |
263 | </map> | 263 | </map> |
264 | 264 | ||
265 | <key>slurl</key> | 265 | <key>slurl</key> |
266 | <map> | 266 | <map> |
267 | <key>desc</key> | 267 | <key>desc</key> |
268 | <string>Startup SLurl</string> | 268 | <string>Startup SLurl</string> |
269 | <key>count</key> | 269 | <key>count</key> |
270 | <integer>1</integer> | 270 | <integer>1</integer> |
271 | <key>positional</key> | 271 | <key>positional</key> |
272 | <boolean>true</boolean> | 272 | <boolean>true</boolean> |
273 | <key>last_option</key> | 273 | <key>last_option</key> |
274 | <boolean>true</boolean> | 274 | <boolean>true</boolean> |
275 | <!-- Special case. Not mapped to a setting. --> | 275 | <!-- Special case. Not mapped to a setting. --> |
276 | </map> | 276 | </map> |
277 | 277 | ||
278 | <key>ignorepixeldepth</key> | 278 | <key>ignorepixeldepth</key> |
279 | <map> | 279 | <map> |
280 | <key>desc</key> | 280 | <key>desc</key> |
281 | <string>Ignore pixel depth settings.</string> | 281 | <string>Ignore pixel depth settings.</string> |
282 | <key>map-to</key> | 282 | <key>map-to</key> |
283 | <string>IgnorePixelDepth</string> | 283 | <string>IgnorePixelDepth</string> |
284 | </map> | 284 | </map> |
285 | 285 | ||
286 | <key>cooperative</key> | 286 | <key>cooperative</key> |
287 | <map> | 287 | <map> |
288 | <key>desc</key> | 288 | <key>desc</key> |
289 | <string>Yield some idle time to local host.</string> | 289 | <string>Yield some idle time to local host.</string> |
290 | <key>count</key> | 290 | <key>count</key> |
291 | <integer>1</integer> | 291 | <integer>1</integer> |
292 | <key>map-to</key> | 292 | <key>map-to</key> |
293 | <string>YieldTime</string> | 293 | <string>YieldTime</string> |
294 | </map> | 294 | </map> |
295 | 295 | ||
296 | <key>no-verify-ssl-cert</key> | 296 | <key>no-verify-ssl-cert</key> |
297 | <map> | 297 | <map> |
298 | <key>map-to</key> | 298 | <key>map-to</key> |
299 | <string>NoVerifySSLCert</string> | 299 | <string>NoVerifySSLCert</string> |
300 | </map> | 300 | </map> |
301 | 301 | ||
302 | <key>channel</key> | 302 | <key>channel</key> |
303 | <map> | 303 | <map> |
304 | <key>count</key> | 304 | <key>count</key> |
305 | <integer>1</integer> | 305 | <integer>1</integer> |
306 | <key>map-to</key> | 306 | <key>map-to</key> |
307 | <string>VersionChannelName</string> | 307 | <string>VersionChannelName</string> |
308 | </map> | 308 | </map> |
309 | 309 | ||
310 | <key>loginpage</key> | 310 | <key>loginpage</key> |
311 | <map> | 311 | <map> |
312 | <key>desc</key> | 312 | <key>desc</key> |
313 | <string>Login authentication page to use.</string> | 313 | <string>Login authentication page to use.</string> |
314 | <key>count</key> | 314 | <key>count</key> |
315 | <integer>1</integer> | 315 | <integer>1</integer> |
316 | <key>map-to</key> | 316 | <key>map-to</key> |
317 | <string>LoginPage</string> | 317 | <string>LoginPage</string> |
318 | </map> | 318 | </map> |
319 | 319 | ||
320 | <key>qa</key> | 320 | <key>qa</key> |
321 | <map> | 321 | <map> |
322 | <key>desc</key> | 322 | <key>desc</key> |
323 | <string>Activated debugging menu in Advanced Settings.</string> | 323 | <string>Activated debugging menu in Advanced Settings.</string> |
324 | <key>map-to</key> | 324 | <key>map-to</key> |
325 | <string>QAMode</string> | 325 | <string>QAMode</string> |
326 | </map> | 326 | </map> |
327 | 327 | ||
328 | <key>crashonstartup</key> | 328 | <key>crashonstartup</key> |
329 | <map> | 329 | <map> |
330 | <key>desc</key> | 330 | <key>desc</key> |
331 | <string>Crashes on startup. For QA use.</string> | 331 | <string>Crashes on startup. For QA use.</string> |
332 | <key>map-to</key> | 332 | <key>map-to</key> |
333 | <string>CrashOnStartup</string> | 333 | <string>CrashOnStartup</string> |
334 | </map> | 334 | </map> |
335 | 335 | ||
336 | </map> | 336 | </map> |
337 | </llsd> | 337 | </llsd> |
diff --git a/linden/indra/newview/installers/windows/FILES_ARE_UNICODE_UTF-16LE.txt b/linden/indra/newview/installers/windows/FILES_ARE_UNICODE_UTF-16LE.txt index 185c018..30f9349 100644 --- a/linden/indra/newview/installers/windows/FILES_ARE_UNICODE_UTF-16LE.txt +++ b/linden/indra/newview/installers/windows/FILES_ARE_UNICODE_UTF-16LE.txt | |||
@@ -1,6 +1,6 @@ | |||
1 | The language files in this directory are Unicode (Little-Endian) format, also known as UTF-16 LE. | 1 | The language files in this directory are Unicode (Little-Endian) format, also known as UTF-16 LE. |
2 | 2 | ||
3 | This is the format required for NSIS Unicode. See http://www.scratchpaper.com/ for details. | 3 | This is the format required for NSIS Unicode. See http://www.scratchpaper.com/ for details. |
4 | 4 | ||
5 | James Cook | 5 | James Cook |
6 | September 2008 | 6 | September 2008 |
diff --git a/linden/indra/newview/skins/default/html/en-us/loading/loading.html b/linden/indra/newview/skins/default/html/en-us/loading/loading.html index 34e5c84..1c62d2f 100644 --- a/linden/indra/newview/skins/default/html/en-us/loading/loading.html +++ b/linden/indra/newview/skins/default/html/en-us/loading/loading.html | |||
@@ -1,9 +1,9 @@ | |||
1 | <body style="background-color:#000000;font-family:verdana,helvetica,sans-serif;font-size:62.5%;color:#e9f1f8;"> | 1 | <body style="background-color:#000000;font-family:verdana,helvetica,sans-serif;font-size:62.5%;color:#e9f1f8;"> |
2 | <table width="100%" height="100%" border="0"> | 2 | <table width="100%" height="100%" border="0"> |
3 | <tr> | 3 | <tr> |
4 | <td align="center" valign="middle" style="font-size:0.8em;"> | 4 | <td align="center" valign="middle" style="font-size:0.8em;"> |
5 | <img src="sl_logo_rotate_black.gif" align="absmiddle"><br/> loading... | 5 | <img src="sl_logo_rotate_black.gif" align="absmiddle"><br/> loading... |
6 | </td> | 6 | </td> |
7 | </tr> | 7 | </tr> |
8 | </table> | 8 | </table> |
9 | </body> | 9 | </body> |