- Second Life can't establish a connection to the login server.
+ This viewer can't establish a connection to the login server.
- Please check your internet connection. If your computer or network is protected by a firewall or proxy, make sure that Second Life is permitted to access the network.
+ Please check your internet connection. If your computer or network is protected by a firewall or proxy, make sure that this viewer is permitted to access the network.
diff --git a/linden/indra/newview/skins/default/xui/en-us/notifications.xml b/linden/indra/newview/skins/default/xui/en-us/notifications.xml
index 36a8f93..be29df8 100644
--- a/linden/indra/newview/skins/default/xui/en-us/notifications.xml
+++ b/linden/indra/newview/skins/default/xui/en-us/notifications.xml
@@ -3686,7 +3686,7 @@ Default: off
label="Max Inventory Items To Transfer"
name="HelpMaxInventoryItemsTransfer"
type="alertmodal">
-This box controls how many objects can be transfered between clients at a time. -1 sets no limit on the amount of objects. Default Second Life setting is 42.
+This box controls how many objects can be transfered between clients at a time. -1 sets no limit on the amount of objects. Default setting is 42.
Default: -1
diff --git a/linden/indra/newview/skins/default/xui/en-us/panel_avatar.xml b/linden/indra/newview/skins/default/xui/en-us/panel_avatar.xml
index 0df65e7..38c5a98 100644
--- a/linden/indra/newview/skins/default/xui/en-us/panel_avatar.xml
+++ b/linden/indra/newview/skins/default/xui/en-us/panel_avatar.xml
@@ -103,7 +103,7 @@
bottom_delta="-25" drop_shadow_visible="true" follows="left|top"
font="SansSerifSmall" h_pad="0" halign="left" height="16" right="-12"
mouse_opaque="true" name="partner_label"
- tool_tip="Second Life partner. For more info on how to set, see www.secondlife.com/partner"
+ tool_tip="In world partner."
v_pad="0" width="145">
Partner:
@@ -118,7 +118,7 @@
border_thickness="1" bottom_delta="-19" enabled="true" follows="left|top"
font="SansSerifSmall" height="18" is_unicode="false" right="-12"
max_length="254" mouse_opaque="false" name="partner_edit"
- tool_tip="Second Life partner. For more info on how to set, see www.secondlife.com/partner"
+ tool_tip="In world partner."
width="145">
[FIRST] [LAST]
@@ -295,7 +295,7 @@
bottom="-20" drop_shadow_visible="true" follows="left|top"
font="SansSerifSmall" h_pad="0" halign="left" height="16" left="114"
mouse_opaque="true"
- name="Tell everyone about your favorite places in Second Life." v_pad="0"
+ name="Tell everyone about your favorite places in world." v_pad="0"
width="302">
Tell everyone about your favorite places.
@@ -321,7 +321,7 @@
bottom="-20" drop_shadow_visible="true" follows="left|top"
font="SansSerifSmall" h_pad="0" halign="left" height="16" left="114"
mouse_opaque="true"
- name="Place an ad in Second Life's classified listings." v_pad="0"
+ name="Place an ad in the classified listings." v_pad="0"
width="302">
Place an ad in the current grid's classified listings.
diff --git a/linden/indra/newview/skins/default/xui/en-us/panel_preferences_web.xml b/linden/indra/newview/skins/default/xui/en-us/panel_preferences_web.xml
index 46283bb..e077ca1 100644
--- a/linden/indra/newview/skins/default/xui/en-us/panel_preferences_web.xml
+++ b/linden/indra/newview/skins/default/xui/en-us/panel_preferences_web.xml
@@ -9,7 +9,7 @@
Use external web browser (Firefox, Safari, Internet Explorer)
+ tool_tip="Use the built-in web browser for help, web links, etc. This browser opens as a new window inside the viewer.">
Use built-in web browser
diff --git a/linden/indra/newview/skins/default/xui/en-us/panel_status_bar.xml b/linden/indra/newview/skins/default/xui/en-us/panel_status_bar.xml
index 46ba64a..0169f38 100644
--- a/linden/indra/newview/skins/default/xui/en-us/panel_status_bar.xml
+++ b/linden/indra/newview/skins/default/xui/en-us/panel_status_bar.xml
@@ -101,7 +101,7 @@
+ tool_tip="Search the grid" width="16" scale_image="false"/>
-
+
Second Lifeã®ãŠæ°—入りã®å ´æ‰€ã‚’皆ã«æ•™ãˆã¦ãã ã•ã„
@@ -149,7 +149,7 @@
-
+
SecondLifeã®ã‚¯ãƒ©ã‚·ãƒ•ã‚¡ã‚¤ãƒ‰ãƒªã‚¹ãƒˆã«åºƒå‘Šã‚’載ã›ã¾ã™ã€‚
diff --git a/linden/indra/test/llsdserialize_tut.cpp b/linden/indra/test/llsdserialize_tut.cpp
index 6fcbe4b..3e9e4b8 100644
--- a/linden/indra/test/llsdserialize_tut.cpp
+++ b/linden/indra/test/llsdserialize_tut.cpp
@@ -315,25 +315,7 @@ namespace tut
checkRoundTrip(msg + " non-empty string", v);
v =
-"Second Life is a 3-D virtual world entirely built and owned by its residents. "
-"Since opening to the public in 2003, it has grown explosively and today is "
-"inhabited by nearly 100,000 people from around the globe.\n"
-"\n"
-"From the moment you enter the World you'll discover a vast digital continent, "
-"teeming with people, entertainment, experiences and opportunity. Once you've "
-"explored a bit, perhaps you'll find a perfect parcel of land to build your "
-"house or business.\n"
-"\n"
-"You'll also be surrounded by the Creations of your fellow residents. Because "
-"residents retain the rights to their digital creations, they can buy, sell "
-"and trade with other residents.\n"
-"\n"
-"The Marketplace currently supports millions of US dollars in monthly "
-"transactions. This commerce is handled with the in-world currency, the Linden "
-"dollar, which can be converted to US dollars at several thriving online "
-"currency exchanges.\n"
-"\n"
-"Welcome to Second Life. We look forward to seeing you in-world!\n"
+"Welcome to this grid. We look forward to seeing you in-world!\n"
;
checkRoundTrip(msg + " long string", v);
diff --git a/linden/indra/test/lluri_tut.cpp b/linden/indra/test/lluri_tut.cpp
index 2ee15be..5f0d4e5 100644
--- a/linden/indra/test/lluri_tut.cpp
+++ b/linden/indra/test/lluri_tut.cpp
@@ -306,7 +306,7 @@ namespace tut
void URITestObject::test<17>()
{
// do some round-trip tests with very long strings.
- escapeRoundTrip("Welcome to Second Life.We hope you'll have a richly rewarding experience, filled with creativity, self expression and fun.The goals of the Community Standards are simple: treat each other with respect and without harassment, adhere to local standards as indicated by simulator ratings, and refrain from any hate activity which slurs a real-world individual or real-world community. Behavioral Guidelines - The Big Six");
+ escapeRoundTrip("Welcome to this grid.We hope you'll have a richly rewarding experience, filled with creativity, self expression and fun. The goals of the Community Standards are simple: treat each other with respect and without harassment, adhere to local standards as indicated by simulator ratings, and refrain from any hate activity which slurs a real-world individual or real-world community.");
escapeRoundTrip(
"'asset_data':b(12100){'task_id':ucc706f2d-0b68-68f8-11a4-f1043ff35ca0}\n{\n\tname\tObject|\n\tpermissions 0\n\t{\n\t\tbase_mask\t7fffffff\n\t\towner_mask\t7fffffff\n\t\tgroup_mask\t00000000\n\t\teveryone_mask\t00000000\n\t\tnext_owner_mask\t7fffffff\n\t\tcreator_id\t13fd9595-a47b-4d64-a5fb-6da645f038e0\n\t\towner_id\t3c115e51-04f4-523c-9fa6-98aff1034730\n\t\tlast_owner_id\t3c115e51-04f4-523c-9fa6-98aff1034730\n\t\tgroup_id\t00000000-0000-0000-0000-000000000000\n\t}\n\tlocal_id\t217444921\n\ttotal_crc\t323\n\ttype\t2\n\ttask_valid\t2\n\ttravel_access\t13\n\tdisplayopts\t2\n\tdisplaytype\tv\n\tpos\t-0.368634403\t0.00781063363\t-0.569040775\n\toldpos\t150.117996\t25.8658009\t8.19664001\n\trotation\t-0.06293071806430816650390625\t-0.6995697021484375\t-0.7002241611480712890625\t0.1277817934751510620117188\n\tchildpos\t-0.00499999989\t-0.0359999985\t0.307999998\n\tchildrot\t-0.515492737293243408203125\t-0.46601200103759765625\t0.529055416584014892578125\t0.4870323240756988525390625\n\tscale"
"\t0.074629\t0.289956\t0.01\n\tsit_offset\t0\t0\t0\n\tcamera_eye_offset\t0\t0\t0\n\tcamera_at_offset\t0\t0\t0\n\tsit_quat\t0\t0\t0\t1\n\tsit_hint\t0\n\tstate\t160\n\tmaterial\t3\n\tsoundid\t00000000-0000-0000-0000-000000000000\n\tsoundgain\t0\n\tsoundradius\t0\n\tsoundflags\t0\n\ttextcolor\t0 0 0 1\n\tselected\t0\n\tselector\t00000000-0000-0000-0000-000000000000\n\tusephysics\t0\n\trotate_x\t1\n\trotate_y\t1\n\trotate_z\t1\n\tphantom\t0\n\tremote_script_access_pin\t0\n\tvolume_detect\t0\n\tblock_grabs\t0\n\tdie_at_edge\t0\n\treturn_at_edge\t0\n\ttemporary\t0\n\tsandbox\t0\n\tsandboxhome\t0\t0\t0\n\tshape 0\n\t{\n\t\tpath 0\n\t\t{\n\t\t\tcurve\t16\n\t\t\tbegin\t0\n\t\t\tend\t1\n\t\t\tscale_x\t1\n\t\t\tscale_y\t1\n\t\t\tshear_x\t0\n\t\t\tshear_y\t0\n\t\t\ttwist\t0\n\t\t\ttwist_begin\t0\n\t\t\tradius_offset\t0\n\t\t\ttaper_x\t0\n\t\t\ttaper_y\t0\n\t\t\trevolutions\t1\n\t\t\tskew\t0\n\t\t}\n\t\tprofile 0\n\t\t{\n\t\t\tcurve\t1\n\t\t\tbegin\t0\n\t\t\tend\t1\n\t\t\thollow\t0\n\t\t}\n\t}\n\tf"
diff --git a/linden/indra/win_updater/updater.cpp b/linden/indra/win_updater/updater.cpp
index 2e78296..117b8e8 100644
--- a/linden/indra/win_updater/updater.cpp
+++ b/linden/indra/win_updater/updater.cpp
@@ -482,7 +482,7 @@ WinMain (HINSTANCE hInstance, HINSTANCE hPrevInstance, LPSTR lpCmdLine, int nSho
//char params[256]; /* Flawfinder: ignore */
//sprintf(params, "/S"); /* Flawfinder: ignore */
//MessageBox(gWindow,
- // L"Updating Second Life.\n\nSecond Life will automatically start once the update is complete. This may take a minute...",
+ // L"Updating grid viewer.\n\n The grid viewer will automatically start once the update is complete. This may take a minute...",
// L"Download Complete",
// MB_OK);
--
cgit v1.1
From 325f9c40159793b4d25a19d88dd7e2d205fff3b8 Mon Sep 17 00:00:00 2001
From: David Seikel
Date: Sun, 13 Feb 2011 14:38:54 +1000
Subject: Changing some "Second Life" references to "meta-impy".
---
linden/indra/llcommon/llversionviewer.h | 2 +-
linden/indra/newview/viewerversion.h | 10 +++++-----
linden/indra/win_crash_logger/llcrashloggerwindows.cpp | 2 +-
3 files changed, 7 insertions(+), 7 deletions(-)
diff --git a/linden/indra/llcommon/llversionviewer.h b/linden/indra/llcommon/llversionviewer.h
index ad6a88a..a571b95 100644
--- a/linden/indra/llcommon/llversionviewer.h
+++ b/linden/indra/llcommon/llversionviewer.h
@@ -40,7 +40,7 @@ const S32 LL_VERSION_MINOR = 23;
const S32 LL_VERSION_PATCH = 5;
const S32 LL_VERSION_BUILD = 136262;
-const char * const LL_VIEWER_NAME = "Second Life";
+const char * const LL_VIEWER_NAME = "meta-impy";
// These aren't used anymore.
// The channel is ViewerChannelName in settings.xml
diff --git a/linden/indra/newview/viewerversion.h b/linden/indra/newview/viewerversion.h
index d67cee5..a517f9f 100644
--- a/linden/indra/newview/viewerversion.h
+++ b/linden/indra/newview/viewerversion.h
@@ -52,15 +52,15 @@ public:
// Returns the name of the viewer. Currently always "Imprudence"
static std::string getImpViewerName() { return sViewerName; }
- // Returns the major version of Second Life
+ // Returns the major version of the viewer
static S32 getLLMajorVersion() { return LL_VERSION_MAJOR; }
- // Returns the minor version of Second Life
+ // Returns the minor version of the viewer
static S32 getLLMinorVersion() { return LL_VERSION_MINOR; }
- // Returns the patch version of Second Life
+ // Returns the patch version of the viewer
static S32 getLLPatchVersion() { return LL_VERSION_PATCH; }
- // Returns the build version of Second Life
+ // Returns the build version of the viewer
static S32 getLLBuildVersion() { return LL_VERSION_BUILD; }
- // Returns the name of the LL viewer ("Second Life")
+ // Returns the name of the viewer ("meta-impy")
static std::string getLLViewerName() { return LL_VIEWER_NAME; }
// Note that the viewer channel is set in settings.xml
diff --git a/linden/indra/win_crash_logger/llcrashloggerwindows.cpp b/linden/indra/win_crash_logger/llcrashloggerwindows.cpp
index c9e01c8..e15268a 100644
--- a/linden/indra/win_crash_logger/llcrashloggerwindows.cpp
+++ b/linden/indra/win_crash_logger/llcrashloggerwindows.cpp
@@ -261,7 +261,7 @@ bool LLCrashLoggerWindows::init(void)
/*
mbstowcs( gProductName, mProductName.c_str(), LL_ARRAY_SIZE(gProductName) );
gProductName[ LL_ARRY_SIZE(gProductName) - 1 ] = 0;
- swprintf(gProductName, L"Second Life");
+ swprintf(gProductName, L"meta-impy");
*/
llinfos << "Loading dialogs" << llendl;
--
cgit v1.1
From 07e4ce782ffba2e4464ebc966c8ef514b9af11b0 Mon Sep 17 00:00:00 2001
From: David Seikel
Date: Sun, 13 Feb 2011 14:41:11 +1000
Subject: Remove catering to LL's probably illegal attempt to block copying of
open source content that specifically prevents attempts to block copying.
---
linden/indra/newview/primbackup.cpp | 17 ++++++++++++-----
1 file changed, 12 insertions(+), 5 deletions(-)
diff --git a/linden/indra/newview/primbackup.cpp b/linden/indra/newview/primbackup.cpp
index 7f050a0..305731f 100644
--- a/linden/indra/newview/primbackup.cpp
+++ b/linden/indra/newview/primbackup.cpp
@@ -423,11 +423,18 @@ void primbackup::exportworker(void *userdata)
// Exporting object textures (or other content) from Second Life
// without checking creator is a violation of the Second Life
// Policy on Third-Party Viewers and Terms of Service.
- if(gHippoGridManager->getConnectedGrid()->isSecondLife())
- {
- primbackup::getInstance()->export_state=EXPORT_DONE;
- return;
- }
+ // Coz LL are paranoid about other grids getting useful content.
+ // This is probably illegal with respect to open source content,
+ // it usually has licenses designed to prevent third parties (LL)
+ // from restricting copying.
+ // This is the meta-impy viewer, we don't care about LL's broken policies
+ // and we really don't care for LL imposing their own restrictions
+ // on content that the content author did not want.
+// if(gHippoGridManager->getConnectedGrid()->isSecondLife())
+// {
+// primbackup::getInstance()->export_state=EXPORT_DONE;
+// return;
+// }
if(primbackup::getInstance()->m_nexttextureready==false)
return;
--
cgit v1.1
From 8fa1dc90a9fec493b19604a4b4e08dc3208c7e8f Mon Sep 17 00:00:00 2001
From: David Seikel
Date: Fri, 25 Feb 2011 05:58:41 +1000
Subject: Unbranding. Todays word is "linden".
---
linden/indra/develop.py | 2 +-
linden/indra/llcommon/indra_constants.cpp | 5 +--
linden/indra/llcommon/indra_constants.h | 6 +--
linden/indra/llcommon/linden_common.h | 2 +-
linden/indra/llcommon/llassettype.h | 4 +-
linden/indra/llcommon/llavatarname.cpp | 2 +-
linden/indra/llcommon/llavatarname.h | 18 ++++-----
linden/indra/llcommon/llpreprocessor.h | 2 +-
linden/indra/llcommon/roles_constants.h | 4 +-
linden/indra/llinventory/llnotecard.cpp | 18 ++++-----
linden/indra/llinventory/llparcel.h | 2 +-
linden/indra/llmessage/llassetstorage.cpp | 2 +-
linden/indra/llmessage/llcachename.cpp | 2 +-
linden/indra/llmessage/lliosocket.cpp | 2 +-
linden/indra/llmessage/llpacketring.cpp | 2 +-
linden/indra/llmessage/lltaskname.h | 2 +-
linden/indra/llmessage/message.cpp | 2 +-
linden/indra/llmessage/message.h | 3 +-
linden/indra/llmessage/net.cpp | 2 +-
linden/indra/llrender/llfont.cpp | 2 +-
linden/indra/llui/llbutton.cpp | 2 +-
linden/indra/llui/lliconctrl.cpp | 2 +-
linden/indra/llui/lltexteditor.cpp | 20 +++++-----
linden/indra/llui/llui.cpp | 2 +-
linden/indra/llvfs/lldir.cpp | 30 +++++++--------
linden/indra/llvfs/lldir.h | 6 +--
linden/indra/llvfs/lldir_linux.cpp | 2 +-
linden/indra/llvfs/lldir_solaris.cpp | 2 +-
linden/indra/llwindow/llwindowmacosx-objc.mm | 2 +-
linden/indra/newview/app_settings/settings.xml | 2 +-
linden/indra/newview/floatervoicelicense.cpp | 2 +-
.../installers/windows/installer_template.nsi | 44 +++++++++++-----------
linden/indra/newview/llagent.cpp | 2 +-
linden/indra/newview/llappviewer.cpp | 2 +-
linden/indra/newview/llcolorswatch.cpp | 2 +-
linden/indra/newview/llcommandhandler.h | 2 +-
linden/indra/newview/llconsole.cpp | 2 +-
linden/indra/newview/llfilepicker.cpp | 4 +-
linden/indra/newview/llfloateractivespeakers.cpp | 2 +-
linden/indra/newview/llfloateravatarinfo.cpp | 2 +-
linden/indra/newview/llfloaterbuyland.cpp | 2 +-
linden/indra/newview/llfloaterchat.cpp | 2 +-
linden/indra/newview/llfloaterclassified.cpp | 2 +-
linden/indra/newview/llfloaterevent.cpp | 2 +-
linden/indra/newview/llfloaterhud.cpp | 2 +-
linden/indra/newview/llfloaterjoystick.cpp | 2 +-
linden/indra/newview/llfloaternamedesc.cpp | 2 +-
linden/indra/newview/llfloaterreporter.cpp | 2 +-
linden/indra/newview/llfloatertos.cpp | 2 +-
linden/indra/newview/llhoverview.cpp | 4 +-
linden/indra/newview/llimview.cpp | 10 ++---
linden/indra/newview/llimview.h | 2 +-
linden/indra/newview/llmanipscale.cpp | 2 +-
linden/indra/newview/llmaniptranslate.cpp | 2 +-
linden/indra/newview/llmediactrl.cpp | 2 +-
linden/indra/newview/llmutelist.cpp | 12 +++---
linden/indra/newview/llmutelist.h | 2 +-
linden/indra/newview/llpanelLCD.cpp | 2 +-
linden/indra/newview/llpanelaudioprefs.cpp | 2 +-
linden/indra/newview/llpanelcontents.cpp | 2 +-
linden/indra/newview/llpaneldebug.cpp | 2 +-
linden/indra/newview/llpaneldirbrowser.cpp | 2 +-
linden/indra/newview/llpaneldirclassified.cpp | 2 +-
linden/indra/newview/llpaneldirevents.cpp | 2 +-
linden/indra/newview/llpaneldirfind.cpp | 2 +-
linden/indra/newview/llpaneldirgroups.cpp | 2 +-
linden/indra/newview/llpaneldirland.cpp | 2 +-
linden/indra/newview/llpaneldirpeople.cpp | 2 +-
linden/indra/newview/llpaneldirplaces.cpp | 2 +-
linden/indra/newview/llpaneldisplay.cpp | 2 +-
linden/indra/newview/llpanelobject.cpp | 2 +-
linden/indra/newview/llpanelskins.cpp | 2 +-
linden/indra/newview/llpanelvolume.cpp | 2 +-
linden/indra/newview/llsky.cpp | 2 +-
linden/indra/newview/llstartup.cpp | 8 ++--
linden/indra/newview/lltoolplacer.cpp | 2 +-
linden/indra/newview/llurldispatcher.h | 2 +-
linden/indra/newview/llurlhistory.cpp | 4 +-
linden/indra/newview/llviewerdisplay.cpp | 2 +-
linden/indra/newview/llviewermedia.cpp | 10 ++---
linden/indra/newview/llviewermenu.cpp | 8 ++--
linden/indra/newview/llviewermenufile.cpp | 4 +-
linden/indra/newview/llviewermessage.cpp | 24 ++++++------
linden/indra/newview/llviewerwindow.cpp | 4 +-
linden/indra/newview/llvoiceclient.cpp | 6 +--
linden/indra/newview/llvowlsky.cpp | 2 +-
linden/indra/newview/llwind.cpp | 2 +-
linden/indra/newview/macview_Prefix.h | 2 +-
linden/indra/newview/primbackup.cpp | 2 +-
linden/indra/newview/skins/dark/colors_base.xml | 2 +-
linden/indra/newview/skins/default/colors_base.xml | 2 +-
.../skins/default/xui/da/floater_report_bug.xml | 4 +-
.../skins/default/xui/de/floater_report_bug.xml | 4 +-
.../skins/default/xui/en-us/floater_about_land.xml | 4 +-
.../skins/default/xui/en-us/floater_report_bug.xml | 4 +-
.../skins/default/xui/en-us/notifications.xml | 22 +++++------
.../skins/default/xui/en-us/role_actions.xml | 8 ++--
.../skins/default/xui/es/floater_report_bug.xml | 4 +-
.../skins/default/xui/fr/floater_report_bug.xml | 4 +-
.../skins/default/xui/hu/floater_report_bug.xml | 4 +-
.../skins/default/xui/it/floater_report_bug.xml | 4 +-
.../skins/default/xui/ja/floater_report_bug.xml | 2 +-
.../skins/default/xui/ko/floater_report_bug.xml | 2 +-
.../skins/default/xui/pl/floater_report_bug.xml | 4 +-
.../skins/default/xui/ru/floater_report_bug.xml | 2 +-
.../skins/default/xui/uk/floater_report_bug.xml | 2 +-
.../skins/default/xui/zh/floater_report_bug.xml | 2 +-
linden/indra/newview/skins/gemini/colors_base.xml | 2 +-
linden/indra/newview/skins/silver/colors_base.xml | 2 +-
.../newview/skins/white_Meta7/colors_base.xml | 2 +-
linden/indra/win_crash_logger/win_crash_logger.rc | 2 +-
111 files changed, 233 insertions(+), 243 deletions(-)
diff --git a/linden/indra/develop.py b/linden/indra/develop.py
index c909a1b..af7e42f 100755
--- a/linden/indra/develop.py
+++ b/linden/indra/develop.py
@@ -694,7 +694,7 @@ Usage: develop.py [options] [command [command-options]]
Options:
-h | --help print this help message
- --standalone build standalone, without Linden prebuild libraries
+ --standalone build standalone, without prebuild libraries
--unattended build unattended, do not invoke any tools requiring
a human response
--universal build a universal binary on Mac OS X (unsupported)
diff --git a/linden/indra/llcommon/indra_constants.cpp b/linden/indra/llcommon/indra_constants.cpp
index 64cbb11..1ab47d0 100644
--- a/linden/indra/llcommon/indra_constants.cpp
+++ b/linden/indra/llcommon/indra_constants.cpp
@@ -40,8 +40,5 @@
const LLUUID LL_UUID_ALL_AGENTS("44e87126-e794-4ded-05b3-7c42da3d5cdb");
// Governor Linden's agent id.
+// FIXME for meta-impy: Gotta get rid of this.
const LLUUID ALEXANDRIA_LINDEN_ID("ba2a564a-f0f1-4b82-9c61-b7520bfcd09f");
-const LLUUID GOVERNOR_LINDEN_ID("3d6181b0-6a4b-97ef-18d8-722652995cf1");
-const LLUUID REALESTATE_LINDEN_ID("3d6181b0-6a4b-97ef-18d8-722652995cf1");
-// Maintenance's group id.
-const LLUUID MAINTENANCE_GROUP_ID("dc7b21cd-3c89-fcaa-31c8-25f9ffd224cd");
diff --git a/linden/indra/llcommon/indra_constants.h b/linden/indra/llcommon/indra_constants.h
index 2fa2cdf..e64ee62 100644
--- a/linden/indra/llcommon/indra_constants.h
+++ b/linden/indra/llcommon/indra_constants.h
@@ -267,13 +267,9 @@ const U8 GOD_NOT = 0;
LL_COMMON_API extern const LLUUID LL_UUID_ALL_AGENTS;
// inventory library owner
+// FIXME for meta-impy: Gotta get rid of this.
LL_COMMON_API extern const LLUUID ALEXANDRIA_LINDEN_ID;
-LL_COMMON_API extern const LLUUID GOVERNOR_LINDEN_ID;
-LL_COMMON_API extern const LLUUID REALESTATE_LINDEN_ID;
-// Maintenance's group id.
-LL_COMMON_API extern const LLUUID MAINTENANCE_GROUP_ID;
-
// Flags for kick message
const U32 KICK_FLAGS_DEFAULT = 0x0;
const U32 KICK_FLAGS_FREEZE = 1 << 0;
diff --git a/linden/indra/llcommon/linden_common.h b/linden/indra/llcommon/linden_common.h
index bf844b9..cfb2dce 100644
--- a/linden/indra/llcommon/linden_common.h
+++ b/linden/indra/llcommon/linden_common.h
@@ -82,7 +82,7 @@
// moved msvc warnings to llpreprocessor.h *TODO - delete this comment after merge conflicts are unlikely -brad
#endif // LL_WINDOWS
-// Linden only libs in alpha-order other than stdtypes.h
+// Viewer only libs in alpha-order other than stdtypes.h
// *NOTE: Please keep includes here to a minimum, see above.
#include "stdtypes.h"
#include "lldefs.h"
diff --git a/linden/indra/llcommon/llassettype.h b/linden/indra/llcommon/llassettype.h
index 9f611ae..5465cc3 100644
--- a/linden/indra/llcommon/llassettype.h
+++ b/linden/indra/llcommon/llassettype.h
@@ -50,12 +50,12 @@ public:
AT_SOUND = 1,
// Links instant message access to the user on the card. eg, a
- // card for yourself, a card for linden support, a card for
+ // card for yourself, a card for grid support, a card for
// the guy you were talking to in the coliseum.
AT_CALLINGCARD = 2,
// Links to places in the world with location and a screen
- // shot or image saved. eg, home, linden headquarters, the
+ // shot or image saved. eg, home, grid headquarters, the
// coliseum, or destinations where we want to increase
// traffic.
AT_LANDMARK = 3,
diff --git a/linden/indra/llcommon/llavatarname.cpp b/linden/indra/llcommon/llavatarname.cpp
index ebe8c88..4a2c7ab 100644
--- a/linden/indra/llcommon/llavatarname.cpp
+++ b/linden/indra/llcommon/llavatarname.cpp
@@ -1,7 +1,7 @@
/**
* @file llavatarname.cpp
* @brief Represents name-related data for an avatar, such as the
- * username/SLID ("bobsmith123" or "james.linden") and the display
+ * username/SLID ("bobsmith123" or "james.green") and the display
* name ("James Cook")
*
* $LicenseInfo:firstyear=2010&license=viewerlgpl$
diff --git a/linden/indra/llcommon/llavatarname.h b/linden/indra/llcommon/llavatarname.h
index 3b6c6ea..1e141dc 100644
--- a/linden/indra/llcommon/llavatarname.h
+++ b/linden/indra/llcommon/llavatarname.h
@@ -1,7 +1,7 @@
/**
* @file llavatarname.h
* @brief Represents name-related data for an avatar, such as the
- * username/SLID ("bobsmith123" or "james.linden") and the display
+ * username/SLID ("bobsmith123" or "james.green") and the display
* name ("James Cook")
*
* $LicenseInfo:firstyear=2010&license=viewerlgpl$
@@ -43,8 +43,8 @@ public:
void fromLLSD(const LLSD& sd);
- // For normal names, returns "James Linden (james.linden)"
- // When display names are disabled returns just "James Linden"
+ // For normal names, returns "James Green (james.green)"
+ // When display names are disabled returns just "James Green"
std::string getCompleteName() const;
// For normal names, returns "Whatever Display Name (John Doe)" when
@@ -55,31 +55,31 @@ public:
// line feed.
std::string getNames(bool linefeed = false) const;
- // Returns "James Linden" or "bobsmith123 Resident" for backwards
+ // Returns "James Green" or "bobsmith123 Resident" for backwards
// compatibility with systems like voice and muting
std::string getLegacyName() const;
- // "bobsmith123" or "james.linden", US-ASCII only
+ // "bobsmith123" or "james.green", US-ASCII only
std::string mUsername;
- // "Jose' Sanchez" or "James Linden", UTF-8 encoded Unicode
+ // "Jose' Sanchez" or "James Green", UTF-8 encoded Unicode
// Contains data whether or not user has explicitly set
// a display name; may duplicate their username.
std::string mDisplayName;
- // For "James Linden", "James"
+ // For "James Green", "James"
// For "bobsmith123", "bobsmith123"
// Used to communicate with legacy systems like voice and muting which
// rely on old-style names.
std::string mLegacyFirstName;
- // For "James Linden", "Linden"
+ // For "James Green", "Green"
// For "bobsmith123", "Resident"
// see above for rationale
std::string mLegacyLastName;
// If true, both display name and SLID were generated from
- // a legacy first and last name, like "James Linden (james.linden)"
+ // a legacy first and last name, like "James Green (james.green)"
bool mIsDisplayNameDefault;
// Under error conditions, we may insert "dummy" records with
diff --git a/linden/indra/llcommon/llpreprocessor.h b/linden/indra/llcommon/llpreprocessor.h
index 6886e3a..29d90ba 100644
--- a/linden/indra/llcommon/llpreprocessor.h
+++ b/linden/indra/llcommon/llpreprocessor.h
@@ -1,6 +1,6 @@
/**
* @file llpreprocessor.h
- * @brief This file should be included in all Linden Lab files and
+ * @brief This file should be included in all viewer files and
* should only contain special preprocessor directives
*
* $LicenseInfo:firstyear=2001&license=viewergpl$
diff --git a/linden/indra/llcommon/roles_constants.h b/linden/indra/llcommon/roles_constants.h
index 854a153..b3107e7 100644
--- a/linden/indra/llcommon/roles_constants.h
+++ b/linden/indra/llcommon/roles_constants.h
@@ -89,7 +89,7 @@ const U64 GP_GROUP_CHANGE_IDENTITY = 0x1 << 11; // Charter, insignia, 'Show In G
// Parcel Management
const U64 GP_LAND_DEED = 0x1 << 12; // Deed Land and Buy Land for Group
-const U64 GP_LAND_RELEASE = 0x1 << 13; // Release Land (to Gov. Linden)
+const U64 GP_LAND_RELEASE = 0x1 << 13; // Release Land (abandon it back to the grid owners)
const U64 GP_LAND_SET_SALE_INFO = 0x1 << 14; // Set for sale info (Toggle "For Sale", Set Price, Set Target, Toggle "Sell objects with the land")
const U64 GP_LAND_DIVIDE_JOIN = 0x1 << 15; // Divide and Join Parcels
@@ -126,7 +126,7 @@ const U64 GP_LAND_RETURN = GP_LAND_RETURN_GROUP_OWNED
| GP_LAND_RETURN_GROUP_SET
| GP_LAND_RETURN_NON_GROUP;
-const U64 GP_LAND_GARDENING = 0x1LL << 35; // Parcel Gardening - plant and move linden trees
+const U64 GP_LAND_GARDENING = 0x1LL << 35; // Parcel Gardening - plant and move tree prims
// Object Management
const U64 GP_OBJECT_DEED = 0x1LL << 36; // Deed Object
diff --git a/linden/indra/llinventory/llnotecard.cpp b/linden/indra/llinventory/llnotecard.cpp
index 9e7e043..f7e3632 100644
--- a/linden/indra/llinventory/llnotecard.cpp
+++ b/linden/indra/llinventory/llnotecard.cpp
@@ -61,7 +61,7 @@ bool LLNotecard::importEmbeddedItemsStream(std::istream& str)
str >> std::ws >> "LLEmbeddedItems version" >> mEmbeddedVersion >> "\n";
if (str.fail())
{
- llwarns << "Invalid Linden text file header" << llendl;
+ llwarns << "Invalid notecard text file header" << llendl;
goto import_file_failed;
}
@@ -74,7 +74,7 @@ bool LLNotecard::importEmbeddedItemsStream(std::istream& str)
str >> std::ws >> "{\n";
if(str.fail())
{
- llwarns << "Invalid Linden text file format: missing {" << llendl;
+ llwarns << "Invalid notecard text file format: missing {" << llendl;
goto import_file_failed;
}
@@ -165,20 +165,20 @@ bool LLNotecard::importStream(std::istream& str)
str >> std::ws >> "Linden text version " >> mVersion >> "\n";
if(str.fail())
{
- llwarns << "Invalid Linden text file header " << llendl;
+ llwarns << "Invalid notecard text file header " << llendl;
return FALSE;
}
if( 1 != mVersion && 2 != mVersion)
{
- llwarns << "Invalid Linden text file version: " << mVersion << llendl;
+ llwarns << "Invalid notecard text file version: " << mVersion << llendl;
return FALSE;
}
str >> std::ws >> "{\n";
if(str.fail())
{
- llwarns << "Invalid Linden text file format" << llendl;
+ llwarns << "Invalid notecard text file format" << llendl;
return FALSE;
}
@@ -191,7 +191,7 @@ bool LLNotecard::importStream(std::istream& str)
str.getline(line_buf, STD_STRING_BUF_SIZE);
if(str.fail())
{
- llwarns << "Invalid Linden text length field" << llendl;
+ llwarns << "Invalid notecard text length field" << llendl;
return FALSE;
}
line_buf[STD_STRING_STR_LEN] = '\0';
@@ -199,13 +199,13 @@ bool LLNotecard::importStream(std::istream& str)
S32 text_len = 0;
if( 1 != sscanf(line_buf, "Text length %d", &text_len) )
{
- llwarns << "Invalid Linden text length field" << llendl;
+ llwarns << "Invalid notecard text length field" << llendl;
return FALSE;
}
if(text_len > mMaxText)
{
- llwarns << "Invalid Linden text length: " << text_len << llendl;
+ llwarns << "Invalid notecard text length: " << text_len << llendl;
return FALSE;
}
@@ -215,7 +215,7 @@ bool LLNotecard::importStream(std::istream& str)
fullread(str, text, text_len);
if(str.fail())
{
- llwarns << "Invalid Linden text: text shorter than text length: " << text_len << llendl;
+ llwarns << "Invalid notecard text: text shorter than text length: " << text_len << llendl;
success = FALSE;
}
text[text_len] = '\0';
diff --git a/linden/indra/llinventory/llparcel.h b/linden/indra/llinventory/llparcel.h
index 8faa673..0af9ab7 100644
--- a/linden/indra/llinventory/llparcel.h
+++ b/linden/indra/llinventory/llparcel.h
@@ -632,7 +632,7 @@ protected:
F32 mDiscountRate; // 0.0-1.0
F32 mDrawDistance;
U32 mParcelFlags;
- S32 mSalePrice; // linden dollars
+ S32 mSalePrice; // in world currency
std::string mName;
std::string mDesc;
std::string mMusicURL;
diff --git a/linden/indra/llmessage/llassetstorage.cpp b/linden/indra/llmessage/llassetstorage.cpp
index 0ab1081..fd1dd95 100644
--- a/linden/indra/llmessage/llassetstorage.cpp
+++ b/linden/indra/llmessage/llassetstorage.cpp
@@ -38,7 +38,7 @@
#include "llassetstorage.h"
-// linden library includes
+// viewer library includes
#include "llmath.h"
#include "llstring.h"
#include "lldir.h"
diff --git a/linden/indra/llmessage/llcachename.cpp b/linden/indra/llmessage/llcachename.cpp
index 88a0cfe..db81e8c 100644
--- a/linden/indra/llmessage/llcachename.cpp
+++ b/linden/indra/llmessage/llcachename.cpp
@@ -34,7 +34,7 @@
#include "llcachename.h"
-// linden library includes
+// viewer library includes
#include "lldbstrings.h"
#include "llframetimer.h"
#include "llhost.h"
diff --git a/linden/indra/llmessage/lliosocket.cpp b/linden/indra/llmessage/lliosocket.cpp
index 686c037..150b771 100644
--- a/linden/indra/llmessage/lliosocket.cpp
+++ b/linden/indra/llmessage/lliosocket.cpp
@@ -597,7 +597,7 @@ LLIOPipe::EStatus LLIOServerSocket::process_impl(
else
{
char buf[256];
- llwarns << "Unable to accept linden socket: " << apr_strerror(status, buf, sizeof(buf)) << llendl;
+ llwarns << "Unable to accept server socket: " << apr_strerror(status, buf, sizeof(buf)) << llendl;
}
PUMP_DEBUG;
diff --git a/linden/indra/llmessage/llpacketring.cpp b/linden/indra/llmessage/llpacketring.cpp
index 7dcb606..7f9617f 100644
--- a/linden/indra/llmessage/llpacketring.cpp
+++ b/linden/indra/llmessage/llpacketring.cpp
@@ -34,7 +34,7 @@
#include "llpacketring.h"
-// linden library includes
+// viewer library includes
#include "llerror.h"
#include "lltimer.h"
#include "timing.h"
diff --git a/linden/indra/llmessage/lltaskname.h b/linden/indra/llmessage/lltaskname.h
index 401d355..305b31a 100644
--- a/linden/indra/llmessage/lltaskname.h
+++ b/linden/indra/llmessage/lltaskname.h
@@ -44,7 +44,7 @@
typedef enum e_lltask_name
{
LLTASK_NULL = 0, // Not a valid task
- LLTASK_AGENT = 1, // The player's agent in Linden World
+ LLTASK_AGENT = 1, // The player's agent in world
LLTASK_CHILD_AGENT = 2, // Child agents sent to adjacent regions
// LLTASK_BASIC_SHOT, // Simple shot that moves in a straight line
// LLTASK_BIG_SHOT, // Big shot that uses gravity
diff --git a/linden/indra/llmessage/message.cpp b/linden/indra/llmessage/message.cpp
index 53036bc..9a80d7b 100644
--- a/linden/indra/llmessage/message.cpp
+++ b/linden/indra/llmessage/message.cpp
@@ -51,7 +51,7 @@
#include "apr_network_io.h"
#include "apr_poll.h"
-// linden library headers
+// viewer library headers
#include "indra_constants.h"
#include "lldarray.h"
#include "lldir.h"
diff --git a/linden/indra/llmessage/message.h b/linden/indra/llmessage/message.h
index e6391d9..660cd2b 100644
--- a/linden/indra/llmessage/message.h
+++ b/linden/indra/llmessage/message.h
@@ -304,8 +304,7 @@ public:
S32 getErrorCode() const { return mErrorCode; }
// Read file and build message templates filename must point to a
- // valid string which specifies the path of a valid linden
- // template.
+ // valid string which specifies the path of a valid template.
void loadTemplateFile(const std::string& filename, bool failure_is_fatal);
diff --git a/linden/indra/llmessage/net.cpp b/linden/indra/llmessage/net.cpp
index f63faa5..7166271 100644
--- a/linden/indra/llmessage/net.cpp
+++ b/linden/indra/llmessage/net.cpp
@@ -50,7 +50,7 @@
#include
#endif
-// linden library includes
+// viewer library includes
#include "llerror.h"
#include "llhost.h"
#include "lltimer.h"
diff --git a/linden/indra/llrender/llfont.cpp b/linden/indra/llrender/llfont.cpp
index 5ee3929..2ca1984 100644
--- a/linden/indra/llrender/llfont.cpp
+++ b/linden/indra/llrender/llfont.cpp
@@ -49,7 +49,7 @@
#include "llerror.h"
#include "llimage.h"
//#include "llimagej2c.h"
-#include "llmath.h" // Linden math
+#include "llmath.h"
#include "llstring.h"
//#include "imdebug.h"
#include "llfontbitmapcache.h"
diff --git a/linden/indra/llui/llbutton.cpp b/linden/indra/llui/llbutton.cpp
index 702e34e..e6b86c9 100644
--- a/linden/indra/llui/llbutton.cpp
+++ b/linden/indra/llui/llbutton.cpp
@@ -34,7 +34,7 @@
#include "llbutton.h"
-// Linden library includes
+// viewer library includes
#include "v4color.h"
#include "llstring.h"
diff --git a/linden/indra/llui/lliconctrl.cpp b/linden/indra/llui/lliconctrl.cpp
index 0df960e..9b01060 100644
--- a/linden/indra/llui/lliconctrl.cpp
+++ b/linden/indra/llui/lliconctrl.cpp
@@ -34,7 +34,7 @@
#include "lliconctrl.h"
-// Linden library includes
+// viewer library includes
// Project includes
#include "llcontrol.h"
diff --git a/linden/indra/llui/lltexteditor.cpp b/linden/indra/llui/lltexteditor.cpp
index 004d063..40dafcd 100644
--- a/linden/indra/llui/lltexteditor.cpp
+++ b/linden/indra/llui/lltexteditor.cpp
@@ -4206,10 +4206,10 @@ void LLTextEditor::appendColoredText(const std::string &new_text,
const std::string& font_name)
{
LLColor4 lcolor=color;
- // If LindenUserDir is empty then we didn't login yet.
+ // If ViewerUserDir is empty then we didn't login yet.
// In that case we can't instantiate LLTextParser, which
// is initialized per user.
- if (mParseHighlights && !gDirUtilp->getLindenUserDir(true).empty())
+ if (mParseHighlights && !gDirUtilp->getViewerUserDir(true).empty())
{
LLTextParser* highlight = LLTextParser::getInstance();
highlight->parseFullLineHighlights(new_text, &lcolor);
@@ -4289,10 +4289,10 @@ void LLTextEditor::appendHighlightedText(const std::string &new_text,
S32 highlight_part,
LLStyleSP stylep)
{
- // If LindenUserDir is empty then we didn't login yet.
+ // If ViewerUserDir is empty then we didn't login yet.
// In that case we can't instantiate LLTextParser, which
// is initialized per user.
- if (mParseHighlights && !gDirUtilp->getLindenUserDir(true).empty())
+ if (mParseHighlights && !gDirUtilp->getViewerUserDir(true).empty())
{
LLTextParser* highlight = LLTextParser::getInstance();
@@ -4760,20 +4760,20 @@ BOOL LLTextEditor::importBuffer(const char* buffer, S32 length )
instream.getline(tbuf, MAX_STRING);
if( 1 != sscanf(tbuf, "Linden text version %d", &version) )
{
- llwarns << "Invalid Linden text file header " << llendl;
+ llwarns << "Invalid Notecard text file header " << llendl;
return FALSE;
}
if( 1 != version )
{
- llwarns << "Invalid Linden text file version: " << version << llendl;
+ llwarns << "Invalid Notecard text file version: " << version << llendl;
return FALSE;
}
instream.getline(tbuf, MAX_STRING);
if( 0 != sscanf(tbuf, "{") )
{
- llwarns << "Invalid Linden text file format" << llendl;
+ llwarns << "Invalid Notecard text file format" << llendl;
return FALSE;
}
@@ -4781,13 +4781,13 @@ BOOL LLTextEditor::importBuffer(const char* buffer, S32 length )
instream.getline(tbuf, MAX_STRING);
if( 1 != sscanf(tbuf, "Text length %d", &text_len) )
{
- llwarns << "Invalid Linden text length field" << llendl;
+ llwarns << "Invalid Notecard text length field" << llendl;
return FALSE;
}
if( text_len > mMaxTextByteLength )
{
- llwarns << "Invalid Linden text length: " << text_len << llendl;
+ llwarns << "Invalid Notecard text length: " << text_len << llendl;
return FALSE;
}
@@ -4810,7 +4810,7 @@ BOOL LLTextEditor::importBuffer(const char* buffer, S32 length )
instream.getline(tbuf, MAX_STRING);
if( success && (0 != sscanf(tbuf, "}")) )
{
- llwarns << "Invalid Linden text file format: missing terminal }" << llendl;
+ llwarns << "Invalid Notecard text file format: missing terminal }" << llendl;
success = FALSE;
}
diff --git a/linden/indra/llui/llui.cpp b/linden/indra/llui/llui.cpp
index 75a4467..dfef4bc 100644
--- a/linden/indra/llui/llui.cpp
+++ b/linden/indra/llui/llui.cpp
@@ -37,7 +37,7 @@
#include
#include
One or more of these options is set at the estate level
diff --git a/linden/indra/newview/skins/default/xui/en-us/floater_report_bug.xml b/linden/indra/newview/skins/default/xui/en-us/floater_report_bug.xml
index 83d7a5c..67b72e5 100644
--- a/linden/indra/newview/skins/default/xui/en-us/floater_report_bug.xml
+++ b/linden/indra/newview/skins/default/xui/en-us/floater_report_bug.xml
@@ -106,8 +106,8 @@
Missing Content
-
- Linden Dollars (L$)
+
+ Grid currency
Permissions
diff --git a/linden/indra/newview/skins/default/xui/en-us/notifications.xml b/linden/indra/newview/skins/default/xui/en-us/notifications.xml
index 358dbbf..668cf4e 100644
--- a/linden/indra/newview/skins/default/xui/en-us/notifications.xml
+++ b/linden/indra/newview/skins/default/xui/en-us/notifications.xml
@@ -1442,7 +1442,7 @@ Corrupt resource file:
icon="alertmodal.tga"
name="UnknownResourceFileVersion"
type="alertmodal">
-Unknown Linden resource file version in file:
+Unknown resource file version in file:
[FILE]
@@ -2877,7 +2877,7 @@ Visit the [SECOND_LIFE] Wiki for info on how to use the Public Issue Tracker.
icon="alertmodal.tga"
name="WebLaunchSupportWiki"
type="alertmodal">
-Go to the Official Linden Blog, for the latest news and information.
+Go to the grids web site, for the latest news and information.
-This checkbox makes the sun in your estate follow the same position as on the Linden-owned 'mainland' estates.
+This checkbox makes the sun in your estate follow the same position as on the grid owned estates.
Default: on
@@ -4086,7 +4086,7 @@ Access to this estate will be limited to groups listed here and any Residents ab
type="alertmodal">
Setting this to a valid email address will cause abuse reports on this estate to be sent to that address.
-Setting it blank will cause abuse reports to be sent only to Linden Lab.
+Setting it blank will cause abuse reports to be sent only to the grid owners.
-IMPORTANT: This report will go to the owner of the region you are currently in and not to Linden Lab.
+IMPORTANT: This report will go to the owner of the region you are currently in and not to the grid owners.
-As a service to residents and visitors, the owner of the region you are in has elected to receive and resolve all reports originating in this region. Linden Lab will not investigate reports you file from this location.
+As a service to residents and visitors, the owner of the region you are in has elected to receive and resolve all reports originating in this region. The grid owners will not investigate reports you file from this location.
The region owner will resolve reports based on the local rules of this region as outlined in the estate Covenant.
(View covenants by going to the World menu and selecting About Land.)
-The resolution of this report applies only to this Region; Residents access to other areas of [GRID_NAME] will not be affected by the outcome of this report.
+The resolution of this report applies only to this Region; Residents access to other areas of [GRID_NAME] will not be affected by the outcome of this report.
-
Contenido perdido
-
- Linden Dólares (L$)
+
+ Grid currency
Permisos
diff --git a/linden/indra/newview/skins/default/xui/fr/floater_report_bug.xml b/linden/indra/newview/skins/default/xui/fr/floater_report_bug.xml
index 80a42f1..1cbf457 100644
--- a/linden/indra/newview/skins/default/xui/fr/floater_report_bug.xml
+++ b/linden/indra/newview/skins/default/xui/fr/floater_report_bug.xml
@@ -61,8 +61,8 @@
Contenu manquant
-
- Dollar Linden (L$)
+
+ Grid currency
Autorisations
diff --git a/linden/indra/newview/skins/default/xui/hu/floater_report_bug.xml b/linden/indra/newview/skins/default/xui/hu/floater_report_bug.xml
index 6c3286d..3db9f5a 100644
--- a/linden/indra/newview/skins/default/xui/hu/floater_report_bug.xml
+++ b/linden/indra/newview/skins/default/xui/hu/floater_report_bug.xml
@@ -60,8 +60,8 @@
Hiányzó tartalom
-
- Linden dollár (L$)
+
+ Grid currency
Jogosultság
diff --git a/linden/indra/newview/skins/default/xui/it/floater_report_bug.xml b/linden/indra/newview/skins/default/xui/it/floater_report_bug.xml
index efaa626..07cd21e 100644
--- a/linden/indra/newview/skins/default/xui/it/floater_report_bug.xml
+++ b/linden/indra/newview/skins/default/xui/it/floater_report_bug.xml
@@ -57,8 +57,8 @@
Contenuto mancante
-
- Linden Dollar (L$)
+
+ Grid currency
Permessi
diff --git a/linden/indra/newview/skins/default/xui/ja/floater_report_bug.xml b/linden/indra/newview/skins/default/xui/ja/floater_report_bug.xml
index 7c20151..dbcb21d 100644
--- a/linden/indra/newview/skins/default/xui/ja/floater_report_bug.xml
+++ b/linden/indra/newview/skins/default/xui/ja/floater_report_bug.xml
@@ -63,7 +63,7 @@
コンテンツãªã—
-
+
リンデン・ドル(L$)
diff --git a/linden/indra/newview/skins/default/xui/ko/floater_report_bug.xml b/linden/indra/newview/skins/default/xui/ko/floater_report_bug.xml
index fbe3a45..a7b1ab5 100644
--- a/linden/indra/newview/skins/default/xui/ko/floater_report_bug.xml
+++ b/linden/indra/newview/skins/default/xui/ko/floater_report_bug.xml
@@ -64,7 +64,7 @@
ìœ ì‹¤ 컨í…ì¸
-
+
ë¦°ë“ ë‹¬ëŸ¬(L$)
diff --git a/linden/indra/newview/skins/default/xui/pl/floater_report_bug.xml b/linden/indra/newview/skins/default/xui/pl/floater_report_bug.xml
index af4c4c5..15c9547 100755
--- a/linden/indra/newview/skins/default/xui/pl/floater_report_bug.xml
+++ b/linden/indra/newview/skins/default/xui/pl/floater_report_bug.xml
@@ -60,8 +60,8 @@
BrakujÄ…cy Element
-
- Linden Dollars (L$)
+
+ Grid currency
Prawa
diff --git a/linden/indra/newview/skins/default/xui/ru/floater_report_bug.xml b/linden/indra/newview/skins/default/xui/ru/floater_report_bug.xml
index 0779ac3..b74c154 100644
--- a/linden/indra/newview/skins/default/xui/ru/floater_report_bug.xml
+++ b/linden/indra/newview/skins/default/xui/ru/floater_report_bug.xml
@@ -60,7 +60,7 @@
ОтÑутÑтвующее Ñодержимое
-
+
Деньги (L$)
diff --git a/linden/indra/newview/skins/default/xui/uk/floater_report_bug.xml b/linden/indra/newview/skins/default/xui/uk/floater_report_bug.xml
index f23a2bc..12de17b 100644
--- a/linden/indra/newview/skins/default/xui/uk/floater_report_bug.xml
+++ b/linden/indra/newview/skins/default/xui/uk/floater_report_bug.xml
@@ -60,7 +60,7 @@
ВідÑутній зміÑÑ‚
-
+
Гроші (L$)
diff --git a/linden/indra/newview/skins/default/xui/zh/floater_report_bug.xml b/linden/indra/newview/skins/default/xui/zh/floater_report_bug.xml
index 0a5d292..24e2e15 100644
--- a/linden/indra/newview/skins/default/xui/zh/floater_report_bug.xml
+++ b/linden/indra/newview/skins/default/xui/zh/floater_report_bug.xml
@@ -57,7 +57,7 @@
é—失内容
-
+
æž—ç™»å¸ (L$)
diff --git a/linden/indra/newview/skins/gemini/colors_base.xml b/linden/indra/newview/skins/gemini/colors_base.xml
index 935c6d3..0b65586 100644
--- a/linden/indra/newview/skins/gemini/colors_base.xml
+++ b/linden/indra/newview/skins/gemini/colors_base.xml
@@ -173,7 +173,7 @@
-
+
diff --git a/linden/indra/newview/skins/silver/colors_base.xml b/linden/indra/newview/skins/silver/colors_base.xml
index f9bf283..e2059c6 100644
--- a/linden/indra/newview/skins/silver/colors_base.xml
+++ b/linden/indra/newview/skins/silver/colors_base.xml
@@ -105,7 +105,7 @@
-
+
diff --git a/linden/indra/newview/skins/white_Meta7/colors_base.xml b/linden/indra/newview/skins/white_Meta7/colors_base.xml
index 514782e..78b7b27 100644
--- a/linden/indra/newview/skins/white_Meta7/colors_base.xml
+++ b/linden/indra/newview/skins/white_Meta7/colors_base.xml
@@ -172,7 +172,7 @@
-
+
diff --git a/linden/indra/win_crash_logger/win_crash_logger.rc b/linden/indra/win_crash_logger/win_crash_logger.rc
index 2819722..bbefab6 100644
--- a/linden/indra/win_crash_logger/win_crash_logger.rc
+++ b/linden/indra/win_crash_logger/win_crash_logger.rc
@@ -96,7 +96,7 @@ BEGIN
LTEXT "logs, all of which are used for debugging purposes only.",IDC_STATIC,4,33,210,8
LTEXT "In the space below, please briefly describe what you were doing",IDC_STATIC,3,48,208,8
LTEXT "or trying to do just prior to the crash.",IDC_STATIC,3,56,204,8
- LTEXT "If you don't wish to send Linden Lab a crash report, press Don't Send.",IDC_STATIC,3,90,223,8
+ LTEXT "If you don't wish to send the grid developers a crash report, press Don't Send.",IDC_STATIC,3,90,223,8
LTEXT "This report is NOT read by customer support. If you have billing or",IDC_STATIC,3,68,208,8
LTEXT "other questions, please go to: www.secondlife.com/support",IDC_STATIC,3,76,206,8
CONTROL "Remember this choice",IDC_CHECK_AUTO,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,3,193,89,13
--
cgit v1.1
From cae0d29bd0c57722e1108a5a83456fb0767211e6 Mon Sep 17 00:00:00 2001
From: David Seikel
Date: Fri, 25 Feb 2011 06:01:18 +1000
Subject: In the meta grid, staff members have the last name "Meta", the users
are "metazens", and we abuse the age verification flag to let people choose
to see Adult stuff.
---
linden/indra/newview/llmutelist.cpp | 2 +-
linden/indra/newview/skins/default/xui/en-us/panel_avatar.xml | 8 ++++----
2 files changed, 5 insertions(+), 5 deletions(-)
diff --git a/linden/indra/newview/llmutelist.cpp b/linden/indra/newview/llmutelist.cpp
index 76f966e..a59f410 100644
--- a/linden/indra/newview/llmutelist.cpp
+++ b/linden/indra/newview/llmutelist.cpp
@@ -294,7 +294,7 @@ BOOL LLMuteList::isGod(const std::string& name) const
if (token_iter == tokens.end()) return FALSE;
std::string last_name = *token_iter;
- return last_name == "Linden";
+ return last_name == "Meta";
}
diff --git a/linden/indra/newview/skins/default/xui/en-us/panel_avatar.xml b/linden/indra/newview/skins/default/xui/en-us/panel_avatar.xml
index 2db2595..986fca1 100644
--- a/linden/indra/newview/skins/default/xui/en-us/panel_avatar.xml
+++ b/linden/indra/newview/skins/default/xui/en-us/panel_avatar.xml
@@ -10,7 +10,7 @@
[AGEVERIFICATION]
- Resident
+ Metazen
Trial
@@ -19,7 +19,7 @@
Charter Member
- Linden Lab Employee
+ Meta7 Employee
Payment Info Used
@@ -31,10 +31,10 @@
No Payment Info On File
- Age-verified
+ Adult
- Not Age-verified
+ Mature
Copied key for [AVATAR] to clipboard: [KEY]
--
cgit v1.1
From 100384f232733d112e7a3f14fa02c2c2c39d246c Mon Sep 17 00:00:00 2001
From: David Seikel
Date: Sat, 26 Feb 2011 05:26:28 +1000
Subject: Unbranding word of the day is "Second Life".
---
linden/indra/llmessage/llinstantmessage.cpp | 1 +
linden/indra/llui/lluistring.h | 12 ++++++------
linden/indra/mac_crash_logger/mac_crash_logger.cpp | 2 +-
linden/indra/newview/llappviewermacosx.cpp | 2 +-
linden/indra/newview/llmediactrl.cpp | 2 +-
linden/indra/newview/llviewertexteditor.h | 2 +-
.../indra/newview/skins/default/xui/en-us/floater_about.xml | 2 +-
7 files changed, 12 insertions(+), 11 deletions(-)
diff --git a/linden/indra/llmessage/llinstantmessage.cpp b/linden/indra/llmessage/llinstantmessage.cpp
index 44be3ae..30205d8 100644
--- a/linden/indra/llmessage/llinstantmessage.cpp
+++ b/linden/indra/llmessage/llinstantmessage.cpp
@@ -60,6 +60,7 @@ const S32 VOTE_UNANIMOUS = 2;
const char EMPTY_BINARY_BUCKET[] = "";
const S32 EMPTY_BINARY_BUCKET_SIZE = 1;
const U32 NO_TIMESTAMP = 0;
+// Damn, this seems to be hard coded into the protocol.
const std::string SYSTEM_FROM("Second Life");
const S32 IM_TTL = 1;
diff --git a/linden/indra/llui/lluistring.h b/linden/indra/llui/lluistring.h
index aedeca2..adc2e08 100644
--- a/linden/indra/llui/lluistring.h
+++ b/linden/indra/llui/lluistring.h
@@ -45,14 +45,14 @@
// the correct result
// Example Usage:
-// LLUIString mMessage("Welcome [USERNAME] to [SECONDLIFE]!");
+// LLUIString mMessage("Welcome [USERNAME] to [GRIDNAME]!");
// mMessage.setArg("[USERNAME]", "Steve");
-// mMessage.setArg("[SECONDLIFE]", "Second Life");
-// llinfos << mMessage.getString() << llendl; // outputs "Welcome Steve to Second Life"
+// mMessage.setArg("[GRIDNAME]", "This Grid");
+// llinfos << mMessage.getString() << llendl; // outputs "Welcome Steve to This Grid"
// mMessage.setArg("[USERNAME]", "Joe");
-// llinfos << mMessage.getString() << llendl; // outputs "Welcome Joe to Second Life"
-// mMessage = "Recepci￳n a la [SECONDLIFE] [USERNAME]"
-// mMessage.setArg("[SECONDLIFE]", "Segunda Vida");
+// llinfos << mMessage.getString() << llendl; // outputs "Welcome Joe to This Grid"
+// mMessage = "Recepci￳n a la [GRIDNAME] [USERNAME]"
+// mMessage.setArg("[GRIDNAME]", "Segunda Vida");
// llinfos << mMessage.getString() << llendl; // outputs "Recepci￳n a la Segunda Vida Joe"
// Implementation Notes:
diff --git a/linden/indra/mac_crash_logger/mac_crash_logger.cpp b/linden/indra/mac_crash_logger/mac_crash_logger.cpp
index 1f5663d..464cc5d 100644
--- a/linden/indra/mac_crash_logger/mac_crash_logger.cpp
+++ b/linden/indra/mac_crash_logger/mac_crash_logger.cpp
@@ -38,7 +38,7 @@ int main(int argc, char **argv)
{
//time(&gLaunchTime);
- llinfos << "Starting Second Life Viewer Crash Reporter" << llendl;
+ llinfos << "Starting Crash Reporter" << llendl;
LLCrashLoggerMac app;
app.parseCommandOptions(argc, argv);
diff --git a/linden/indra/newview/llappviewermacosx.cpp b/linden/indra/newview/llappviewermacosx.cpp
index d81b6e3..5496e5b 100644
--- a/linden/indra/newview/llappviewermacosx.cpp
+++ b/linden/indra/newview/llappviewermacosx.cpp
@@ -300,7 +300,7 @@ static OSStatus CarbonEventHandler(EventHandlerCallRef inHandlerCallRef,
void LLAppViewerMacOSX::handleCrashReporting(bool reportFreeze)
{
// This used to use fork&exec, but is switched to LSOpenApplication to
- // Make sure the crash reporter launches in front of the SL window.
+ // Make sure the crash reporter launches in front of the viewer window.
std::string command_str;
//command_str = "open Second Life.app/Contents/Resources/mac-crash-logger.app";
diff --git a/linden/indra/newview/llmediactrl.cpp b/linden/indra/newview/llmediactrl.cpp
index cc9fec6..51b0929 100644
--- a/linden/indra/newview/llmediactrl.cpp
+++ b/linden/indra/newview/llmediactrl.cpp
@@ -888,7 +888,7 @@ void LLMediaCtrl::onClickLinkHref( LLPluginClassMedia* self )
// const bool open_links_externally = false;
// LLFloaterHtml::getInstance()->show(
// event_in.mStringPayload,
-// "Second Life Browser",
+// "Viewer Browser",
// open_links_externally,
// mTrusted);
}
diff --git a/linden/indra/newview/llviewertexteditor.h b/linden/indra/newview/llviewertexteditor.h
index c69b3f0..9d30e4f 100644
--- a/linden/indra/newview/llviewertexteditor.h
+++ b/linden/indra/newview/llviewertexteditor.h
@@ -85,7 +85,7 @@ public:
void setEmbeddedText(const std::string& instr);
std::string getEmbeddedText();
- // Appends Second Life time, small font, grey.
+ // Appends grid time, small font, grey.
// If this starts a line, you need to prepend a newline.
std::string appendTime(bool prepend_newline);
diff --git a/linden/indra/newview/skins/default/xui/en-us/floater_about.xml b/linden/indra/newview/skins/default/xui/en-us/floater_about.xml
index ef02bfa..3485684 100644
--- a/linden/indra/newview/skins/default/xui/en-us/floater_about.xml
+++ b/linden/indra/newview/skins/default/xui/en-us/floater_about.xml
@@ -2,7 +2,7 @@
+ title="About grid viewer" width="470">
is_god conversions.
---
linden/indra/newview/llviewermessage.cpp | 14 +++++++-------
1 file changed, 7 insertions(+), 7 deletions(-)
diff --git a/linden/indra/newview/llviewermessage.cpp b/linden/indra/newview/llviewermessage.cpp
index 657658c..0a27e0a 100755
--- a/linden/indra/newview/llviewermessage.cpp
+++ b/linden/indra/newview/llviewermessage.cpp
@@ -1875,7 +1875,7 @@ void process_improved_im(LLMessageSystem *msg, void **user_data)
gIMMgr->processIMTypingStop(im_info);
}
// [/RLVa:KB]
-// else if (offline == IM_ONLINE && !is_linden && is_busy && name != SYSTEM_FROM)
+// else if (offline == IM_ONLINE && !is_god && is_busy && name != SYSTEM_FROM)
// [RLVa:KB] - Checked: 2009-07-10 (RLVa-1.0.0g)
else if ( (offline == IM_ONLINE && !is_god && is_busy && name != SYSTEM_FROM) &&
( (!gRlvHandler.hasBehaviour(RLV_BHVR_RECVIM)) || (gRlvHandler.isException(RLV_BHVR_RECVIM, from_id))) )
@@ -2130,7 +2130,7 @@ void process_improved_im(LLMessageSystem *msg, void **user_data)
break;
case IM_GROUP_INVITATION:
{
- //if (!is_linden && (is_busy || is_muted))
+ //if (!is_god && (is_busy || is_muted))
if ((is_busy || is_muted))
{
LLMessageSystem *msg = gMessageSystem;
@@ -2922,13 +2922,13 @@ void process_chat_from_simulator(LLMessageSystem *msg, void **user_data)
BOOL is_busy = gAgent.getBusy();
BOOL is_muted = FALSE;
- BOOL is_linden = FALSE;
+ BOOL is_god = FALSE;
is_muted = LLMuteList::getInstance()->isMuted(
from_id,
from_name,
LLMute::flagTextChat)
|| LLMuteList::getInstance()->isMuted(owner_id, LLMute::flagTextChat);
- is_linden = chat.mSourceType != CHAT_SOURCE_OBJECT &&
+ is_god = chat.mSourceType != CHAT_SOURCE_OBJECT &&
LLMuteList::getInstance()->isGod(from_name);
BOOL is_audible = (CHAT_AUDIBLE_FULLY == chat.mAudible);
@@ -2958,7 +2958,7 @@ void process_chat_from_simulator(LLMessageSystem *msg, void **user_data)
// record last audible utterance
if (is_audible
- && (is_linden || (!is_muted && !is_busy)))
+ && (is_god || (!is_muted && !is_busy)))
{
if (chat.mChatType != CHAT_TYPE_START
&& chat.mChatType != CHAT_TYPE_STOP)
@@ -3297,11 +3297,11 @@ void process_chat_from_simulator(LLMessageSystem *msg, void **user_data)
// F T T T * No No
// T * * * F Yes Yes
- chat.mMuted = is_muted && !is_linden;
+ chat.mMuted = is_muted && !is_god;
if (!visible_in_chat_bubble
- && (is_linden || !is_busy || is_owned_by_me))
+ && (is_god || !is_busy || is_owned_by_me))
{
// show on screen and add to history
check_translate_chat(mesg, chat, FALSE);
--
cgit v1.1
From 28ebe59d856fcec9b05a16823a36d7548b2408bd Mon Sep 17 00:00:00 2001
From: David Seikel
Date: Sat, 26 Feb 2011 07:07:19 +1000
Subject: Add meta7 logo to startup page, AND make it work.
---
linden/indra/newview/llpanellogin.cpp | 2 +-
.../skins/default/html/en-us/loading/loading.html | 9 +++++++++
.../html/en-us/loading/meta-impy_loading.png | Bin 10714 -> 14642 bytes
3 files changed, 10 insertions(+), 1 deletion(-)
create mode 100644 linden/indra/newview/skins/default/html/en-us/loading/loading.html
diff --git a/linden/indra/newview/llpanellogin.cpp b/linden/indra/newview/llpanellogin.cpp
index db086bf..00d9332 100644
--- a/linden/indra/newview/llpanellogin.cpp
+++ b/linden/indra/newview/llpanellogin.cpp
@@ -297,7 +297,7 @@ LLPanelLogin::LLPanelLogin(const LLRect &rect,
// don't make it a tab stop until SL-27594 is fixed
web_browser->setTabStop(FALSE);
- // web_browser->navigateToLocalPage( "loading", "loading.html" );
+ web_browser->navigateToLocalPage( "loading", "loading.html" );
// make links open in external browser
web_browser->setOpenInExternalBrowser( true );
diff --git a/linden/indra/newview/skins/default/html/en-us/loading/loading.html b/linden/indra/newview/skins/default/html/en-us/loading/loading.html
new file mode 100644
index 0000000..6aa4845
--- /dev/null
+++ b/linden/indra/newview/skins/default/html/en-us/loading/loading.html
@@ -0,0 +1,9 @@
+
+
+
+
+ 
loading...
+ |
+
+
+
diff --git a/linden/indra/newview/skins/default/html/en-us/loading/meta-impy_loading.png b/linden/indra/newview/skins/default/html/en-us/loading/meta-impy_loading.png
index f9ea7a2..7479f9e 100644
Binary files a/linden/indra/newview/skins/default/html/en-us/loading/meta-impy_loading.png and b/linden/indra/newview/skins/default/html/en-us/loading/meta-impy_loading.png differ
--
cgit v1.1
From 71490c8290035bb43251b368a683a3aa73d03961 Mon Sep 17 00:00:00 2001
From: David Seikel
Date: Sat, 26 Feb 2011 09:14:20 +1000
Subject: Update the About viewer bit for meta-impy.
---
.../skins/default/xui/en-us/floater_about.xml | 20 +++++++-------------
.../newview/skins/default/xui/en-us/menu_login.xml | 2 +-
.../newview/skins/default/xui/en-us/menu_viewer.xml | 4 ++--
.../newview/skins/default/xui/ja/menu_viewer.xml | 2 +-
4 files changed, 11 insertions(+), 17 deletions(-)
diff --git a/linden/indra/newview/skins/default/xui/en-us/floater_about.xml b/linden/indra/newview/skins/default/xui/en-us/floater_about.xml
index 3485684..1ae660a 100644
--- a/linden/indra/newview/skins/default/xui/en-us/floater_about.xml
+++ b/linden/indra/newview/skins/default/xui/en-us/floater_about.xml
@@ -7,9 +7,14 @@
follows="left|top|right|bottom" font="SansSerifSmall" height="168" left="6"
max_length="65536" mouse_opaque="true" name="credits_editor" width="458"
word_wrap="true">
+ Meta7 is brought to you by Laurent, George, Melanie, Shaun, Dave, Kitto, Mike, Brandon, Erich, Daniel, Mark, Trinity, and Tom.
+ This viewer is based on the Imprudence viewer.
+
+
The Imprudence Viewer was rocked hard by:
Jacek Antonelli, McCabe Maxsted, Armin Weatherwax, Elektra Hesse, and CodeBastard Redgrave.
http://imprudenceviewer.org
+
Imprudence is so awesome thanks to contributions from many generous people:
@@ -20,18 +25,9 @@
Thanks also to the developer(s) of the Emerald Viewer, Hippo Viewer, Cool VL Viewer, Snowglobe Viewer, Meta7 Viewer, FrozenGlobe Viewer, and Meerkat Viewer for viewer enhancements we have incorporated, as well as Kitty Barnett for RLVa. Special thanks to the folks at Linden Lab for releasing the viewer source, without which this endeavor would have been impossible.
For a complete list of who did what, read the release notes!
-
- Second Life Copyright (C) 1999-2009 Linden Research Inc.
-
- Second Life is brought to you by Philip, Tessa, Andrew, Cory, James, Ben, Char, Charlie, Colin, Dan, Daniel, Doug, Eric, Hamlet, Haney, Eve, Hunter, Ian, Jeff, Jennifer, Jim, John, Lee, Mark, Peter, Phoenix, Richard, Robin, Xenon, Steve, Tanya, Eddie, Avi, Frank, Bruce, Aaron, Alice, Bob, Debra, Eileen, Helen, Janet, Louie, Leviathania, Stefan, Ray, Kevin, Tom, Mikeb, MikeT, Burgess, Elena, Tracy, Bill, Todd, Ryan, Zach, Sarah, Nova, Tim, Stephanie, Michael, Evan, Nicolas, Catherine, Rachelle, Dave, Holly, Bub, Kelly, Magellan, Ramzi, Don, Sabin, Jill, Rheya, Jeska, Torley, Kona, Callum, Charity, Ventrella, Jack, Vektor, Iris, Chris, Nicole, Mick, Reuben, Blue, Babbage, Yedwab, Deana, Lauren, Brent, Pathfinder, Chadrick, Altruima, Jesse, Teeny, Monroe, Icculus, David, Tess, Lizzie, Patsy, Isaac, Lawrence, Cyn, Bo, Gia, Annette, Marius, Tbone, Jonathan, Karen, Ginsu, Satoko, Yuko, Makiko, Thomas, Harry, Seth, Alexei, Brian, Guy, Runitai, Ethan, Data, Cornelius, Kenny, Swiss, Zero, Natria, Wendy, Stephen, Teeple, Thumper, Lucy, Dee, Mia, Liana, Warren, Branka, Aura, beez, Milo, Hermia, Red, Thrax, Joe, Sally, Magenta, Mogura, Paul, Jose, Rejean, Henrik, Lexie, Amber, Logan, Xan, Nora, Morpheus, Donovan, Leyla, MichaelFrancis, Beast, Cube, Bucky, Joshua, Stryfe, Harmony, Teresa, Claudia, Walker, Glenn, Fritz, Fordak, June, Cleopetra, Jean, Ivy, Betsy, Roosevelt, Spike, Ken, Which, Tofu, Chiyo, Rob, Zee, dustin, George, Del, Matthew, Cat, Jacqui, Lightfoot, Adrian, Viola, Alfred, Noel, Irfan, Sunil, Yool, Rika, Jane, Xtreme, Frontier, a2, Neo, Siobhan, Yoz, Justin, Elle, Qarl, Benjamin, Isabel, Gulliver, Everett, Christopher, Izzy, Stephany, Garry, Sejong, Sean, Tobin, Iridium, Meta, Anthony, Jeremy, JP, Jake, Maurice, Madhavi, Leopard, Kyle, Joon, Kari, Bert, Belinda, Jon, Kristi, Bridie, Pramod, KJ, Socrates, Maria, Ivan, Aric, Yamasaki, Adreanne, Jay, MitchK, Ceren, Coco, Durl, Jenny, Periapse, Kartic, Storrs, Lotte, Sandy, Rohn, Colossus, Zen, BigPapi, Brad, Pastrami, Kurz, Mani, Neuro, Jaime, MJ, Rowan, Sgt, Elvis, Gecko, Samuel, Sardonyx, Leo, Bryan, Niko, Soft, Poppy, Rachel, Aki, Angelo, Banzai, Alexa, Sue, CeeLo, Bender, CG, Gillian, Pelle, Nick, Echo, Zara, Christine, Shamiran, Emma, Blake, Keiko, Plexus, Joppa, Sidewinder, Erica, Ashlei, Twilight, Kristen, Brett, Q, Enus, Simon, Bevis, Kraft, Kip, Chandler, Ron, LauraP, Ram, KyleJM, Scouse, Prospero, Melissa, Marty, Nat, Hamilton, Kend, Lordan, Jimmy, Kosmo, Seraph, Green, Ekim, Wiggo, JT, Rome, Doris, Miz, Benoc, Whump, Trinity, Patch, Kate, TJ, Bao, Joohwan, Christy, Sofia, Matias, Cogsworth, Johan, Oreh, Cheah, Angela, Brandy, Mango, Lan, Aleks, Gloria, Heidy, Mitchell, Space, Colton, Bambers, Einstein, Maggie, Malbers, Rose, Winnie, Stella, Milton, Rothman, Niall, Marin, Allison, Katie, Dawn, Katt, Dusty, Kalpana, Judy, Andrea, Ambroff, Infinity, Gail, Rico, Raymond, Yi, William, Christa, M, Teagan, Scout, Molly, Dante, Corr, Dynamike, Usi, Kaylee, Vidtuts, Lil, Danica, Sascha, Kelv, Jacob, Nya, Rodney, Brandon, Elsie, Blondin, Grant, Katrin, Nyx, Gabriel, Locklainn, Claire, Devin, Minerva, Monty, Austin, Bradford, Si, Keira, H, Caitlin, Dita, Makai, Jenn, Ann, Meredith, Clare, Joy, Praveen, Cody, Edmund, Ruthe, Sirena, Gayathri, Spider, FJ, Davidoff, Tian, Jennie, Louise, Oskar, Landon, Noelle, Jarv, Ingrid, Al, Sommer, Doc, Aria, Huin, Gray, Lili, Vir, DJ, Yang, T, Simone, Maestro, Scott, Charlene, Quixote, Amanda, Susan, Zed, Anne, Enkidu, Esbee, Joroan, Katelin, Roxie, Tay, Scarlet, Kevin, Johnny, Wolfgang, Andren, Bob, Howard, Merov, Rand, Ray, Michon, Newell, Galen, Dessie, Les, Michon, Jenelle, Geo, Siz, Shapiro, Pete, Calyle, Selene, Allen, Phoebe, Goldin, Kimmora, Dakota, Slaton, Lindquist, Zoey, Hari, Othello, Rohit, Sheldon, Petra, Viale, Gordon, Kaye, Pink, Ferny, Emerson, Davy, Bri, Chan, Juan, Robert, Terrence, Nathan, Carl and many others.
- Thank you to the following residents for helping to ensure that this is the best version yet: able whitman, Adeon Writer, adonaira aabye, Aeron Kohime,
-Agathos Frascati, Aimee Trescothick, Aleric Inglewood, Alissa Sabre, Aminom Marvin, Angela Talamasca, Aralara Rajal, Armin Weatherwax, Ashrilyn Hayashida,
-Athanasius Skytower, Aura Dirval, Barney Boomslang, Biancaluce Robbiani, Biker Offcourse, Borg Capalini, Bulli Schumann, catherine pfeffer, Chalice Yao,
-Corre Porta, Court Goodman, Cummere Mayo, Dale Innis, Darien Caldwell, Darjeeling Schoonhoven, Daten Thielt, dimentox travanti, Dirk Talamasca, Drew Dwi,
-Duckless Vandyke, Elanthius Flagstaff, Electro Burnstein, emiley tomsen, Escort DeFarge, Eva Rau, Ezian Ecksol, Fire Centaur, Fluf Fredriksson, Francisco Koolhoven, Frontera Thor, Frungi Stastny, Gally Young, gearsawe stonecutter, Gigs Taggart, Gordon Wendt, Gudmund Shepherd, Gypsy Paz, Harleen Gretzky,
-Henri Beauchamp, Inma Rau, Irene Muni, Iskar Ariantho, Jacek Antonelli, JB Kraft, Jessicka Graves, Joeseph Albanese, Joshua Philgarlic, Khyota Wulluf, kirstenlee Cinquetti, Latif Khalifa, Lex Neva, Lilibeth Andree, Lisa Lowe, Lunita Savira, Loosey Demonia, lum pfohl, Marcos Fonzarelli, MartinRJ Fayray, Marusame Arai, Matthew Dowd, Maya Remblai, McCabe Maxsted, Meghan Dench, Melchoir Tokhes, Menos Short, Michelle2 Zenovka, Mimika Oh, Minerva Memel, Mm Alder, Ochi Wolfe, Omei Turnbull, Pesho Replacement, Phantom Ninetails, phoenixflames kukulcan, Polo Gufler, prez pessoa, princess niven, Prokofy Neva, Qie Niangao, Rem Beattie, RodneyLee Jessop, Saijanai Kuhn, Seg Baphomet, Sergen Davies, Shirley Marquez, SignpostMarv Martin, Sindy Tsure, Sira Arbizu, Skips Jigsaw, Sougent Harrop, Spritely Pixel, Squirrel Wood, StarSong Bright, Subversive Writer, Sugarcult Dagger, Sylumm Grigorovich, Tammy Nowotny, Tanooki Darkes, Tayra Dagostino, Theoretical Chemistry, Thickbrick Sleaford, valerie rosewood, Vex Streeter, Vixen Heron, Whoops Babii, Winter Ventura, Xiki Luik, Yann Dufaux, Yina Yao, Yukinoroh Kamachi, Zolute Infinity, Zwagoth Klaar
+ Many thanks to Linden Lab and the many residents in both grids who contributed towards this viewer in countless ways.
3Dconnexion SDK Copyright (C) 1992-2007 3Dconnexion
APR Copyright (C) 2000-2004 The Apache Software Foundation
@@ -57,9 +53,7 @@ Henri Beauchamp, Inma Rau, Irene Muni, Iskar Ariantho, Jacek Antonelli, JB Kraft
Voice chat Audio coding: Polycom(R) Siren14(TM) (ITU-T Rec. G.722.1 Annex C)
- Begin, be bold and venture to be wise. -- Horace
-
- If you don't like something, change it. If you can't change it, change your attitude. -- Maya Angelou
+ I live in the future, just waiting for the rest of you to catch up. -- onefang Rejected
-
+
diff --git a/linden/indra/newview/skins/default/xui/en-us/menu_viewer.xml b/linden/indra/newview/skins/default/xui/en-us/menu_viewer.xml
index c2424d7..84ee86a 100644
--- a/linden/indra/newview/skins/default/xui/en-us/menu_viewer.xml
+++ b/linden/indra/newview/skins/default/xui/en-us/menu_viewer.xml
@@ -853,8 +853,8 @@
-
+
diff --git a/linden/indra/newview/skins/default/xui/ja/menu_viewer.xml b/linden/indra/newview/skins/default/xui/ja/menu_viewer.xml
index bc263bb..c6fa7fb 100644
--- a/linden/indra/newview/skins/default/xui/ja/menu_viewer.xml
+++ b/linden/indra/newview/skins/default/xui/ja/menu_viewer.xml
@@ -255,7 +255,7 @@
-
+
--
cgit v1.1
From 79b906c5ab67b122d49e0590c8c2030ab7dd7281 Mon Sep 17 00:00:00 2001
From: David Seikel
Date: Sat, 26 Feb 2011 09:19:08 +1000
Subject: It's "TPVP" dammit.
---
README.txt | 6 +++---
1 file changed, 3 insertions(+), 3 deletions(-)
diff --git a/README.txt b/README.txt
index de5a09e..94a2e8c 100644
--- a/README.txt
+++ b/README.txt
@@ -35,14 +35,14 @@
streak ahead of them.
Since this is being done for meta7, and meta7 does not care about LL
- TPV, somethings are just going to be changed specifically to suit
+ TPVP, somethings are just going to be changed specifically to suit
the meta7 grid. On the other hand, there are some things we might
implement that are of general usefulness, or already on the Impy
wish list. I will try to write them such that Impy developers can
cherry pick those things, then let the Impy developers know.
- Note, since we don't care about LL TPV, it's likely that meta7
- viewers will not be TPV compliant. Meta7 viewers are made for use
+ Note, since we don't care about LL TPVP, it's likely that meta7
+ viewers will not be TPVP compliant. Meta7 viewers are made for use
on the meta7 grid. They will probably work on the SL grid, but that
is not important to us, and not recommended by us. Use at your own
risk on the SL grid.
--
cgit v1.1
From 0cc783a5043dc65b763efb2f5b91058cc75823d5 Mon Sep 17 00:00:00 2001
From: David Seikel
Date: Sat, 26 Feb 2011 10:45:39 +1000
Subject: Adding the meta 7 web site stuff to the help menu. With translations
by Ben and Daniel.
---
.../newview/skins/default/xui/da/menu_viewer.xml | 15 ++++++-
.../newview/skins/default/xui/de/menu_viewer.xml | 15 ++++++-
.../skins/default/xui/en-us/menu_viewer.xml | 52 ++++++++++++++++++++++
.../newview/skins/default/xui/es/menu_viewer.xml | 15 ++++++-
.../newview/skins/default/xui/fr/menu_viewer.xml | 15 ++++++-
.../newview/skins/default/xui/hu/menu_viewer.xml | 15 ++++++-
.../newview/skins/default/xui/it/menu_viewer.xml | 15 ++++++-
.../newview/skins/default/xui/ja/menu_viewer.xml | 13 ++++++
.../newview/skins/default/xui/ko/menu_viewer.xml | 15 ++++++-
.../newview/skins/default/xui/pl/menu_viewer.xml | 15 ++++++-
.../newview/skins/default/xui/pt/menu_viewer.xml | 15 ++++++-
.../newview/skins/default/xui/ru/menu_viewer.xml | 15 ++++++-
.../newview/skins/default/xui/tr/menu_viewer.xml | 15 ++++++-
.../newview/skins/default/xui/uk/menu_viewer.xml | 15 ++++++-
.../newview/skins/default/xui/zh/menu_viewer.xml | 15 ++++++-
15 files changed, 247 insertions(+), 13 deletions(-)
diff --git a/linden/indra/newview/skins/default/xui/da/menu_viewer.xml b/linden/indra/newview/skins/default/xui/da/menu_viewer.xml
index 8bc99f2..905e6d0 100644
--- a/linden/indra/newview/skins/default/xui/da/menu_viewer.xml
+++ b/linden/indra/newview/skins/default/xui/da/menu_viewer.xml
@@ -202,6 +202,19 @@
-
+
+
diff --git a/linden/indra/newview/skins/default/xui/de/menu_viewer.xml b/linden/indra/newview/skins/default/xui/de/menu_viewer.xml
index e1fb1ca..375ae62 100644
--- a/linden/indra/newview/skins/default/xui/de/menu_viewer.xml
+++ b/linden/indra/newview/skins/default/xui/de/menu_viewer.xml
@@ -214,6 +214,19 @@
-
+
+
diff --git a/linden/indra/newview/skins/default/xui/en-us/menu_viewer.xml b/linden/indra/newview/skins/default/xui/en-us/menu_viewer.xml
index 84ee86a..5bdabf6 100644
--- a/linden/indra/newview/skins/default/xui/en-us/menu_viewer.xml
+++ b/linden/indra/newview/skins/default/xui/en-us/menu_viewer.xml
@@ -853,6 +853,58 @@
+
+
+
+
+
diff --git a/linden/indra/newview/skins/default/xui/es/menu_viewer.xml b/linden/indra/newview/skins/default/xui/es/menu_viewer.xml
index 4a7ac4e..def46e4 100644
--- a/linden/indra/newview/skins/default/xui/es/menu_viewer.xml
+++ b/linden/indra/newview/skins/default/xui/es/menu_viewer.xml
@@ -206,6 +206,19 @@
-
+
+
diff --git a/linden/indra/newview/skins/default/xui/fr/menu_viewer.xml b/linden/indra/newview/skins/default/xui/fr/menu_viewer.xml
index ed46c87..df02fd6 100644
--- a/linden/indra/newview/skins/default/xui/fr/menu_viewer.xml
+++ b/linden/indra/newview/skins/default/xui/fr/menu_viewer.xml
@@ -214,6 +214,19 @@
-
+
+
diff --git a/linden/indra/newview/skins/default/xui/hu/menu_viewer.xml b/linden/indra/newview/skins/default/xui/hu/menu_viewer.xml
index cecd5ad..4bfdd87 100644
--- a/linden/indra/newview/skins/default/xui/hu/menu_viewer.xml
+++ b/linden/indra/newview/skins/default/xui/hu/menu_viewer.xml
@@ -202,6 +202,19 @@
-
+
+
diff --git a/linden/indra/newview/skins/default/xui/it/menu_viewer.xml b/linden/indra/newview/skins/default/xui/it/menu_viewer.xml
index 5741b39..c533bde 100644
--- a/linden/indra/newview/skins/default/xui/it/menu_viewer.xml
+++ b/linden/indra/newview/skins/default/xui/it/menu_viewer.xml
@@ -202,6 +202,19 @@
-
+
+
diff --git a/linden/indra/newview/skins/default/xui/ja/menu_viewer.xml b/linden/indra/newview/skins/default/xui/ja/menu_viewer.xml
index c6fa7fb..c39a2cb 100644
--- a/linden/indra/newview/skins/default/xui/ja/menu_viewer.xml
+++ b/linden/indra/newview/skins/default/xui/ja/menu_viewer.xml
@@ -255,6 +255,19 @@
+
diff --git a/linden/indra/newview/skins/default/xui/ko/menu_viewer.xml b/linden/indra/newview/skins/default/xui/ko/menu_viewer.xml
index 40d5d0a..6e8eb71 100644
--- a/linden/indra/newview/skins/default/xui/ko/menu_viewer.xml
+++ b/linden/indra/newview/skins/default/xui/ko/menu_viewer.xml
@@ -261,6 +261,19 @@
-
+
+
diff --git a/linden/indra/newview/skins/default/xui/pl/menu_viewer.xml b/linden/indra/newview/skins/default/xui/pl/menu_viewer.xml
index aafd2d4..fcaac38 100755
--- a/linden/indra/newview/skins/default/xui/pl/menu_viewer.xml
+++ b/linden/indra/newview/skins/default/xui/pl/menu_viewer.xml
@@ -202,6 +202,19 @@
-
+
+
diff --git a/linden/indra/newview/skins/default/xui/pt/menu_viewer.xml b/linden/indra/newview/skins/default/xui/pt/menu_viewer.xml
index 76b674a..e9ca689 100644
--- a/linden/indra/newview/skins/default/xui/pt/menu_viewer.xml
+++ b/linden/indra/newview/skins/default/xui/pt/menu_viewer.xml
@@ -206,6 +206,19 @@
-
+
+
diff --git a/linden/indra/newview/skins/default/xui/ru/menu_viewer.xml b/linden/indra/newview/skins/default/xui/ru/menu_viewer.xml
index a9b3c00..8b38742 100644
--- a/linden/indra/newview/skins/default/xui/ru/menu_viewer.xml
+++ b/linden/indra/newview/skins/default/xui/ru/menu_viewer.xml
@@ -202,6 +202,19 @@
-
+
+
diff --git a/linden/indra/newview/skins/default/xui/tr/menu_viewer.xml b/linden/indra/newview/skins/default/xui/tr/menu_viewer.xml
index 9169977..cb030ca 100644
--- a/linden/indra/newview/skins/default/xui/tr/menu_viewer.xml
+++ b/linden/indra/newview/skins/default/xui/tr/menu_viewer.xml
@@ -202,6 +202,19 @@
-
+
+
diff --git a/linden/indra/newview/skins/default/xui/uk/menu_viewer.xml b/linden/indra/newview/skins/default/xui/uk/menu_viewer.xml
index 27b1625..446a88e 100644
--- a/linden/indra/newview/skins/default/xui/uk/menu_viewer.xml
+++ b/linden/indra/newview/skins/default/xui/uk/menu_viewer.xml
@@ -202,6 +202,19 @@
-
+
+
diff --git a/linden/indra/newview/skins/default/xui/zh/menu_viewer.xml b/linden/indra/newview/skins/default/xui/zh/menu_viewer.xml
index 44b0fae..4624306 100644
--- a/linden/indra/newview/skins/default/xui/zh/menu_viewer.xml
+++ b/linden/indra/newview/skins/default/xui/zh/menu_viewer.xml
@@ -199,6 +199,19 @@
-
+
+
--
cgit v1.1
From b888e0ed51be11c497c615c441e7aa30b9265f86 Mon Sep 17 00:00:00 2001
From: David Seikel
Date: Sat, 26 Feb 2011 13:16:34 +1000
Subject: Add the PSL purple skin.
---
.../newview/skins/pslpurple/License and Credit.txt | 4 +
.../indra/newview/skins/pslpurple/colors_base.xml | 206 +++++++++++
.../0098b015-3daf-4cfe-a72f-915369ea97c2.tga | Bin 0 -> 3090 bytes
.../3c18c87e-5f50-14e2-e744-f44734aa365f.tga | Bin 0 -> 786 bytes
.../5748decc-f629-461c-9a36-a35a221fe21f.tga | Bin 0 -> 3116 bytes
.../6002a571-549c-472c-9443-9ab35b1a55ed.tga | Bin 0 -> 6162 bytes
.../7a0b1bdb-b5d9-4df5-bac2-ba230da93b5b.tga | Bin 0 -> 3090 bytes
.../7dabc040-ec13-2309-ddf7-4f161f6de2f4.tga | Bin 0 -> 1068 bytes
.../89e9fc7c-0b16-457d-be4f-136270759c4d.tga | Bin 0 -> 4140 bytes
.../9cad3e6d-2d6d-107d-f8ab-5ba272b5bfe1.tga | Bin 0 -> 1068 bytes
.../skins/pslpurple/textures/active_speakers.tga | Bin 0 -> 1137 bytes
.../skins/pslpurple/textures/active_voice_tab.tga | Bin 0 -> 402 bytes
.../skins/pslpurple/textures/alpha_gradient.tga | Bin 0 -> 1042 bytes
.../skins/pslpurple/textures/arrow_down.tga | Bin 0 -> 1068 bytes
.../newview/skins/pslpurple/textures/arrow_up.tga | Bin 0 -> 786 bytes
.../b4870163-6208-42a9-9801-93133bf9a6cd.tga | Bin 0 -> 3090 bytes
.../newview/skins/pslpurple/textures/black.tga | Bin 0 -> 3116 bytes
.../skins/pslpurple/textures/btn_chatbar.tga | Bin 0 -> 4626 bytes
.../pslpurple/textures/btn_chatbar_selected.tga | Bin 0 -> 4626 bytes
.../skins/pslpurple/textures/button_anim_pause.tga | Bin 0 -> 786 bytes
.../textures/button_anim_pause_selected.tga | Bin 0 -> 786 bytes
.../skins/pslpurple/textures/button_anim_play.tga | Bin 0 -> 786 bytes
.../textures/button_anim_play_selected.tga | Bin 0 -> 786 bytes
.../skins/pslpurple/textures/button_anim_stop.tga | Bin 0 -> 786 bytes
.../textures/button_anim_stop_selected.tga | Bin 0 -> 786 bytes
.../pslpurple/textures/button_disabled_32x128.tga | Bin 0 -> 7698 bytes
.../pslpurple/textures/button_enabled_32x128.tga | Bin 0 -> 7698 bytes
.../textures/button_enabled_selected_32x128.tga | Bin 0 -> 7698 bytes
.../c1e21504-f136-451d-b8e9-929037812f1d.tga | Bin 0 -> 3090 bytes
.../c63f124c-6340-4fbf-b59e-0869a44adb64.tga | Bin 0 -> 3090 bytes
.../skins/pslpurple/textures/cam_rotate_in.tga | Bin 0 -> 814 bytes
.../skins/pslpurple/textures/cam_rotate_out.tga | Bin 0 -> 5224 bytes
.../skins/pslpurple/textures/cam_tracking_in.tga | Bin 0 -> 946 bytes
.../skins/pslpurple/textures/cam_tracking_out.tga | Bin 0 -> 4816 bytes
.../skins/pslpurple/textures/cam_zoom_minus_in.tga | Bin 0 -> 1462 bytes
.../skins/pslpurple/textures/cam_zoom_out.tga | Bin 0 -> 1434 bytes
.../skins/pslpurple/textures/cam_zoom_plus_in.tga | Bin 0 -> 1522 bytes
.../ce15fd63-b0b6-463c-a37d-ea6393208b3e.tga | Bin 0 -> 3090 bytes
.../pslpurple/textures/checkbox_disabled_false.tga | Bin 0 -> 786 bytes
.../pslpurple/textures/checkbox_disabled_true.tga | Bin 0 -> 786 bytes
.../pslpurple/textures/checkbox_enabled_false.tga | Bin 0 -> 786 bytes
.../pslpurple/textures/checkbox_enabled_true.tga | Bin 0 -> 786 bytes
.../newview/skins/pslpurple/textures/circle.tga | Bin 0 -> 1068 bytes
.../skins/pslpurple/textures/close_in_blue.tga | Bin 0 -> 786 bytes
.../skins/pslpurple/textures/close_inactive.tga | Bin 0 -> 786 bytes
.../pslpurple/textures/close_inactive_blue.tga | Bin 0 -> 786 bytes
.../newview/skins/pslpurple/textures/closebox.tga | Bin 0 -> 786 bytes
.../skins/pslpurple/textures/combobox_arrow.tga | Bin 0 -> 202 bytes
.../newview/skins/pslpurple/textures/darkgray.tga | Bin 0 -> 3090 bytes
.../skins/pslpurple/textures/eye_button_active.tga | Bin 0 -> 3090 bytes
.../pslpurple/textures/eye_button_inactive.tga | Bin 0 -> 3090 bytes
.../ff9a71eb-7414-4cf8-866e-a701deb7c3cf.tga | Bin 0 -> 786 bytes
.../pslpurple/textures/ff_edit_mine_button.tga | Bin 0 -> 1218 bytes
.../pslpurple/textures/ff_edit_theirs_button.tga | Bin 0 -> 1218 bytes
.../pslpurple/textures/ff_online_status_button.tga | Bin 0 -> 1218 bytes
.../skins/pslpurple/textures/ff_visible_map.tga | Bin 0 -> 786 bytes
.../pslpurple/textures/ff_visible_map_button.tga | Bin 0 -> 1218 bytes
.../skins/pslpurple/textures/ff_visible_online.tga | Bin 0 -> 786 bytes
.../textures/ff_visible_online_button.tga | Bin 0 -> 1218 bytes
.../skins/pslpurple/textures/flyout_btn_left.tga | Bin 0 -> 9234 bytes
.../textures/flyout_btn_left_disabled.tga | Bin 0 -> 7698 bytes
.../textures/flyout_btn_left_selected.tga | Bin 0 -> 9234 bytes
.../skins/pslpurple/textures/flyout_btn_right.tga | Bin 0 -> 1746 bytes
.../textures/flyout_btn_right_disabled.tga | Bin 0 -> 1218 bytes
.../textures/flyout_btn_right_selected.tga | Bin 0 -> 1746 bytes
.../skins/pslpurple/textures/folder_arrow.tga | Bin 0 -> 4140 bytes
.../textures/icn_active-speakers-dot-lvl0.tga | Bin 0 -> 1068 bytes
.../textures/icn_active-speakers-dot-lvl1.tga | Bin 0 -> 1068 bytes
.../textures/icn_active-speakers-dot-lvl2.tga | Bin 0 -> 1068 bytes
.../textures/icn_active-speakers-typing1.tga | Bin 0 -> 1068 bytes
.../textures/icn_active-speakers-typing2.tga | Bin 0 -> 1068 bytes
.../textures/icn_active-speakers-typing3.tga | Bin 0 -> 1068 bytes
.../skins/pslpurple/textures/icn_chatbar.tga | Bin 0 -> 1075 bytes
.../pslpurple/textures/icn_clear_lineeditor.tga | Bin 0 -> 1068 bytes
.../skins/pslpurple/textures/icn_label_media.tga | Bin 0 -> 732 bytes
.../skins/pslpurple/textures/icn_label_music.tga | Bin 0 -> 606 bytes
.../skins/pslpurple/textures/icn_label_web.tga | Bin 0 -> 606 bytes
.../pslpurple/textures/icn_media-pause_active.tga | Bin 0 -> 3090 bytes
.../textures/icn_media-pause_disabled.tga | Bin 0 -> 3090 bytes
.../pslpurple/textures/icn_media-pause_enabled.tga | Bin 0 -> 3090 bytes
.../pslpurple/textures/icn_media-play_active.tga | Bin 0 -> 3090 bytes
.../pslpurple/textures/icn_media-play_disabled.tga | Bin 0 -> 3090 bytes
.../pslpurple/textures/icn_media-play_enabled.tga | Bin 0 -> 3090 bytes
.../pslpurple/textures/icn_media-stop_active.tga | Bin 0 -> 3090 bytes
.../pslpurple/textures/icn_media-stop_disabled.tga | Bin 0 -> 3090 bytes
.../pslpurple/textures/icn_media-stop_enabled.tga | Bin 0 -> 3090 bytes
.../newview/skins/pslpurple/textures/icn_media.tga | Bin 0 -> 3090 bytes
.../skins/pslpurple/textures/icn_media_movie.tga | Bin 0 -> 732 bytes
.../skins/pslpurple/textures/icn_media_web.tga | Bin 0 -> 732 bytes
.../skins/pslpurple/textures/icn_music-play.tga | Bin 0 -> 1554 bytes
.../newview/skins/pslpurple/textures/icn_music.tga | Bin 0 -> 3090 bytes
.../newview/skins/pslpurple/textures/icn_play.tga | Bin 0 -> 318 bytes
.../pslpurple/textures/icn_rounded-text-field.tga | Bin 0 -> 12306 bytes
.../skins/pslpurple/textures/icn_scrollbar.tga | Bin 0 -> 786 bytes
.../skins/pslpurple/textures/icn_scrollbar_bg.tga | Bin 0 -> 786 bytes
.../pslpurple/textures/icn_scrollbar_thumb.tga | Bin 0 -> 786 bytes
.../pslpurple/textures/icn_slide-groove_dark.tga | Bin 0 -> 170 bytes
.../pslpurple/textures/icn_slide-highlight.tga | Bin 0 -> 261 bytes
.../pslpurple/textures/icn_slide-thumb_dark.tga | Bin 0 -> 604 bytes
.../pslpurple/textures/icn_speaker-muted_dark.tga | Bin 0 -> 786 bytes
.../skins/pslpurple/textures/icn_speaker_dark.tga | Bin 0 -> 786 bytes
.../skins/pslpurple/textures/icn_toolbar_build.tga | Bin 0 -> 949 bytes
.../skins/pslpurple/textures/icn_toolbar_fly.tga | Bin 0 -> 912 bytes
.../pslpurple/textures/icn_toolbar_inventory.tga | Bin 0 -> 1209 bytes
.../skins/pslpurple/textures/icn_toolbar_map.tga | Bin 0 -> 904 bytes
.../pslpurple/textures/icn_toolbar_minimap.tga | Bin 0 -> 1215 bytes
.../pslpurple/textures/icn_toolbar_search.tga | Bin 0 -> 792 bytes
.../pslpurple/textures/icn_toolbar_snapshot.tga | Bin 0 -> 988 bytes
.../skins/pslpurple/textures/icon_diurnal.tga | Bin 0 -> 6162 bytes
.../newview/skins/pslpurple/textures/lightgray.tga | Bin 0 -> 3090 bytes
.../skins/pslpurple/textures/media_icon.tga | Bin 0 -> 786 bytes
.../newview/skins/pslpurple/textures/minimize.tga | Bin 0 -> 786 bytes
.../skins/pslpurple/textures/minimize_inactive.tga | Bin 0 -> 786 bytes
.../skins/pslpurple/textures/minimize_pressed.tga | Bin 0 -> 786 bytes
.../skins/pslpurple/textures/move_backward_in.tga | Bin 0 -> 651 bytes
.../skins/pslpurple/textures/move_backward_out.tga | Bin 0 -> 769 bytes
.../skins/pslpurple/textures/move_down_in.tga | Bin 0 -> 703 bytes
.../skins/pslpurple/textures/move_down_out.tga | Bin 0 -> 843 bytes
.../skins/pslpurple/textures/move_forward_in.tga | Bin 0 -> 693 bytes
.../skins/pslpurple/textures/move_forward_out.tga | Bin 0 -> 869 bytes
.../skins/pslpurple/textures/move_left_in.tga | Bin 0 -> 580 bytes
.../skins/pslpurple/textures/move_left_out.tga | Bin 0 -> 660 bytes
.../skins/pslpurple/textures/move_right_in.tga | Bin 0 -> 598 bytes
.../skins/pslpurple/textures/move_right_out.tga | Bin 0 -> 674 bytes
.../skins/pslpurple/textures/move_turn_left_in.tga | Bin 0 -> 1032 bytes
.../pslpurple/textures/move_turn_left_out.tga | Bin 0 -> 1166 bytes
.../pslpurple/textures/move_turn_right_in.tga | Bin 0 -> 975 bytes
.../pslpurple/textures/move_turn_right_out.tga | Bin 0 -> 1127 bytes
.../skins/pslpurple/textures/move_up_in.tga | Bin 0 -> 703 bytes
.../skins/pslpurple/textures/move_up_out.tga | Bin 0 -> 843 bytes
.../newview/skins/pslpurple/textures/mute_icon.tga | Bin 0 -> 1042 bytes
.../skins/pslpurple/textures/notify_next.png | Bin 0 -> 559 bytes
.../skins/pslpurple/textures/progress_fill.tga | Bin 0 -> 4146 bytes
.../skins/pslpurple/textures/progressbar_fill.tga | Bin 0 -> 3168 bytes
.../skins/pslpurple/textures/progressbar_track.tga | Bin 0 -> 3798 bytes
.../skins/pslpurple/textures/ptt_lock_off.tga | Bin 0 -> 786 bytes
.../skins/pslpurple/textures/ptt_lock_on.tga | Bin 0 -> 1068 bytes
.../pslpurple/textures/radio_active_false.tga | Bin 0 -> 683 bytes
.../skins/pslpurple/textures/radio_active_true.tga | Bin 0 -> 700 bytes
.../pslpurple/textures/radio_inactive_false.tga | Bin 0 -> 1068 bytes
.../pslpurple/textures/radio_inactive_true.tga | Bin 0 -> 1068 bytes
.../textures/resize_handle_bottom_right_blue.tga | Bin 0 -> 786 bytes
.../newview/skins/pslpurple/textures/restore.tga | Bin 0 -> 786 bytes
.../skins/pslpurple/textures/restore_inactive.tga | Bin 0 -> 786 bytes
.../skins/pslpurple/textures/restore_pressed.tga | Bin 0 -> 786 bytes
.../skins/pslpurple/textures/rounded_square.tga | Bin 0 -> 16428 bytes
.../pslpurple/textures/rounded_square_soft.tga | Bin 0 -> 16428 bytes
.../textures/scrollbutton_down_in_blue.tga | Bin 0 -> 786 bytes
.../textures/scrollbutton_down_out_blue.tga | Bin 0 -> 786 bytes
.../textures/scrollbutton_left_in_blue.tga | Bin 0 -> 786 bytes
.../textures/scrollbutton_left_out_blue.tga | Bin 0 -> 786 bytes
.../textures/scrollbutton_right_in_blue.tga | Bin 0 -> 786 bytes
.../textures/scrollbutton_right_out_blue.tga | Bin 0 -> 786 bytes
.../pslpurple/textures/scrollbutton_up_in_blue.tga | Bin 0 -> 786 bytes
.../textures/scrollbutton_up_out_blue.tga | Bin 0 -> 786 bytes
.../textures/sm_rounded_corners_simple.tga | Bin 0 -> 1068 bytes
.../skins/pslpurple/textures/smicon_warn.tga | Bin 0 -> 786 bytes
.../newview/skins/pslpurple/textures/spacer24.tga | Bin 0 -> 2348 bytes
.../newview/skins/pslpurple/textures/spacer35.tga | Bin 0 -> 3404 bytes
.../skins/pslpurple/textures/spin_down_in_blue.tga | Bin 0 -> 402 bytes
.../pslpurple/textures/spin_down_out_blue.tga | Bin 0 -> 402 bytes
.../skins/pslpurple/textures/spin_up_in_blue.tga | Bin 0 -> 402 bytes
.../skins/pslpurple/textures/spin_up_out_blue.tga | Bin 0 -> 402 bytes
.../skins/pslpurple/textures/square_btn_32x128.tga | Bin 0 -> 7698 bytes
.../textures/square_btn_selected_32x128.tga | Bin 0 -> 7698 bytes
.../pslpurple/textures/status_buy_currency.tga | Bin 0 -> 786 bytes
.../textures/status_buy_currency_pressed.tga | Bin 0 -> 786 bytes
.../skins/pslpurple/textures/status_buy_land.tga | Bin 0 -> 786 bytes
.../pslpurple/textures/status_buy_land_pressed.tga | Bin 0 -> 786 bytes
.../skins/pslpurple/textures/tab_bottom_blue.tga | Bin 0 -> 6546 bytes
.../textures/tab_bottom_selected_blue.tga | Bin 0 -> 6546 bytes
.../newview/skins/pslpurple/textures/tab_left.tga | Bin 0 -> 7698 bytes
.../skins/pslpurple/textures/tab_left_selected.tga | Bin 0 -> 7698 bytes
.../skins/pslpurple/textures/tab_top_blue.tga | Bin 0 -> 6546 bytes
.../pslpurple/textures/tab_top_selected_blue.tga | Bin 0 -> 6546 bytes
.../newview/skins/pslpurple/textures/tabarea.tga | Bin 0 -> 1340 bytes
.../skins/pslpurple/textures/tearoff_pressed.tga | Bin 0 -> 786 bytes
.../skins/pslpurple/textures/tearoffbox.tga | Bin 0 -> 786 bytes
.../newview/skins/pslpurple/textures/textures.xml | 386 +++++++++++++++++++++
.../skins/pslpurple/textures/tool_dozer.tga | Bin 0 -> 3090 bytes
.../skins/pslpurple/textures/tool_dozer_active.tga | Bin 0 -> 3090 bytes
.../newview/skins/pslpurple/textures/tool_zoom.tga | Bin 0 -> 3090 bytes
.../skins/pslpurple/textures/tool_zoom_active.tga | Bin 0 -> 3090 bytes
.../pslpurple/textures/toolbar_btn_disabled.tga | Bin 0 -> 9234 bytes
.../pslpurple/textures/toolbar_btn_enabled.tga | Bin 0 -> 9234 bytes
.../pslpurple/textures/toolbar_btn_selected.tga | Bin 0 -> 9234 bytes
.../skins/pslpurple/textures/toolbar_tab.tga | Bin 0 -> 19158 bytes
.../newview/skins/pslpurple/textures/up_arrow.tga | Bin 0 -> 786 bytes
.../newview/skins/pslpurple/textures/white.tga | Bin 0 -> 3116 bytes
189 files changed, 596 insertions(+)
create mode 100644 linden/indra/newview/skins/pslpurple/License and Credit.txt
create mode 100644 linden/indra/newview/skins/pslpurple/colors_base.xml
create mode 100644 linden/indra/newview/skins/pslpurple/textures/0098b015-3daf-4cfe-a72f-915369ea97c2.tga
create mode 100644 linden/indra/newview/skins/pslpurple/textures/3c18c87e-5f50-14e2-e744-f44734aa365f.tga
create mode 100644 linden/indra/newview/skins/pslpurple/textures/5748decc-f629-461c-9a36-a35a221fe21f.tga
create mode 100644 linden/indra/newview/skins/pslpurple/textures/6002a571-549c-472c-9443-9ab35b1a55ed.tga
create mode 100644 linden/indra/newview/skins/pslpurple/textures/7a0b1bdb-b5d9-4df5-bac2-ba230da93b5b.tga
create mode 100644 linden/indra/newview/skins/pslpurple/textures/7dabc040-ec13-2309-ddf7-4f161f6de2f4.tga
create mode 100644 linden/indra/newview/skins/pslpurple/textures/89e9fc7c-0b16-457d-be4f-136270759c4d.tga
create mode 100644 linden/indra/newview/skins/pslpurple/textures/9cad3e6d-2d6d-107d-f8ab-5ba272b5bfe1.tga
create mode 100644 linden/indra/newview/skins/pslpurple/textures/active_speakers.tga
create mode 100644 linden/indra/newview/skins/pslpurple/textures/active_voice_tab.tga
create mode 100644 linden/indra/newview/skins/pslpurple/textures/alpha_gradient.tga
create mode 100644 linden/indra/newview/skins/pslpurple/textures/arrow_down.tga
create mode 100644 linden/indra/newview/skins/pslpurple/textures/arrow_up.tga
create mode 100644 linden/indra/newview/skins/pslpurple/textures/b4870163-6208-42a9-9801-93133bf9a6cd.tga
create mode 100644 linden/indra/newview/skins/pslpurple/textures/black.tga
create mode 100644 linden/indra/newview/skins/pslpurple/textures/btn_chatbar.tga
create mode 100644 linden/indra/newview/skins/pslpurple/textures/btn_chatbar_selected.tga
create mode 100644 linden/indra/newview/skins/pslpurple/textures/button_anim_pause.tga
create mode 100644 linden/indra/newview/skins/pslpurple/textures/button_anim_pause_selected.tga
create mode 100644 linden/indra/newview/skins/pslpurple/textures/button_anim_play.tga
create mode 100644 linden/indra/newview/skins/pslpurple/textures/button_anim_play_selected.tga
create mode 100644 linden/indra/newview/skins/pslpurple/textures/button_anim_stop.tga
create mode 100644 linden/indra/newview/skins/pslpurple/textures/button_anim_stop_selected.tga
create mode 100644 linden/indra/newview/skins/pslpurple/textures/button_disabled_32x128.tga
create mode 100644 linden/indra/newview/skins/pslpurple/textures/button_enabled_32x128.tga
create mode 100644 linden/indra/newview/skins/pslpurple/textures/button_enabled_selected_32x128.tga
create mode 100644 linden/indra/newview/skins/pslpurple/textures/c1e21504-f136-451d-b8e9-929037812f1d.tga
create mode 100644 linden/indra/newview/skins/pslpurple/textures/c63f124c-6340-4fbf-b59e-0869a44adb64.tga
create mode 100644 linden/indra/newview/skins/pslpurple/textures/cam_rotate_in.tga
create mode 100644 linden/indra/newview/skins/pslpurple/textures/cam_rotate_out.tga
create mode 100644 linden/indra/newview/skins/pslpurple/textures/cam_tracking_in.tga
create mode 100644 linden/indra/newview/skins/pslpurple/textures/cam_tracking_out.tga
create mode 100644 linden/indra/newview/skins/pslpurple/textures/cam_zoom_minus_in.tga
create mode 100644 linden/indra/newview/skins/pslpurple/textures/cam_zoom_out.tga
create mode 100644 linden/indra/newview/skins/pslpurple/textures/cam_zoom_plus_in.tga
create mode 100644 linden/indra/newview/skins/pslpurple/textures/ce15fd63-b0b6-463c-a37d-ea6393208b3e.tga
create mode 100644 linden/indra/newview/skins/pslpurple/textures/checkbox_disabled_false.tga
create mode 100644 linden/indra/newview/skins/pslpurple/textures/checkbox_disabled_true.tga
create mode 100644 linden/indra/newview/skins/pslpurple/textures/checkbox_enabled_false.tga
create mode 100644 linden/indra/newview/skins/pslpurple/textures/checkbox_enabled_true.tga
create mode 100644 linden/indra/newview/skins/pslpurple/textures/circle.tga
create mode 100644 linden/indra/newview/skins/pslpurple/textures/close_in_blue.tga
create mode 100644 linden/indra/newview/skins/pslpurple/textures/close_inactive.tga
create mode 100644 linden/indra/newview/skins/pslpurple/textures/close_inactive_blue.tga
create mode 100644 linden/indra/newview/skins/pslpurple/textures/closebox.tga
create mode 100644 linden/indra/newview/skins/pslpurple/textures/combobox_arrow.tga
create mode 100644 linden/indra/newview/skins/pslpurple/textures/darkgray.tga
create mode 100644 linden/indra/newview/skins/pslpurple/textures/eye_button_active.tga
create mode 100644 linden/indra/newview/skins/pslpurple/textures/eye_button_inactive.tga
create mode 100644 linden/indra/newview/skins/pslpurple/textures/ff9a71eb-7414-4cf8-866e-a701deb7c3cf.tga
create mode 100644 linden/indra/newview/skins/pslpurple/textures/ff_edit_mine_button.tga
create mode 100644 linden/indra/newview/skins/pslpurple/textures/ff_edit_theirs_button.tga
create mode 100644 linden/indra/newview/skins/pslpurple/textures/ff_online_status_button.tga
create mode 100644 linden/indra/newview/skins/pslpurple/textures/ff_visible_map.tga
create mode 100644 linden/indra/newview/skins/pslpurple/textures/ff_visible_map_button.tga
create mode 100644 linden/indra/newview/skins/pslpurple/textures/ff_visible_online.tga
create mode 100644 linden/indra/newview/skins/pslpurple/textures/ff_visible_online_button.tga
create mode 100644 linden/indra/newview/skins/pslpurple/textures/flyout_btn_left.tga
create mode 100644 linden/indra/newview/skins/pslpurple/textures/flyout_btn_left_disabled.tga
create mode 100644 linden/indra/newview/skins/pslpurple/textures/flyout_btn_left_selected.tga
create mode 100644 linden/indra/newview/skins/pslpurple/textures/flyout_btn_right.tga
create mode 100644 linden/indra/newview/skins/pslpurple/textures/flyout_btn_right_disabled.tga
create mode 100644 linden/indra/newview/skins/pslpurple/textures/flyout_btn_right_selected.tga
create mode 100644 linden/indra/newview/skins/pslpurple/textures/folder_arrow.tga
create mode 100644 linden/indra/newview/skins/pslpurple/textures/icn_active-speakers-dot-lvl0.tga
create mode 100644 linden/indra/newview/skins/pslpurple/textures/icn_active-speakers-dot-lvl1.tga
create mode 100644 linden/indra/newview/skins/pslpurple/textures/icn_active-speakers-dot-lvl2.tga
create mode 100644 linden/indra/newview/skins/pslpurple/textures/icn_active-speakers-typing1.tga
create mode 100644 linden/indra/newview/skins/pslpurple/textures/icn_active-speakers-typing2.tga
create mode 100644 linden/indra/newview/skins/pslpurple/textures/icn_active-speakers-typing3.tga
create mode 100644 linden/indra/newview/skins/pslpurple/textures/icn_chatbar.tga
create mode 100644 linden/indra/newview/skins/pslpurple/textures/icn_clear_lineeditor.tga
create mode 100644 linden/indra/newview/skins/pslpurple/textures/icn_label_media.tga
create mode 100644 linden/indra/newview/skins/pslpurple/textures/icn_label_music.tga
create mode 100644 linden/indra/newview/skins/pslpurple/textures/icn_label_web.tga
create mode 100644 linden/indra/newview/skins/pslpurple/textures/icn_media-pause_active.tga
create mode 100644 linden/indra/newview/skins/pslpurple/textures/icn_media-pause_disabled.tga
create mode 100644 linden/indra/newview/skins/pslpurple/textures/icn_media-pause_enabled.tga
create mode 100644 linden/indra/newview/skins/pslpurple/textures/icn_media-play_active.tga
create mode 100644 linden/indra/newview/skins/pslpurple/textures/icn_media-play_disabled.tga
create mode 100644 linden/indra/newview/skins/pslpurple/textures/icn_media-play_enabled.tga
create mode 100644 linden/indra/newview/skins/pslpurple/textures/icn_media-stop_active.tga
create mode 100644 linden/indra/newview/skins/pslpurple/textures/icn_media-stop_disabled.tga
create mode 100644 linden/indra/newview/skins/pslpurple/textures/icn_media-stop_enabled.tga
create mode 100644 linden/indra/newview/skins/pslpurple/textures/icn_media.tga
create mode 100644 linden/indra/newview/skins/pslpurple/textures/icn_media_movie.tga
create mode 100644 linden/indra/newview/skins/pslpurple/textures/icn_media_web.tga
create mode 100644 linden/indra/newview/skins/pslpurple/textures/icn_music-play.tga
create mode 100644 linden/indra/newview/skins/pslpurple/textures/icn_music.tga
create mode 100644 linden/indra/newview/skins/pslpurple/textures/icn_play.tga
create mode 100644 linden/indra/newview/skins/pslpurple/textures/icn_rounded-text-field.tga
create mode 100644 linden/indra/newview/skins/pslpurple/textures/icn_scrollbar.tga
create mode 100644 linden/indra/newview/skins/pslpurple/textures/icn_scrollbar_bg.tga
create mode 100644 linden/indra/newview/skins/pslpurple/textures/icn_scrollbar_thumb.tga
create mode 100644 linden/indra/newview/skins/pslpurple/textures/icn_slide-groove_dark.tga
create mode 100644 linden/indra/newview/skins/pslpurple/textures/icn_slide-highlight.tga
create mode 100644 linden/indra/newview/skins/pslpurple/textures/icn_slide-thumb_dark.tga
create mode 100644 linden/indra/newview/skins/pslpurple/textures/icn_speaker-muted_dark.tga
create mode 100644 linden/indra/newview/skins/pslpurple/textures/icn_speaker_dark.tga
create mode 100644 linden/indra/newview/skins/pslpurple/textures/icn_toolbar_build.tga
create mode 100644 linden/indra/newview/skins/pslpurple/textures/icn_toolbar_fly.tga
create mode 100644 linden/indra/newview/skins/pslpurple/textures/icn_toolbar_inventory.tga
create mode 100644 linden/indra/newview/skins/pslpurple/textures/icn_toolbar_map.tga
create mode 100644 linden/indra/newview/skins/pslpurple/textures/icn_toolbar_minimap.tga
create mode 100644 linden/indra/newview/skins/pslpurple/textures/icn_toolbar_search.tga
create mode 100644 linden/indra/newview/skins/pslpurple/textures/icn_toolbar_snapshot.tga
create mode 100644 linden/indra/newview/skins/pslpurple/textures/icon_diurnal.tga
create mode 100644 linden/indra/newview/skins/pslpurple/textures/lightgray.tga
create mode 100644 linden/indra/newview/skins/pslpurple/textures/media_icon.tga
create mode 100644 linden/indra/newview/skins/pslpurple/textures/minimize.tga
create mode 100644 linden/indra/newview/skins/pslpurple/textures/minimize_inactive.tga
create mode 100644 linden/indra/newview/skins/pslpurple/textures/minimize_pressed.tga
create mode 100644 linden/indra/newview/skins/pslpurple/textures/move_backward_in.tga
create mode 100644 linden/indra/newview/skins/pslpurple/textures/move_backward_out.tga
create mode 100644 linden/indra/newview/skins/pslpurple/textures/move_down_in.tga
create mode 100644 linden/indra/newview/skins/pslpurple/textures/move_down_out.tga
create mode 100644 linden/indra/newview/skins/pslpurple/textures/move_forward_in.tga
create mode 100644 linden/indra/newview/skins/pslpurple/textures/move_forward_out.tga
create mode 100644 linden/indra/newview/skins/pslpurple/textures/move_left_in.tga
create mode 100644 linden/indra/newview/skins/pslpurple/textures/move_left_out.tga
create mode 100644 linden/indra/newview/skins/pslpurple/textures/move_right_in.tga
create mode 100644 linden/indra/newview/skins/pslpurple/textures/move_right_out.tga
create mode 100644 linden/indra/newview/skins/pslpurple/textures/move_turn_left_in.tga
create mode 100644 linden/indra/newview/skins/pslpurple/textures/move_turn_left_out.tga
create mode 100644 linden/indra/newview/skins/pslpurple/textures/move_turn_right_in.tga
create mode 100644 linden/indra/newview/skins/pslpurple/textures/move_turn_right_out.tga
create mode 100644 linden/indra/newview/skins/pslpurple/textures/move_up_in.tga
create mode 100644 linden/indra/newview/skins/pslpurple/textures/move_up_out.tga
create mode 100644 linden/indra/newview/skins/pslpurple/textures/mute_icon.tga
create mode 100644 linden/indra/newview/skins/pslpurple/textures/notify_next.png
create mode 100644 linden/indra/newview/skins/pslpurple/textures/progress_fill.tga
create mode 100644 linden/indra/newview/skins/pslpurple/textures/progressbar_fill.tga
create mode 100644 linden/indra/newview/skins/pslpurple/textures/progressbar_track.tga
create mode 100644 linden/indra/newview/skins/pslpurple/textures/ptt_lock_off.tga
create mode 100644 linden/indra/newview/skins/pslpurple/textures/ptt_lock_on.tga
create mode 100644 linden/indra/newview/skins/pslpurple/textures/radio_active_false.tga
create mode 100644 linden/indra/newview/skins/pslpurple/textures/radio_active_true.tga
create mode 100644 linden/indra/newview/skins/pslpurple/textures/radio_inactive_false.tga
create mode 100644 linden/indra/newview/skins/pslpurple/textures/radio_inactive_true.tga
create mode 100644 linden/indra/newview/skins/pslpurple/textures/resize_handle_bottom_right_blue.tga
create mode 100644 linden/indra/newview/skins/pslpurple/textures/restore.tga
create mode 100644 linden/indra/newview/skins/pslpurple/textures/restore_inactive.tga
create mode 100644 linden/indra/newview/skins/pslpurple/textures/restore_pressed.tga
create mode 100644 linden/indra/newview/skins/pslpurple/textures/rounded_square.tga
create mode 100644 linden/indra/newview/skins/pslpurple/textures/rounded_square_soft.tga
create mode 100644 linden/indra/newview/skins/pslpurple/textures/scrollbutton_down_in_blue.tga
create mode 100644 linden/indra/newview/skins/pslpurple/textures/scrollbutton_down_out_blue.tga
create mode 100644 linden/indra/newview/skins/pslpurple/textures/scrollbutton_left_in_blue.tga
create mode 100644 linden/indra/newview/skins/pslpurple/textures/scrollbutton_left_out_blue.tga
create mode 100644 linden/indra/newview/skins/pslpurple/textures/scrollbutton_right_in_blue.tga
create mode 100644 linden/indra/newview/skins/pslpurple/textures/scrollbutton_right_out_blue.tga
create mode 100644 linden/indra/newview/skins/pslpurple/textures/scrollbutton_up_in_blue.tga
create mode 100644 linden/indra/newview/skins/pslpurple/textures/scrollbutton_up_out_blue.tga
create mode 100644 linden/indra/newview/skins/pslpurple/textures/sm_rounded_corners_simple.tga
create mode 100644 linden/indra/newview/skins/pslpurple/textures/smicon_warn.tga
create mode 100644 linden/indra/newview/skins/pslpurple/textures/spacer24.tga
create mode 100644 linden/indra/newview/skins/pslpurple/textures/spacer35.tga
create mode 100644 linden/indra/newview/skins/pslpurple/textures/spin_down_in_blue.tga
create mode 100644 linden/indra/newview/skins/pslpurple/textures/spin_down_out_blue.tga
create mode 100644 linden/indra/newview/skins/pslpurple/textures/spin_up_in_blue.tga
create mode 100644 linden/indra/newview/skins/pslpurple/textures/spin_up_out_blue.tga
create mode 100644 linden/indra/newview/skins/pslpurple/textures/square_btn_32x128.tga
create mode 100644 linden/indra/newview/skins/pslpurple/textures/square_btn_selected_32x128.tga
create mode 100644 linden/indra/newview/skins/pslpurple/textures/status_buy_currency.tga
create mode 100644 linden/indra/newview/skins/pslpurple/textures/status_buy_currency_pressed.tga
create mode 100644 linden/indra/newview/skins/pslpurple/textures/status_buy_land.tga
create mode 100644 linden/indra/newview/skins/pslpurple/textures/status_buy_land_pressed.tga
create mode 100644 linden/indra/newview/skins/pslpurple/textures/tab_bottom_blue.tga
create mode 100644 linden/indra/newview/skins/pslpurple/textures/tab_bottom_selected_blue.tga
create mode 100644 linden/indra/newview/skins/pslpurple/textures/tab_left.tga
create mode 100644 linden/indra/newview/skins/pslpurple/textures/tab_left_selected.tga
create mode 100644 linden/indra/newview/skins/pslpurple/textures/tab_top_blue.tga
create mode 100644 linden/indra/newview/skins/pslpurple/textures/tab_top_selected_blue.tga
create mode 100644 linden/indra/newview/skins/pslpurple/textures/tabarea.tga
create mode 100644 linden/indra/newview/skins/pslpurple/textures/tearoff_pressed.tga
create mode 100644 linden/indra/newview/skins/pslpurple/textures/tearoffbox.tga
create mode 100644 linden/indra/newview/skins/pslpurple/textures/textures.xml
create mode 100644 linden/indra/newview/skins/pslpurple/textures/tool_dozer.tga
create mode 100644 linden/indra/newview/skins/pslpurple/textures/tool_dozer_active.tga
create mode 100644 linden/indra/newview/skins/pslpurple/textures/tool_zoom.tga
create mode 100644 linden/indra/newview/skins/pslpurple/textures/tool_zoom_active.tga
create mode 100644 linden/indra/newview/skins/pslpurple/textures/toolbar_btn_disabled.tga
create mode 100644 linden/indra/newview/skins/pslpurple/textures/toolbar_btn_enabled.tga
create mode 100644 linden/indra/newview/skins/pslpurple/textures/toolbar_btn_selected.tga
create mode 100644 linden/indra/newview/skins/pslpurple/textures/toolbar_tab.tga
create mode 100644 linden/indra/newview/skins/pslpurple/textures/up_arrow.tga
create mode 100644 linden/indra/newview/skins/pslpurple/textures/white.tga
diff --git a/linden/indra/newview/skins/pslpurple/License and Credit.txt b/linden/indra/newview/skins/pslpurple/License and Credit.txt
new file mode 100644
index 0000000..8e57c5b
--- /dev/null
+++ b/linden/indra/newview/skins/pslpurple/License and Credit.txt
@@ -0,0 +1,4 @@
+This skin was modified by JB Kraft from the default linden skin provided.
+This skin was modified by Chalice Yao from the default linden skin and JB Kraft's skin.
+
+All Images and modifications done are provided free to use, modify, and distribute, so long as this infomation is distributed with it.
diff --git a/linden/indra/newview/skins/pslpurple/colors_base.xml b/linden/indra/newview/skins/pslpurple/colors_base.xml
new file mode 100644
index 0000000..3708d8d
--- /dev/null
+++ b/linden/indra/newview/skins/pslpurple/colors_base.xml
@@ -0,0 +1,206 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/linden/indra/newview/skins/pslpurple/textures/0098b015-3daf-4cfe-a72f-915369ea97c2.tga b/linden/indra/newview/skins/pslpurple/textures/0098b015-3daf-4cfe-a72f-915369ea97c2.tga
new file mode 100644
index 0000000..dba13ad
Binary files /dev/null and b/linden/indra/newview/skins/pslpurple/textures/0098b015-3daf-4cfe-a72f-915369ea97c2.tga differ
diff --git a/linden/indra/newview/skins/pslpurple/textures/3c18c87e-5f50-14e2-e744-f44734aa365f.tga b/linden/indra/newview/skins/pslpurple/textures/3c18c87e-5f50-14e2-e744-f44734aa365f.tga
new file mode 100644
index 0000000..01146ad
Binary files /dev/null and b/linden/indra/newview/skins/pslpurple/textures/3c18c87e-5f50-14e2-e744-f44734aa365f.tga differ
diff --git a/linden/indra/newview/skins/pslpurple/textures/5748decc-f629-461c-9a36-a35a221fe21f.tga b/linden/indra/newview/skins/pslpurple/textures/5748decc-f629-461c-9a36-a35a221fe21f.tga
new file mode 100644
index 0000000..55e3793
Binary files /dev/null and b/linden/indra/newview/skins/pslpurple/textures/5748decc-f629-461c-9a36-a35a221fe21f.tga differ
diff --git a/linden/indra/newview/skins/pslpurple/textures/6002a571-549c-472c-9443-9ab35b1a55ed.tga b/linden/indra/newview/skins/pslpurple/textures/6002a571-549c-472c-9443-9ab35b1a55ed.tga
new file mode 100644
index 0000000..fc720c8
Binary files /dev/null and b/linden/indra/newview/skins/pslpurple/textures/6002a571-549c-472c-9443-9ab35b1a55ed.tga differ
diff --git a/linden/indra/newview/skins/pslpurple/textures/7a0b1bdb-b5d9-4df5-bac2-ba230da93b5b.tga b/linden/indra/newview/skins/pslpurple/textures/7a0b1bdb-b5d9-4df5-bac2-ba230da93b5b.tga
new file mode 100644
index 0000000..5613715
Binary files /dev/null and b/linden/indra/newview/skins/pslpurple/textures/7a0b1bdb-b5d9-4df5-bac2-ba230da93b5b.tga differ
diff --git a/linden/indra/newview/skins/pslpurple/textures/7dabc040-ec13-2309-ddf7-4f161f6de2f4.tga b/linden/indra/newview/skins/pslpurple/textures/7dabc040-ec13-2309-ddf7-4f161f6de2f4.tga
new file mode 100644
index 0000000..132b192
Binary files /dev/null and b/linden/indra/newview/skins/pslpurple/textures/7dabc040-ec13-2309-ddf7-4f161f6de2f4.tga differ
diff --git a/linden/indra/newview/skins/pslpurple/textures/89e9fc7c-0b16-457d-be4f-136270759c4d.tga b/linden/indra/newview/skins/pslpurple/textures/89e9fc7c-0b16-457d-be4f-136270759c4d.tga
new file mode 100644
index 0000000..6cc9ea1
Binary files /dev/null and b/linden/indra/newview/skins/pslpurple/textures/89e9fc7c-0b16-457d-be4f-136270759c4d.tga differ
diff --git a/linden/indra/newview/skins/pslpurple/textures/9cad3e6d-2d6d-107d-f8ab-5ba272b5bfe1.tga b/linden/indra/newview/skins/pslpurple/textures/9cad3e6d-2d6d-107d-f8ab-5ba272b5bfe1.tga
new file mode 100644
index 0000000..ceaaaba
Binary files /dev/null and b/linden/indra/newview/skins/pslpurple/textures/9cad3e6d-2d6d-107d-f8ab-5ba272b5bfe1.tga differ
diff --git a/linden/indra/newview/skins/pslpurple/textures/active_speakers.tga b/linden/indra/newview/skins/pslpurple/textures/active_speakers.tga
new file mode 100644
index 0000000..37521d2
Binary files /dev/null and b/linden/indra/newview/skins/pslpurple/textures/active_speakers.tga differ
diff --git a/linden/indra/newview/skins/pslpurple/textures/active_voice_tab.tga b/linden/indra/newview/skins/pslpurple/textures/active_voice_tab.tga
new file mode 100644
index 0000000..b7c817b
Binary files /dev/null and b/linden/indra/newview/skins/pslpurple/textures/active_voice_tab.tga differ
diff --git a/linden/indra/newview/skins/pslpurple/textures/alpha_gradient.tga b/linden/indra/newview/skins/pslpurple/textures/alpha_gradient.tga
new file mode 100644
index 0000000..c7efa26
Binary files /dev/null and b/linden/indra/newview/skins/pslpurple/textures/alpha_gradient.tga differ
diff --git a/linden/indra/newview/skins/pslpurple/textures/arrow_down.tga b/linden/indra/newview/skins/pslpurple/textures/arrow_down.tga
new file mode 100644
index 0000000..5b05df1
Binary files /dev/null and b/linden/indra/newview/skins/pslpurple/textures/arrow_down.tga differ
diff --git a/linden/indra/newview/skins/pslpurple/textures/arrow_up.tga b/linden/indra/newview/skins/pslpurple/textures/arrow_up.tga
new file mode 100644
index 0000000..d9b71ac
Binary files /dev/null and b/linden/indra/newview/skins/pslpurple/textures/arrow_up.tga differ
diff --git a/linden/indra/newview/skins/pslpurple/textures/b4870163-6208-42a9-9801-93133bf9a6cd.tga b/linden/indra/newview/skins/pslpurple/textures/b4870163-6208-42a9-9801-93133bf9a6cd.tga
new file mode 100644
index 0000000..fef00c8
Binary files /dev/null and b/linden/indra/newview/skins/pslpurple/textures/b4870163-6208-42a9-9801-93133bf9a6cd.tga differ
diff --git a/linden/indra/newview/skins/pslpurple/textures/black.tga b/linden/indra/newview/skins/pslpurple/textures/black.tga
new file mode 100644
index 0000000..e368ea4
Binary files /dev/null and b/linden/indra/newview/skins/pslpurple/textures/black.tga differ
diff --git a/linden/indra/newview/skins/pslpurple/textures/btn_chatbar.tga b/linden/indra/newview/skins/pslpurple/textures/btn_chatbar.tga
new file mode 100644
index 0000000..e5de824
Binary files /dev/null and b/linden/indra/newview/skins/pslpurple/textures/btn_chatbar.tga differ
diff --git a/linden/indra/newview/skins/pslpurple/textures/btn_chatbar_selected.tga b/linden/indra/newview/skins/pslpurple/textures/btn_chatbar_selected.tga
new file mode 100644
index 0000000..ef3e5d6
Binary files /dev/null and b/linden/indra/newview/skins/pslpurple/textures/btn_chatbar_selected.tga differ
diff --git a/linden/indra/newview/skins/pslpurple/textures/button_anim_pause.tga b/linden/indra/newview/skins/pslpurple/textures/button_anim_pause.tga
new file mode 100644
index 0000000..fbc81a5
Binary files /dev/null and b/linden/indra/newview/skins/pslpurple/textures/button_anim_pause.tga differ
diff --git a/linden/indra/newview/skins/pslpurple/textures/button_anim_pause_selected.tga b/linden/indra/newview/skins/pslpurple/textures/button_anim_pause_selected.tga
new file mode 100644
index 0000000..defa66f
Binary files /dev/null and b/linden/indra/newview/skins/pslpurple/textures/button_anim_pause_selected.tga differ
diff --git a/linden/indra/newview/skins/pslpurple/textures/button_anim_play.tga b/linden/indra/newview/skins/pslpurple/textures/button_anim_play.tga
new file mode 100644
index 0000000..92145f6
Binary files /dev/null and b/linden/indra/newview/skins/pslpurple/textures/button_anim_play.tga differ
diff --git a/linden/indra/newview/skins/pslpurple/textures/button_anim_play_selected.tga b/linden/indra/newview/skins/pslpurple/textures/button_anim_play_selected.tga
new file mode 100644
index 0000000..bee2326
Binary files /dev/null and b/linden/indra/newview/skins/pslpurple/textures/button_anim_play_selected.tga differ
diff --git a/linden/indra/newview/skins/pslpurple/textures/button_anim_stop.tga b/linden/indra/newview/skins/pslpurple/textures/button_anim_stop.tga
new file mode 100644
index 0000000..d0fdaaa
Binary files /dev/null and b/linden/indra/newview/skins/pslpurple/textures/button_anim_stop.tga differ
diff --git a/linden/indra/newview/skins/pslpurple/textures/button_anim_stop_selected.tga b/linden/indra/newview/skins/pslpurple/textures/button_anim_stop_selected.tga
new file mode 100644
index 0000000..ebab0a7
Binary files /dev/null and b/linden/indra/newview/skins/pslpurple/textures/button_anim_stop_selected.tga differ
diff --git a/linden/indra/newview/skins/pslpurple/textures/button_disabled_32x128.tga b/linden/indra/newview/skins/pslpurple/textures/button_disabled_32x128.tga
new file mode 100644
index 0000000..f49054f
Binary files /dev/null and b/linden/indra/newview/skins/pslpurple/textures/button_disabled_32x128.tga differ
diff --git a/linden/indra/newview/skins/pslpurple/textures/button_enabled_32x128.tga b/linden/indra/newview/skins/pslpurple/textures/button_enabled_32x128.tga
new file mode 100644
index 0000000..8e2f33d
Binary files /dev/null and b/linden/indra/newview/skins/pslpurple/textures/button_enabled_32x128.tga differ
diff --git a/linden/indra/newview/skins/pslpurple/textures/button_enabled_selected_32x128.tga b/linden/indra/newview/skins/pslpurple/textures/button_enabled_selected_32x128.tga
new file mode 100644
index 0000000..644a5e8
Binary files /dev/null and b/linden/indra/newview/skins/pslpurple/textures/button_enabled_selected_32x128.tga differ
diff --git a/linden/indra/newview/skins/pslpurple/textures/c1e21504-f136-451d-b8e9-929037812f1d.tga b/linden/indra/newview/skins/pslpurple/textures/c1e21504-f136-451d-b8e9-929037812f1d.tga
new file mode 100644
index 0000000..bd8cbd7
Binary files /dev/null and b/linden/indra/newview/skins/pslpurple/textures/c1e21504-f136-451d-b8e9-929037812f1d.tga differ
diff --git a/linden/indra/newview/skins/pslpurple/textures/c63f124c-6340-4fbf-b59e-0869a44adb64.tga b/linden/indra/newview/skins/pslpurple/textures/c63f124c-6340-4fbf-b59e-0869a44adb64.tga
new file mode 100644
index 0000000..94525f3
Binary files /dev/null and b/linden/indra/newview/skins/pslpurple/textures/c63f124c-6340-4fbf-b59e-0869a44adb64.tga differ
diff --git a/linden/indra/newview/skins/pslpurple/textures/cam_rotate_in.tga b/linden/indra/newview/skins/pslpurple/textures/cam_rotate_in.tga
new file mode 100644
index 0000000..d08f980
Binary files /dev/null and b/linden/indra/newview/skins/pslpurple/textures/cam_rotate_in.tga differ
diff --git a/linden/indra/newview/skins/pslpurple/textures/cam_rotate_out.tga b/linden/indra/newview/skins/pslpurple/textures/cam_rotate_out.tga
new file mode 100644
index 0000000..f8f64f1
Binary files /dev/null and b/linden/indra/newview/skins/pslpurple/textures/cam_rotate_out.tga differ
diff --git a/linden/indra/newview/skins/pslpurple/textures/cam_tracking_in.tga b/linden/indra/newview/skins/pslpurple/textures/cam_tracking_in.tga
new file mode 100644
index 0000000..562c951
Binary files /dev/null and b/linden/indra/newview/skins/pslpurple/textures/cam_tracking_in.tga differ
diff --git a/linden/indra/newview/skins/pslpurple/textures/cam_tracking_out.tga b/linden/indra/newview/skins/pslpurple/textures/cam_tracking_out.tga
new file mode 100644
index 0000000..7835704
Binary files /dev/null and b/linden/indra/newview/skins/pslpurple/textures/cam_tracking_out.tga differ
diff --git a/linden/indra/newview/skins/pslpurple/textures/cam_zoom_minus_in.tga b/linden/indra/newview/skins/pslpurple/textures/cam_zoom_minus_in.tga
new file mode 100644
index 0000000..a1da27b
Binary files /dev/null and b/linden/indra/newview/skins/pslpurple/textures/cam_zoom_minus_in.tga differ
diff --git a/linden/indra/newview/skins/pslpurple/textures/cam_zoom_out.tga b/linden/indra/newview/skins/pslpurple/textures/cam_zoom_out.tga
new file mode 100644
index 0000000..2e9519d
Binary files /dev/null and b/linden/indra/newview/skins/pslpurple/textures/cam_zoom_out.tga differ
diff --git a/linden/indra/newview/skins/pslpurple/textures/cam_zoom_plus_in.tga b/linden/indra/newview/skins/pslpurple/textures/cam_zoom_plus_in.tga
new file mode 100644
index 0000000..c17d607
Binary files /dev/null and b/linden/indra/newview/skins/pslpurple/textures/cam_zoom_plus_in.tga differ
diff --git a/linden/indra/newview/skins/pslpurple/textures/ce15fd63-b0b6-463c-a37d-ea6393208b3e.tga b/linden/indra/newview/skins/pslpurple/textures/ce15fd63-b0b6-463c-a37d-ea6393208b3e.tga
new file mode 100644
index 0000000..eeec2fd
Binary files /dev/null and b/linden/indra/newview/skins/pslpurple/textures/ce15fd63-b0b6-463c-a37d-ea6393208b3e.tga differ
diff --git a/linden/indra/newview/skins/pslpurple/textures/checkbox_disabled_false.tga b/linden/indra/newview/skins/pslpurple/textures/checkbox_disabled_false.tga
new file mode 100644
index 0000000..9fd3670
Binary files /dev/null and b/linden/indra/newview/skins/pslpurple/textures/checkbox_disabled_false.tga differ
diff --git a/linden/indra/newview/skins/pslpurple/textures/checkbox_disabled_true.tga b/linden/indra/newview/skins/pslpurple/textures/checkbox_disabled_true.tga
new file mode 100644
index 0000000..4e5f70b
Binary files /dev/null and b/linden/indra/newview/skins/pslpurple/textures/checkbox_disabled_true.tga differ
diff --git a/linden/indra/newview/skins/pslpurple/textures/checkbox_enabled_false.tga b/linden/indra/newview/skins/pslpurple/textures/checkbox_enabled_false.tga
new file mode 100644
index 0000000..25c48bc
Binary files /dev/null and b/linden/indra/newview/skins/pslpurple/textures/checkbox_enabled_false.tga differ
diff --git a/linden/indra/newview/skins/pslpurple/textures/checkbox_enabled_true.tga b/linden/indra/newview/skins/pslpurple/textures/checkbox_enabled_true.tga
new file mode 100644
index 0000000..71b6515
Binary files /dev/null and b/linden/indra/newview/skins/pslpurple/textures/checkbox_enabled_true.tga differ
diff --git a/linden/indra/newview/skins/pslpurple/textures/circle.tga b/linden/indra/newview/skins/pslpurple/textures/circle.tga
new file mode 100644
index 0000000..d7097e3
Binary files /dev/null and b/linden/indra/newview/skins/pslpurple/textures/circle.tga differ
diff --git a/linden/indra/newview/skins/pslpurple/textures/close_in_blue.tga b/linden/indra/newview/skins/pslpurple/textures/close_in_blue.tga
new file mode 100644
index 0000000..68a20b4
Binary files /dev/null and b/linden/indra/newview/skins/pslpurple/textures/close_in_blue.tga differ
diff --git a/linden/indra/newview/skins/pslpurple/textures/close_inactive.tga b/linden/indra/newview/skins/pslpurple/textures/close_inactive.tga
new file mode 100644
index 0000000..cd32eaa
Binary files /dev/null and b/linden/indra/newview/skins/pslpurple/textures/close_inactive.tga differ
diff --git a/linden/indra/newview/skins/pslpurple/textures/close_inactive_blue.tga b/linden/indra/newview/skins/pslpurple/textures/close_inactive_blue.tga
new file mode 100644
index 0000000..cd32eaa
Binary files /dev/null and b/linden/indra/newview/skins/pslpurple/textures/close_inactive_blue.tga differ
diff --git a/linden/indra/newview/skins/pslpurple/textures/closebox.tga b/linden/indra/newview/skins/pslpurple/textures/closebox.tga
new file mode 100644
index 0000000..fea0f77
Binary files /dev/null and b/linden/indra/newview/skins/pslpurple/textures/closebox.tga differ
diff --git a/linden/indra/newview/skins/pslpurple/textures/combobox_arrow.tga b/linden/indra/newview/skins/pslpurple/textures/combobox_arrow.tga
new file mode 100644
index 0000000..d769d31
Binary files /dev/null and b/linden/indra/newview/skins/pslpurple/textures/combobox_arrow.tga differ
diff --git a/linden/indra/newview/skins/pslpurple/textures/darkgray.tga b/linden/indra/newview/skins/pslpurple/textures/darkgray.tga
new file mode 100644
index 0000000..1ac39a0
Binary files /dev/null and b/linden/indra/newview/skins/pslpurple/textures/darkgray.tga differ
diff --git a/linden/indra/newview/skins/pslpurple/textures/eye_button_active.tga b/linden/indra/newview/skins/pslpurple/textures/eye_button_active.tga
new file mode 100644
index 0000000..eb021d7
Binary files /dev/null and b/linden/indra/newview/skins/pslpurple/textures/eye_button_active.tga differ
diff --git a/linden/indra/newview/skins/pslpurple/textures/eye_button_inactive.tga b/linden/indra/newview/skins/pslpurple/textures/eye_button_inactive.tga
new file mode 100644
index 0000000..848d896
Binary files /dev/null and b/linden/indra/newview/skins/pslpurple/textures/eye_button_inactive.tga differ
diff --git a/linden/indra/newview/skins/pslpurple/textures/ff9a71eb-7414-4cf8-866e-a701deb7c3cf.tga b/linden/indra/newview/skins/pslpurple/textures/ff9a71eb-7414-4cf8-866e-a701deb7c3cf.tga
new file mode 100644
index 0000000..cb183cb
Binary files /dev/null and b/linden/indra/newview/skins/pslpurple/textures/ff9a71eb-7414-4cf8-866e-a701deb7c3cf.tga differ
diff --git a/linden/indra/newview/skins/pslpurple/textures/ff_edit_mine_button.tga b/linden/indra/newview/skins/pslpurple/textures/ff_edit_mine_button.tga
new file mode 100644
index 0000000..4bf64c4
Binary files /dev/null and b/linden/indra/newview/skins/pslpurple/textures/ff_edit_mine_button.tga differ
diff --git a/linden/indra/newview/skins/pslpurple/textures/ff_edit_theirs_button.tga b/linden/indra/newview/skins/pslpurple/textures/ff_edit_theirs_button.tga
new file mode 100644
index 0000000..dac53dd
Binary files /dev/null and b/linden/indra/newview/skins/pslpurple/textures/ff_edit_theirs_button.tga differ
diff --git a/linden/indra/newview/skins/pslpurple/textures/ff_online_status_button.tga b/linden/indra/newview/skins/pslpurple/textures/ff_online_status_button.tga
new file mode 100644
index 0000000..44f5e09
Binary files /dev/null and b/linden/indra/newview/skins/pslpurple/textures/ff_online_status_button.tga differ
diff --git a/linden/indra/newview/skins/pslpurple/textures/ff_visible_map.tga b/linden/indra/newview/skins/pslpurple/textures/ff_visible_map.tga
new file mode 100644
index 0000000..d8ed323
Binary files /dev/null and b/linden/indra/newview/skins/pslpurple/textures/ff_visible_map.tga differ
diff --git a/linden/indra/newview/skins/pslpurple/textures/ff_visible_map_button.tga b/linden/indra/newview/skins/pslpurple/textures/ff_visible_map_button.tga
new file mode 100644
index 0000000..081f242
Binary files /dev/null and b/linden/indra/newview/skins/pslpurple/textures/ff_visible_map_button.tga differ
diff --git a/linden/indra/newview/skins/pslpurple/textures/ff_visible_online.tga b/linden/indra/newview/skins/pslpurple/textures/ff_visible_online.tga
new file mode 100644
index 0000000..2b76d72
Binary files /dev/null and b/linden/indra/newview/skins/pslpurple/textures/ff_visible_online.tga differ
diff --git a/linden/indra/newview/skins/pslpurple/textures/ff_visible_online_button.tga b/linden/indra/newview/skins/pslpurple/textures/ff_visible_online_button.tga
new file mode 100644
index 0000000..001933d
Binary files /dev/null and b/linden/indra/newview/skins/pslpurple/textures/ff_visible_online_button.tga differ
diff --git a/linden/indra/newview/skins/pslpurple/textures/flyout_btn_left.tga b/linden/indra/newview/skins/pslpurple/textures/flyout_btn_left.tga
new file mode 100644
index 0000000..1c977a9
Binary files /dev/null and b/linden/indra/newview/skins/pslpurple/textures/flyout_btn_left.tga differ
diff --git a/linden/indra/newview/skins/pslpurple/textures/flyout_btn_left_disabled.tga b/linden/indra/newview/skins/pslpurple/textures/flyout_btn_left_disabled.tga
new file mode 100644
index 0000000..a073103
Binary files /dev/null and b/linden/indra/newview/skins/pslpurple/textures/flyout_btn_left_disabled.tga differ
diff --git a/linden/indra/newview/skins/pslpurple/textures/flyout_btn_left_selected.tga b/linden/indra/newview/skins/pslpurple/textures/flyout_btn_left_selected.tga
new file mode 100644
index 0000000..d1ad939
Binary files /dev/null and b/linden/indra/newview/skins/pslpurple/textures/flyout_btn_left_selected.tga differ
diff --git a/linden/indra/newview/skins/pslpurple/textures/flyout_btn_right.tga b/linden/indra/newview/skins/pslpurple/textures/flyout_btn_right.tga
new file mode 100644
index 0000000..870bf3b
Binary files /dev/null and b/linden/indra/newview/skins/pslpurple/textures/flyout_btn_right.tga differ
diff --git a/linden/indra/newview/skins/pslpurple/textures/flyout_btn_right_disabled.tga b/linden/indra/newview/skins/pslpurple/textures/flyout_btn_right_disabled.tga
new file mode 100644
index 0000000..23731d3
Binary files /dev/null and b/linden/indra/newview/skins/pslpurple/textures/flyout_btn_right_disabled.tga differ
diff --git a/linden/indra/newview/skins/pslpurple/textures/flyout_btn_right_selected.tga b/linden/indra/newview/skins/pslpurple/textures/flyout_btn_right_selected.tga
new file mode 100644
index 0000000..6934156
Binary files /dev/null and b/linden/indra/newview/skins/pslpurple/textures/flyout_btn_right_selected.tga differ
diff --git a/linden/indra/newview/skins/pslpurple/textures/folder_arrow.tga b/linden/indra/newview/skins/pslpurple/textures/folder_arrow.tga
new file mode 100644
index 0000000..77d4707
Binary files /dev/null and b/linden/indra/newview/skins/pslpurple/textures/folder_arrow.tga differ
diff --git a/linden/indra/newview/skins/pslpurple/textures/icn_active-speakers-dot-lvl0.tga b/linden/indra/newview/skins/pslpurple/textures/icn_active-speakers-dot-lvl0.tga
new file mode 100644
index 0000000..35846ce
Binary files /dev/null and b/linden/indra/newview/skins/pslpurple/textures/icn_active-speakers-dot-lvl0.tga differ
diff --git a/linden/indra/newview/skins/pslpurple/textures/icn_active-speakers-dot-lvl1.tga b/linden/indra/newview/skins/pslpurple/textures/icn_active-speakers-dot-lvl1.tga
new file mode 100644
index 0000000..1f9f564
Binary files /dev/null and b/linden/indra/newview/skins/pslpurple/textures/icn_active-speakers-dot-lvl1.tga differ
diff --git a/linden/indra/newview/skins/pslpurple/textures/icn_active-speakers-dot-lvl2.tga b/linden/indra/newview/skins/pslpurple/textures/icn_active-speakers-dot-lvl2.tga
new file mode 100644
index 0000000..b2e5609
Binary files /dev/null and b/linden/indra/newview/skins/pslpurple/textures/icn_active-speakers-dot-lvl2.tga differ
diff --git a/linden/indra/newview/skins/pslpurple/textures/icn_active-speakers-typing1.tga b/linden/indra/newview/skins/pslpurple/textures/icn_active-speakers-typing1.tga
new file mode 100644
index 0000000..3706c96
Binary files /dev/null and b/linden/indra/newview/skins/pslpurple/textures/icn_active-speakers-typing1.tga differ
diff --git a/linden/indra/newview/skins/pslpurple/textures/icn_active-speakers-typing2.tga b/linden/indra/newview/skins/pslpurple/textures/icn_active-speakers-typing2.tga
new file mode 100644
index 0000000..0d127f9
Binary files /dev/null and b/linden/indra/newview/skins/pslpurple/textures/icn_active-speakers-typing2.tga differ
diff --git a/linden/indra/newview/skins/pslpurple/textures/icn_active-speakers-typing3.tga b/linden/indra/newview/skins/pslpurple/textures/icn_active-speakers-typing3.tga
new file mode 100644
index 0000000..031b3ad
Binary files /dev/null and b/linden/indra/newview/skins/pslpurple/textures/icn_active-speakers-typing3.tga differ
diff --git a/linden/indra/newview/skins/pslpurple/textures/icn_chatbar.tga b/linden/indra/newview/skins/pslpurple/textures/icn_chatbar.tga
new file mode 100644
index 0000000..94fd6dc
Binary files /dev/null and b/linden/indra/newview/skins/pslpurple/textures/icn_chatbar.tga differ
diff --git a/linden/indra/newview/skins/pslpurple/textures/icn_clear_lineeditor.tga b/linden/indra/newview/skins/pslpurple/textures/icn_clear_lineeditor.tga
new file mode 100644
index 0000000..8cd8310
Binary files /dev/null and b/linden/indra/newview/skins/pslpurple/textures/icn_clear_lineeditor.tga differ
diff --git a/linden/indra/newview/skins/pslpurple/textures/icn_label_media.tga b/linden/indra/newview/skins/pslpurple/textures/icn_label_media.tga
new file mode 100644
index 0000000..b30b879
Binary files /dev/null and b/linden/indra/newview/skins/pslpurple/textures/icn_label_media.tga differ
diff --git a/linden/indra/newview/skins/pslpurple/textures/icn_label_music.tga b/linden/indra/newview/skins/pslpurple/textures/icn_label_music.tga
new file mode 100644
index 0000000..e42eb9b
Binary files /dev/null and b/linden/indra/newview/skins/pslpurple/textures/icn_label_music.tga differ
diff --git a/linden/indra/newview/skins/pslpurple/textures/icn_label_web.tga b/linden/indra/newview/skins/pslpurple/textures/icn_label_web.tga
new file mode 100644
index 0000000..b12ef30
Binary files /dev/null and b/linden/indra/newview/skins/pslpurple/textures/icn_label_web.tga differ
diff --git a/linden/indra/newview/skins/pslpurple/textures/icn_media-pause_active.tga b/linden/indra/newview/skins/pslpurple/textures/icn_media-pause_active.tga
new file mode 100644
index 0000000..4d10aff
Binary files /dev/null and b/linden/indra/newview/skins/pslpurple/textures/icn_media-pause_active.tga differ
diff --git a/linden/indra/newview/skins/pslpurple/textures/icn_media-pause_disabled.tga b/linden/indra/newview/skins/pslpurple/textures/icn_media-pause_disabled.tga
new file mode 100644
index 0000000..7689cb7
Binary files /dev/null and b/linden/indra/newview/skins/pslpurple/textures/icn_media-pause_disabled.tga differ
diff --git a/linden/indra/newview/skins/pslpurple/textures/icn_media-pause_enabled.tga b/linden/indra/newview/skins/pslpurple/textures/icn_media-pause_enabled.tga
new file mode 100644
index 0000000..6ea800a
Binary files /dev/null and b/linden/indra/newview/skins/pslpurple/textures/icn_media-pause_enabled.tga differ
diff --git a/linden/indra/newview/skins/pslpurple/textures/icn_media-play_active.tga b/linden/indra/newview/skins/pslpurple/textures/icn_media-play_active.tga
new file mode 100644
index 0000000..fb7d843
Binary files /dev/null and b/linden/indra/newview/skins/pslpurple/textures/icn_media-play_active.tga differ
diff --git a/linden/indra/newview/skins/pslpurple/textures/icn_media-play_disabled.tga b/linden/indra/newview/skins/pslpurple/textures/icn_media-play_disabled.tga
new file mode 100644
index 0000000..0306e94
Binary files /dev/null and b/linden/indra/newview/skins/pslpurple/textures/icn_media-play_disabled.tga differ
diff --git a/linden/indra/newview/skins/pslpurple/textures/icn_media-play_enabled.tga b/linden/indra/newview/skins/pslpurple/textures/icn_media-play_enabled.tga
new file mode 100644
index 0000000..51b6807
Binary files /dev/null and b/linden/indra/newview/skins/pslpurple/textures/icn_media-play_enabled.tga differ
diff --git a/linden/indra/newview/skins/pslpurple/textures/icn_media-stop_active.tga b/linden/indra/newview/skins/pslpurple/textures/icn_media-stop_active.tga
new file mode 100644
index 0000000..de06448
Binary files /dev/null and b/linden/indra/newview/skins/pslpurple/textures/icn_media-stop_active.tga differ
diff --git a/linden/indra/newview/skins/pslpurple/textures/icn_media-stop_disabled.tga b/linden/indra/newview/skins/pslpurple/textures/icn_media-stop_disabled.tga
new file mode 100644
index 0000000..6c18bbe
Binary files /dev/null and b/linden/indra/newview/skins/pslpurple/textures/icn_media-stop_disabled.tga differ
diff --git a/linden/indra/newview/skins/pslpurple/textures/icn_media-stop_enabled.tga b/linden/indra/newview/skins/pslpurple/textures/icn_media-stop_enabled.tga
new file mode 100644
index 0000000..8738cdc
Binary files /dev/null and b/linden/indra/newview/skins/pslpurple/textures/icn_media-stop_enabled.tga differ
diff --git a/linden/indra/newview/skins/pslpurple/textures/icn_media.tga b/linden/indra/newview/skins/pslpurple/textures/icn_media.tga
new file mode 100644
index 0000000..9743d47
Binary files /dev/null and b/linden/indra/newview/skins/pslpurple/textures/icn_media.tga differ
diff --git a/linden/indra/newview/skins/pslpurple/textures/icn_media_movie.tga b/linden/indra/newview/skins/pslpurple/textures/icn_media_movie.tga
new file mode 100644
index 0000000..36cba54
Binary files /dev/null and b/linden/indra/newview/skins/pslpurple/textures/icn_media_movie.tga differ
diff --git a/linden/indra/newview/skins/pslpurple/textures/icn_media_web.tga b/linden/indra/newview/skins/pslpurple/textures/icn_media_web.tga
new file mode 100644
index 0000000..0d73d88
Binary files /dev/null and b/linden/indra/newview/skins/pslpurple/textures/icn_media_web.tga differ
diff --git a/linden/indra/newview/skins/pslpurple/textures/icn_music-play.tga b/linden/indra/newview/skins/pslpurple/textures/icn_music-play.tga
new file mode 100644
index 0000000..4249627
Binary files /dev/null and b/linden/indra/newview/skins/pslpurple/textures/icn_music-play.tga differ
diff --git a/linden/indra/newview/skins/pslpurple/textures/icn_music.tga b/linden/indra/newview/skins/pslpurple/textures/icn_music.tga
new file mode 100644
index 0000000..a7c2845
Binary files /dev/null and b/linden/indra/newview/skins/pslpurple/textures/icn_music.tga differ
diff --git a/linden/indra/newview/skins/pslpurple/textures/icn_play.tga b/linden/indra/newview/skins/pslpurple/textures/icn_play.tga
new file mode 100644
index 0000000..6b9bfb0
Binary files /dev/null and b/linden/indra/newview/skins/pslpurple/textures/icn_play.tga differ
diff --git a/linden/indra/newview/skins/pslpurple/textures/icn_rounded-text-field.tga b/linden/indra/newview/skins/pslpurple/textures/icn_rounded-text-field.tga
new file mode 100644
index 0000000..3ec9a33
Binary files /dev/null and b/linden/indra/newview/skins/pslpurple/textures/icn_rounded-text-field.tga differ
diff --git a/linden/indra/newview/skins/pslpurple/textures/icn_scrollbar.tga b/linden/indra/newview/skins/pslpurple/textures/icn_scrollbar.tga
new file mode 100644
index 0000000..68c2321
Binary files /dev/null and b/linden/indra/newview/skins/pslpurple/textures/icn_scrollbar.tga differ
diff --git a/linden/indra/newview/skins/pslpurple/textures/icn_scrollbar_bg.tga b/linden/indra/newview/skins/pslpurple/textures/icn_scrollbar_bg.tga
new file mode 100644
index 0000000..76ac928
Binary files /dev/null and b/linden/indra/newview/skins/pslpurple/textures/icn_scrollbar_bg.tga differ
diff --git a/linden/indra/newview/skins/pslpurple/textures/icn_scrollbar_thumb.tga b/linden/indra/newview/skins/pslpurple/textures/icn_scrollbar_thumb.tga
new file mode 100644
index 0000000..f0448d6
Binary files /dev/null and b/linden/indra/newview/skins/pslpurple/textures/icn_scrollbar_thumb.tga differ
diff --git a/linden/indra/newview/skins/pslpurple/textures/icn_slide-groove_dark.tga b/linden/indra/newview/skins/pslpurple/textures/icn_slide-groove_dark.tga
new file mode 100644
index 0000000..1936143
Binary files /dev/null and b/linden/indra/newview/skins/pslpurple/textures/icn_slide-groove_dark.tga differ
diff --git a/linden/indra/newview/skins/pslpurple/textures/icn_slide-highlight.tga b/linden/indra/newview/skins/pslpurple/textures/icn_slide-highlight.tga
new file mode 100644
index 0000000..0747e3c
Binary files /dev/null and b/linden/indra/newview/skins/pslpurple/textures/icn_slide-highlight.tga differ
diff --git a/linden/indra/newview/skins/pslpurple/textures/icn_slide-thumb_dark.tga b/linden/indra/newview/skins/pslpurple/textures/icn_slide-thumb_dark.tga
new file mode 100644
index 0000000..7605b2c
Binary files /dev/null and b/linden/indra/newview/skins/pslpurple/textures/icn_slide-thumb_dark.tga differ
diff --git a/linden/indra/newview/skins/pslpurple/textures/icn_speaker-muted_dark.tga b/linden/indra/newview/skins/pslpurple/textures/icn_speaker-muted_dark.tga
new file mode 100644
index 0000000..7e725ab
Binary files /dev/null and b/linden/indra/newview/skins/pslpurple/textures/icn_speaker-muted_dark.tga differ
diff --git a/linden/indra/newview/skins/pslpurple/textures/icn_speaker_dark.tga b/linden/indra/newview/skins/pslpurple/textures/icn_speaker_dark.tga
new file mode 100644
index 0000000..99e5524
Binary files /dev/null and b/linden/indra/newview/skins/pslpurple/textures/icn_speaker_dark.tga differ
diff --git a/linden/indra/newview/skins/pslpurple/textures/icn_toolbar_build.tga b/linden/indra/newview/skins/pslpurple/textures/icn_toolbar_build.tga
new file mode 100644
index 0000000..46e84ef
Binary files /dev/null and b/linden/indra/newview/skins/pslpurple/textures/icn_toolbar_build.tga differ
diff --git a/linden/indra/newview/skins/pslpurple/textures/icn_toolbar_fly.tga b/linden/indra/newview/skins/pslpurple/textures/icn_toolbar_fly.tga
new file mode 100644
index 0000000..8bd422a
Binary files /dev/null and b/linden/indra/newview/skins/pslpurple/textures/icn_toolbar_fly.tga differ
diff --git a/linden/indra/newview/skins/pslpurple/textures/icn_toolbar_inventory.tga b/linden/indra/newview/skins/pslpurple/textures/icn_toolbar_inventory.tga
new file mode 100644
index 0000000..b832ebc
Binary files /dev/null and b/linden/indra/newview/skins/pslpurple/textures/icn_toolbar_inventory.tga differ
diff --git a/linden/indra/newview/skins/pslpurple/textures/icn_toolbar_map.tga b/linden/indra/newview/skins/pslpurple/textures/icn_toolbar_map.tga
new file mode 100644
index 0000000..a100f57
Binary files /dev/null and b/linden/indra/newview/skins/pslpurple/textures/icn_toolbar_map.tga differ
diff --git a/linden/indra/newview/skins/pslpurple/textures/icn_toolbar_minimap.tga b/linden/indra/newview/skins/pslpurple/textures/icn_toolbar_minimap.tga
new file mode 100644
index 0000000..21149f3
Binary files /dev/null and b/linden/indra/newview/skins/pslpurple/textures/icn_toolbar_minimap.tga differ
diff --git a/linden/indra/newview/skins/pslpurple/textures/icn_toolbar_search.tga b/linden/indra/newview/skins/pslpurple/textures/icn_toolbar_search.tga
new file mode 100644
index 0000000..2da9704
Binary files /dev/null and b/linden/indra/newview/skins/pslpurple/textures/icn_toolbar_search.tga differ
diff --git a/linden/indra/newview/skins/pslpurple/textures/icn_toolbar_snapshot.tga b/linden/indra/newview/skins/pslpurple/textures/icn_toolbar_snapshot.tga
new file mode 100644
index 0000000..23b97c0
Binary files /dev/null and b/linden/indra/newview/skins/pslpurple/textures/icn_toolbar_snapshot.tga differ
diff --git a/linden/indra/newview/skins/pslpurple/textures/icon_diurnal.tga b/linden/indra/newview/skins/pslpurple/textures/icon_diurnal.tga
new file mode 100644
index 0000000..fc720c8
Binary files /dev/null and b/linden/indra/newview/skins/pslpurple/textures/icon_diurnal.tga differ
diff --git a/linden/indra/newview/skins/pslpurple/textures/lightgray.tga b/linden/indra/newview/skins/pslpurple/textures/lightgray.tga
new file mode 100644
index 0000000..1ac39a0
Binary files /dev/null and b/linden/indra/newview/skins/pslpurple/textures/lightgray.tga differ
diff --git a/linden/indra/newview/skins/pslpurple/textures/media_icon.tga b/linden/indra/newview/skins/pslpurple/textures/media_icon.tga
new file mode 100644
index 0000000..868da37
Binary files /dev/null and b/linden/indra/newview/skins/pslpurple/textures/media_icon.tga differ
diff --git a/linden/indra/newview/skins/pslpurple/textures/minimize.tga b/linden/indra/newview/skins/pslpurple/textures/minimize.tga
new file mode 100644
index 0000000..616eede
Binary files /dev/null and b/linden/indra/newview/skins/pslpurple/textures/minimize.tga differ
diff --git a/linden/indra/newview/skins/pslpurple/textures/minimize_inactive.tga b/linden/indra/newview/skins/pslpurple/textures/minimize_inactive.tga
new file mode 100644
index 0000000..ecddd24
Binary files /dev/null and b/linden/indra/newview/skins/pslpurple/textures/minimize_inactive.tga differ
diff --git a/linden/indra/newview/skins/pslpurple/textures/minimize_pressed.tga b/linden/indra/newview/skins/pslpurple/textures/minimize_pressed.tga
new file mode 100644
index 0000000..8a261a1
Binary files /dev/null and b/linden/indra/newview/skins/pslpurple/textures/minimize_pressed.tga differ
diff --git a/linden/indra/newview/skins/pslpurple/textures/move_backward_in.tga b/linden/indra/newview/skins/pslpurple/textures/move_backward_in.tga
new file mode 100644
index 0000000..b64204e
Binary files /dev/null and b/linden/indra/newview/skins/pslpurple/textures/move_backward_in.tga differ
diff --git a/linden/indra/newview/skins/pslpurple/textures/move_backward_out.tga b/linden/indra/newview/skins/pslpurple/textures/move_backward_out.tga
new file mode 100644
index 0000000..1acce4b
Binary files /dev/null and b/linden/indra/newview/skins/pslpurple/textures/move_backward_out.tga differ
diff --git a/linden/indra/newview/skins/pslpurple/textures/move_down_in.tga b/linden/indra/newview/skins/pslpurple/textures/move_down_in.tga
new file mode 100644
index 0000000..904e9a8
Binary files /dev/null and b/linden/indra/newview/skins/pslpurple/textures/move_down_in.tga differ
diff --git a/linden/indra/newview/skins/pslpurple/textures/move_down_out.tga b/linden/indra/newview/skins/pslpurple/textures/move_down_out.tga
new file mode 100644
index 0000000..39bcda4
Binary files /dev/null and b/linden/indra/newview/skins/pslpurple/textures/move_down_out.tga differ
diff --git a/linden/indra/newview/skins/pslpurple/textures/move_forward_in.tga b/linden/indra/newview/skins/pslpurple/textures/move_forward_in.tga
new file mode 100644
index 0000000..d41a1e1
Binary files /dev/null and b/linden/indra/newview/skins/pslpurple/textures/move_forward_in.tga differ
diff --git a/linden/indra/newview/skins/pslpurple/textures/move_forward_out.tga b/linden/indra/newview/skins/pslpurple/textures/move_forward_out.tga
new file mode 100644
index 0000000..643c260
Binary files /dev/null and b/linden/indra/newview/skins/pslpurple/textures/move_forward_out.tga differ
diff --git a/linden/indra/newview/skins/pslpurple/textures/move_left_in.tga b/linden/indra/newview/skins/pslpurple/textures/move_left_in.tga
new file mode 100644
index 0000000..f63ff2d
Binary files /dev/null and b/linden/indra/newview/skins/pslpurple/textures/move_left_in.tga differ
diff --git a/linden/indra/newview/skins/pslpurple/textures/move_left_out.tga b/linden/indra/newview/skins/pslpurple/textures/move_left_out.tga
new file mode 100644
index 0000000..775bc15
Binary files /dev/null and b/linden/indra/newview/skins/pslpurple/textures/move_left_out.tga differ
diff --git a/linden/indra/newview/skins/pslpurple/textures/move_right_in.tga b/linden/indra/newview/skins/pslpurple/textures/move_right_in.tga
new file mode 100644
index 0000000..c85c4c3
Binary files /dev/null and b/linden/indra/newview/skins/pslpurple/textures/move_right_in.tga differ
diff --git a/linden/indra/newview/skins/pslpurple/textures/move_right_out.tga b/linden/indra/newview/skins/pslpurple/textures/move_right_out.tga
new file mode 100644
index 0000000..729331d
Binary files /dev/null and b/linden/indra/newview/skins/pslpurple/textures/move_right_out.tga differ
diff --git a/linden/indra/newview/skins/pslpurple/textures/move_turn_left_in.tga b/linden/indra/newview/skins/pslpurple/textures/move_turn_left_in.tga
new file mode 100644
index 0000000..970b7f2
Binary files /dev/null and b/linden/indra/newview/skins/pslpurple/textures/move_turn_left_in.tga differ
diff --git a/linden/indra/newview/skins/pslpurple/textures/move_turn_left_out.tga b/linden/indra/newview/skins/pslpurple/textures/move_turn_left_out.tga
new file mode 100644
index 0000000..8c16775
Binary files /dev/null and b/linden/indra/newview/skins/pslpurple/textures/move_turn_left_out.tga differ
diff --git a/linden/indra/newview/skins/pslpurple/textures/move_turn_right_in.tga b/linden/indra/newview/skins/pslpurple/textures/move_turn_right_in.tga
new file mode 100644
index 0000000..367deae
Binary files /dev/null and b/linden/indra/newview/skins/pslpurple/textures/move_turn_right_in.tga differ
diff --git a/linden/indra/newview/skins/pslpurple/textures/move_turn_right_out.tga b/linden/indra/newview/skins/pslpurple/textures/move_turn_right_out.tga
new file mode 100644
index 0000000..3105adb
Binary files /dev/null and b/linden/indra/newview/skins/pslpurple/textures/move_turn_right_out.tga differ
diff --git a/linden/indra/newview/skins/pslpurple/textures/move_up_in.tga b/linden/indra/newview/skins/pslpurple/textures/move_up_in.tga
new file mode 100644
index 0000000..f62727d
Binary files /dev/null and b/linden/indra/newview/skins/pslpurple/textures/move_up_in.tga differ
diff --git a/linden/indra/newview/skins/pslpurple/textures/move_up_out.tga b/linden/indra/newview/skins/pslpurple/textures/move_up_out.tga
new file mode 100644
index 0000000..777b221
Binary files /dev/null and b/linden/indra/newview/skins/pslpurple/textures/move_up_out.tga differ
diff --git a/linden/indra/newview/skins/pslpurple/textures/mute_icon.tga b/linden/indra/newview/skins/pslpurple/textures/mute_icon.tga
new file mode 100644
index 0000000..879b9e6
Binary files /dev/null and b/linden/indra/newview/skins/pslpurple/textures/mute_icon.tga differ
diff --git a/linden/indra/newview/skins/pslpurple/textures/notify_next.png b/linden/indra/newview/skins/pslpurple/textures/notify_next.png
new file mode 100644
index 0000000..20166e3
Binary files /dev/null and b/linden/indra/newview/skins/pslpurple/textures/notify_next.png differ
diff --git a/linden/indra/newview/skins/pslpurple/textures/progress_fill.tga b/linden/indra/newview/skins/pslpurple/textures/progress_fill.tga
new file mode 100644
index 0000000..a536346
Binary files /dev/null and b/linden/indra/newview/skins/pslpurple/textures/progress_fill.tga differ
diff --git a/linden/indra/newview/skins/pslpurple/textures/progressbar_fill.tga b/linden/indra/newview/skins/pslpurple/textures/progressbar_fill.tga
new file mode 100644
index 0000000..95bc24e
Binary files /dev/null and b/linden/indra/newview/skins/pslpurple/textures/progressbar_fill.tga differ
diff --git a/linden/indra/newview/skins/pslpurple/textures/progressbar_track.tga b/linden/indra/newview/skins/pslpurple/textures/progressbar_track.tga
new file mode 100644
index 0000000..9423e8d
Binary files /dev/null and b/linden/indra/newview/skins/pslpurple/textures/progressbar_track.tga differ
diff --git a/linden/indra/newview/skins/pslpurple/textures/ptt_lock_off.tga b/linden/indra/newview/skins/pslpurple/textures/ptt_lock_off.tga
new file mode 100644
index 0000000..7a179ee
Binary files /dev/null and b/linden/indra/newview/skins/pslpurple/textures/ptt_lock_off.tga differ
diff --git a/linden/indra/newview/skins/pslpurple/textures/ptt_lock_on.tga b/linden/indra/newview/skins/pslpurple/textures/ptt_lock_on.tga
new file mode 100644
index 0000000..5a7413b
Binary files /dev/null and b/linden/indra/newview/skins/pslpurple/textures/ptt_lock_on.tga differ
diff --git a/linden/indra/newview/skins/pslpurple/textures/radio_active_false.tga b/linden/indra/newview/skins/pslpurple/textures/radio_active_false.tga
new file mode 100644
index 0000000..15d5e59
Binary files /dev/null and b/linden/indra/newview/skins/pslpurple/textures/radio_active_false.tga differ
diff --git a/linden/indra/newview/skins/pslpurple/textures/radio_active_true.tga b/linden/indra/newview/skins/pslpurple/textures/radio_active_true.tga
new file mode 100644
index 0000000..cbef889
Binary files /dev/null and b/linden/indra/newview/skins/pslpurple/textures/radio_active_true.tga differ
diff --git a/linden/indra/newview/skins/pslpurple/textures/radio_inactive_false.tga b/linden/indra/newview/skins/pslpurple/textures/radio_inactive_false.tga
new file mode 100644
index 0000000..48a9342
Binary files /dev/null and b/linden/indra/newview/skins/pslpurple/textures/radio_inactive_false.tga differ
diff --git a/linden/indra/newview/skins/pslpurple/textures/radio_inactive_true.tga b/linden/indra/newview/skins/pslpurple/textures/radio_inactive_true.tga
new file mode 100644
index 0000000..785b3fa
Binary files /dev/null and b/linden/indra/newview/skins/pslpurple/textures/radio_inactive_true.tga differ
diff --git a/linden/indra/newview/skins/pslpurple/textures/resize_handle_bottom_right_blue.tga b/linden/indra/newview/skins/pslpurple/textures/resize_handle_bottom_right_blue.tga
new file mode 100644
index 0000000..4d3ee6c
Binary files /dev/null and b/linden/indra/newview/skins/pslpurple/textures/resize_handle_bottom_right_blue.tga differ
diff --git a/linden/indra/newview/skins/pslpurple/textures/restore.tga b/linden/indra/newview/skins/pslpurple/textures/restore.tga
new file mode 100644
index 0000000..a65c949
Binary files /dev/null and b/linden/indra/newview/skins/pslpurple/textures/restore.tga differ
diff --git a/linden/indra/newview/skins/pslpurple/textures/restore_inactive.tga b/linden/indra/newview/skins/pslpurple/textures/restore_inactive.tga
new file mode 100644
index 0000000..ecddd24
Binary files /dev/null and b/linden/indra/newview/skins/pslpurple/textures/restore_inactive.tga differ
diff --git a/linden/indra/newview/skins/pslpurple/textures/restore_pressed.tga b/linden/indra/newview/skins/pslpurple/textures/restore_pressed.tga
new file mode 100644
index 0000000..7d80447
Binary files /dev/null and b/linden/indra/newview/skins/pslpurple/textures/restore_pressed.tga differ
diff --git a/linden/indra/newview/skins/pslpurple/textures/rounded_square.tga b/linden/indra/newview/skins/pslpurple/textures/rounded_square.tga
new file mode 100644
index 0000000..c8fc7b7
Binary files /dev/null and b/linden/indra/newview/skins/pslpurple/textures/rounded_square.tga differ
diff --git a/linden/indra/newview/skins/pslpurple/textures/rounded_square_soft.tga b/linden/indra/newview/skins/pslpurple/textures/rounded_square_soft.tga
new file mode 100644
index 0000000..0e5bc79
Binary files /dev/null and b/linden/indra/newview/skins/pslpurple/textures/rounded_square_soft.tga differ
diff --git a/linden/indra/newview/skins/pslpurple/textures/scrollbutton_down_in_blue.tga b/linden/indra/newview/skins/pslpurple/textures/scrollbutton_down_in_blue.tga
new file mode 100644
index 0000000..5b24a9e
Binary files /dev/null and b/linden/indra/newview/skins/pslpurple/textures/scrollbutton_down_in_blue.tga differ
diff --git a/linden/indra/newview/skins/pslpurple/textures/scrollbutton_down_out_blue.tga b/linden/indra/newview/skins/pslpurple/textures/scrollbutton_down_out_blue.tga
new file mode 100644
index 0000000..2fdbfdb
Binary files /dev/null and b/linden/indra/newview/skins/pslpurple/textures/scrollbutton_down_out_blue.tga differ
diff --git a/linden/indra/newview/skins/pslpurple/textures/scrollbutton_left_in_blue.tga b/linden/indra/newview/skins/pslpurple/textures/scrollbutton_left_in_blue.tga
new file mode 100644
index 0000000..e845a44
Binary files /dev/null and b/linden/indra/newview/skins/pslpurple/textures/scrollbutton_left_in_blue.tga differ
diff --git a/linden/indra/newview/skins/pslpurple/textures/scrollbutton_left_out_blue.tga b/linden/indra/newview/skins/pslpurple/textures/scrollbutton_left_out_blue.tga
new file mode 100644
index 0000000..a4e8ef8
Binary files /dev/null and b/linden/indra/newview/skins/pslpurple/textures/scrollbutton_left_out_blue.tga differ
diff --git a/linden/indra/newview/skins/pslpurple/textures/scrollbutton_right_in_blue.tga b/linden/indra/newview/skins/pslpurple/textures/scrollbutton_right_in_blue.tga
new file mode 100644
index 0000000..a13d1a5
Binary files /dev/null and b/linden/indra/newview/skins/pslpurple/textures/scrollbutton_right_in_blue.tga differ
diff --git a/linden/indra/newview/skins/pslpurple/textures/scrollbutton_right_out_blue.tga b/linden/indra/newview/skins/pslpurple/textures/scrollbutton_right_out_blue.tga
new file mode 100644
index 0000000..650d08e
Binary files /dev/null and b/linden/indra/newview/skins/pslpurple/textures/scrollbutton_right_out_blue.tga differ
diff --git a/linden/indra/newview/skins/pslpurple/textures/scrollbutton_up_in_blue.tga b/linden/indra/newview/skins/pslpurple/textures/scrollbutton_up_in_blue.tga
new file mode 100644
index 0000000..a5f00df
Binary files /dev/null and b/linden/indra/newview/skins/pslpurple/textures/scrollbutton_up_in_blue.tga differ
diff --git a/linden/indra/newview/skins/pslpurple/textures/scrollbutton_up_out_blue.tga b/linden/indra/newview/skins/pslpurple/textures/scrollbutton_up_out_blue.tga
new file mode 100644
index 0000000..48a03d5
Binary files /dev/null and b/linden/indra/newview/skins/pslpurple/textures/scrollbutton_up_out_blue.tga differ
diff --git a/linden/indra/newview/skins/pslpurple/textures/sm_rounded_corners_simple.tga b/linden/indra/newview/skins/pslpurple/textures/sm_rounded_corners_simple.tga
new file mode 100644
index 0000000..30bbbb4
Binary files /dev/null and b/linden/indra/newview/skins/pslpurple/textures/sm_rounded_corners_simple.tga differ
diff --git a/linden/indra/newview/skins/pslpurple/textures/smicon_warn.tga b/linden/indra/newview/skins/pslpurple/textures/smicon_warn.tga
new file mode 100644
index 0000000..de8cce2
Binary files /dev/null and b/linden/indra/newview/skins/pslpurple/textures/smicon_warn.tga differ
diff --git a/linden/indra/newview/skins/pslpurple/textures/spacer24.tga b/linden/indra/newview/skins/pslpurple/textures/spacer24.tga
new file mode 100644
index 0000000..c7cab6b
Binary files /dev/null and b/linden/indra/newview/skins/pslpurple/textures/spacer24.tga differ
diff --git a/linden/indra/newview/skins/pslpurple/textures/spacer35.tga b/linden/indra/newview/skins/pslpurple/textures/spacer35.tga
new file mode 100644
index 0000000..b88bc66
Binary files /dev/null and b/linden/indra/newview/skins/pslpurple/textures/spacer35.tga differ
diff --git a/linden/indra/newview/skins/pslpurple/textures/spin_down_in_blue.tga b/linden/indra/newview/skins/pslpurple/textures/spin_down_in_blue.tga
new file mode 100644
index 0000000..50a6042
Binary files /dev/null and b/linden/indra/newview/skins/pslpurple/textures/spin_down_in_blue.tga differ
diff --git a/linden/indra/newview/skins/pslpurple/textures/spin_down_out_blue.tga b/linden/indra/newview/skins/pslpurple/textures/spin_down_out_blue.tga
new file mode 100644
index 0000000..bb4d821
Binary files /dev/null and b/linden/indra/newview/skins/pslpurple/textures/spin_down_out_blue.tga differ
diff --git a/linden/indra/newview/skins/pslpurple/textures/spin_up_in_blue.tga b/linden/indra/newview/skins/pslpurple/textures/spin_up_in_blue.tga
new file mode 100644
index 0000000..a0c364a
Binary files /dev/null and b/linden/indra/newview/skins/pslpurple/textures/spin_up_in_blue.tga differ
diff --git a/linden/indra/newview/skins/pslpurple/textures/spin_up_out_blue.tga b/linden/indra/newview/skins/pslpurple/textures/spin_up_out_blue.tga
new file mode 100644
index 0000000..5c9328c
Binary files /dev/null and b/linden/indra/newview/skins/pslpurple/textures/spin_up_out_blue.tga differ
diff --git a/linden/indra/newview/skins/pslpurple/textures/square_btn_32x128.tga b/linden/indra/newview/skins/pslpurple/textures/square_btn_32x128.tga
new file mode 100644
index 0000000..4c8f788
Binary files /dev/null and b/linden/indra/newview/skins/pslpurple/textures/square_btn_32x128.tga differ
diff --git a/linden/indra/newview/skins/pslpurple/textures/square_btn_selected_32x128.tga b/linden/indra/newview/skins/pslpurple/textures/square_btn_selected_32x128.tga
new file mode 100644
index 0000000..d0f81ef
Binary files /dev/null and b/linden/indra/newview/skins/pslpurple/textures/square_btn_selected_32x128.tga differ
diff --git a/linden/indra/newview/skins/pslpurple/textures/status_buy_currency.tga b/linden/indra/newview/skins/pslpurple/textures/status_buy_currency.tga
new file mode 100644
index 0000000..82644ef
Binary files /dev/null and b/linden/indra/newview/skins/pslpurple/textures/status_buy_currency.tga differ
diff --git a/linden/indra/newview/skins/pslpurple/textures/status_buy_currency_pressed.tga b/linden/indra/newview/skins/pslpurple/textures/status_buy_currency_pressed.tga
new file mode 100644
index 0000000..e1d2296
Binary files /dev/null and b/linden/indra/newview/skins/pslpurple/textures/status_buy_currency_pressed.tga differ
diff --git a/linden/indra/newview/skins/pslpurple/textures/status_buy_land.tga b/linden/indra/newview/skins/pslpurple/textures/status_buy_land.tga
new file mode 100644
index 0000000..cb27cdd
Binary files /dev/null and b/linden/indra/newview/skins/pslpurple/textures/status_buy_land.tga differ
diff --git a/linden/indra/newview/skins/pslpurple/textures/status_buy_land_pressed.tga b/linden/indra/newview/skins/pslpurple/textures/status_buy_land_pressed.tga
new file mode 100644
index 0000000..b957fcc
Binary files /dev/null and b/linden/indra/newview/skins/pslpurple/textures/status_buy_land_pressed.tga differ
diff --git a/linden/indra/newview/skins/pslpurple/textures/tab_bottom_blue.tga b/linden/indra/newview/skins/pslpurple/textures/tab_bottom_blue.tga
new file mode 100644
index 0000000..26a72f9
Binary files /dev/null and b/linden/indra/newview/skins/pslpurple/textures/tab_bottom_blue.tga differ
diff --git a/linden/indra/newview/skins/pslpurple/textures/tab_bottom_selected_blue.tga b/linden/indra/newview/skins/pslpurple/textures/tab_bottom_selected_blue.tga
new file mode 100644
index 0000000..5c41ae1
Binary files /dev/null and b/linden/indra/newview/skins/pslpurple/textures/tab_bottom_selected_blue.tga differ
diff --git a/linden/indra/newview/skins/pslpurple/textures/tab_left.tga b/linden/indra/newview/skins/pslpurple/textures/tab_left.tga
new file mode 100644
index 0000000..b8f006a
Binary files /dev/null and b/linden/indra/newview/skins/pslpurple/textures/tab_left.tga differ
diff --git a/linden/indra/newview/skins/pslpurple/textures/tab_left_selected.tga b/linden/indra/newview/skins/pslpurple/textures/tab_left_selected.tga
new file mode 100644
index 0000000..881a49e
Binary files /dev/null and b/linden/indra/newview/skins/pslpurple/textures/tab_left_selected.tga differ
diff --git a/linden/indra/newview/skins/pslpurple/textures/tab_top_blue.tga b/linden/indra/newview/skins/pslpurple/textures/tab_top_blue.tga
new file mode 100644
index 0000000..19ad53c
Binary files /dev/null and b/linden/indra/newview/skins/pslpurple/textures/tab_top_blue.tga differ
diff --git a/linden/indra/newview/skins/pslpurple/textures/tab_top_selected_blue.tga b/linden/indra/newview/skins/pslpurple/textures/tab_top_selected_blue.tga
new file mode 100644
index 0000000..0d9c00d
Binary files /dev/null and b/linden/indra/newview/skins/pslpurple/textures/tab_top_selected_blue.tga differ
diff --git a/linden/indra/newview/skins/pslpurple/textures/tabarea.tga b/linden/indra/newview/skins/pslpurple/textures/tabarea.tga
new file mode 100644
index 0000000..5517aeb
Binary files /dev/null and b/linden/indra/newview/skins/pslpurple/textures/tabarea.tga differ
diff --git a/linden/indra/newview/skins/pslpurple/textures/tearoff_pressed.tga b/linden/indra/newview/skins/pslpurple/textures/tearoff_pressed.tga
new file mode 100644
index 0000000..c9005fb
Binary files /dev/null and b/linden/indra/newview/skins/pslpurple/textures/tearoff_pressed.tga differ
diff --git a/linden/indra/newview/skins/pslpurple/textures/tearoffbox.tga b/linden/indra/newview/skins/pslpurple/textures/tearoffbox.tga
new file mode 100644
index 0000000..f7735ab
Binary files /dev/null and b/linden/indra/newview/skins/pslpurple/textures/tearoffbox.tga differ
diff --git a/linden/indra/newview/skins/pslpurple/textures/textures.xml b/linden/indra/newview/skins/pslpurple/textures/textures.xml
new file mode 100644
index 0000000..4dbbdf0
--- /dev/null
+++ b/linden/indra/newview/skins/pslpurple/textures/textures.xml
@@ -0,0 +1,386 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/linden/indra/newview/skins/pslpurple/textures/tool_dozer.tga b/linden/indra/newview/skins/pslpurple/textures/tool_dozer.tga
new file mode 100644
index 0000000..359fe75
Binary files /dev/null and b/linden/indra/newview/skins/pslpurple/textures/tool_dozer.tga differ
diff --git a/linden/indra/newview/skins/pslpurple/textures/tool_dozer_active.tga b/linden/indra/newview/skins/pslpurple/textures/tool_dozer_active.tga
new file mode 100644
index 0000000..6ca3e25
Binary files /dev/null and b/linden/indra/newview/skins/pslpurple/textures/tool_dozer_active.tga differ
diff --git a/linden/indra/newview/skins/pslpurple/textures/tool_zoom.tga b/linden/indra/newview/skins/pslpurple/textures/tool_zoom.tga
new file mode 100644
index 0000000..9677712
Binary files /dev/null and b/linden/indra/newview/skins/pslpurple/textures/tool_zoom.tga differ
diff --git a/linden/indra/newview/skins/pslpurple/textures/tool_zoom_active.tga b/linden/indra/newview/skins/pslpurple/textures/tool_zoom_active.tga
new file mode 100644
index 0000000..e727254
Binary files /dev/null and b/linden/indra/newview/skins/pslpurple/textures/tool_zoom_active.tga differ
diff --git a/linden/indra/newview/skins/pslpurple/textures/toolbar_btn_disabled.tga b/linden/indra/newview/skins/pslpurple/textures/toolbar_btn_disabled.tga
new file mode 100644
index 0000000..c56e151
Binary files /dev/null and b/linden/indra/newview/skins/pslpurple/textures/toolbar_btn_disabled.tga differ
diff --git a/linden/indra/newview/skins/pslpurple/textures/toolbar_btn_enabled.tga b/linden/indra/newview/skins/pslpurple/textures/toolbar_btn_enabled.tga
new file mode 100644
index 0000000..98790c4
Binary files /dev/null and b/linden/indra/newview/skins/pslpurple/textures/toolbar_btn_enabled.tga differ
diff --git a/linden/indra/newview/skins/pslpurple/textures/toolbar_btn_selected.tga b/linden/indra/newview/skins/pslpurple/textures/toolbar_btn_selected.tga
new file mode 100644
index 0000000..992bfd6
Binary files /dev/null and b/linden/indra/newview/skins/pslpurple/textures/toolbar_btn_selected.tga differ
diff --git a/linden/indra/newview/skins/pslpurple/textures/toolbar_tab.tga b/linden/indra/newview/skins/pslpurple/textures/toolbar_tab.tga
new file mode 100644
index 0000000..fcab9dd
Binary files /dev/null and b/linden/indra/newview/skins/pslpurple/textures/toolbar_tab.tga differ
diff --git a/linden/indra/newview/skins/pslpurple/textures/up_arrow.tga b/linden/indra/newview/skins/pslpurple/textures/up_arrow.tga
new file mode 100644
index 0000000..4dcb587
Binary files /dev/null and b/linden/indra/newview/skins/pslpurple/textures/up_arrow.tga differ
diff --git a/linden/indra/newview/skins/pslpurple/textures/white.tga b/linden/indra/newview/skins/pslpurple/textures/white.tga
new file mode 100644
index 0000000..55e3793
Binary files /dev/null and b/linden/indra/newview/skins/pslpurple/textures/white.tga differ
--
cgit v1.1
From eb4790e17ebf91c86884eb5a1540b9d9c0f70642 Mon Sep 17 00:00:00 2001
From: David Seikel
Date: Sat, 26 Feb 2011 13:17:30 +1000
Subject: Change the skin preferences panel to have the meta skins.
---
linden/indra/newview/llpanelskins.cpp | 24 +++++------
linden/indra/newview/llpanelskins.h | 6 +--
.../default/textures/skin_thumbnail_Meta7.png | Bin 0 -> 26862 bytes
.../textures/skin_thumbnail_white_Meta7.png | Bin 0 -> 13107 bytes
.../default/xui/en-us/panel_preferences_skins.xml | 44 ++++++++++-----------
5 files changed, 37 insertions(+), 37 deletions(-)
create mode 100644 linden/indra/newview/skins/default/textures/skin_thumbnail_Meta7.png
create mode 100644 linden/indra/newview/skins/default/textures/skin_thumbnail_white_Meta7.png
diff --git a/linden/indra/newview/llpanelskins.cpp b/linden/indra/newview/llpanelskins.cpp
index f35998f..fd1e365 100644
--- a/linden/indra/newview/llpanelskins.cpp
+++ b/linden/indra/newview/llpanelskins.cpp
@@ -58,10 +58,10 @@ BOOL LLPanelSkins::postBuild()
skin_select->setCommitCallback(onSelectSkin);
skin_select->setCallbackUserData(this);
+ getChild("meta7_preview")->setClickedCallback(onClickMeta7, this);
+ getChild("m7white_preview")->setClickedCallback(onClickM7White, this);
+ getChild("pslpurple_preview")->setClickedCallback(onClickPSLPurple, this);
getChild("classic_preview")->setClickedCallback(onClickClassic, this);
- getChild("silver_preview")->setClickedCallback(onClickSilver, this);
- getChild("dark_preview")->setClickedCallback(onClickDark, this);
- getChild("gemini_preview")->setClickedCallback(onClickGemini, this);
refresh();
return TRUE;
@@ -104,25 +104,25 @@ void LLPanelSkins::onClickClassic(void* data)
}
//static
-void LLPanelSkins::onClickSilver(void* data)
+void LLPanelSkins::onClickMeta7(void* data)
{
LLPanelSkins* self = (LLPanelSkins*)data;
- gSavedSettings.setString("SkinCurrent", "silver");
- self->getChild("skin_selection")->setValue("silver");
+ gSavedSettings.setString("SkinCurrent", "Meta7");
+ self->getChild("skin_selection")->setValue("Meta7");
}
//static
-void LLPanelSkins::onClickDark(void* data)
+void LLPanelSkins::onClickM7White(void* data)
{
LLPanelSkins* self = (LLPanelSkins*)data;
- gSavedSettings.setString("SkinCurrent", "dark");
- self->getChild("skin_selection")->setValue("dark");
+ gSavedSettings.setString("SkinCurrent", "white_Meta7");
+ self->getChild("skin_selection")->setValue("white_Meta7");
}
//static
-void LLPanelSkins::onClickGemini(void* data)
+void LLPanelSkins::onClickPSLPurple(void* data)
{
LLPanelSkins* self = (LLPanelSkins*)data;
- gSavedSettings.setString("SkinCurrent", "gemini");
- self->getChild("skin_selection")->setValue("gemini");
+ gSavedSettings.setString("SkinCurrent", "pslpurple");
+ self->getChild("skin_selection")->setValue("pslpurple");
}
diff --git a/linden/indra/newview/llpanelskins.h b/linden/indra/newview/llpanelskins.h
index 8dbd556..615b619 100644
--- a/linden/indra/newview/llpanelskins.h
+++ b/linden/indra/newview/llpanelskins.h
@@ -50,9 +50,9 @@ public:
private:
static void onSelectSkin(LLUICtrl* ctrl, void* data);
static void onClickClassic(void* data);
- static void onClickSilver(void* data);
- static void onClickDark(void* data);
- static void onClickGemini(void* data);
+ static void onClickMeta7(void* data);
+ static void onClickM7White(void* data);
+ static void onClickPSLPurple(void* data);
private:
std::string mSkin;
diff --git a/linden/indra/newview/skins/default/textures/skin_thumbnail_Meta7.png b/linden/indra/newview/skins/default/textures/skin_thumbnail_Meta7.png
new file mode 100644
index 0000000..ab35bc0
Binary files /dev/null and b/linden/indra/newview/skins/default/textures/skin_thumbnail_Meta7.png differ
diff --git a/linden/indra/newview/skins/default/textures/skin_thumbnail_white_Meta7.png b/linden/indra/newview/skins/default/textures/skin_thumbnail_white_Meta7.png
new file mode 100644
index 0000000..e93ea4c
Binary files /dev/null and b/linden/indra/newview/skins/default/textures/skin_thumbnail_white_Meta7.png differ
diff --git a/linden/indra/newview/skins/default/xui/en-us/panel_preferences_skins.xml b/linden/indra/newview/skins/default/xui/en-us/panel_preferences_skins.xml
index 58a2989..b8dfbba 100644
--- a/linden/indra/newview/skins/default/xui/en-us/panel_preferences_skins.xml
+++ b/linden/indra/newview/skins/default/xui/en-us/panel_preferences_skins.xml
@@ -10,36 +10,36 @@
-
- Default
+
+ Meta 7
-
- Silver
+
+ Meta 7 white
-
- Dark
+
+ PSL purple
-
- Gemini
+
+ Classic
-
+
+
+
-
-
-
- Meta7 Employee
+ Meta7 staff
Payment Info Used
--
cgit v1.1