aboutsummaryrefslogtreecommitdiffstatshomepage
diff options
context:
space:
mode:
authorJacek Antonelli2008-12-06 21:00:15 -0600
committerJacek Antonelli2008-12-06 21:00:15 -0600
commite23dcb6417910fa2073d0c4492732d04324f8c8f (patch)
treebdede6646e160d9423899fda63d71c985eb0d294
parentRead filter labels from XML, no hard-coding. (diff)
parentAdded banners in ChangeLog to set versions apart. (diff)
downloadmeta-impy-e23dcb6417910fa2073d0c4492732d04324f8c8f.zip
meta-impy-e23dcb6417910fa2073d0c4492732d04324f8c8f.tar.gz
meta-impy-e23dcb6417910fa2073d0c4492732d04324f8c8f.tar.bz2
meta-impy-e23dcb6417910fa2073d0c4492732d04324f8c8f.tar.xz
Merge RC2 into quickfilter
Diffstat
-rw-r--r--ChangeLog.txt187
-rw-r--r--linden/indra/linux_crash_logger/llcrashloggerlinux.cpp2
-rwxr-xr-xlinden/indra/llcrashlogger/llcrashlogger.cpp8
-rw-r--r--linden/indra/llimage/llimagetga.cpp2
-rw-r--r--linden/indra/llmedia/llmediaimplgstreamer.cpp2
-rw-r--r--linden/indra/llmedia/llmediamanager.cpp2
-rw-r--r--linden/indra/llmessage/llhttpclient.cpp14
-rw-r--r--linden/indra/llrender/llgl.cpp2
-rw-r--r--linden/indra/llrender/llrender.h2
-rw-r--r--linden/indra/llvfs/lldir.cpp2
-rw-r--r--linden/indra/llvfs/lldir_mac.cpp4
-rw-r--r--linden/indra/llwindow/llwindowsdl.cpp2
-rw-r--r--linden/indra/lscript/lscript_compile/lscript_tree.cpp8
-rw-r--r--linden/indra/newview/llappviewer.cpp9
-rw-r--r--linden/indra/newview/lldrawable.cpp4
-rw-r--r--linden/indra/newview/llfloaterdirectory.cpp4
-rw-r--r--linden/indra/newview/llpanellogin.cpp71
-rw-r--r--linden/indra/newview/llstartup.cpp2
-rw-r--r--linden/indra/newview/llviewernetwork.cpp97
-rw-r--r--linden/indra/newview/llviewernetwork.h31
-rw-r--r--linden/indra/newview/skins/default/xui/en-us/panel_group_invite.xml4
-rw-r--r--linden/indra/newview/skins/default/xui/en-us/panel_group_roles.xml2
-rw-r--r--linden/indra/newview/skins/silver/xui/en-us/floater_tools.xml1275
-rw-r--r--linden/install.xml4
24 files changed, 266 insertions, 1474 deletions
diff --git a/ChangeLog.txt b/ChangeLog.txt
index 45426b7..74ffa27 100644
--- a/ChangeLog.txt
+++ b/ChangeLog.txt
@@ -1,3 +1,39 @@
12008-12-06 Jacek Antonelli <jacek.antonelli@gmail.com>
2
3 * ChangeLog:
4 Added banners in ChangeLog to set versions apart.
5
6 Entries should be placed in the section for the
7 version into which they were merged. Entries within
8 a section should be sorted chronologically.
9
10 This is important for keeping track of changes which
11 weren't merged until a later release than they were
12 written. (Mixing them in chronologically would cause
13 confusion about which changes were included in a
14 release.)
15
16
17 * linden/indra/llmessage/llhttpclient.cpp:
18 VWR-9400b (memleak whenever an LSL script is uploaded)
19 Patch by Henri Beauchamp.
20
21
22 * linden/indra/llmessage/llhttpclient.cpp:
23 VWR-9400 (memleak whenever an LSL script is uploaded)
24 Patch by Carjay McGinnis.
25
26
27 * linden/indra/llimage/llimagetga.cpp:
28 VWR-10837 (use delete [] in LLImageTGA)
29 Patch by Aleric Inglewood.
30
31
32 * linden/indra/llmedia/llmediaimplgstreamer.cpp:
33 VWR-10759 (use delete [] in LLMediaImplGStreamer)
34 Patch by Aleric Inglewood.
35
36
12008-11-23 Jacek Antonelli <jacek.antonelli@gmail.com> 372008-11-23 Jacek Antonelli <jacek.antonelli@gmail.com>
2 38
3 * linden/indra/newview/llinventoryview.cpp: 39 * linden/indra/newview/llinventoryview.cpp:
@@ -86,6 +122,157 @@
86 Added XUI for the Quick Filter combo box. 122 Added XUI for the Quick Filter combo box.
87 123
88 124
125=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-
126=- 1.0.0 RC2 -=
127=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-
128
129
1302008-12-04 Jacek Antonelli <jacek.antonelli@gmail.com>
131
132 * Imprudence 1.0.0 RC2 released.
133
134
135 * linden/indra/newview/llviewernetwork.cpp:
136 Use 127.0.0.1 for local opensim, not 0.0.0.0.
137
138
1392008-11-30 Jacek Antonelli <jacek.antonelli@gmail.com>
140
141 * linden/indra/llmedia/llmediamanager.cpp:
142 Disable llmozlib-dependent code when not available.
143 Patch by Stephen Zenith. [#12]
144
145
146 * linden/indra/llwindow/llwindowsdl.cpp:
147 Fixed passing nonliteral strings to *printf functions.
148 gcc 4.3 rejects that as being unsafe.
149 Patch by Stephen Zenith. [#11]
150 * linden/indra/linux_crash_logger/llcrashloggerlinux.cpp:
151 Ditto.
152 * linden/indra/lscript/lscript_compile/lscript_tree.cpp:
153 Ditto.
154
155
1562008-11-29 Jacek Antonelli <jacek.antonelli@gmail.com>
157
158 * linden/indra/newview/llpanellogin.cpp:
159 Remove preprocessor condition for grid selector.
160 The grid selector on the login screen will always show,
161 instead of only showing when the viewer was compiled
162 as LL_RELEASE_FOR_DOWNLOAD.
163
164
165 * linden/indra/newview/llappviewer.cpp:
166 Stop console window from always showing up.
167
168
1692008-11-29 McCabe Maxsted <hakushakukun@gmail.com>
170
171 * linden/indra/newview/llfloaterdirectory.cpp:
172 Fixed search window not refreshing in RelWithDebInfo builds.
173
174
1752008-11-25 Jacek Antonelli <jacek.antonelli@gmail.com>
176
177 * linden/indra/newview/llstartup.cpp:
178 Rearranged grid selectors so main grid is first.
179 * linden/indra/newview/llviewernetwork.cpp:
180 Ditto.
181 * linden/indra/newview/llviewernetwork.cpp:
182 Ditto.
183
184
185 * linden/indra/newview/llpanellogin.cpp:
186 Added "code name" field for grid selections.
187 The code name is used to fetch the proper splash page.
188 This decouples the user-visible label from the name
189 expected by the SL web server.
190 * linden/indra/newview/llviewernetwork.cpp:
191 Ditto.
192 * linden/indra/newview/llviewernetwork.h:
193 Ditto.
194
195
1962008-11-24 Jacek Antonelli <jacek.antonelli@gmail.com>
197
198 * linden/indra/newview/llpanellogin.cpp:
199 Changed the grid selector options at login.
200 Renamed "Agni" to "SL Main Grid", etc. and removed private
201 LL grids from the list. Also added "Local OpenSim" option.
202 * linden/indra/newview/llviewernetwork.cpp:
203 Ditto.
204 * linden/indra/newview/llviewernetwork.h:
205 Ditto.
206
207
2082008-11-21 Jacek Antonelli <jacek.antonelli@gmail.com>
209
210 * linden/indra/newview/lldrawable.cpp:
211 Likely fix for VWR-8920 (disappearing attachments).
212 From http://svn.secondlife.com/trac/linden/changeset/1393
213
214
2152008-11-19 McCabe Maxsted <hakushakukun@gmail.com>
216
217 * linden/install.xml:
218 Fixed inworld browser crash in Windows.
219
220
2212008-11-18 Jacek Antonelli <jacek.antonelli@gmail.com>
222
223 * linden/indra/llcrashlogger/llcrashlogger.cpp:
224 Changed to Imprudence.exec_marker to match llappviewer.cpp.
225
226
227 * linden/indra/llcrashlogger/llcrashlogger.cpp:
228 Changed app dir (for cache, etc.) to Imprudence.
229 * linden/indra/llvfs/lldir.cpp:
230 Ditto.
231 * linden/indra/llvfs/lldir_mac.cpp:
232 Ditto.
233 * linden/indra/newview/llappviewer.cpp:
234 Ditto.
235
236
2372008-11-18 McCabe Maxsted <hakushakukun@gmail.com>
238
239 * linden/indra/newview/skins/default/xui/en-us/panel_group_invite.xml:
240 VWR-9007: Group UI uses "Person" instead of "Resident".
241 * linden/indra/newview/skins/default/xui/en-us/panel_group_roles.xml:
242 Ditto.
243
244
2452008-11-18 Jacek Antonelli <jacek.antonelli@gmail.com>
246
247 * linden/indra/llrender/llrender.h:
248 Fix VWR-9507: bad typedef breaks build on gcc 4.3.
249 Suggested by Alissa Sabre.
250
251
252 * linden/indra/llrender/llgl.cpp:
253 Likely fix for VWR-9358 (palletized textures).
254 Suggested by Angus Boyd.
255
256
2572008-11-16 Jacek Antonelli <jacek.antonelli@gmail.com>
258
259 * linden/indra/newview/skins/silver/xui/en-us/floater_tools.xml:
260 Removed floater_tools.xml from silver skin.
261 It was out of sync with the default version, and the only
262 changes that LL had made to it were tiny tweaks to button size
263 and position. It will now correctly inherit from default skin.
264
265
266=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-
267=- 1.0.0 RC1 -=
268=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-
269
270
2712008-11-15 Jacek Antonelli <jacek.antonelli@gmail.com>
272
273 * Imprudence 1.0.0 RC1 released.
274
275
892008-11-05 Jacek Antonelli <jacek.antonelli@gmail.com> 2762008-11-05 Jacek Antonelli <jacek.antonelli@gmail.com>
90 277
91 * linden/indra/newview/viewer_manifest.py: 278 * linden/indra/newview/viewer_manifest.py:
diff --git a/linden/indra/linux_crash_logger/llcrashloggerlinux.cpp b/linden/indra/linux_crash_logger/llcrashloggerlinux.cpp
index 6ac9831..c4294d6 100644
--- a/linden/indra/linux_crash_logger/llcrashloggerlinux.cpp
+++ b/linden/indra/linux_crash_logger/llcrashloggerlinux.cpp
@@ -90,7 +90,7 @@ static BOOL do_ask_dialog(void)
90 90
91 win = gtk_message_dialog_new(NULL, 91 win = gtk_message_dialog_new(NULL,
92 flags, messagetype, buttons, 92 flags, messagetype, buttons,
93 dialog_text); 93 "%s", dialog_text);
94 gtk_window_set_type_hint(GTK_WINDOW(win), 94 gtk_window_set_type_hint(GTK_WINDOW(win),
95 GDK_WINDOW_TYPE_HINT_DIALOG); 95 GDK_WINDOW_TYPE_HINT_DIALOG);
96 gtk_window_set_title(GTK_WINDOW(win), dialog_title); 96 gtk_window_set_title(GTK_WINDOW(win), dialog_title);
diff --git a/linden/indra/llcrashlogger/llcrashlogger.cpp b/linden/indra/llcrashlogger/llcrashlogger.cpp
index b9a182c..af30136 100755
--- a/linden/indra/llcrashlogger/llcrashlogger.cpp
+++ b/linden/indra/llcrashlogger/llcrashlogger.cpp
@@ -327,9 +327,9 @@ void LLCrashLogger::updateApplication(const std::string& message)
327bool LLCrashLogger::init() 327bool LLCrashLogger::init()
328{ 328{
329 // We assume that all the logs we're looking for reside on the current drive 329 // We assume that all the logs we're looking for reside on the current drive
330 gDirUtilp->initAppDirs("SecondLife"); 330 gDirUtilp->initAppDirs("Imprudence");
331 331
332 // Default to the product name "Second Life" (this is overridden by the -name argument) 332 // Default to the product name "Imprudence" (this is overridden by the -name argument)
333 mProductName = "Imprudence"; 333 mProductName = "Imprudence";
334 334
335 mCrashSettings.declareS32(CRASH_BEHAVIOR_SETTING, CRASH_BEHAVIOR_ASK, "Controls behavior when viewer crashes " 335 mCrashSettings.declareS32(CRASH_BEHAVIOR_SETTING, CRASH_BEHAVIOR_ASK, "Controls behavior when viewer crashes "
@@ -341,7 +341,7 @@ bool LLCrashLogger::init()
341 //Run through command line options 341 //Run through command line options
342 if(getOption("previous").isDefined()) 342 if(getOption("previous").isDefined())
343 { 343 {
344 llinfos << "Previous execution did not remove SecondLife.exec_marker" << llendl; 344 llinfos << "Previous execution did not remove Imprudence.exec_marker" << llendl;
345 mCrashInPreviousExec = TRUE; 345 mCrashInPreviousExec = TRUE;
346 } 346 }
347 347
@@ -371,7 +371,7 @@ bool LLCrashLogger::init()
371 //If we've opened the crash logger, assume we can delete the marker file if it exists 371 //If we've opened the crash logger, assume we can delete the marker file if it exists
372 if( gDirUtilp ) 372 if( gDirUtilp )
373 { 373 {
374 std::string marker_file = gDirUtilp->getExpandedFilename(LL_PATH_LOGS,"SecondLife.exec_marker"); 374 std::string marker_file = gDirUtilp->getExpandedFilename(LL_PATH_LOGS,"Imprudence.exec_marker");
375 ll_apr_file_remove( marker_file ); 375 ll_apr_file_remove( marker_file );
376 } 376 }
377 377
diff --git a/linden/indra/llimage/llimagetga.cpp b/linden/indra/llimage/llimagetga.cpp
index 32c2111..21d0fd1 100644
--- a/linden/indra/llimage/llimagetga.cpp
+++ b/linden/indra/llimage/llimagetga.cpp
@@ -104,7 +104,7 @@ LLImageTGA::LLImageTGA(const std::string& file_name)
104 104
105LLImageTGA::~LLImageTGA() 105LLImageTGA::~LLImageTGA()
106{ 106{
107 delete mColorMap; 107 delete [] mColorMap;
108} 108}
109 109
110BOOL LLImageTGA::updateData() 110BOOL LLImageTGA::updateData()
diff --git a/linden/indra/llmedia/llmediaimplgstreamer.cpp b/linden/indra/llmedia/llmediaimplgstreamer.cpp
index 51a5bca..5d6a648 100644
--- a/linden/indra/llmedia/llmediaimplgstreamer.cpp
+++ b/linden/indra/llmedia/llmediaimplgstreamer.cpp
@@ -428,7 +428,7 @@ unload ()
428 428
429 if (mediaData) 429 if (mediaData)
430 { 430 {
431 delete mediaData; 431 delete [] mediaData;
432 mediaData = NULL; 432 mediaData = NULL;
433 } 433 }
434 434
diff --git a/linden/indra/llmedia/llmediamanager.cpp b/linden/indra/llmedia/llmediamanager.cpp
index f72e63c..16c731f 100644
--- a/linden/indra/llmedia/llmediamanager.cpp
+++ b/linden/indra/llmedia/llmediamanager.cpp
@@ -150,8 +150,10 @@ LLMediaManager* LLMediaManager::getInstance()
150// (static) 150// (static)
151void LLMediaManager::setBrowserUserAgent(std::string user_agent) 151void LLMediaManager::setBrowserUserAgent(std::string user_agent)
152{ 152{
153#if LL_LLMOZLIB_ENABLED
153 // *HACK: Breaks encapsulation model, as initClass does above. JC 154 // *HACK: Breaks encapsulation model, as initClass does above. JC
154 LLMediaImplLLMozLib::setBrowserUserAgent(user_agent); 155 LLMediaImplLLMozLib::setBrowserUserAgent(user_agent);
156#endif
155} 157}
156 158
157//////////////////////////////////////////////////////////////////////////////// 159////////////////////////////////////////////////////////////////////////////////
diff --git a/linden/indra/llmessage/llhttpclient.cpp b/linden/indra/llmessage/llhttpclient.cpp
index fc2612f..ef163fa 100644
--- a/linden/indra/llmessage/llhttpclient.cpp
+++ b/linden/indra/llmessage/llhttpclient.cpp
@@ -160,10 +160,9 @@ namespace
160 fstream.seekg(0, std::ios::end); 160 fstream.seekg(0, std::ios::end);
161 U32 fileSize = fstream.tellg(); 161 U32 fileSize = fstream.tellg();
162 fstream.seekg(0, std::ios::beg); 162 fstream.seekg(0, std::ios::beg);
163 char* fileBuffer; 163 std::vector<char> fileBuffer(fileSize);
164 fileBuffer = new char [fileSize]; 164 fstream.read(&fileBuffer[0], fileSize);
165 fstream.read(fileBuffer, fileSize); 165 ostream.write(&fileBuffer[0], fileSize);
166 ostream.write(fileBuffer, fileSize);
167 fstream.close(); 166 fstream.close();
168 eos = true; 167 eos = true;
169 return STATUS_DONE; 168 return STATUS_DONE;
@@ -190,10 +189,9 @@ namespace
190 189
191 LLVFile vfile(gVFS, mUUID, mAssetType, LLVFile::READ); 190 LLVFile vfile(gVFS, mUUID, mAssetType, LLVFile::READ);
192 S32 fileSize = vfile.getSize(); 191 S32 fileSize = vfile.getSize();
193 U8* fileBuffer; 192 std::vector<U8> fileBuffer(fileSize);
194 fileBuffer = new U8 [fileSize]; 193 vfile.read(&fileBuffer[0], fileSize);
195 vfile.read(fileBuffer, fileSize); 194 ostream.write((char*)&fileBuffer[0], fileSize);
196 ostream.write((char*)fileBuffer, fileSize);
197 eos = true; 195 eos = true;
198 return STATUS_DONE; 196 return STATUS_DONE;
199 } 197 }
diff --git a/linden/indra/llrender/llgl.cpp b/linden/indra/llrender/llgl.cpp
index 843bc79..2cb7adc 100644
--- a/linden/indra/llrender/llgl.cpp
+++ b/linden/indra/llrender/llgl.cpp
@@ -578,7 +578,7 @@ void LLGLManager::initExtensions()
578#else // LL_MESA_HEADLESS 578#else // LL_MESA_HEADLESS
579 mHasMultitexture = glh_init_extensions("GL_ARB_multitexture"); 579 mHasMultitexture = glh_init_extensions("GL_ARB_multitexture");
580 mHasMipMapGeneration = glh_init_extensions("GL_SGIS_generate_mipmap"); 580 mHasMipMapGeneration = glh_init_extensions("GL_SGIS_generate_mipmap");
581 mHasPalettedTextures = glh_init_extension("GL_EXT_paletted_texture"); 581 mHasPalettedTextures = glh_init_extensions("GL_EXT_paletted_texture");
582 mHasSeparateSpecularColor = glh_init_extensions("GL_EXT_separate_specular_color"); 582 mHasSeparateSpecularColor = glh_init_extensions("GL_EXT_separate_specular_color");
583 mHasAnisotropic = glh_init_extensions("GL_EXT_texture_filter_anisotropic"); 583 mHasAnisotropic = glh_init_extensions("GL_EXT_texture_filter_anisotropic");
584 glh_init_extensions("GL_ARB_texture_cube_map"); 584 glh_init_extensions("GL_ARB_texture_cube_map");
diff --git a/linden/indra/llrender/llrender.h b/linden/indra/llrender/llrender.h
index 15360a3..ef495ed 100644
--- a/linden/indra/llrender/llrender.h
+++ b/linden/indra/llrender/llrender.h
@@ -214,7 +214,7 @@ public:
214 214
215 LLTexUnit* getTexUnit(U32 index); 215 LLTexUnit* getTexUnit(U32 index);
216 216
217 typedef struct Vertex 217 struct Vertex
218 { 218 {
219 GLfloat v[3]; 219 GLfloat v[3];
220 GLubyte c[4]; 220 GLubyte c[4];
diff --git a/linden/indra/llvfs/lldir.cpp b/linden/indra/llvfs/lldir.cpp
index 0e014d9..8cd2b5c 100644
--- a/linden/indra/llvfs/lldir.cpp
+++ b/linden/indra/llvfs/lldir.cpp
@@ -229,7 +229,7 @@ const std::string LLDir::getCacheDir(bool get_default) const
229 } 229 }
230 else 230 else
231 { 231 {
232 res = getOSCacheDir() + mDirDelimiter + "SecondLife"; 232 res = getOSCacheDir() + mDirDelimiter + "Imprudence";
233 } 233 }
234 return res; 234 return res;
235 } 235 }
diff --git a/linden/indra/llvfs/lldir_mac.cpp b/linden/indra/llvfs/lldir_mac.cpp
index fd8f087..548f3da 100644
--- a/linden/indra/llvfs/lldir_mac.cpp
+++ b/linden/indra/llvfs/lldir_mac.cpp
@@ -121,7 +121,7 @@ LLDir_Mac::LLDir_Mac()
121 CFStringRef stringRef = NULL; 121 CFStringRef stringRef = NULL;
122 OSStatus error = noErr; 122 OSStatus error = noErr;
123 FSRef fileRef; 123 FSRef fileRef;
124 CFStringRef secondLifeString = CFSTR("SecondLife"); 124 CFStringRef secondLifeString = CFSTR("Imprudence");
125 125
126 mainBundleRef = CFBundleGetMainBundle(); 126 mainBundleRef = CFBundleGetMainBundle();
127 127
@@ -172,7 +172,7 @@ LLDir_Mac::LLDir_Mac()
172 if (error == noErr) 172 if (error == noErr)
173 { 173 {
174 FSRefToLLString(&cacheDirRef, mOSCacheDir); 174 FSRefToLLString(&cacheDirRef, mOSCacheDir);
175 (void)CFCreateDirectory(&cacheDirRef, CFSTR("SecondLife"),NULL); 175 (void)CFCreateDirectory(&cacheDirRef, CFSTR("Imprudence"),NULL);
176 } 176 }
177 177
178 // mOSUserAppDir 178 // mOSUserAppDir
diff --git a/linden/indra/llwindow/llwindowsdl.cpp b/linden/indra/llwindow/llwindowsdl.cpp
index c088dd8..f0acee5 100644
--- a/linden/indra/llwindow/llwindowsdl.cpp
+++ b/linden/indra/llwindow/llwindowsdl.cpp
@@ -2530,7 +2530,7 @@ S32 OSMessageBoxSDL(const std::string& text, const std::string& caption, U32 typ
2530 buttons = GTK_BUTTONS_YES_NO; 2530 buttons = GTK_BUTTONS_YES_NO;
2531 break; 2531 break;
2532 } 2532 }
2533 win = gtk_message_dialog_new(NULL,flags, messagetype, buttons, text.c_str()); 2533 win = gtk_message_dialog_new(NULL,flags, messagetype, buttons, "%s", text.c_str());
2534 2534
2535# if LL_X11 2535# if LL_X11
2536 // Make GTK tell the window manager to associate this 2536 // Make GTK tell the window manager to associate this
diff --git a/linden/indra/lscript/lscript_compile/lscript_tree.cpp b/linden/indra/lscript/lscript_compile/lscript_tree.cpp
index 71e7f19..70d8195 100644
--- a/linden/indra/lscript/lscript_compile/lscript_tree.cpp
+++ b/linden/indra/lscript/lscript_compile/lscript_tree.cpp
@@ -7885,10 +7885,10 @@ void LLScriptFunctionCall::recurse(LLFILE *fp, S32 tabs, S32 tabsize, LSCRIPTCom
7885 { 7885 {
7886 // Prefix function name with g to distinguish from 7886 // Prefix function name with g to distinguish from
7887 // event handlers. 7887 // event handlers.
7888 fprintf(fp, gScriptp->getClassName()); 7888 fprintf(fp, "%s", gScriptp->getClassName());
7889 fprintf(fp, "::'g"); 7889 fprintf(fp, "::'g");
7890 } 7890 }
7891 fprintf(fp, mIdentifier->mName); 7891 fprintf(fp, "%s", mIdentifier->mName);
7892 fprintf(fp, "'("); 7892 fprintf(fp, "'(");
7893 print_cil_arg_list(fp, mIdentifier->mScopeEntry->mFunctionArgs); 7893 print_cil_arg_list(fp, mIdentifier->mScopeEntry->mFunctionArgs);
7894 fprintf(fp, ")\n"); 7894 fprintf(fp, ")\n");
@@ -9720,7 +9720,7 @@ void LLScriptEventHandler::recurse(LLFILE *fp, S32 tabs, S32 tabsize, LSCRIPTCom
9720 // Allows state changing by finding handlers prefixed with new 9720 // Allows state changing by finding handlers prefixed with new
9721 // state name. Prefix disambiguates functions and event handlers. 9721 // state name. Prefix disambiguates functions and event handlers.
9722 fprintf(fp, "e"); 9722 fprintf(fp, "e");
9723 fprintf(fp, entry->mIdentifier); 9723 fprintf(fp, "%s", entry->mIdentifier);
9724 9724
9725 // Handler name and arguments. 9725 // Handler name and arguments.
9726 mEventp->recurse(fp, tabs, tabsize, pass, ptype, prunearg, scope, type, basetype, count, chunk, heap, stacksize, entry, entrycount, NULL); 9726 mEventp->recurse(fp, tabs, tabsize, pass, ptype, prunearg, scope, type, basetype, count, chunk, heap, stacksize, entry, entrycount, NULL);
@@ -10152,7 +10152,7 @@ void LLScriptGlobalFunctions::recurse(LLFILE *fp, S32 tabs, S32 tabsize, LSCRIPT
10152 fprintf(fp, ".method public hidebysig instance default "); 10152 fprintf(fp, ".method public hidebysig instance default ");
10153 print_cil_type(fp, mType ? mType->mType : LST_NULL); 10153 print_cil_type(fp, mType ? mType->mType : LST_NULL);
10154 fprintf(fp, " 'g"); 10154 fprintf(fp, " 'g");
10155 fprintf(fp, mIdentifier->mName); 10155 fprintf(fp, "%s", mIdentifier->mName);
10156 fprintf(fp, "'"); 10156 fprintf(fp, "'");
10157 if (mParameters) 10157 if (mParameters)
10158 { 10158 {
diff --git a/linden/indra/newview/llappviewer.cpp b/linden/indra/newview/llappviewer.cpp
index 5fd5575..243a9d8 100644
--- a/linden/indra/newview/llappviewer.cpp
+++ b/linden/indra/newview/llappviewer.cpp
@@ -580,7 +580,7 @@ bool LLAppViewer::init()
580 580
581 // Need to do this initialization before we do anything else, since anything 581 // Need to do this initialization before we do anything else, since anything
582 // that touches files should really go through the lldir API 582 // that touches files should really go through the lldir API
583 gDirUtilp->initAppDirs("SecondLife"); 583 gDirUtilp->initAppDirs(IMP_VIEWER_NAME);
584 // set skin search path to default, will be overridden later 584 // set skin search path to default, will be overridden later
585 // this allows simple skinned file lookups to work 585 // this allows simple skinned file lookups to work
586 gDirUtilp->setSkinFolder("default"); 586 gDirUtilp->setSkinFolder("default");
@@ -1604,11 +1604,6 @@ bool LLAppViewer::initConfiguration()
1604 1604
1605 gSavedSettings.setString("VersionChannelName", IMP_VIEWER_NAME); 1605 gSavedSettings.setString("VersionChannelName", IMP_VIEWER_NAME);
1606 1606
1607#ifndef LL_RELEASE_FOR_DOWNLOAD
1608 gSavedSettings.setBOOL("ShowConsoleWindow", TRUE);
1609 gSavedSettings.setBOOL("AllowMultipleViewers", TRUE);
1610#endif
1611
1612#if !LL_DYNAMIC_FONT_DISCOVERY 1607#if !LL_DYNAMIC_FONT_DISCOVERY
1613 // static font discovery - user settings can override. 1608 // static font discovery - user settings can override.
1614 gSavedSettings.setString("FontSansSerifFallback", 1609 gSavedSettings.setString("FontSansSerifFallback",
@@ -2688,7 +2683,7 @@ bool LLAppViewer::initCache()
2688 std::string cache_dir = gDirUtilp->getOSUserAppDir(); 2683 std::string cache_dir = gDirUtilp->getOSUserAppDir();
2689 std::string new_cache_dir = gDirUtilp->getOSCacheDir(); 2684 std::string new_cache_dir = gDirUtilp->getOSCacheDir();
2690 cache_dir = cache_dir + "/cache"; 2685 cache_dir = cache_dir + "/cache";
2691 new_cache_dir = new_cache_dir + "/SecondLife"; 2686 new_cache_dir = new_cache_dir + "/" + gSecondLife;
2692 if (gDirUtilp->fileExists(cache_dir)) 2687 if (gDirUtilp->fileExists(cache_dir))
2693 { 2688 {
2694 gDirUtilp->setCacheDir(cache_dir); 2689 gDirUtilp->setCacheDir(cache_dir);
diff --git a/linden/indra/newview/lldrawable.cpp b/linden/indra/newview/lldrawable.cpp
index 0f89585..5e4aafc 100644
--- a/linden/indra/newview/lldrawable.cpp
+++ b/linden/indra/newview/lldrawable.cpp
@@ -951,6 +951,9 @@ BOOL LLDrawable::isVisible() const
951 return TRUE; 951 return TRUE;
952 } 952 }
953 953
954#if 0
955 //disabling this code fixes DEV-20105. Leaving in place in case some other bug pops up as a a result.
956 //should be safe to just always ask the spatial group for visibility.
954 if (isActive()) 957 if (isActive())
955 { 958 {
956 if (isRoot()) 959 if (isRoot())
@@ -973,6 +976,7 @@ BOOL LLDrawable::isVisible() const
973 } 976 }
974 } 977 }
975 else 978 else
979#endif
976 { 980 {
977 LLSpatialGroup* group = getSpatialGroup(); 981 LLSpatialGroup* group = getSpatialGroup();
978 if (group && group->isVisible()) 982 if (group && group->isVisible())
diff --git a/linden/indra/newview/llfloaterdirectory.cpp b/linden/indra/newview/llfloaterdirectory.cpp
index 305a029..9a0c2fc 100644
--- a/linden/indra/newview/llfloaterdirectory.cpp
+++ b/linden/indra/newview/llfloaterdirectory.cpp
@@ -383,10 +383,6 @@ void LLFloaterDirectory::showPanel(const std::string& tabname)
383// static 383// static
384void LLFloaterDirectory::toggleFind(void*) 384void LLFloaterDirectory::toggleFind(void*)
385{ 385{
386#ifndef LL_RELEASE_FOR_DOWNLOAD
387 delete sInstance;
388 sInstance = NULL;
389#endif
390 if (!sInstance) 386 if (!sInstance)
391 { 387 {
392 std::string panel = gSavedSettings.getString("LastFindPanel"); 388 std::string panel = gSavedSettings.getString("LastFindPanel");
diff --git a/linden/indra/newview/llpanellogin.cpp b/linden/indra/newview/llpanellogin.cpp
index 61bf215..09e2cee 100644
--- a/linden/indra/newview/llpanellogin.cpp
+++ b/linden/indra/newview/llpanellogin.cpp
@@ -134,74 +134,14 @@ void LLLoginHandler::parse(const LLSD& queryMap)
134 mLastName = queryMap["last_name"].asString(); 134 mLastName = queryMap["last_name"].asString();
135 135
136 EGridInfo grid_choice = GRID_INFO_NONE; 136 EGridInfo grid_choice = GRID_INFO_NONE;
137 if (queryMap["grid"].asString() == "aditi") 137 if (queryMap["grid"].asString() == "sl beta grid")
138 { 138 {
139 grid_choice = GRID_INFO_ADITI; 139 grid_choice = GRID_INFO_ADITI;
140 } 140 }
141 else if (queryMap["grid"].asString() == "agni") 141 else if (queryMap["grid"].asString() == "sl main grid")
142 { 142 {
143 grid_choice = GRID_INFO_AGNI; 143 grid_choice = GRID_INFO_AGNI;
144 } 144 }
145 else if (queryMap["grid"].asString() == "siva")
146 {
147 grid_choice = GRID_INFO_SIVA;
148 }
149 else if (queryMap["grid"].asString() == "damballah")
150 {
151 grid_choice = GRID_INFO_DAMBALLAH;
152 }
153 else if (queryMap["grid"].asString() == "durga")
154 {
155 grid_choice = GRID_INFO_DURGA;
156 }
157 else if (queryMap["grid"].asString() == "shakti")
158 {
159 grid_choice = GRID_INFO_SHAKTI;
160 }
161 else if (queryMap["grid"].asString() == "soma")
162 {
163 grid_choice = GRID_INFO_SOMA;
164 }
165 else if (queryMap["grid"].asString() == "ganga")
166 {
167 grid_choice = GRID_INFO_GANGA;
168 }
169 else if (queryMap["grid"].asString() == "vaak")
170 {
171 grid_choice = GRID_INFO_VAAK;
172 }
173 else if (queryMap["grid"].asString() == "uma")
174 {
175 grid_choice = GRID_INFO_UMA;
176 }
177 else if (queryMap["grid"].asString() == "mohini")
178 {
179 grid_choice = GRID_INFO_MOHINI;
180 }
181 else if (queryMap["grid"].asString() == "yami")
182 {
183 grid_choice = GRID_INFO_YAMI;
184 }
185 else if (queryMap["grid"].asString() == "nandi")
186 {
187 grid_choice = GRID_INFO_NANDI;
188 }
189 else if (queryMap["grid"].asString() == "mitra")
190 {
191 grid_choice = GRID_INFO_MITRA;
192 }
193 else if (queryMap["grid"].asString() == "radha")
194 {
195 grid_choice = GRID_INFO_RADHA;
196 }
197 else if (queryMap["grid"].asString() == "ravi")
198 {
199 grid_choice = GRID_INFO_RAVI;
200 }
201 else if (queryMap["grid"].asString() == "aruna")
202 {
203 grid_choice = GRID_INFO_ARUNA;
204 }
205 145
206 if(grid_choice != GRID_INFO_NONE) 146 if(grid_choice != GRID_INFO_NONE)
207 { 147 {
@@ -849,12 +789,7 @@ void LLPanelLogin::refreshLocation( bool force_visible )
849 sInstance->childSetVisible("start_location_combo", show_start); 789 sInstance->childSetVisible("start_location_combo", show_start);
850 sInstance->childSetVisible("start_location_text", show_start); 790 sInstance->childSetVisible("start_location_text", show_start);
851 791
852#if LL_RELEASE_FOR_DOWNLOAD
853 BOOL show_server = gSavedSettings.getBOOL("ForceShowGrid");
854 sInstance->childSetVisible("server_combo", show_server);
855#else
856 sInstance->childSetVisible("server_combo", TRUE); 792 sInstance->childSetVisible("server_combo", TRUE);
857#endif
858 793
859#endif 794#endif
860} 795}
@@ -937,7 +872,7 @@ void LLPanelLogin::loadLoginPage()
937 curl_free(curl_version); 872 curl_free(curl_version);
938 873
939 // Grid 874 // Grid
940 char* curl_grid = curl_escape(LLViewerLogin::getInstance()->getGridLabel().c_str(), 0); 875 char* curl_grid = curl_escape(LLViewerLogin::getInstance()->getGridCodeName().c_str(), 0);
941 oStr << "&grid=" << curl_grid; 876 oStr << "&grid=" << curl_grid;
942 curl_free(curl_grid); 877 curl_free(curl_grid);
943 878
diff --git a/linden/indra/newview/llstartup.cpp b/linden/indra/newview/llstartup.cpp
index 0978fbb..625b1d8 100644
--- a/linden/indra/newview/llstartup.cpp
+++ b/linden/indra/newview/llstartup.cpp
@@ -2462,7 +2462,7 @@ void login_show()
2462 LLPanelLogin::addServer(LLViewerLogin::getInstance()->getGridLabel(), LLViewerLogin::getInstance()->getGridChoice()); 2462 LLPanelLogin::addServer(LLViewerLogin::getInstance()->getGridLabel(), LLViewerLogin::getInstance()->getGridChoice());
2463 2463
2464 LLViewerLogin* vl = LLViewerLogin::getInstance(); 2464 LLViewerLogin* vl = LLViewerLogin::getInstance();
2465 for(int grid_index = GRID_INFO_ADITI; grid_index < GRID_INFO_OTHER; ++grid_index) 2465 for(int grid_index = GRID_INFO_NONE + 1; grid_index < GRID_INFO_OTHER; ++grid_index)
2466 { 2466 {
2467 LLPanelLogin::addServer(vl->getKnownGridLabel((EGridInfo)grid_index), grid_index); 2467 LLPanelLogin::addServer(vl->getKnownGridLabel((EGridInfo)grid_index), grid_index);
2468 } 2468 }
diff --git a/linden/indra/newview/llviewernetwork.cpp b/linden/indra/newview/llviewernetwork.cpp
index 13d432a..c8cffcf 100644
--- a/linden/indra/newview/llviewernetwork.cpp
+++ b/linden/indra/newview/llviewernetwork.cpp
@@ -38,6 +38,7 @@
38struct LLGridData 38struct LLGridData
39{ 39{
40 const char* mLabel; 40 const char* mLabel;
41 const char* mCodeName;
41 const char* mName; 42 const char* mName;
42 const char* mLoginURI; 43 const char* mLoginURI;
43 const char* mHelperURI; 44 const char* mHelperURI;
@@ -45,83 +46,23 @@ struct LLGridData
45 46
46static LLGridData gGridInfo[GRID_INFO_COUNT] = 47static LLGridData gGridInfo[GRID_INFO_COUNT] =
47{ 48{
48 { "None", "", "", ""}, 49 { "None", "", "", "", "" },
49 { "Aditi", 50 { "SL Main Grid",
50 "util.aditi.lindenlab.com", 51 "Agni",
51 "https://login.aditi.lindenlab.com/cgi-bin/login.cgi",
52 "http://aditi-secondlife.webdev.lindenlab.com/helpers/" },
53 { "Agni",
54 "util.agni.lindenlab.com", 52 "util.agni.lindenlab.com",
55 "https://login.agni.lindenlab.com/cgi-bin/login.cgi", 53 "https://login.agni.lindenlab.com/cgi-bin/login.cgi",
56 "https://secondlife.com/helpers/" }, 54 "https://secondlife.com/helpers/" },
57 { "Aruna", 55 { "SL Beta Grid",
58 "util.aruna.lindenlab.com", 56 "Aditi",
59 "https://login.aruna.lindenlab.com/cgi-bin/login.cgi", 57 "util.aditi.lindenlab.com",
60 "http://aruna-secondlife.webdev.lindenlab.com/helpers/" }, 58 "https://login.aditi.lindenlab.com/cgi-bin/login.cgi",
61 { "Damballah", 59 "http://aditi-secondlife.webdev.lindenlab.com/helpers/" },
62 "util.damballah.lindenlab.com", 60 { "Local OpenSim",
63 "https://login.damballah.lindenlab.com/cgi-bin/login.cgi", 61 "",
64 "http://damballah-secondlife.webdev.lindenlab.com/helpers/" }, 62 "localhost",
65 { "Durga", 63 "http://127.0.0.1:9000",
66 "util.durga.lindenlab.com",
67 "https://login.durga.lindenlab.com/cgi-bin/login.cgi",
68 "http://durga-secondlife.webdev.lindenlab.com/helpers/" },
69 { "Ganga",
70 "util.ganga.lindenlab.com",
71 "https://login.ganga.lindenlab.com/cgi-bin/login.cgi",
72 "http://ganga-secondlife.webdev.lindenlab.com/helpers/" },
73 { "Mitra",
74 "util.mitra.lindenlab.com",
75 "https://login.mitra.lindenlab.com/cgi-bin/login.cgi",
76 "http://mitra-secondlife.webdev.lindenlab.com/helpers/" },
77 { "Mohini",
78 "util.mohini.lindenlab.com",
79 "https://login.mohini.lindenlab.com/cgi-bin/login.cgi",
80 "http://mohini-secondlife.webdev.lindenlab.com/helpers/" },
81 { "Nandi",
82 "util.nandi.lindenlab.com",
83 "https://login.nandi.lindenlab.com/cgi-bin/login.cgi",
84 "http://nandi-secondlife.webdev.lindenlab.com/helpers/" },
85 { "Radha",
86 "util.radha.lindenlab.com",
87 "https://login.radha.lindenlab.com/cgi-bin/login.cgi",
88 "http://radha-secondlife.webdev.lindenlab.com/helpers/" },
89 { "Ravi",
90 "util.ravi.lindenlab.com",
91 "https://login.ravi.lindenlab.com/cgi-bin/login.cgi",
92 "http://ravi-secondlife.webdev.lindenlab.com/helpers/" },
93 { "Siva",
94 "util.siva.lindenlab.com",
95 "https://login.siva.lindenlab.com/cgi-bin/login.cgi",
96 "http://siva-secondlife.webdev.lindenlab.com/helpers/" },
97 { "Shakti",
98 "util.shakti.lindenlab.com",
99 "https://login.shakti.lindenlab.com/cgi-bin/login.cgi",
100 "http://shakti-secondlife.webdev.lindenlab.com/helpers/" },
101 { "Soma",
102 "util.soma.lindenlab.com",
103 "https://login.soma.lindenlab.com/cgi-bin/login.cgi",
104 "http://soma-secondlife.webdev.lindenlab.com/helpers/" },
105 { "Uma",
106 "util.uma.lindenlab.com",
107 "https://login.uma.lindenlab.com/cgi-bin/login.cgi",
108 "http://uma-secondlife.webdev.lindenlab.com/helpers/" },
109 { "Vaak",
110 "util.vaak.lindenlab.com",
111 "https://login.vaak.lindenlab.com/cgi-bin/login.cgi",
112 "http://vaak-secondlife.webdev.lindenlab.com/helpers/" },
113 { "Yami",
114 "util.yami.lindenlab.com",
115 "https://login.yami.lindenlab.com/cgi-bin/login.cgi",
116 "http://yami-secondlife.webdev.lindenlab.com/helpers/" },
117 { "Local",
118 "localhost",
119 "https://login.dmz.lindenlab.com/cgi-bin/login.cgi",
120 "" }, 64 "" },
121 { "Other", 65 { "Other", "", "", "", "" }
122 "",
123 "https://login.dmz.lindenlab.com/cgi-bin/login.cgi",
124 "" }
125}; 66};
126 67
127const EGridInfo DEFAULT_GRID_CHOICE = GRID_INFO_AGNI; 68const EGridInfo DEFAULT_GRID_CHOICE = GRID_INFO_AGNI;
@@ -220,6 +161,16 @@ std::string LLViewerLogin::getGridLabel() const
220 return mGridName; 161 return mGridName;
221} 162}
222 163
164std::string LLViewerLogin::getGridCodeName() const
165{
166 if( gGridInfo[mGridChoice].mCodeName == "" )
167 {
168 return getGridLabel();
169 }
170
171 return gGridInfo[mGridChoice].mCodeName;
172}
173
223std::string LLViewerLogin::getKnownGridLabel(EGridInfo grid_index) const 174std::string LLViewerLogin::getKnownGridLabel(EGridInfo grid_index) const
224{ 175{
225 if(grid_index > GRID_INFO_NONE && grid_index < GRID_INFO_OTHER) 176 if(grid_index > GRID_INFO_NONE && grid_index < GRID_INFO_OTHER)
diff --git a/linden/indra/newview/llviewernetwork.h b/linden/indra/newview/llviewernetwork.h
index 53bb0ab..970e2ce 100644
--- a/linden/indra/newview/llviewernetwork.h
+++ b/linden/indra/newview/llviewernetwork.h
@@ -38,23 +38,8 @@ class LLHost;
38enum EGridInfo 38enum EGridInfo
39{ 39{
40 GRID_INFO_NONE, 40 GRID_INFO_NONE,
41 GRID_INFO_ADITI,
42 GRID_INFO_AGNI, 41 GRID_INFO_AGNI,
43 GRID_INFO_ARUNA, 42 GRID_INFO_ADITI,
44 GRID_INFO_DAMBALLAH,
45 GRID_INFO_DURGA,
46 GRID_INFO_GANGA,
47 GRID_INFO_MITRA,
48 GRID_INFO_MOHINI,
49 GRID_INFO_NANDI,
50 GRID_INFO_RADHA,
51 GRID_INFO_RAVI,
52 GRID_INFO_SIVA,
53 GRID_INFO_SHAKTI,
54 GRID_INFO_SOMA,
55 GRID_INFO_UMA,
56 GRID_INFO_VAAK,
57 GRID_INFO_YAMI,
58 GRID_INFO_LOCAL, 43 GRID_INFO_LOCAL,
59 GRID_INFO_OTHER, // IP address set via command line option 44 GRID_INFO_OTHER, // IP address set via command line option
60 GRID_INFO_COUNT 45 GRID_INFO_COUNT
@@ -87,6 +72,20 @@ public:
87 **/ 72 **/
88 std::string getGridLabel() const; 73 std::string getGridLabel() const;
89 74
75 /**
76 * @brief Get the code name for the grid choice.
77 *
78 * Returns the code name for the grid choice, as designated
79 * by Linden Lab. The SL main grid is Agni, and the beta
80 * grid is Aditi. There are other LL testing grids with code
81 * names, but we don't care about those.
82 *
83 * This string is used primarily for fetching the proper
84 * login splash page, since the web server expects "Agni"
85 * and "Aditi", not "SL Main Grid" and "SL Beta Grid".
86 */
87 std::string getGridCodeName() const;
88
90 std::string getKnownGridLabel(EGridInfo grid_index) const; 89 std::string getKnownGridLabel(EGridInfo grid_index) const;
91 90
92 void getLoginURIs(std::vector<std::string>& uris) const; 91 void getLoginURIs(std::vector<std::string>& uris) const;
diff --git a/linden/indra/newview/skins/default/xui/en-us/panel_group_invite.xml b/linden/indra/newview/skins/default/xui/en-us/panel_group_invite.xml
index 8c5cbb5..74d71f4 100644
--- a/linden/indra/newview/skins/default/xui/en-us/panel_group_invite.xml
+++ b/linden/indra/newview/skins/default/xui/en-us/panel_group_invite.xml
@@ -4,10 +4,10 @@
4 <text bottom_delta="-78" height="54" left="7" width="200" name="help_text"> 4 <text bottom_delta="-78" height="54" left="7" width="200" name="help_text">
5 You can select multiple residents to 5 You can select multiple residents to
6invite to your group. Click &apos;Open 6invite to your group. Click &apos;Open
7Person Chooser&apos; to start. 7Resident Chooser&apos; to start.
8 </text> 8 </text>
9 <button bottom_delta="-10" font="SansSerifSmall" halign="center" height="20" 9 <button bottom_delta="-10" font="SansSerifSmall" halign="center" height="20"
10 label="Open Person Chooser" left="5" name="add_button" tool_tip="" 10 label="Open Resident Chooser" left="5" name="add_button" tool_tip=""
11 width="200" /> 11 width="200" />
12 <name_list allow_calling_card_drop="true" background_visible="true" bottom_delta="-178" 12 <name_list allow_calling_card_drop="true" background_visible="true" bottom_delta="-178"
13 column_padding="0" draw_border="true" height="174" left="5" 13 column_padding="0" draw_border="true" height="174" left="5"
diff --git a/linden/indra/newview/skins/default/xui/en-us/panel_group_roles.xml b/linden/indra/newview/skins/default/xui/en-us/panel_group_roles.xml
index 53f847a..bd64622 100644
--- a/linden/indra/newview/skins/default/xui/en-us/panel_group_roles.xml
+++ b/linden/indra/newview/skins/default/xui/en-us/panel_group_roles.xml
@@ -80,7 +80,7 @@ execute the Ability.
80 <column label="Last Login" name="online" width="116" /> 80 <column label="Last Login" name="online" width="116" />
81 </name_list> 81 </name_list>
82 <button bottom_delta="-20" font="SansSerif" halign="center" height="19" 82 <button bottom_delta="-20" font="SansSerif" halign="center" height="19"
83 label="Invite New Person ..." left="4" name="member_invite" width="146" /> 83 label="Invite New Member ..." left="4" name="member_invite" width="146" />
84 <button bottom_delta="0" font="SansSerif" halign="center" height="19" 84 <button bottom_delta="0" font="SansSerif" halign="center" height="19"
85 label="Eject From Group" left="-153" name="member_eject" width="146" /> 85 label="Eject From Group" left="-153" name="member_eject" width="146" />
86 <string name="help_text"> 86 <string name="help_text">
diff --git a/linden/indra/newview/skins/silver/xui/en-us/floater_tools.xml b/linden/indra/newview/skins/silver/xui/en-us/floater_tools.xml
deleted file mode 100644
index 9b5d340..0000000
--- a/linden/indra/newview/skins/silver/xui/en-us/floater_tools.xml
+++ /dev/null
@@ -1,1275 +0,0 @@
1<?xml version="1.0" encoding="utf-8" standalone="yes" ?>
2<floater bottom="-359" can_close="true" can_drag_on_left="false" can_minimize="true"
3 can_resize="false" follows="left|top" height="550"
4 left="308" min_height="100" min_width="100" mouse_opaque="true"
5 name="toolbox floater" rect_control="ToolboxRect" sound_flags="0" title=""
6 short_title="Build" width="272">
7
8<!-- Main floater tabs -->
9
10 <button bottom="-34" follows="left|top" font="SansSerif" halign="center" height="32"
11 image_disabled="tool_zoom.tga"
12 image_disabled_selected="tool_zoom_active.tga"
13 image_selected="tool_zoom_active.tga" image_unselected="tool_zoom.tga"
14 label="" label_selected="" left="4" mouse_opaque="true" name="button focus"
15 tool_tip="Focus" width="32" />
16 <button bottom="-34" follows="left|top" font="SansSerif" halign="center" height="32"
17 image_disabled="UIImgGrabUUID"
18 image_disabled_selected="UIImgGrabSelectedUUID"
19 image_selected="UIImgGrabSelectedUUID" image_unselected="UIImgGrabUUID"
20 label="" label_selected="" left="40" mouse_opaque="true" name="button move"
21 tool_tip="Move" width="32" />
22 <button bottom="-34" follows="left|top" font="SansSerif" halign="center" height="32"
23 image_disabled="UIImgFaceUUID"
24 image_disabled_selected="UIImgFaceSelectedUUID"
25 image_selected="UIImgFaceSelectedUUID" image_unselected="UIImgFaceUUID"
26 label="" label_selected="" left="76" mouse_opaque="true" name="button edit"
27 tool_tip="Edit" width="32" />
28 <button bottom="-34" follows="left|top" font="SansSerif" halign="center" height="32"
29 image_disabled="UIImgCreateUUID"
30 image_disabled_selected="UIImgCreateSelectedUUID"
31 image_selected="UIImgCreateSelectedUUID" image_unselected="UIImgCreateUUID"
32 label="" label_selected="" left="112" mouse_opaque="true"
33 name="button create" tool_tip="Create" width="32" />
34 <button bottom="-34" follows="left|top" font="SansSerif" halign="center" height="32"
35 image_disabled="tool_dozer.tga"
36 image_disabled_selected="tool_dozer_active.tga"
37 image_selected="tool_dozer_active.tga" image_unselected="tool_dozer.tga"
38 label="" label_selected="" left="148" mouse_opaque="true"
39 name="button land" tool_tip="Land" width="32" />
40
41<!-- Focus panel -->
42
43 <check_box bottom="-70" follows="left|top" font="SansSerifSmall" height="16"
44 initial_value="false" label="Zoom" left="4" mouse_opaque="true"
45 name="radio zoom" radio_style="true" width="114" />
46 <volume_slider bottom="-69" follows="left|top" height="14" increment="0.01"
47 initial_val="0.125" left="114" max_val="0.5" min_val="0"
48 mouse_opaque="true" name="slider zoom" width="134" />
49 <check_box bottom="-84" follows="left|top" font="SansSerifSmall" height="16"
50 initial_value="false" label="Orbit (Ctrl)" left="4" mouse_opaque="true"
51 name="radio orbit" radio_style="true" width="114" />
52 <check_box bottom_delta="-15" follows="left|top" font="SansSerifSmall" height="16"
53 initial_value="false" label="Pan (Ctrl-Shift)" left="4"
54 mouse_opaque="true" name="radio pan" radio_style="true" width="114" />
55
56<!-- Move panel -->
57
58 <check_box bottom="-70" follows="left|top" font="SansSerifSmall" height="16"
59 initial_value="false" label="Move" left="4" mouse_opaque="true"
60 name="radio move" radio_style="true" width="114" />
61 <check_box bottom_delta="-15" follows="left|top" font="SansSerifSmall" height="16"
62 initial_value="false" label="Lift (Ctrl)" left="4" mouse_opaque="true"
63 name="radio lift" radio_style="true" width="114" />
64 <check_box bottom_delta="-15" follows="left|top" font="SansSerifSmall" height="16"
65 initial_value="false" label="Spin (Ctrl-Shift)" left="4"
66 mouse_opaque="true" name="radio spin" radio_style="true" width="114" />
67
68<!-- Edit panel -->
69
70 <check_box bottom="-70" follows="left|top" font="SansSerifSmall" height="16"
71 initial_value="false" label="Position" left="4" mouse_opaque="true"
72 name="radio position" radio_style="true" width="114" />
73 <check_box bottom_delta="-15" follows="left|top" font="SansSerifSmall" height="16"
74 initial_value="false" label="Rotate (Ctrl)" left="4" mouse_opaque="true"
75 name="radio rotate" radio_style="true" width="114" />
76 <check_box bottom_delta="-15" follows="left|top" font="SansSerifSmall" height="16"
77 initial_value="false" label="Stretch (Ctrl-Shift)" left="4"
78 mouse_opaque="true" name="radio stretch" radio_style="true" width="123" />
79 <check_box bottom_delta="-15" follows="left|top" font="SansSerifSmall" height="16"
80 initial_value="false" label="Select Texture" left="4" mouse_opaque="true"
81 name="radio select face" radio_style="true" width="114" />
82 <check_box bottom_delta="-19" control_name="EditLinkedParts" follows="left|top"
83 font="SansSerifSmall" height="16" initial_value="false"
84 label="Edit linked parts" left="4" mouse_opaque="true"
85 name="checkbox edit linked parts" width="114" />
86 <text bg_visible="false" border_drop_shadow_visible="false" border_visible="false"
87 bottom_delta="-20" drop_shadow_visible="true" follows="left|top"
88 font="SansSerifSmall" h_pad="0" halign="left" height="14" left="6"
89 mouse_opaque="true" name="text ruler mode" v_pad="0" width="68">
90 Ruler mode:
91 </text>
92 <combo_box allow_text_entry="false" bottom_delta="-4" follows="left|top" height="20"
93 left_delta="74" max_chars="20" mouse_opaque="true"
94 name="combobox grid mode" width="86">
95 <combo_item name="World" value="World">
96 World
97 </combo_item>
98 <combo_item name="Local" value="Local">
99 Local
100 </combo_item>
101 <combo_item name="Reference" value="Reference">
102 Reference
103 </combo_item>
104 </combo_box>
105 <check_box bottom="-70" control_name="ScaleUniform" follows="left|top"
106 font="SansSerifSmall" height="16" initial_value="false"
107 label="Stretch Both Sides" left="143" mouse_opaque="true"
108 name="checkbox uniform" width="134" />
109 <check_box bottom_delta="-15" control_name="ScaleStretchTextures" follows="left|top"
110 font="SansSerifSmall" height="16" initial_value="true"
111 label="Stretch Textures" left_delta="0" mouse_opaque="true"
112 name="checkbox stretch textures" width="134" />
113 <check_box bottom_delta="-19" control_name="SnapEnabled" follows="left|top"
114 font="SansSerifSmall" height="16" initial_value="true" label="Use Grid"
115 left_delta="0" mouse_opaque="true" name="checkbox snap to grid" width="134" />
116 <button bottom_delta="-14" follows="left|top" font="SansSerifSmall" halign="center"
117 height="16" label="Options..." label_selected="Options..." left_delta="20"
118 mouse_opaque="true" name="Options..." scale_image="TRUE" width="80" />
119
120<!-- Help text -->
121
122 <text bg_visible="false" border_drop_shadow_visible="false" border_visible="false"
123 bottom="-52" drop_shadow_visible="true" follows="left|top"
124 font="SansSerifSmall" h_pad="0" halign="left" height="16" left="4"
125 mouse_opaque="true" name="text status" v_pad="0" width="264">
126 Drag to move, shift-drag to copy
127 </text>
128
129<!-- Create panel -->
130
131 <button bottom="-78" follows="left|top" font="SansSerif" halign="center" height="30"
132 image_disabled="object_cube.tga"
133 image_disabled_selected="object_cube_active.tga"
134 image_selected="object_cube_active.tga" image_unselected="object_cube.tga"
135 label="" label_selected="" left="4" mouse_opaque="true" name="ToolCube"
136 scale_image="TRUE" width="30" tool_tip="Cube"/>
137 <button bottom_delta="0" follows="left|top" font="SansSerif" halign="center"
138 height="30" image_disabled="object_prism.tga"
139 image_disabled_selected="object_prism_active.tga"
140 image_selected="object_prism_active.tga"
141 image_unselected="object_prism.tga" label="" label_selected=""
142 left_delta="28" mouse_opaque="true" name="ToolPrism" scale_image="TRUE"
143 tool_tip="Prism" width="30" />
144 <button bottom_delta="0" follows="left|top" font="SansSerif" halign="center"
145 height="30" image_disabled="object_pyramid.tga"
146 image_disabled_selected="object_pyramid_active.tga"
147 image_selected="object_pyramid_active.tga"
148 image_unselected="object_pyramid.tga" label="" label_selected=""
149 left_delta="28" mouse_opaque="true" name="ToolPyramid" scale_image="TRUE"
150 tool_tip="Pyramid" width="30" />
151 <button bottom_delta="0" follows="left|top" font="SansSerif" halign="center"
152 height="30" image_disabled="object_tetrahedron.tga"
153 image_disabled_selected="object_tetrahedron_active.tga"
154 image_selected="object_tetrahedron_active.tga"
155 image_unselected="object_tetrahedron.tga" label="" label_selected=""
156 left_delta="23" mouse_opaque="true" name="ToolTetrahedron"
157 scale_image="TRUE" tool_tip="Tetrahedron" width="30" />
158 <button bottom_delta="0" follows="left|top" font="SansSerif" halign="center"
159 height="30" image_disabled="object_cylinder.tga"
160 image_disabled_selected="object_cylinder_active.tga"
161 image_selected="object_cylinder_active.tga"
162 image_unselected="object_cylinder.tga" label="" label_selected=""
163 left_delta="23" mouse_opaque="true" tool_tip="Cylinder" name="ToolCylinder" scale_image="TRUE"
164 width="30" />
165 <button bottom_delta="0" follows="left|top" font="SansSerif" halign="center"
166 height="30" image_disabled="object_hemi_cylinder.tga"
167 image_disabled_selected="object_hemi_cylinder_active.tga"
168 image_selected="object_hemi_cylinder_active.tga"
169 image_unselected="object_hemi_cylinder.tga" label="" label_selected=""
170 left_delta="23" mouse_opaque="true" name="ToolHemiCylinder"
171 scale_image="TRUE" tool_tip="Hemicylinder" width="30" />
172 <button bottom_delta="0" follows="left|top" font="SansSerif" halign="center"
173 height="30" image_disabled="object_cone.tga"
174 image_disabled_selected="object_cone_active.tga"
175 image_selected="object_cone_active.tga" image_unselected="object_cone.tga"
176 label="" label_selected="" left_delta="23" mouse_opaque="true"
177 name="ToolCone" scale_image="TRUE" tool_tip="Cone" width="30" />
178 <button bottom_delta="0" follows="left|top" font="SansSerif" halign="center"
179 height="30" image_disabled="object_hemi_cone.tga"
180 image_disabled_selected="object_hemi_cone_active.tga"
181 image_selected="object_hemi_cone_active.tga"
182 image_unselected="object_hemi_cone.tga" label="" label_selected=""
183 left_delta="23" mouse_opaque="true" name="ToolHemiCone" scale_image="TRUE"
184 tool_tip="Hemicone" width="30" />
185 <button bottom_delta="0" follows="left|top" font="SansSerif" halign="center"
186 height="30" image_disabled="object_sphere.tga"
187 image_disabled_selected="object_sphere_active.tga"
188 image_selected="object_sphere_active.tga"
189 image_unselected="object_sphere.tga" label="" label_selected=""
190 left_delta="23" mouse_opaque="true" name="ToolSphere" scale_image="TRUE"
191 width="30" tool_tip="Sphere" />
192 <button bottom_delta="0" follows="left|top" font="SansSerif" halign="center"
193 height="30" image_disabled="object_hemi_sphere.tga"
194 image_disabled_selected="object_hemi_sphere_active.tga"
195 image_selected="object_hemi_sphere_active.tga"
196 image_unselected="object_hemi_sphere.tga" label="" label_selected=""
197 left_delta="23" mouse_opaque="true" name="ToolHemiSphere"
198 scale_image="TRUE" tool_tip="Hemisphere" width="30" />
199 <button bottom_delta="-23" follows="left|top" font="SansSerif" halign="center"
200 height="30" image_disabled="object_torus.tga"
201 image_disabled_selected="object_torus_active.tga"
202 image_selected="object_torus_active.tga"
203 image_unselected="object_torus.tga" label="" label_selected="" left="4"
204 mouse_opaque="true" name="ToolTorus" scale_image="TRUE" tool_tip="Torus" width="30" />
205 <button bottom_delta="0" follows="left|top" font="SansSerif" halign="center"
206 height="30" image_disabled="object_tube.tga"
207 image_disabled_selected="object_tube_active.tga"
208 image_selected="object_tube_active.tga" image_unselected="object_tube.tga"
209 label="" label_selected="" left_delta="23" mouse_opaque="true"
210 name="ToolTube" scale_image="TRUE" tool_tip="Tube" width="30" />
211 <button bottom_delta="0" follows="left|top" font="SansSerif" halign="center"
212 height="30" image_disabled="object_ring.tga"
213 image_disabled_selected="object_ring_active.tga"
214 image_selected="object_ring_active.tga" image_unselected="object_ring.tga"
215 label="" label_selected="" left_delta="23" mouse_opaque="true"
216 name="ToolRing" scale_image="TRUE" tool_tip="Ring" width="30" />
217 <button bottom_delta="0" follows="left|top" font="SansSerif" halign="center"
218 height="30" image_disabled="object_tree.tga"
219 image_disabled_selected="object_tree_active.tga"
220 image_selected="object_tree_active.tga" image_unselected="object_tree.tga"
221 label="" label_selected="" left_delta="23" mouse_opaque="true"
222 name="ToolTree" scale_image="TRUE" tool_tip="Tree" width="30" />
223 <button bottom_delta="0" follows="left|top" font="SansSerif" halign="center"
224 height="30" image_disabled="object_grass.tga"
225 image_disabled_selected="object_grass_active.tga"
226 image_selected="object_grass_active.tga"
227 image_unselected="object_grass.tga" label="" label_selected=""
228 left_delta="28" mouse_opaque="true" name="ToolGrass" scale_image="TRUE"
229 tool_tip="Grass" width="30" />
230 <check_box bottom="-120" control_name="CreateToolKeepSelected" follows="left|top"
231 font="SansSerifSmall" height="16" initial_value="false"
232 label="Keep Tool Selected" left="4" mouse_opaque="true"
233 name="checkbox sticky" width="128" />
234 <check_box bottom_delta="-15" control_name="CreateToolCopySelection" follows="left|top"
235 font="SansSerifSmall" height="16" initial_value="false"
236 label="Copy Selection" left_delta="0" mouse_opaque="true"
237 name="checkbox copy selection" width="134" />
238 <check_box bottom_delta="-15" control_name="CreateToolCopyCenters" follows="left|top"
239 font="SansSerifSmall" height="16" initial_value="true" label="Center Copy"
240 left_delta="20" mouse_opaque="true" name="checkbox copy centers"
241 width="134" />
242 <check_box bottom_delta="-15" control_name="CreateToolCopyRotates" follows="left|top"
243 font="SansSerifSmall" height="16" initial_value="false" label="Rotate Copy"
244 left_delta="0" mouse_opaque="true" name="checkbox copy rotates" width="134" />
245
246<!-- Land panel -->
247
248 <check_box bottom="-70" follows="left|top" font="SansSerifSmall" height="16"
249 initial_value="false" label="Select Land" left="4" mouse_opaque="true"
250 name="radio select land" radio_style="true" width="114" />
251 <check_box bottom_delta="-14" follows="left|top" font="SansSerifSmall" height="16"
252 initial_value="false" label="Flatten Land" left="4" mouse_opaque="true"
253 name="radio flatten" radio_style="true" width="114" />
254 <check_box bottom_delta="-14" follows="left|top" font="SansSerifSmall" height="16"
255 initial_value="false" label="Raise Land" left="4" mouse_opaque="true"
256 name="radio raise" radio_style="true" width="114" />
257 <check_box bottom_delta="-14" follows="left|top" font="SansSerifSmall" height="16"
258 initial_value="false" label="Lower Land" left="4" mouse_opaque="true"
259 name="radio lower" radio_style="true" width="114" />
260 <check_box bottom_delta="-14" follows="left|top" font="SansSerifSmall" height="16"
261 initial_value="false" label="Smooth Land" left="4" mouse_opaque="true"
262 name="radio smooth" radio_style="true" width="114" />
263 <check_box bottom_delta="-14" follows="left|top" font="SansSerifSmall" height="16"
264 initial_value="false" label="Roughen Land" left="4" mouse_opaque="true"
265 name="radio noise" radio_style="true" width="114" />
266 <check_box bottom_delta="-14" follows="left|top" font="SansSerifSmall" height="16"
267 initial_value="false" label="Revert Land" left="4" mouse_opaque="true"
268 name="radio revert" radio_style="true" width="114" />
269 <combo_box allow_text_entry="false" bottom="-85" follows="left|top" height="18" left="118"
270 max_chars="20" mouse_opaque="true" name="combobox brush size" width="134">
271 <combo_item name="Small" value="Small">
272 Small
273 </combo_item>
274 <combo_item name="Medium" value="Medium">
275 Medium
276 </combo_item>
277 <combo_item name="Large" value="Large">
278 Large
279 </combo_item>
280 </combo_box>
281 <volume_slider bottom_delta="-19" follows="left|top" height="16" hidden="false" increment="0.1"
282 initial_val="0.00" left="176" max_val="2.0" min_val="-1.0"
283 mouse_opaque="true" name="slider force" width="70" />
284 <text type="string" length="1" bg_visible="false" border_drop_shadow_visible="false" border_visible="false"
285 bottom_delta="4" drop_shadow_visible="true" enabled="true" follows="left|top"
286 font="SansSerifSmall" h_pad="0" halign="left" height="12" hidden="false"
287 left="126" mouse_opaque="true" name="Strength:" v_pad="0" width="128">
288 Strength:
289 </text>
290 <button bottom_delta="-20" follows="left|top" font="SansSerifSmall" halign="center"
291 height="16" label="Apply to selection" label_selected="Apply to selection"
292 left="118" mouse_opaque="true" name="button apply to selection"
293 scale_image="TRUE" tool_tip="Modify Selected Land" width="134" />
294 <check_box bottom_delta="-20" control_name="ShowParcelOwners" follows="left|top"
295 font="SansSerifSmall" height="16" initial_value="false" label="Show Owners"
296 left="118" mouse_opaque="true" name="checkbox show owners" width="134" />
297 <button bottom="-163" follows="left|top" font="SansSerifSmall" halign="center"
298 height="20" label="More &gt;&gt;" left="186" mouse_opaque="true"
299 name="button more" scale_image="TRUE" tool_tip="Advanced Options"
300 width="80" />
301 <button bottom_delta="0" follows="left|top" font="SansSerifSmall" halign="center"
302 height="20" label="&lt;&lt; Less" left_delta="0" mouse_opaque="true"
303 name="button less" scale_image="TRUE" tool_tip="Advanced Options"
304 width="80" />
305
306<!-- Sub-tabs -->
307
308 <tab_container bottom="-550" follows="left|top" height="384" left="0" mouse_opaque="false"
309 name="Object Info Tabs" tab_max_width="52" tab_min_width="40"
310 tab_position="top" width="272">
311 <panel border="true" bottom="-383" follows="left|top|right|bottom" height="367"
312 label="General" left="1" mouse_opaque="false" name="General" width="270">
313 <text bg_visible="false" border_drop_shadow_visible="false" border_visible="false"
314 bottom="-20" drop_shadow_visible="true" follows="left|top"
315 font="SansSerifSmall" h_pad="0" halign="left" height="10" left="10"
316 mouse_opaque="true" name="Name:" v_pad="0" width="78">
317 Name:
318 </text>
319 <line_editor bevel_style="in" border_style="line" border_thickness="1" bottom="-26"
320 follows="left|top|right" font="SansSerifSmall" height="16" left="88"
321 max_length="63" mouse_opaque="true" name="Object Name"
322 select_all_on_focus_received="true" width="172" />
323 <text bg_visible="false" border_drop_shadow_visible="false" border_visible="false"
324 bottom="-40" drop_shadow_visible="true" follows="left|top"
325 font="SansSerifSmall" h_pad="0" halign="left" height="10" left="10"
326 mouse_opaque="true" name="Description:" v_pad="0" width="78">
327 Description:
328 </text>
329 <line_editor bevel_style="in" border_style="line" border_thickness="1" bottom="-46"
330 follows="left|top|right" font="SansSerifSmall" height="16" left="88"
331 max_length="127" mouse_opaque="true" name="Object Description"
332 select_all_on_focus_received="true" width="172" />
333 <text bg_visible="false" border_drop_shadow_visible="false" border_visible="false"
334 bottom="-66" drop_shadow_visible="true" follows="left|top"
335 font="SansSerifSmall" h_pad="0" halign="left" height="16" left="10"
336 mouse_opaque="true" name="Creator:" v_pad="0" width="78">
337 Creator:
338 </text>
339 <text bg_visible="false" border_drop_shadow_visible="false" border_visible="false"
340 bottom="-66" drop_shadow_visible="true" follows="left|top"
341 font="SansSerifSmall" h_pad="0" halign="left" height="16" left_delta="78"
342 mouse_opaque="true" name="Creator Name" v_pad="0" width="88">
343 Thrax Linden
344 </text>
345 <button bottom="-66" follows="top|right" font="SansSerifSmall" halign="center"
346 height="16" label="Profile..." label_selected="Profile..." left_delta="94"
347 mouse_opaque="true" name="button creator profile" scale_image="TRUE"
348 width="78" />
349 <text bg_visible="false" border_drop_shadow_visible="false" border_visible="false"
350 bottom="-86" drop_shadow_visible="true" follows="left|top"
351 font="SansSerifSmall" h_pad="0" halign="left" height="16" left="10"
352 mouse_opaque="true" name="Owner:" v_pad="0" width="78">
353 Owner:
354 </text>
355 <text bg_visible="false" border_drop_shadow_visible="false" border_visible="false"
356 bottom="-86" drop_shadow_visible="true" follows="left|top"
357 font="SansSerifSmall" h_pad="0" halign="left" height="16" left_delta="78"
358 mouse_opaque="true" name="Owner Name" v_pad="0" width="88">
359 Thrax Linden
360 </text>
361 <button bottom="-86" follows="top|right" font="SansSerifSmall" halign="center"
362 height="16" label="Profile..." label_selected="Profile..." left_delta="94"
363 mouse_opaque="true" name="button owner profile" scale_image="TRUE"
364 width="78" />
365 <text bg_visible="false" border_drop_shadow_visible="false" border_visible="false"
366 bottom="-106" drop_shadow_visible="true" follows="left|top"
367 font="SansSerifSmall" h_pad="0" halign="left" height="16" left="10"
368 mouse_opaque="true" name="Group:" v_pad="0" width="78">
369 Group:
370 </text>
371 <text bg_visible="false" border_drop_shadow_visible="false" border_visible="false"
372 bottom="-106" drop_shadow_visible="true" follows="left|top"
373 font="SansSerifSmall" h_pad="0" halign="left" height="16" left_delta="78"
374 mouse_opaque="true" name="Group Name Proxy" v_pad="0" visible="false"
375 width="88">
376 The Lindens
377 </text>
378 <button bottom="-106" follows="top|right" font="SansSerifSmall" halign="center"
379 height="16" label="Set..." label_selected="Set..." left_delta="94"
380 mouse_opaque="true" name="button set group" scale_image="TRUE" width="78" />
381 <text bg_visible="false" border_drop_shadow_visible="false" border_visible="false"
382 bottom="-126" drop_shadow_visible="true" follows="left|top"
383 font="SansSerifSmall" h_pad="0" halign="left" height="16" left="10"
384 mouse_opaque="true" name="prim info" v_pad="0" width="166">
385 1 Object, 1 Primitive
386 </text>
387 <text bg_visible="false" border_drop_shadow_visible="false" border_visible="false"
388 bottom_delta="-20" drop_shadow_visible="true" follows="left|top"
389 font="SansSerifSmall" h_pad="0" halign="left" height="16" left="10"
390 mouse_opaque="true" name="Permissions:" v_pad="0" width="85">
391 Permissions:
392 </text>
393 <text bg_visible="false" border_drop_shadow_visible="false" border_visible="false"
394 bottom_delta="-20" drop_shadow_visible="true" follows="left|top|right"
395 font="SansSerifSmall" h_pad="0" halign="left" height="16" left="10"
396 mouse_opaque="true" name="perm_modify" v_pad="0" width="250">
397 You can modify this object.
398 </text>
399 <check_box bottom_delta="-20" follows="left|top" font="SansSerifSmall" height="16"
400 initial_value="false" label="Share with group" left="10"
401 mouse_opaque="true" name="checkbox share with group"
402 tool_tip="Allow group members to move, modify, copy and delete."
403 width="166" />
404 <string name="text deed continued">
405 Deed...
406 </string>
407 <string name="text deed">
408 Deed
409 </string>
410 <button bottom="-186" follows="top|right" font="SansSerifSmall" halign="center"
411 height="16" label="Deed..." label_selected="Deed..." left_delta="172"
412 mouse_opaque="true" name="button deed" scale_image="TRUE"
413 tool_tip="Group shared objects can be deeded by a group officer."
414 width="78" />
415 <check_box bottom="-206" follows="left|top" font="SansSerifSmall" height="16"
416 initial_value="false" label="Allow anyone to move" left="10"
417 mouse_opaque="true" name="checkbox allow everyone move" width="142" />
418 <check_box bottom_delta="-20" follows="left|top" font="SansSerifSmall" height="16"
419 initial_value="false" label="Allow anyone to copy" left="10"
420 mouse_opaque="true" name="checkbox allow everyone copy" width="141" />
421 <check_box bottom_delta="-20" follows="left|top" font="SansSerifSmall" height="16"
422 initial_value="false" label="Show in search" left="10" name="search_check"
423 tool_tip="Let people see this object in search results" width="78" />
424 <check_box bottom_delta="-20" follows="left|top" font="SansSerifSmall" height="16"
425 initial_value="false" label="For Sale" left="10" mouse_opaque="true"
426 name="checkbox for sale" width="78" />
427 <text bg_visible="false" border_drop_shadow_visible="false" border_visible="false"
428 bottom_delta="0" drop_shadow_visible="true" follows="left|top"
429 font="SansSerifSmall" h_pad="0" halign="left" height="16" left_delta="90"
430 mouse_opaque="true" name="Cost" v_pad="0" width="78">
431 Price: L$
432 </text>
433 <line_editor bevel_style="in" border_style="line" border_thickness="1" bottom_delta="0"
434 follows="left|top|right" font="SansSerifSmall" height="16" left_delta="80"
435 max_length="25" mouse_opaque="true" name="Edit Cost" width="75" />
436 <radio_group bottom="-286" draw_border="false" follows="left|top|right" height="16"
437 left="42" mouse_opaque="true" name="sale type" width="218">
438 <radio_item bottom="-16" follows="left|top" height="16" left="0" mouse_opaque="true"
439 name="Original" width="70">
440 Original
441 </radio_item>
442 <radio_item bottom="-16" follows="left|top" height="16" left="70" mouse_opaque="true"
443 name="Copy" width="70">
444 Copy
445 </radio_item>
446 <radio_item bottom="-16" follows="left|top" height="16" left="140" mouse_opaque="true"
447 name="Contents" width="76">
448 Contents
449 </radio_item>
450 </radio_group>
451 <text bg_visible="false" border_drop_shadow_visible="false" border_visible="false"
452 bottom="-298" drop_shadow_visible="true" follows="left|top|right"
453 font="SansSerifSmall" h_pad="0" halign="left" height="10" left="10"
454 mouse_opaque="true" name="Next owner can:" v_pad="0" width="250">
455 Next owner can:
456 </text>
457 <check_box bottom_delta="-22" follows="left|top|right" font="SansSerifSmall" height="16"
458 initial_value="false" label="Modify" left="10" mouse_opaque="true"
459 name="checkbox next owner can modify" width="250" />
460 <check_box bottom_delta="0" follows="left|top|right" font="SansSerifSmall" height="16"
461 initial_value="false" label="Copy" left_delta="60" mouse_opaque="true"
462 name="checkbox next owner can copy" width="190" />
463 <check_box bottom_delta="0" follows="left|top|right" font="SansSerifSmall" height="16"
464 initial_value="false" label="Resell/Give away" left_delta="60"
465 mouse_opaque="true" name="checkbox next owner can transfer" width="130" />
466 <text bg_visible="false" border_drop_shadow_visible="false" border_visible="false"
467 bottom="-332" drop_shadow_visible="true" follows="left|top"
468 font="SansSerifSmall" h_pad="0" halign="left" height="10" left="10"
469 mouse_opaque="true" name="label click action" v_pad="0" width="150">
470 When Left-Clicked:
471 </text>
472 <combo_box allow_text_entry="false" bottom_delta="-25" follows="left|top" height="18"
473 left="10" max_chars="20" mouse_opaque="true" name="clickaction" width="150">
474 <!-- Do not reorder these items, the index numbers are
475 used internally. JC -->
476 <combo_item name="Touch/grab(default)" value="Touch/grab (default)">
477 Touch/grab (default)
478 </combo_item>
479 <combo_item name="Sitonobject" value="Sit on object">
480 Sit on object
481 </combo_item>
482 <combo_item name="Buyobject" value="Buy object">
483 Buy object
484 </combo_item>
485 <combo_item name="Payobject" value="Pay object">
486 Pay object
487 </combo_item>
488 <combo_item name="Open" value="Open">
489 Open
490 </combo_item>
491 <combo_item name="Play" value="Play">
492 Play parcel media
493 </combo_item>
494 <combo_item name="Opemmedia" value="Open Media">
495 Open parcel media
496 </combo_item>
497 </combo_box>
498 <text bg_visible="false" border_drop_shadow_visible="false" border_visible="false"
499 bottom="-135" drop_shadow_visible="true" follows="left|top"
500 font="SansSerifSmall" h_pad="0" halign="left" height="10" left="88"
501 mouse_opaque="true" name="B:" v_pad="0" width="174">
502 B:
503 </text>
504 <text bg_visible="false" border_drop_shadow_visible="false" border_visible="false"
505 bottom="-135" drop_shadow_visible="true" follows="left|top"
506 font="SansSerifSmall" h_pad="0" halign="left" height="10" left_delta="50"
507 mouse_opaque="true" name="O:" v_pad="0" width="124">
508 O;
509 </text>
510 <text bg_visible="false" border_drop_shadow_visible="false" border_visible="false"
511 bottom="-135" drop_shadow_visible="true" follows="left|top"
512 font="SansSerifSmall" h_pad="0" halign="left" height="10" left_delta="50"
513 mouse_opaque="true" name="G:" v_pad="0" width="74">
514 G:
515 </text>
516 <text bg_visible="false" border_drop_shadow_visible="false" border_visible="false"
517 bottom="-147" drop_shadow_visible="true" follows="left|top"
518 font="SansSerifSmall" h_pad="0" halign="left" height="10" left="88"
519 mouse_opaque="true" name="E:" v_pad="0" width="174">
520 E:
521 </text>
522 <text bg_visible="false" border_drop_shadow_visible="false" border_visible="false"
523 bottom="-147" drop_shadow_visible="true" follows="left|top"
524 font="SansSerifSmall" h_pad="0" halign="left" height="10" left_delta="50"
525 mouse_opaque="true" name="N:" v_pad="0" width="124">
526 N:
527 </text>
528 <text bg_visible="false" border_drop_shadow_visible="false" border_visible="false"
529 bottom="-147" drop_shadow_visible="true" follows="left|top"
530 font="SansSerifSmall" h_pad="0" halign="left" height="10" left_delta="50"
531 mouse_opaque="true" name="F:" v_pad="0" width="74">
532 F:
533 </text>
534 <string name="text modify info 1">
535 You can modify this object.
536 </string>
537 <string name="text modify info 2">
538 You can modify these objects.
539 </string>
540 <string name="text modify info 3">
541 You cannot modify this object.
542 </string>
543 <string name="text modify info 4">
544 You cannot modify these objects.
545 </string>
546 <string name="text modify warning">
547 Must select entire object to set permissions.
548 </string>
549 <string name="Cost Default">
550 Price: L$
551 </string>
552 <string name="Cost Total">
553 Total Price: L$
554 </string>
555 <string name="Cost Per Unit">
556 Price Per: L$
557 </string>
558 <string name="Cost Mixed">
559 Mixed Price
560 </string>
561 <string name="Sale Mixed">
562 Mixed Sale
563 </string>
564 </panel>
565
566<!-- Object sub-tab -->
567
568 <panel border="true" bottom="-383" follows="left|top|right|bottom" height="367"
569 label="Object" left="1" mouse_opaque="false" name="Object" width="270">
570 <text bg_visible="false" border_drop_shadow_visible="false" border_visible="false"
571 bottom="-20" drop_shadow_visible="true" follows="left|top"
572 font="SansSerifSmall" h_pad="0" halign="left" height="10" left="10"
573 mouse_opaque="true" name="select_single" v_pad="0" width="252">
574 Select only one primitive to edit parameters.
575 </text>
576 <text bg_visible="false" border_drop_shadow_visible="false" border_visible="false"
577 bottom_delta="0" drop_shadow_visible="true" follows="left|top"
578 font="SansSerifSmall" h_pad="0" halign="left" height="10" left_delta="0"
579 mouse_opaque="true" name="edit_object" v_pad="0" width="252">
580 Edit object parameters:
581 </text>
582 <check_box bottom_delta="-26" follows="left|top" font="SansSerifSmall" height="16"
583 initial_value="false" label="Locked" left="8" mouse_opaque="true"
584 name="checkbox locked"
585 tool_tip="Prevents object from being moved or deleted. Frequently useful during building to avoid unintended edits."
586 width="123" />
587 <check_box bottom_delta="-18" follows="left|top" font="SansSerifSmall" height="16"
588 initial_value="false" label="Physical" left="8" mouse_opaque="true"
589 name="Physical Checkbox Ctrl"
590 tool_tip="Allows object to be pushed and affected by gravity" width="123" />
591 <check_box bottom_delta="-18" follows="left|top" font="SansSerifSmall" height="16"
592 initial_value="false" label="Temporary" left="8" mouse_opaque="true"
593 name="Temporary Checkbox Ctrl"
594 tool_tip="Causes object to be deleted 1 minute after creation." width="123" />
595 <check_box bottom_delta="-18" follows="left|top" font="SansSerifSmall" height="16"
596 initial_value="false" label="Phantom" left="8" mouse_opaque="true"
597 name="Phantom Checkbox Ctrl"
598 tool_tip="Causes object to not collide with other objects or avatars"
599 width="123" />
600 <text bg_visible="false" border_drop_shadow_visible="false" border_visible="false"
601 bottom_delta="-14" drop_shadow_visible="true" follows="left|top"
602 font="SansSerifSmall" h_pad="0" halign="left" height="10" left="10"
603 mouse_opaque="true" name="label position" v_pad="0" width="121">
604 Position (meters)
605 </text>
606 <spinner bottom_delta="-20" decimal_digits="3" follows="left|top" height="16"
607 increment="0.01" initial_val="0" label="X" label_width="10" left="10"
608 max_val="512" min_val="-256" mouse_opaque="true" name="Pos X"
609 text_enabled_color="110, 15, 15, 255" width="87" />
610 <spinner bottom_delta="-18" decimal_digits="3" follows="left|top" height="16"
611 increment="0.01" initial_val="0" label="Y" label_width="10" left="10"
612 max_val="512" min_val="-256" mouse_opaque="true" name="Pos Y"
613 text_enabled_color="0, 100, 40, 255" width="87" />
614 <spinner bottom_delta="-18" decimal_digits="3" follows="left|top" height="16"
615 increment="0.01" initial_val="0" label="Z" label_width="10" left="10"
616 max_val="4096" min_val="0" mouse_opaque="true" name="Pos Z"
617 text_enabled_color="0, 67, 132, 255" width="87" />
618 <text bg_visible="false" border_drop_shadow_visible="false" border_visible="false"
619 bottom_delta="-16" drop_shadow_visible="true" follows="left|top"
620 font="SansSerifSmall" h_pad="0" halign="left" height="10" left="10"
621 mouse_opaque="true" name="label size" v_pad="0" width="121">
622 Size (meters)
623 </text>
624 <spinner bottom_delta="-20" decimal_digits="3" follows="left|top" height="16"
625 increment="0.01" initial_val="0" label="X" label_width="10" left="10"
626 max_val="10" min_val="0.01" mouse_opaque="true" name="Scale X"
627 text_enabled_color="1, 1, 1, 1" width="87" />
628 <spinner bottom_delta="-18" decimal_digits="3" follows="left|top" height="16"
629 increment="0.01" initial_val="0" label="Y" label_width="10" left="10"
630 max_val="10" min_val="0.01" mouse_opaque="true" name="Scale Y"
631 text_enabled_color="1, 1, 1, 1" width="87" />
632 <spinner bottom_delta="-18" decimal_digits="3" follows="left|top" height="16"
633 increment="0.01" initial_val="0" label="Z" label_width="10" left="10"
634 max_val="10" min_val="0.01" mouse_opaque="true" name="Scale Z"
635 text_enabled_color="1, 1, 1, 1" width="87" />
636 <text bg_visible="false" border_drop_shadow_visible="false" border_visible="false"
637 bottom_delta="-16" drop_shadow_visible="true" follows="left|top"
638 font="SansSerifSmall" h_pad="0" halign="left" height="10" left="10"
639 mouse_opaque="true" name="label rotation" v_pad="0" width="121">
640 Rotation (degrees)
641 </text>
642 <spinner bottom_delta="-22" decimal_digits="2" follows="left|top" height="16"
643 increment="1" initial_val="0" label="X" label_width="10" left="10"
644 max_val="9999" min_val="-9999" mouse_opaque="true" name="Rot X"
645 text_enabled_color="1, 1, 1, 1" width="87" />
646 <spinner bottom_delta="-18" decimal_digits="2" follows="left|top" height="16"
647 increment="1" initial_val="0" label="Y" label_width="10" left="10"
648 max_val="9999" min_val="-9999" mouse_opaque="true" name="Rot Y"
649 text_enabled_color="1, 1, 1, 1" width="87" />
650 <spinner bottom_delta="-18" decimal_digits="2" follows="left|top" height="16"
651 increment="1" initial_val="0" label="Z" label_width="10" left="10"
652 max_val="9999" min_val="-9999" mouse_opaque="true" name="Rot Z"
653 text_enabled_color="1, 1, 1, 1" width="87" />
654 <text bg_visible="false" border_drop_shadow_visible="false" border_visible="false"
655 bottom_delta="-16" drop_shadow_visible="true" follows="left|top"
656 font="SansSerifSmall" h_pad="0" halign="left" height="10" left="10"
657 mouse_opaque="true" name="label material" v_pad="0" width="121">
658 Material
659 </text>
660 <combo_box allow_text_entry="false" bottom_delta="-22" follows="left|top" height="18"
661 left="10" max_chars="20" mouse_opaque="true" name="material" width="87">
662 <combo_item name="Stone" value="Stone">
663 Stone
664 </combo_item>
665 <combo_item name="Metal" value="Metal">
666 Metal
667 </combo_item>
668 <combo_item name="Glass" value="Glass">
669 Glass
670 </combo_item>
671 <combo_item name="Wood" value="Wood">
672 Wood
673 </combo_item>
674 <combo_item name="Flesh" value="Flesh">
675 Flesh
676 </combo_item>
677 <combo_item name="Plastic" value="Plastic">
678 Plastic
679 </combo_item>
680 <combo_item name="Rubber" value="Rubber">
681 Rubber
682 </combo_item>
683 </combo_box>
684 <text bg_visible="false" border_drop_shadow_visible="false" border_visible="false"
685 bottom="-36" drop_shadow_visible="true" follows="left|top"
686 font="SansSerifSmall" h_pad="0" halign="left" height="10" left="121"
687 mouse_opaque="true" name="label basetype" v_pad="0" width="141">
688 Building Block Type
689 </text>
690 <combo_box allow_text_entry="false" bottom_delta="-24" follows="left|top" height="18"
691 left="121" max_chars="20" mouse_opaque="true" name="comboBaseType"
692 width="141">
693 <combo_item name="Box" value="Box">
694 Box
695 </combo_item>
696 <combo_item name="Cylinder" value="Cylinder">
697 Cylinder
698 </combo_item>
699 <combo_item name="Prism" value="Prism">
700 Prism
701 </combo_item>
702 <combo_item name="Sphere" value="Sphere">
703 Sphere
704 </combo_item>
705 <combo_item name="Torus" value="Torus">
706 Torus
707 </combo_item>
708 <combo_item name="Tube" value="Tube">
709 Tube
710 </combo_item>
711 <combo_item name="Ring" value="Ring">
712 Ring
713 </combo_item>
714 <combo_item name="Sculpted" value="Sculpted">
715 Sculpted
716 </combo_item>
717 </combo_box>
718 <text bg_visible="false" border_drop_shadow_visible="false" border_visible="false"
719 bottom_delta="-12" drop_shadow_visible="true" follows="left|top"
720 font="SansSerifSmall" h_pad="0" halign="left" height="10" left="121"
721 mouse_opaque="true" name="text cut" v_pad="0" width="141">
722 Path Cut Begin and End
723 </text>
724 <spinner bottom_delta="-22" decimal_digits="3" follows="left|top" height="16"
725 increment="0.05" initial_val="0" label="B" label_width="10" left="121"
726 max_val="0.98" min_val="0" mouse_opaque="true" name="cut begin" width="68" />
727 <spinner bottom_delta="0" decimal_digits="3" follows="left|top" height="16"
728 increment="0.05" initial_val="1" label="E" label_width="10" left_delta="73"
729 max_val="1" min_val="0.02" mouse_opaque="true" name="cut end" width="68" />
730 <text bg_visible="false" border_drop_shadow_visible="false" border_visible="false"
731 bottom_delta="-14" drop_shadow_visible="true" follows="left|top"
732 font="SansSerifSmall" h_pad="0" halign="left" height="10" left="121"
733 mouse_opaque="true" name="text hollow" v_pad="0" width="68">
734 Hollow
735 </text>
736 <text bg_visible="false" border_drop_shadow_visible="false" border_visible="false"
737 bottom_delta="0" drop_shadow_visible="true" follows="left|top"
738 font="SansSerifSmall" h_pad="0" halign="left" height="10" left_delta="78"
739 mouse_opaque="true" name="text skew" v_pad="0" width="63">
740 Skew
741 </text>
742 <spinner bottom_delta="-20" decimal_digits="1" follows="left|top" height="16"
743 increment="5" initial_val="0" left="121" max_val="95" min_val="0"
744 mouse_opaque="true" name="Scale 1" width="68" />
745 <spinner bottom_delta="0" decimal_digits="2" follows="left|top" height="16"
746 increment="0.05" initial_val="0" left_delta="73" max_val="0.95"
747 min_val="-0.95" mouse_opaque="true" name="Skew" width="68" />
748 <text bg_visible="false" border_drop_shadow_visible="false" border_visible="false"
749 bottom_delta="-15" drop_shadow_visible="true" follows="left|top"
750 font="SansSerifSmall" h_pad="0" halign="left" height="10" left="121"
751 mouse_opaque="true" name="Hollow Shape" v_pad="0" width="141">
752 Hollow Shape
753 </text>
754 <combo_box allow_text_entry="false" bottom_delta="-24" follows="left|top" height="18"
755 left="121" max_chars="20" mouse_opaque="true" name="hole" width="141">
756 <combo_item name="Default" value="Default">
757 Default
758 </combo_item>
759 <combo_item name="Circle" value="Circle">
760 Circle
761 </combo_item>
762 <combo_item name="Square" value="Square">
763 Square
764 </combo_item>
765 <combo_item name="Triangle" value="Triangle">
766 Triangle
767 </combo_item>
768 </combo_box>
769 <text bg_visible="false" border_drop_shadow_visible="false" border_visible="false"
770 bottom_delta="-12" drop_shadow_visible="true" follows="left|top"
771 font="SansSerifSmall" h_pad="0" halign="left" height="10" left="121"
772 mouse_opaque="true" name="text twist" v_pad="0" width="141">
773 Twist Begin and End
774 </text>
775 <spinner bottom_delta="-22" decimal_digits="0" follows="left|top" height="16"
776 increment="9" initial_val="0" label="B" label_width="10" left="121"
777 max_val="180" min_val="-180" mouse_opaque="true" name="Twist Begin"
778 width="68" />
779 <spinner bottom_delta="0" decimal_digits="0" follows="left|top" height="16"
780 increment="9" initial_val="0" label="E" label_width="10" left_delta="73"
781 max_val="180" min_val="-180" mouse_opaque="true" name="Twist End"
782 width="68" />
783 <text bg_visible="false" border_drop_shadow_visible="false" border_visible="false"
784 bottom_delta="-14" drop_shadow_visible="true" follows="left|top"
785 font="SansSerifSmall" h_pad="0" halign="left" height="10" left="121"
786 mouse_opaque="true" name="scale_taper" v_pad="0" width="141">
787 Taper
788 </text>
789 <text bg_visible="false" border_drop_shadow_visible="false" border_visible="false"
790 bottom_delta="0" drop_shadow_visible="true" follows="left|top"
791 font="SansSerifSmall" h_pad="0" halign="left" height="10" left="121"
792 mouse_opaque="true" name="scale_hole" v_pad="0" width="141">
793 Hole Size
794 </text>
795 <spinner bottom_delta="-20" decimal_digits="2" follows="left|top" height="16"
796 increment="0.05" initial_val="0" label="X" label_width="10" left="121"
797 max_val="1" min_val="-1" mouse_opaque="true" name="Taper Scale X"
798 width="68" />
799 <spinner bottom_delta="0" decimal_digits="2" follows="left|top" height="16"
800 increment="0.05" initial_val="0" label="Y" label_width="10" left_delta="73"
801 max_val="1" min_val="-1" mouse_opaque="true" name="Taper Scale Y"
802 width="68" />
803 <text bg_visible="false" border_drop_shadow_visible="false" border_visible="false"
804 bottom_delta="-14" drop_shadow_visible="true" follows="left|top"
805 font="SansSerifSmall" h_pad="0" halign="left" height="10" left="121"
806 mouse_opaque="true" name="text topshear" v_pad="0" width="141">
807 Top Shear
808 </text>
809 <spinner bottom_delta="-20" decimal_digits="2" follows="left|top" height="16"
810 increment="0.05" initial_val="0" label="X" label_width="10" left="121"
811 max_val="0.5" min_val="-0.5" mouse_opaque="true" name="Shear X" width="68" />
812 <spinner bottom_delta="0" decimal_digits="2" follows="left|top" height="16"
813 increment="0.05" initial_val="0" label="Y" label_width="10" left_delta="73"
814 max_val="0.5" min_val="-0.5" mouse_opaque="true" name="Shear Y" width="68" />
815 <text bg_visible="false" border_drop_shadow_visible="false" border_visible="false"
816 bottom_delta="-14" drop_shadow_visible="true" follows="left|top"
817 font="SansSerifSmall" h_pad="0" halign="left" height="10" left="121"
818 mouse_opaque="true" name="advanced_cut" v_pad="0" width="141">
819 Profile Cut Begin and End
820 </text>
821 <text bg_visible="false" border_drop_shadow_visible="false" border_visible="false"
822 bottom_delta="0" drop_shadow_visible="true" follows="left|top"
823 font="SansSerifSmall" h_pad="0" halign="left" height="10" left_delta="0"
824 mouse_opaque="true" name="advanced_dimple" v_pad="0" width="141">
825 Dimple Begin and End
826 </text>
827 <spinner bottom_delta="-19" decimal_digits="3" follows="left|top" height="16"
828 increment="0.05" initial_val="0" label="B" label_width="10" left="121"
829 max_val="0.95" min_val="0" mouse_opaque="true" name="Path Limit Begin"
830 width="68" />
831 <spinner bottom_delta="0" decimal_digits="3" follows="left|top" height="16"
832 increment="0.05" initial_val="1" label="E" label_width="10" left_delta="73"
833 max_val="1" min_val="0.05" mouse_opaque="true" name="Path Limit End"
834 width="68" />
835 <text bg_visible="false" border_drop_shadow_visible="false" border_visible="false"
836 bottom_delta="-14" drop_shadow_visible="true" follows="left|top"
837 font="SansSerifSmall" h_pad="0" halign="left" height="10" left="121"
838 mouse_opaque="true" name="text taper2" v_pad="0" width="141">
839 Taper
840 </text>
841 <spinner bottom_delta="-19" decimal_digits="2" follows="left|top" height="16"
842 increment="0.05" initial_val="0" label="X" label_width="10" left="121"
843 max_val="1" min_val="-1" mouse_opaque="true" name="Taper X" width="68" />
844 <spinner bottom_delta="0" decimal_digits="2" follows="left|top" height="16"
845 increment="0.05" initial_val="0" label="Y" label_width="10" left_delta="73"
846 max_val="1" min_val="-1" mouse_opaque="true" name="Taper Y" width="68" />
847 <text bg_visible="false" border_drop_shadow_visible="false" border_visible="false"
848 bottom_delta="-12" drop_shadow_visible="true" follows="left|top"
849 font="SansSerifSmall" h_pad="0" halign="left" height="10" left="121"
850 mouse_opaque="true" name="text radius delta" v_pad="0" width="78">
851 Radius
852 </text>
853 <text bg_visible="false" border_drop_shadow_visible="false" border_visible="false"
854 bottom_delta="0" drop_shadow_visible="true" follows="left|top"
855 font="SansSerifSmall" h_pad="0" halign="left" height="10" left_delta="73"
856 mouse_opaque="true" name="text revolutions" v_pad="0" width="68">
857 Revolutions
858 </text>
859 <spinner bottom_delta="-19" decimal_digits="3" follows="left|top" height="16"
860 increment="0.05" initial_val="0" left="121" max_val="1" min_val="-1"
861 mouse_opaque="true" name="Radius Offset" width="68" />
862 <spinner bottom_delta="0" decimal_digits="2" follows="left|top" height="16"
863 increment="0.1" initial_val="1" left_delta="73" max_val="4" min_val="1"
864 mouse_opaque="true" name="Revolutions" width="68" />
865 <texture_picker allow_no_texture="false" bottom="-211" can_apply_immediately="true"
866 default_image_name="Default" follows="left|top" height="141"
867 label="Sculpt Texture" left="121" mouse_opaque="true"
868 name="sculpt texture control" tool_tip="Click to choose a picture"
869 visible="false" width="141" />
870 <check_box bottom_delta="-24" follows="left|top" font="SansSerifSmall" height="16"
871 initial_value="false" label="Mirror" left="121" mouse_opaque="true"
872 name="sculpt mirror control" visible="false"
873 tool_tip="Flips sculpted prim along the X axis."
874 width="121" />
875 <check_box bottom_delta="-20" follows="left|top" font="SansSerifSmall" height="16"
876 initial_value="false" label="Inside-out" left="121" mouse_opaque="true"
877 name="sculpt invert control" visible="false"
878 tool_tip="Inverts the sculpted prims normals, making it appear inside-out."
879 width="121" />
880 <text align="left" bg_visible="false" border_drop_shadow_visible="false"
881 border_visible="false" bottom_delta="-20" drop_shadow_visible="true"
882 follows="left|top" font="SansSerifSmall" h_pad="0" height="10" left="121"
883 mouse_opaque="true" name="label sculpt type" v_pad="0" visible="false"
884 width="121">
885 Stitching type
886 </text>
887 <combo_box allow_text_entry="false" bottom_delta="-24" follows="left|top" height="18"
888 left="121" max_chars="20" mouse_opaque="true" name="sculpt type control"
889 visible="false" width="141">
890 <combo_item name="None" value="None">
891 (none)
892 </combo_item>
893 <combo_item name="Sphere" value="Sphere">
894 Sphere
895 </combo_item>
896 <combo_item name="Torus" value="Torus">
897 Torus
898 </combo_item>
899 <combo_item name="Plane" value="Plane">
900 Plane
901 </combo_item>
902 <combo_item name="Cylinder" value="Cylinder">
903 Cylinder
904 </combo_item>
905 </combo_box>
906 </panel>
907
908<!-- Features sub-tab -->
909
910 <panel border="true" bottom="-383" follows="left|top|right|bottom" height="367"
911 label="Features" left="1" mouse_opaque="false" name="Features" width="270">
912 <text bg_visible="false" border_drop_shadow_visible="false" border_visible="false"
913 bottom="-20" drop_shadow_visible="true" follows="left|top"
914 font="SansSerifSmall" h_pad="0" halign="left" height="10" left="10"
915 mouse_opaque="true" name="select_single" v_pad="0" width="252">
916 Select only one primitive to edit features.
917 </text>
918 <text bg_visible="false" border_drop_shadow_visible="false" border_visible="false"
919 bottom_delta="0" drop_shadow_visible="true" follows="left|top"
920 font="SansSerifSmall" h_pad="0" halign="left" height="10" left="10"
921 mouse_opaque="true" name="edit_object" v_pad="0" width="252">
922 Edit object features:
923 </text>
924 <check_box bottom_delta="-26" follows="left|top" font="SansSerifSmall" height="16"
925 initial_value="false" label="Flexible Path" left="10" mouse_opaque="true"
926 name="Flexible1D Checkbox Ctrl"
927 tool_tip="Allows object to flex about the Z axis. (Client-side only)"
928 width="121" />
929 <spinner bottom_delta="-20" decimal_digits="3" follows="left|top" height="16"
930 increment="1" initial_val="2" label="Softness" label_width="65" left="10"
931 max_val="3" min_val="0" mouse_opaque="true" name="FlexNumSections"
932 width="128" />
933 <spinner bottom_delta="-20" decimal_digits="3" follows="left|top" height="16"
934 increment="0.5" initial_val="0.3" label="Gravity" label_width="65"
935 left="10" max_val="10" min_val="-10" mouse_opaque="true" name="FlexGravity"
936 width="128" />
937 <spinner bottom_delta="-20" decimal_digits="3" follows="left|top" height="16"
938 increment="0.5" initial_val="2" label="Drag" label_width="65" left="10"
939 max_val="10" min_val="0" mouse_opaque="true" name="FlexFriction"
940 width="128" />
941 <spinner bottom_delta="-20" decimal_digits="3" follows="left|top" height="16"
942 increment="0.5" initial_val="0" label="Wind" label_width="65" left="10"
943 max_val="10" min_val="0" mouse_opaque="true" name="FlexWind" width="128" />
944 <spinner bottom_delta="-20" decimal_digits="3" follows="left|top" height="16"
945 increment="0.5" initial_val="1" label="Tension" label_width="65" left="10"
946 max_val="10" min_val="0" mouse_opaque="true" name="FlexTension" width="128" />
947 <spinner bottom_delta="-20" decimal_digits="3" follows="left|top" height="16"
948 increment="0.01" initial_val="0" label="Force X" label_width="65" left="10"
949 max_val="10" min_val="-10" mouse_opaque="true" name="FlexForceX"
950 width="128" />
951 <spinner bottom_delta="-20" decimal_digits="3" follows="left|top" height="16"
952 increment="0.01" initial_val="0" label="Force Y" label_width="65" left="10"
953 max_val="10" min_val="-10" mouse_opaque="true" name="FlexForceY"
954 width="128" />
955 <spinner bottom_delta="-20" decimal_digits="3" follows="left|top" height="16"
956 increment="0.01" initial_val="0" label="Force Z" label_width="65" left="10"
957 max_val="10" min_val="-10" mouse_opaque="true" name="FlexForceZ"
958 width="128" />
959 <check_box bottom_delta="-30" follows="left|top" font="SansSerifSmall" height="16"
960 initial_value="false" label="Light" left="10" mouse_opaque="true"
961 name="Light Checkbox Ctrl" tool_tip="Causes object to emit light"
962 width="121" />
963 <text bg_visible="false" border_drop_shadow_visible="false" border_visible="false"
964 bottom_delta="-21" drop_shadow_visible="true" follows="left|top"
965 font="SansSerifSmall" h_pad="0" halign="left" height="10" left_delta="0"
966 mouse_opaque="true" name="label color" v_pad="0" width="58">
967 Color
968 </text>
969 <color_swatch border_color="0.45098, 0.517647, 0.607843, 1" bottom_delta="-28"
970 can_apply_immediately="true" color="0.5, 0.5, 0.5, 1" follows="left|top"
971 height="48" label="" left_delta="67" mouse_opaque="true" name="colorswatch"
972 tool_tip="Click to open Color Picker" width="32" />
973 <spinner bottom_delta="-4" decimal_digits="3" follows="left|top" height="16"
974 increment="0.1" initial_val="0.5" label="Intensity" label_width="65"
975 left="10" max_val="1" min_val="0" mouse_opaque="true"
976 name="Light Intensity" width="128" />
977 <spinner bottom_delta="-20" decimal_digits="3" follows="left|top" height="16"
978 increment="0.1" initial_val="5" label="Radius" label_width="65"
979 left_delta="0" max_val="20" min_val="0" mouse_opaque="true"
980 name="Light Radius" width="128" />
981 <spinner bottom_delta="-20" decimal_digits="3" follows="left|top" height="16"
982 increment="0.25" initial_val="1" label="Falloff" label_width="65"
983 left_delta="0" max_val="2" min_val="0" mouse_opaque="true"
984 name="Light Falloff" width="128" />
985 </panel>
986
987<!-- Texture sub-tab -->
988
989 <panel border="true" bottom="-383" follows="left|top|right|bottom" height="367"
990 label="Texture" left="1" mouse_opaque="false" name="Texture" width="270">
991 <texture_picker allow_no_texture="false" bottom="-90" can_apply_immediately="true"
992 default_image_name="Default" follows="left|top" height="80" label="Texture"
993 left="10" mouse_opaque="true" name="texture control"
994 tool_tip="Click to choose a picture" width="64" />
995 <color_swatch border_color="0.45098, 0.517647, 0.607843, 1" bottom="-90"
996 can_apply_immediately="true" color="1, 1, 1, 1" follows="left|top"
997 height="80" label="Color" left_delta="90" mouse_opaque="true"
998 name="colorswatch" tool_tip="Click to open Color Picker" width="64" />
999 <text bg_visible="false" border_drop_shadow_visible="false" border_visible="false"
1000 bottom="-11" drop_shadow_visible="true" follows="left|top"
1001 font="SansSerifSmall" h_pad="0" halign="left" height="10" left="180"
1002 mouse_opaque="true" name="color trans" v_pad="0" width="80">
1003 Transparency %
1004 </text>
1005 <spinner bottom_delta="-20" decimal_digits="0" follows="left|top" height="16"
1006 increment="2" initial_val="0" left="180" max_val="90" min_val="0"
1007 mouse_opaque="true" name="ColorTrans" width="80" />
1008 <text bg_visible="false" border_drop_shadow_visible="false" border_visible="false"
1009 bottom_delta="-12" drop_shadow_visible="true" follows="left|top"
1010 font="SansSerifSmall" h_pad="0" halign="left" height="10"
1011 left="180" mouse_opaque="true" name="glow label" v_pad="0" width="80">
1012 Glow
1013 </text>
1014 <spinner bottom_delta="-20" decimal_digits="2" follows="left|top" height="16"
1015 increment="0.1" initial_val="0" left="180" max_val="1"
1016 min_val="0" mouse_opaque="true" name="glow" width="80" />
1017 <check_box bottom_delta="-23" follows="left|top" font="SansSerifSmall" height="16"
1018 initial_value="false" label="Full Bright" left="180" mouse_opaque="true"
1019 name="checkbox fullbright" width="81" />
1020 <text bg_visible="false" border_drop_shadow_visible="false" border_visible="false"
1021 bottom="-104" drop_shadow_visible="true" follows="left|top"
1022 font="SansSerifSmall" h_pad="0" halign="left" height="10" left="10"
1023 mouse_opaque="true" name="tex gen" v_pad="0" width="90">
1024 Mapping
1025 </text>
1026 <combo_box allow_text_entry="false" bottom_delta="-22" follows="left|top" height="18"
1027 left="10" max_chars="20" mouse_opaque="true" name="combobox texgen"
1028 width="80">
1029 <combo_item name="Default" value="Default">
1030 Default
1031 </combo_item>
1032 <combo_item name="Planar" value="Planar">
1033 Planar
1034 </combo_item>
1035 </combo_box>
1036 <text bg_visible="false" border_drop_shadow_visible="false" border_visible="false"
1037 bottom="-104" drop_shadow_visible="true" follows="left|top"
1038 font="SansSerifSmall" h_pad="0" halign="left" height="10" left="100"
1039 mouse_opaque="true" name="label shininess" v_pad="0" width="70">
1040 Shininess
1041 </text>
1042 <combo_box allow_text_entry="false" bottom_delta="-22" follows="left|top" height="18"
1043 left="100" max_chars="20" mouse_opaque="true" name="combobox shininess"
1044 width="70">
1045 <combo_item name="None" value="None">
1046 None
1047 </combo_item>
1048 <combo_item name="Low" value="Low">
1049 Low
1050 </combo_item>
1051 <combo_item name="Medium" value="Medium">
1052 Medium
1053 </combo_item>
1054 <combo_item name="High" value="High">
1055 High
1056 </combo_item>
1057 </combo_box>
1058 <text bg_visible="false" border_drop_shadow_visible="false" border_visible="false"
1059 bottom="-104" drop_shadow_visible="true" follows="left|top"
1060 font="SansSerifSmall" h_pad="0" halign="left" height="10" left="180"
1061 mouse_opaque="true" name="label bumpiness" v_pad="0" width="80">
1062 Bumpiness
1063 </text>
1064 <combo_box allow_text_entry="false" bottom_delta="-22" follows="left|top" height="18"
1065 left="180" max_chars="20" mouse_opaque="true" name="combobox bumpiness"
1066 width="80">
1067 <combo_item name="None" value="None">
1068 None
1069 </combo_item>
1070 <combo_item name="Brightness" value="Brightness">
1071 Brightness
1072 </combo_item>
1073 <combo_item name="Darkness" value="Darkness">
1074 Darkness
1075 </combo_item>
1076 <combo_item name="woodgrain" value="woodgrain">
1077 woodgrain
1078 </combo_item>
1079 <combo_item name="bark" value="bark">
1080 bark
1081 </combo_item>
1082 <combo_item name="bricks" value="bricks">
1083 bricks
1084 </combo_item>
1085 <combo_item name="checker" value="checker">
1086 checker
1087 </combo_item>
1088 <combo_item name="concrete" value="concrete">
1089 concrete
1090 </combo_item>
1091 <combo_item name="crustytile" value="crustytile">
1092 crustytile
1093 </combo_item>
1094 <combo_item name="cutstone" value="cutstone">
1095 cutstone
1096 </combo_item>
1097 <combo_item name="discs" value="discs">
1098 discs
1099 </combo_item>
1100 <combo_item name="gravel" value="gravel">
1101 gravel
1102 </combo_item>
1103 <combo_item name="petridish" value="petridish">
1104 petridish
1105 </combo_item>
1106 <combo_item name="siding" value="siding">
1107 siding
1108 </combo_item>
1109 <combo_item name="stonetile" value="stonetile">
1110 stonetile
1111 </combo_item>
1112 <combo_item name="stucco" value="stucco">
1113 stucco
1114 </combo_item>
1115 <combo_item name="suction" value="suction">
1116 suction
1117 </combo_item>
1118 <combo_item name="weave" value="weave">
1119 weave
1120 </combo_item>
1121 </combo_box>
1122 <text bg_visible="false" border_drop_shadow_visible="false" border_visible="false"
1123 bottom="-158" drop_shadow_visible="true" follows="left|top"
1124 font="SansSerifSmall" h_pad="0" halign="left" height="10" left="10"
1125 mouse_opaque="true" name="tex scale" v_pad="0" width="160">
1126 Repeats per Face
1127 </text>
1128 <spinner bottom="-178" decimal_digits="3" follows="left|top" height="16" increment="0.1"
1129 initial_val="0" label="Horizontal (U)" label_width="90" left="20"
1130 max_val="100" min_val="0" mouse_opaque="true" name="TexScaleU" width="160" />
1131 <check_box bottom="-179" follows="left|top" font="SansSerifSmall" height="16"
1132 initial_value="false" label="Flip" left_delta="170" mouse_opaque="true"
1133 name="checkbox flip s" width="70" />
1134 <spinner bottom="-196" decimal_digits="3" follows="left|top" height="16" increment="0.1"
1135 initial_val="0" label="Vertical (V)" label_width="90" left="20"
1136 max_val="100" min_val="0" mouse_opaque="true" name="TexScaleV" width="160" />
1137 <check_box bottom="-197" follows="left|top" font="SansSerifSmall" height="16"
1138 initial_value="false" label="Flip" left_delta="170" mouse_opaque="true"
1139 name="checkbox flip t" width="70" />
1140 <text bg_visible="false" border_drop_shadow_visible="false" border_visible="false"
1141 bottom="-228" drop_shadow_visible="true" follows="left|top"
1142 font="SansSerifSmall" h_pad="0" halign="left" height="10" left="10"
1143 mouse_opaque="true" name="tex rotate" v_pad="0" width="102">
1144 Rotation (degrees)
1145 </text>
1146 <spinner bottom="-234" decimal_digits="2" follows="left|top" height="16" increment="1"
1147 initial_val="0" left="112" max_val="9999" min_val="-9999"
1148 mouse_opaque="true" name="TexRot" width="68" />
1149 <string name="string repeats per meter">
1150 Repeats Per Meter
1151 </string>
1152 <string name="string repeats per face">
1153 Repeats Per Face
1154 </string>
1155 <text bg_visible="false" border_drop_shadow_visible="false" border_visible="false"
1156 bottom="-250" drop_shadow_visible="true" follows="left|top"
1157 font="SansSerifSmall" h_pad="0" halign="left" height="10" left="10"
1158 mouse_opaque="true" name="rpt" v_pad="0" width="160">
1159 Repeats Per Meter
1160 </text>
1161 <spinner bottom="-256" decimal_digits="1" follows="left|top" height="16" increment="0.1"
1162 initial_val="1" left="112" max_val="10" min_val="0.1" mouse_opaque="true"
1163 name="rptctrl" width="68" />
1164 <button bottom="-256" follows="left|top" font="SansSerifSmall" halign="center"
1165 height="16" label="Apply" label_selected="Apply" left_delta="78"
1166 mouse_opaque="true" name="button apply" scale_image="TRUE" width="75" />
1167 <text bg_visible="false" border_drop_shadow_visible="false" border_visible="false"
1168 bottom="-288" drop_shadow_visible="true" follows="left|top"
1169 font="SansSerifSmall" h_pad="0" halign="left" height="10" left="10"
1170 mouse_opaque="true" name="tex offset" v_pad="0" width="160">
1171 Offset
1172 </text>
1173 <spinner bottom="-308" decimal_digits="3" follows="left|top" height="16" increment="0.1"
1174 initial_val="0" label="Horizontal (U)" label_width="90" left="20"
1175 max_val="1" min_val="-1" mouse_opaque="true" name="TexOffsetU" width="160" />
1176 <spinner bottom_delta="-18" decimal_digits="3" follows="left|top" height="16"
1177 increment="0.1" initial_val="0" label="Vertical (V)" label_width="90"
1178 left="20" max_val="1" min_val="-1" mouse_opaque="true" name="TexOffsetV"
1179 width="160" />
1180 <text bg_visible="false" border_drop_shadow_visible="false" border_visible="false"
1181 bottom="-352" drop_shadow_visible="true" follows="left|top"
1182 font="SansSerifSmall" h_pad="0" halign="left" height="20" left="10"
1183 mouse_opaque="true" name="textbox autofix" v_pad="0" width="160">
1184 Align media texture
1185(must load first)
1186 </text>
1187 <button bottom="-360" follows="left|top" font="SansSerifSmall" halign="center"
1188 height="16" label="Align" label_selected="Align" left="112"
1189 mouse_opaque="true" name="button align" scale_image="TRUE" width="68" />
1190 </panel>
1191 <panel border="true" bottom="-383" follows="left|top|right|bottom" height="367"
1192 label="Content" left="1" mouse_opaque="false" name="Contents" width="270">
1193 <button bottom="-30" follows="left|top" font="SansSerif" halign="center" height="20"
1194 label="New Script..." label_selected="New Script..."
1195 left="10" mouse_opaque="true" name="button new script" scale_image="TRUE"
1196 width="130" />
1197 <panel bottom_delta="-330" follows="left|top" height="325" left="10"
1198 mouse_opaque="true" name="ContentsInventory" width="252" />
1199 </panel>
1200 </tab_container>
1201
1202<!-- Land Info sub-tab -->
1203
1204 <panel bottom="-550" follows="left|top" height="384" left="0" mouse_opaque="true"
1205 name="land info panel" width="272">
1206 <text bg_visible="false" border_drop_shadow_visible="false" border_visible="false"
1207 bottom="-18" drop_shadow_visible="true" follows="left|top"
1208 font="SansSerifSmall" h_pad="0" halign="left" height="16" left="4"
1209 mouse_opaque="true" name="label_area_price" v_pad="0" width="150">
1210 Price: L$[PRICE] for [AREA] sq. m.
1211 </text>
1212 <text bg_visible="false" border_drop_shadow_visible="false" border_visible="false"
1213 bottom_delta="0" drop_shadow_visible="true" follows="left|top"
1214 font="SansSerifSmall" h_pad="0" halign="left" height="16" left="4"
1215 mouse_opaque="true" name="label_area" v_pad="0" width="128">
1216 Area: [AREA] sq. m.
1217 </text>
1218 <button bottom_delta="-38" follows="left|top" font="SansSerif" halign="center"
1219 height="20" label="Buy Land..." label_selected="Buy Land..." left="76"
1220 mouse_opaque="true" name="button buy land" scale_image="TRUE" width="102" />
1221 <button bottom_delta="-24" follows="left|top" font="SansSerif" halign="center"
1222 height="20" label="Abandon Land..." label_selected="Abandon Land..."
1223 left="76" mouse_opaque="true" name="button abandon land" scale_image="TRUE"
1224 width="102" />
1225 <button bottom_delta="-24" follows="left|top" font="SansSerif" halign="center"
1226 height="20" label="Subdivide..." label_selected="Subdivide..." left="76"
1227 mouse_opaque="true" name="button subdivide land" scale_image="TRUE"
1228 width="102" />
1229 <button bottom_delta="-24" follows="left|top" font="SansSerif" halign="center"
1230 height="20" label="Join..." label_selected="Join..." left="76"
1231 mouse_opaque="true" name="button join land" scale_image="TRUE" width="102" />
1232 <button bottom_delta="-40" follows="left|top" font="SansSerif" halign="center"
1233 height="20" label="About Land..." label_selected="About Land..." left="76"
1234 mouse_opaque="true" name="button about land" scale_image="TRUE" width="102" />
1235 </panel>
1236 <string name="status_rotate">
1237 Drag colored bands to rotate object
1238 </string>
1239 <string name="status_scale">
1240 Click and drag to stretch selected side
1241 </string>
1242 <string name="status_move">
1243 Drag to move, shift-drag to copy
1244 </string>
1245 <string name="status_modifyland">
1246 Click and hold to modify land
1247 </string>
1248 <string name="status_camera">
1249 Click and drag to change view
1250 </string>
1251 <string name="status_grab">
1252 Drag to move objects, Ctrl to lift, Ctrl-Shift to spin
1253 </string>
1254 <string name="status_place">
1255 Click in the world to create, shift-click to select
1256 </string>
1257 <string name="status_selectland">
1258 Click and drag to select land
1259 </string>
1260 <string name="grid_screen_text">
1261 Screen
1262 </string>
1263 <string name="grid_local_text">
1264 Local
1265 </string>
1266 <string name="grid_world_text">
1267 World
1268 </string>
1269 <string name="grid_reference_text">
1270 Reference
1271 </string>
1272 <string name="grid_attachment_text">
1273 Attachment
1274 </string>
1275</floater>
diff --git a/linden/install.xml b/linden/install.xml
index 216c854..0326b24 100644
--- a/linden/install.xml
+++ b/linden/install.xml
@@ -699,9 +699,9 @@ anguage Infrstructure (CLI) international standard</string>
699 <key>windows</key> 699 <key>windows</key>
700 <map> 700 <map>
701 <key>md5sum</key> 701 <key>md5sum</key>
702 <string>8c1b8881285631eb32ba541e10d07b07</string> 702 <string>42cb780c595d25881b4967292a4a0f40</string>
703 <key>url</key> 703 <key>url</key>
704 <uri>http://s3.amazonaws.com/viewer-source-downloads/install_pkgs/llmozlib-windows-20080922.tar.bz2</uri> 704 <uri>http://s3.amazonaws.com/viewer-source-downloads/install_pkgs/llmozlib-windows-20080828.tar.bz2</uri>
705 </map> 705 </map>
706 </map> 706 </map>
707 </map> 707 </map>
generated by cgit v1.1 at 2024-11-16 08:33:49 +0000