Singularity-Viewer/SingularityViewer
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Stricter git

Browse Source
This commit is contained in:
Siana Gearz
2012-08-21 19:17:45 +02:00
parent df1e9732d0
commit 7b42fea0f5
8 changed files with 1279 additions and 1278 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
.gitattributes vendored Normal file
View File

@@ -0,0 +1 @@
* text=auto

282
indra/newview/app_settings/windlight/skies/Blacknight.xml
View File

@@ -1,141 +1,141 @@
<llsd>
<map>
<key>ambient</key>
<array>
<real>0</real>
<real>0</real>
<real>0</real>
<real>0</real>
</array>
<key>blue_density</key>
<array>
<real>2</real>
<real>2</real>
<real>2</real>
<real>1</real>
</array>
<key>blue_horizon</key>
<array>
<real>0</real>
<real>0</real>
<real>0</real>
<real>0</real>
</array>
<key>cloud_color</key>
<array>
<real>0.2113494873046875</real>
<real>0.22654294967651367</real>
<real>0.2339630126953125</real>
<real>0.2339630126953125</real>
</array>
<key>cloud_pos_density1</key>
<array>
<real>1.6884100437164307</real>
<real>0.52609699964523315</real>
<real>1</real>
<real>1</real>
</array>
<key>cloud_pos_density2</key>
<array>
<real>1.6884100437164307</real>
<real>0.52609699964523315</real>
<real>0.125</real>
<real>1</real>
</array>
<key>cloud_scale</key>
<array>
<real>0.18000000715255737</real>
<real>0</real>
<real>0</real>
<real>1</real>
</array>
<key>cloud_scroll_rate</key>
<array>
<real>10.199999809265137</real>
<real>10.01099967956543</real>
</array>
<key>cloud_shadow</key>
<array>
<real>0.28999999165534973</real>
<real>0</real>
<real>0</real>
<real>1</real>
</array>
<key>density_multiplier</key>
<array>
<real>0.00011000000085914508</real>
<real>0</real>
<real>0</real>
<real>1</real>
</array>
<key>distance_multiplier</key>
<array>
<real>100</real>
<real>0</real>
<real>0</real>
<real>1</real>
</array>
<key>east_angle</key>
<real>0</real>
<key>enable_cloud_scroll</key>
<array>
<boolean>1</boolean>
<boolean>1</boolean>
</array>
<key>gamma</key>
<array>
<real>0.070000000298023224</real>
<real>0</real>
<real>0</real>
<real>1</real>
</array>
<key>glow</key>
<array>
<real>20</real>
<real>0.0010000000474974513</real>
<real>-0</real>
<real>1</real>
</array>
<key>haze_density</key>
<array>
<real>4</real>
<real>0</real>
<real>0</real>
<real>1</real>
</array>
<key>haze_horizon</key>
<array>
<real>0</real>
<real>0.19915600121021271</real>
<real>0.19915600121021271</real>
<real>1</real>
</array>
<key>lightnorm</key>
<array>
<real>-0</real>
<real>0.85491091012954712</real>
<real>0.51877486705780029</real>
<real>1</real>
</array>
<key>max_y</key>
<array>
<real>240</real>
<real>0</real>
<real>0</real>
<real>1</real>
</array>
<key>preset_num</key>
<integer>22</integer>
<key>star_brightness</key>
<real>1.4800000190734863</real>
<key>sun_angle</key>
<real>4.1669716835021973</real>
<key>sunlight_color</key>
<array>
<real>0.7084808349609375</real>
<real>0.8618316650390625</real>
<real>0.83307838439941406</real>
<real>0.2872772216796875</real>
</array>
</map>
</llsd>
<llsd>
<map>
<key>ambient</key>
<array>
<real>0</real>
<real>0</real>
<real>0</real>
<real>0</real>
</array>
<key>blue_density</key>
<array>
<real>2</real>
<real>2</real>
<real>2</real>
<real>1</real>
</array>
<key>blue_horizon</key>
<array>
<real>0</real>
<real>0</real>
<real>0</real>
<real>0</real>
</array>
<key>cloud_color</key>
<array>
<real>0.2113494873046875</real>
<real>0.22654294967651367</real>
<real>0.2339630126953125</real>
<real>0.2339630126953125</real>
</array>
<key>cloud_pos_density1</key>
<array>
<real>1.6884100437164307</real>
<real>0.52609699964523315</real>
<real>1</real>
<real>1</real>
</array>
<key>cloud_pos_density2</key>
<array>
<real>1.6884100437164307</real>
<real>0.52609699964523315</real>
<real>0.125</real>
<real>1</real>
</array>
<key>cloud_scale</key>
<array>
<real>0.18000000715255737</real>
<real>0</real>
<real>0</real>
<real>1</real>
</array>
<key>cloud_scroll_rate</key>
<array>
<real>10.199999809265137</real>
<real>10.01099967956543</real>
</array>
<key>cloud_shadow</key>
<array>
<real>0.28999999165534973</real>
<real>0</real>
<real>0</real>
<real>1</real>
</array>
<key>density_multiplier</key>
<array>
<real>0.00011000000085914508</real>
<real>0</real>
<real>0</real>
<real>1</real>
</array>
<key>distance_multiplier</key>
<array>
<real>100</real>
<real>0</real>
<real>0</real>
<real>1</real>
</array>
<key>east_angle</key>
<real>0</real>
<key>enable_cloud_scroll</key>
<array>
<boolean>1</boolean>
<boolean>1</boolean>
</array>
<key>gamma</key>
<array>
<real>0.070000000298023224</real>
<real>0</real>
<real>0</real>
<real>1</real>
</array>
<key>glow</key>
<array>
<real>20</real>
<real>0.0010000000474974513</real>
<real>-0</real>
<real>1</real>
</array>
<key>haze_density</key>
<array>
<real>4</real>
<real>0</real>
<real>0</real>
<real>1</real>
</array>
<key>haze_horizon</key>
<array>
<real>0</real>
<real>0.19915600121021271</real>
<real>0.19915600121021271</real>
<real>1</real>
</array>
<key>lightnorm</key>
<array>
<real>-0</real>
<real>0.85491091012954712</real>
<real>0.51877486705780029</real>
<real>1</real>
</array>
<key>max_y</key>
<array>
<real>240</real>
<real>0</real>
<real>0</real>
<real>1</real>
</array>
<key>preset_num</key>
<integer>22</integer>
<key>star_brightness</key>
<real>1.4800000190734863</real>
<key>sun_angle</key>
<real>4.1669716835021973</real>
<key>sunlight_color</key>
<array>
<real>0.7084808349609375</real>
<real>0.8618316650390625</real>
<real>0.83307838439941406</real>
<real>0.2872772216796875</real>
</array>
</map>
</llsd>

152
indra/newview/app_settings/windlight/skies/names.txt
View File

@@ -1,77 +1,77 @@
- Orac - Black fog 1
- Orac - Black fog 2
- Orac - Drawing blue
- Orac - Drawing extreme
- Orac - Drawing green
- Orac - Drawing red
- Orac - Drawing underground comic
- Orac - fog
- Orac - gray
- Orac - green
AnaLu - outdoor city night
AnaLutetia - AvatarOpt(2)
AnaLutetia - AvatarOpt2 whiter
AnaLutetia - outdoor
AnaLutetia - Studio Light
AnaLutetia - STUDIO2
AnaLutetia - STUDIO3
AnaLutetia-default
AnaLutetia-outdoor2(2)
AnaLutetia
B5-ShadowDancing
CB'%s %Rouge 1
CB'%s %Rouge 2
CB'%s %Rouge 3
CB'%s %Rouge 4
CB'%s %Rouge 5
CB'%s %Rouge 6
Fairy blue (Paulina)
Fairy dark blue (Paulina)
Fairy light pink (Paulina)
Fairy warm pinks (Paulina)
PaperSnow
Places Abracadabra
Places Abracadabra2
Places Abracadabra3
Places alirium
Places Annamaria
Places Astryls Wild
Places Babbage
Places Beach Cay Surreal
Places Beach Cay
Places Bentham
Places Cornfield
Places Cromac
Places Crucible
Places District8
Places Duskwood
Places Eridu
Places Erie
Places Eugene 2
Places Eugene BL
Places Greed
Places Greed2
Places Imagine
Places Kingsport
Places Kunming
Places Las Legunas
Places Legacies
Places Midian
Places Mother
Places Old New York
Places Paris 2
Places Paris
Places Pathfinder
Places Sand
Places Terre Des Mortes
Places Urbania
Places Wiccan
Places-Embryo
StrawberrySingh.com - Closeups
Sunset Pink (Paulina)
Surreal - Brazil (Paulina)
Surreal - Fire (Paulina)
Surreal - Flirt (Paulina)
Surreal - Night (Paulina)
Surreal - Summer (Paulina)
- Orac - Black fog 1
- Orac - Black fog 2
- Orac - Drawing blue
- Orac - Drawing extreme
- Orac - Drawing green
- Orac - Drawing red
- Orac - Drawing underground comic
- Orac - fog
- Orac - gray
- Orac - green
AnaLu - outdoor city night
AnaLutetia - AvatarOpt(2)
AnaLutetia - AvatarOpt2 whiter
AnaLutetia - outdoor
AnaLutetia - Studio Light
AnaLutetia - STUDIO2
AnaLutetia - STUDIO3
AnaLutetia-default
AnaLutetia-outdoor2(2)
AnaLutetia
B5-ShadowDancing
CB'%s %Rouge 1
CB'%s %Rouge 2
CB'%s %Rouge 3
CB'%s %Rouge 4
CB'%s %Rouge 5
CB'%s %Rouge 6
Fairy blue (Paulina)
Fairy dark blue (Paulina)
Fairy light pink (Paulina)
Fairy warm pinks (Paulina)
PaperSnow
Places Abracadabra
Places Abracadabra2
Places Abracadabra3
Places alirium
Places Annamaria
Places Astryls Wild
Places Babbage
Places Beach Cay Surreal
Places Beach Cay
Places Bentham
Places Cornfield
Places Cromac
Places Crucible
Places District8
Places Duskwood
Places Eridu
Places Erie
Places Eugene 2
Places Eugene BL
Places Greed
Places Greed2
Places Imagine
Places Kingsport
Places Kunming
Places Las Legunas
Places Legacies
Places Midian
Places Mother
Places Old New York
Places Paris 2
Places Paris
Places Pathfinder
Places Sand
Places Terre Des Mortes
Places Urbania
Places Wiccan
Places-Embryo
StrawberrySingh.com - Closeups
Sunset Pink (Paulina)
Surreal - Brazil (Paulina)
Surreal - Fire (Paulina)
Surreal - Flirt (Paulina)
Surreal - Night (Paulina)
Surreal - Summer (Paulina)
wastelands

86
indra/newview/app_settings/windlight/water/Blacknight%20Water.xml
View File

@@ -1,43 +1,43 @@
<llsd>
<map>
<key>blurMultiplier</key>
<real>0.13400000333786011</real>
<key>fresnelOffset</key>
<real>0.53999996185302734</real>
<key>fresnelScale</key>
<real>0.61000001430511475</real>
<key>normScale</key>
<array>
<real>5.8000001907348633</real>
<real>1.7000000476837158</real>
<real>5.5</real>
</array>
<key>normalMap</key>
<uuid>822ded49-9a6c-f61c-cb89-6df54f42cdf4</uuid>
<key>scaleAbove</key>
<real>0.079999998211860657</real>
<key>scaleBelow</key>
<real>0.39999997615814209</real>
<key>underWaterFogMod</key>
<real>1</real>
<key>waterFogColor</key>
<array>
<real>0.019683837890625</real>
<real>0.027191162109375</real>
<real>0.027191162109375</real>
<real>1</real>
</array>
<key>waterFogDensity</key>
<real>59.714115142822266</real>
<key>wave1Dir</key>
<array>
<real>0.099999904632568359</real>
<real>-0.3600001335144043</real>
</array>
<key>wave2Dir</key>
<array>
<real>0.099999904632568359</real>
<real>-0.67000001668930054</real>
</array>
</map>
</llsd>
<llsd>
<map>
<key>blurMultiplier</key>
<real>0.13400000333786011</real>
<key>fresnelOffset</key>
<real>0.53999996185302734</real>
<key>fresnelScale</key>
<real>0.61000001430511475</real>
<key>normScale</key>
<array>
<real>5.8000001907348633</real>
<real>1.7000000476837158</real>
<real>5.5</real>
</array>
<key>normalMap</key>
<uuid>822ded49-9a6c-f61c-cb89-6df54f42cdf4</uuid>
<key>scaleAbove</key>
<real>0.079999998211860657</real>
<key>scaleBelow</key>
<real>0.39999997615814209</real>
<key>underWaterFogMod</key>
<real>1</real>
<key>waterFogColor</key>
<array>
<real>0.019683837890625</real>
<real>0.027191162109375</real>
<real>0.027191162109375</real>
<real>1</real>
</array>
<key>waterFogDensity</key>
<real>59.714115142822266</real>
<key>wave1Dir</key>
<array>
<real>0.099999904632568359</real>
<real>-0.3600001335144043</real>
</array>
<key>wave2Dir</key>
<array>
<real>0.099999904632568359</real>
<real>-0.67000001668930054</real>
</array>
</map>
</llsd>

1644
indra/newview/installers/windows/installer_template.nsi
View File

File diff suppressed because it is too large Load Diff

386
indra/newview/res/viewerRes.rc
View File

@@ -1,193 +1,193 @@
// Microsoft Visual C++ generated resource script.
//
#include "resource.h"
#ifdef IDC_STATIC
#undef IDC_STATIC
#endif
#define IDC_STATIC (-1)
#include "winresrc.h"
#define APSTUDIO_READONLY_SYMBOLS
/////////////////////////////////////////////////////////////////////////////
//
// Generated from the TEXTINCLUDE 2 resource.
//
// Commented out because it only compiles if you have MFC installed.
//#include "winres.h"
/////////////////////////////////////////////////////////////////////////////
#undef APSTUDIO_READONLY_SYMBOLS
/////////////////////////////////////////////////////////////////////////////
// English (U.S.) resources
#if !defined(AFX_RESOURCE_DLL) || defined(AFX_TARG_ENU)
#ifdef _WIN32
LANGUAGE LANG_ENGLISH, SUBLANG_ENGLISH_US
#pragma code_page(1252)
#endif //_WIN32
#ifdef APSTUDIO_INVOKED
/////////////////////////////////////////////////////////////////////////////
//
// TEXTINCLUDE
//
1 TEXTINCLUDE
BEGIN
"resource.h\0"
END
2 TEXTINCLUDE
BEGIN
"#include ""winres.h""\r\n"
"\0"
END
3 TEXTINCLUDE
BEGIN
"\r\n"
"\0"
END
#endif // APSTUDIO_INVOKED
/////////////////////////////////////////////////////////////////////////////
//
// Icon
//
// Icon with lowest ID value placed first to ensure application icon
// remains consistent on all systems.
IDI_LL_ICON ICON "singularity_icon.ico"
IDI_LCD_LL_ICON ICON "singularity_icon.ico"
/////////////////////////////////////////////////////////////////////////////
//
// Dialog
//
SPLASHSCREEN DIALOG 32, 32, 144, 34
STYLE DS_SETFONT | DS_MODALFRAME | DS_CENTER | WS_POPUP | WS_VISIBLE
FONT 8, "MS Sans Serif"
BEGIN
ICON IDI_LL_ICON,IDC_STATIC,7,7,20,20
LTEXT "Loading Second Life...",666,36,13,91,8
END
/////////////////////////////////////////////////////////////////////////////
//
// DESIGNINFO
//
#ifdef APSTUDIO_INVOKED
GUIDELINES DESIGNINFO
BEGIN
"SPLASHSCREEN", DIALOG
BEGIN
LEFTMARGIN, 7
RIGHTMARGIN, 137
VERTGUIDE, 36
TOPMARGIN, 7
BOTTOMMARGIN, 27
END
END
#endif // APSTUDIO_INVOKED
/////////////////////////////////////////////////////////////////////////////
//
// Cursor
//
TOOLGRAB CURSOR "lltoolgrab.cur"
TOOLLAND CURSOR "lltoolland.cur"
TOOLZOOMIN CURSOR "lltoolzoomin.cur"
TOOLCREATE CURSOR "lltoolcreate.cur"
ARROWDRAG CURSOR "llarrowdrag.cur"
ARROW CURSOR "llarrow.cur"
NOLOCKED CURSOR "llnolocked.cur"
ARROWLOCKED CURSOR "llarrowlocked.cur"
GRABLOCKED CURSOR "llgrablocked.cur"
TOOLROTATE CURSOR "lltoolrotate.cur"
TOOLTRANSLATE CURSOR "lltooltranslate.cur"
TOOLSCALE CURSOR "lltoolscale.cur"
TOOLCAMERA CURSOR "lltoolcamera.cur"
TOOLPAN CURSOR "lltoolpan.cur"
TOOLFOCUS CURSOR "lltoolfocus.cur"
TOOLPICKOBJECT3 CURSOR "toolpickobject3.cur"
ARROWCOPY CURSOR "arrowcop.cur"
ARROWDRAGMULTI CURSOR "llarrowdragmulti.cur"
ARROWCOPYMULTI CURSOR "arrowcopmulti.cur"
TOOLSIT CURSOR "toolsit.cur"
TOOLBUY CURSOR "toolbuy.cur"
TOOLPAY CURSOR "toolpay.cur"
TOOLOPEN CURSOR "toolopen.cur"
TOOLPIPETTE CURSOR "toolpipette.cur"
TOOLPLAY CURSOR "toolplay.cur"
TOOLPAUSE CURSOR "toolpause.cur"
TOOLMEDIAOPEN CURSOR "toolmediaopen.cur"
/////////////////////////////////////////////////////////////////////////////
//
// Version
//
VS_VERSION_INFO VERSIONINFO
FILEVERSION 1,5,0,0
PRODUCTVERSION 1,5,0,0
FILEFLAGSMASK 0x3fL
#ifdef _DEBUG
FILEFLAGS 0x1L
#else
FILEFLAGS 0x0L
#endif
FILEOS 0x40004L
FILETYPE 0x1L
FILESUBTYPE 0x0L
BEGIN
BLOCK "StringFileInfo"
BEGIN
BLOCK "040904b0"
BEGIN
VALUE "CompanyName", "Siana Gearz"
VALUE "FileDescription", "Singularity Viewer"
VALUE "FileVersion", "1.5.0.0"
VALUE "InternalName", "Second Life"
VALUE "LegalCopyright", "Copyright <20> 2001-2010, Linden Research, Inc., Copyright 2010 Siana Gearz"
VALUE "OriginalFilename", "singularity.exe"
VALUE "ProductName", "Singularity Viewer"
VALUE "ProductVersion", "1.5.0.0"
END
END
BLOCK "VarFileInfo"
BEGIN
VALUE "Translation", 0x409, 1200
END
END
/////////////////////////////////////////////////////////////////////////////
//
// Bitmap
//
#endif // English (U.S.) resources
/////////////////////////////////////////////////////////////////////////////
#ifndef APSTUDIO_INVOKED
/////////////////////////////////////////////////////////////////////////////
//
// Generated from the TEXTINCLUDE 3 resource.
//
/////////////////////////////////////////////////////////////////////////////
#endif // not APSTUDIO_INVOKED
// Microsoft Visual C++ generated resource script.
//
#include "resource.h"
#ifdef IDC_STATIC
#undef IDC_STATIC
#endif
#define IDC_STATIC (-1)
#include "winresrc.h"
#define APSTUDIO_READONLY_SYMBOLS
/////////////////////////////////////////////////////////////////////////////
//
// Generated from the TEXTINCLUDE 2 resource.
//
// Commented out because it only compiles if you have MFC installed.
//#include "winres.h"
/////////////////////////////////////////////////////////////////////////////
#undef APSTUDIO_READONLY_SYMBOLS
/////////////////////////////////////////////////////////////////////////////
// English (U.S.) resources
#if !defined(AFX_RESOURCE_DLL) || defined(AFX_TARG_ENU)
#ifdef _WIN32
LANGUAGE LANG_ENGLISH, SUBLANG_ENGLISH_US
#pragma code_page(1252)
#endif //_WIN32
#ifdef APSTUDIO_INVOKED
/////////////////////////////////////////////////////////////////////////////
//
// TEXTINCLUDE
//
1 TEXTINCLUDE
BEGIN
"resource.h\0"
END
2 TEXTINCLUDE
BEGIN
"#include ""winres.h""\r\n"
"\0"
END
3 TEXTINCLUDE
BEGIN
"\r\n"
"\0"
END
#endif // APSTUDIO_INVOKED
/////////////////////////////////////////////////////////////////////////////
//
// Icon
//
// Icon with lowest ID value placed first to ensure application icon
// remains consistent on all systems.
IDI_LL_ICON ICON "singularity_icon.ico"
IDI_LCD_LL_ICON ICON "singularity_icon.ico"
/////////////////////////////////////////////////////////////////////////////
//
// Dialog
//
SPLASHSCREEN DIALOG 32, 32, 144, 34
STYLE DS_SETFONT | DS_MODALFRAME | DS_CENTER | WS_POPUP | WS_VISIBLE
FONT 8, "MS Sans Serif"
BEGIN
ICON IDI_LL_ICON,IDC_STATIC,7,7,20,20
LTEXT "Loading Second Life...",666,36,13,91,8
END
/////////////////////////////////////////////////////////////////////////////
//
// DESIGNINFO
//
#ifdef APSTUDIO_INVOKED
GUIDELINES DESIGNINFO
BEGIN
"SPLASHSCREEN", DIALOG
BEGIN
LEFTMARGIN, 7
RIGHTMARGIN, 137
VERTGUIDE, 36
TOPMARGIN, 7
BOTTOMMARGIN, 27
END
END
#endif // APSTUDIO_INVOKED
/////////////////////////////////////////////////////////////////////////////
//
// Cursor
//
TOOLGRAB CURSOR "lltoolgrab.cur"
TOOLLAND CURSOR "lltoolland.cur"
TOOLZOOMIN CURSOR "lltoolzoomin.cur"
TOOLCREATE CURSOR "lltoolcreate.cur"
ARROWDRAG CURSOR "llarrowdrag.cur"
ARROW CURSOR "llarrow.cur"
NOLOCKED CURSOR "llnolocked.cur"
ARROWLOCKED CURSOR "llarrowlocked.cur"
GRABLOCKED CURSOR "llgrablocked.cur"
TOOLROTATE CURSOR "lltoolrotate.cur"
TOOLTRANSLATE CURSOR "lltooltranslate.cur"
TOOLSCALE CURSOR "lltoolscale.cur"
TOOLCAMERA CURSOR "lltoolcamera.cur"
TOOLPAN CURSOR "lltoolpan.cur"
TOOLFOCUS CURSOR "lltoolfocus.cur"
TOOLPICKOBJECT3 CURSOR "toolpickobject3.cur"
ARROWCOPY CURSOR "arrowcop.cur"
ARROWDRAGMULTI CURSOR "llarrowdragmulti.cur"
ARROWCOPYMULTI CURSOR "arrowcopmulti.cur"
TOOLSIT CURSOR "toolsit.cur"
TOOLBUY CURSOR "toolbuy.cur"
TOOLPAY CURSOR "toolpay.cur"
TOOLOPEN CURSOR "toolopen.cur"
TOOLPIPETTE CURSOR "toolpipette.cur"
TOOLPLAY CURSOR "toolplay.cur"
TOOLPAUSE CURSOR "toolpause.cur"
TOOLMEDIAOPEN CURSOR "toolmediaopen.cur"
/////////////////////////////////////////////////////////////////////////////
//
// Version
//
VS_VERSION_INFO VERSIONINFO
FILEVERSION 1,5,0,0
PRODUCTVERSION 1,5,0,0
FILEFLAGSMASK 0x3fL
#ifdef _DEBUG
FILEFLAGS 0x1L
#else
FILEFLAGS 0x0L
#endif
FILEOS 0x40004L
FILETYPE 0x1L
FILESUBTYPE 0x0L
BEGIN
BLOCK "StringFileInfo"
BEGIN
BLOCK "040904b0"
BEGIN
VALUE "CompanyName", "Siana Gearz"
VALUE "FileDescription", "Singularity Viewer"
VALUE "FileVersion", "1.5.0.0"
VALUE "InternalName", "Second Life"
VALUE "LegalCopyright", "Copyright <20> 2001-2010, Linden Research, Inc., Copyright 2010 Siana Gearz"
VALUE "OriginalFilename", "singularity.exe"
VALUE "ProductName", "Singularity Viewer"
VALUE "ProductVersion", "1.5.0.0"
END
END
BLOCK "VarFileInfo"
BEGIN
VALUE "Translation", 0x409, 1200
END
END
/////////////////////////////////////////////////////////////////////////////
//
// Bitmap
//
#endif // English (U.S.) resources
/////////////////////////////////////////////////////////////////////////////
#ifndef APSTUDIO_INVOKED
/////////////////////////////////////////////////////////////////////////////
//
// Generated from the TEXTINCLUDE 3 resource.
//
/////////////////////////////////////////////////////////////////////////////
#endif // not APSTUDIO_INVOKED

4
indra/newview/skins/default/xui/en-us/floater_display_name.xml
View File

@@ -19,10 +19,10 @@
<button height="20" bottom_delta="-28" label="Save" font="SansSerif" left="20" name="save_btn" tool_tip="Save your new Display Name" width="113" />
<button height="20" bottom_delta="0" label="Reset" font="SansSerif" left_delta="123" name="reset_btn" tool_tip="Make Display Name the same as Username" width="113" />
<button height="20" bottom_delta="0" label="Cancel" font="SansSerif" left_delta="123" name="cancel_btn" tool_tip="Cancel and close this Dialog" width="113" />
<text left="20" bottom_delta="-25" width="360" height="18" font="SansSerif" name="name_confirm_label2">
<text left="20" bottom_delta="-25" width="360" height="18" font="SansSerif" name="name_confirm_label2">
The name you give your avatar is called yours Display Name.
</text>
<text left="20" bottom_delta="-18" width="360" height="18" font="SansSerif" name="name_confirm_label3">
<text left="20" bottom_delta="-18" width="360" height="18" font="SansSerif" name="name_confirm_label3">
You can change it once a week.
</text>
</floater>

2
indra/newview/skins/default/xui/en-us/panel_preferences_network.xml
View File

@@ -24,7 +24,7 @@
<text bottom_delta="-26" follows="top" height="10" left="12" name="socks5_host_label">Socks 5 Host:</text>
<line_editor bottom_delta="-6" follows="top" font="SansSerif" height="20" left="90" name="socks5_proxy_host" tool_tip="The name or IP address of the SOCKS5 proxy you would like to use" width="311"/>
<spinner bottom_delta="-30" decimal_digits="0" follows="top" height="16" increment="1" initial_val="80" label="Port Number:" label_width="75" max_val="65535" min_val="0" name="socks5_proxy_port" width="140"/>
<text bottom_delta="-20" follows="top" height="10" left="12" name="socks5_auth_label2">Socks5 Authentication:</text>
<text bottom_delta="-20" follows="top" height="10" left="12" name="socks5_auth_label2">Socks5 Authentication:</text>
<radio_group bottom_delta="-6" draw_border="false" follows="top" height="20" name="socks5_auth" width="420">
<radio_item bottom="0" height="20" left_delta="80" name="None" tool_tip="No authentication">None</radio_item>
<radio_item bottom="0" height="20" left_delta="50" name="UserPass" tool_tip="Username / Password authentication">Username/Password</radio_item>