diff --git a/etc/message.xml b/etc/message.xml
index 42bbef035..427a6ac40 100644
--- a/etc/message.xml
+++ b/etc/message.xml
@@ -378,6 +378,14 @@
true
+ WindLightRefresh
+
+
ParcelVoiceInfo
-
ParcelNavigateMedia
+ OtherChatsTornOff
+
+ Comment
+ When true, chats other than local chat open torn off of the Communicate window.
+ Persist
+ 1
+ Type
+ Boolean
+ Value
+ 0
+
+ OtherChatsTornOffAndMinimized
+
+ Comment
+ When this and OtherChatsTornOff are true, new chats open torn off and minimized.
+ Persist
+ 1
+ Type
+ Boolean
+ Value
+ 0
+
MarketImporterUpdateFreq
Comment
@@ -854,6 +876,28 @@ This should be as low as possible, but too low may break functionality
Value
1
+ AnnounceSnapshots
+
+ Comment
+ Announce if someone nearby has taken a snapshot in chat (Won't work on people who hide/quiet snapshots)
+ Persist
+ 1
+ Type
+ Boolean
+ Value
+ 0
+
+ AnnounceStreamMetadata
+
+ Comment
+ Announce the metadata of the track playing, in chat, during streams.
+ Persist
+ 1
+ Type
+ Boolean
+ Value
+ 0
+
InventorySortOrder
Comment
@@ -5824,6 +5868,17 @@ This should be as low as possible, but too low may break functionality
Value
0
+ SecondsInLog
+
+ Comment
+ TRUE to add seconds to timestamps for Log
+ Persist
+ 1
+ Type
+ Boolean
+ Value
+ 0
+
FloaterAboutRect
Comment
diff --git a/indra/newview/app_settings/settings_ascent_coa.xml b/indra/newview/app_settings/settings_ascent_coa.xml
index 792c600e7..f9cf9e010 100644
--- a/indra/newview/app_settings/settings_ascent_coa.xml
+++ b/indra/newview/app_settings/settings_ascent_coa.xml
@@ -135,7 +135,7 @@
AscentFriendColor
Comment
- Color of chat messages from other residents
+ Special color to distinguish friends from other residents
Persist
1
Type
@@ -153,7 +153,7 @@
AscentLindenColor
Comment
- Color of chat messages from other residents
+ Special color to distinguish Lindens(/grid operators) from other residents
Persist
1
Type
@@ -171,7 +171,7 @@
AscentMutedColor
Comment
- Color of chat messages from other residents
+ Special color to distinguish those who have been muted from other residents
Persist
1
Type
@@ -189,7 +189,7 @@
AscentEstateOwnerColor
Comment
- Color of chat messages from other residents
+ Special color to distinguish estate owners from other residents
Persist
1
Type
@@ -204,7 +204,59 @@
IsCOA
1
- AscentReportClientUUID
+ ColorFriendChat
+
+ Comment
+ Color chat from friends using AscentFriendColor
+ Persist
+ 1
+ Type
+ Boolean
+ Value
+ 0
+ IsCOA
+ 1
+
+ ColorLindenChat
+
+ Comment
+ Color chat from Lindens(/grid operators) using AscentLindenColor
+ Persist
+ 1
+ Type
+ Boolean
+ Value
+ 0
+ IsCOA
+ 1
+
+ ColorMutedChat
+
+ Comment
+ Color chat from muted residents using AscentMutedColor
+ Persist
+ 1
+ Type
+ Boolean
+ Value
+ 0
+ IsCOA
+ 1
+
+ ColorEstateOwnerChat
+
+ Comment
+ Color chat from estate owners using AscentEstateOwnerColor
+ Persist
+ 1
+ Type
+ Boolean
+ Value
+ 0
+ IsCOA
+ 1
+
+ AscentReportClientUUID
Comment
Broadcasted Client Key
diff --git a/indra/newview/ascentprefschat.cpp b/indra/newview/ascentprefschat.cpp
index cb7b9e906..d4b8c3407 100644
--- a/indra/newview/ascentprefschat.cpp
+++ b/indra/newview/ascentprefschat.cpp
@@ -335,6 +335,8 @@ void LLPrefsAscentChat::refreshValues()
mEnableOOCAutoClose = gSavedSettings.getBOOL("AscentAutoCloseOOC");
mLinksForChattingObjects = gSavedSettings.getU32("LinksForChattingObjects");
mSecondsInChatAndIMs = gSavedSettings.getBOOL("SecondsInChatAndIMs");
+ mSecondsInLog = gSavedSettings.getBOOL("SecondsInLog");
+ mOtherChatsTornOff = gSavedSettings.getBOOL("OtherChatsTornOff");
std::string format = gSavedSettings.getString("ShortTimeFormat");
if (format.find("%p") == -1)
@@ -540,6 +542,8 @@ void LLPrefsAscentChat::cancel()
gSavedSettings.setBOOL("AscentAutoCloseOOC", mEnableOOCAutoClose);
gSavedSettings.setU32("LinksForChattingObjects", mLinksForChattingObjects);
gSavedSettings.setBOOL("SecondsInChatAndIMs", mSecondsInChatAndIMs);
+ gSavedSettings.setBOOL("SecondsInLog", mSecondsInLog);
+ gSavedSettings.setBOOL("OtherChatsTornOff", mOtherChatsTornOff);
std::string short_date, long_date, short_time, long_time, timestamp;
diff --git a/indra/newview/ascentprefschat.h b/indra/newview/ascentprefschat.h
index cc335cf3e..03e980c3f 100644
--- a/indra/newview/ascentprefschat.h
+++ b/indra/newview/ascentprefschat.h
@@ -76,6 +76,8 @@ protected:
U32 tempTimeFormat;
U32 tempDateFormat;
BOOL mSecondsInChatAndIMs;
+ BOOL mSecondsInLog;
+ BOOL mOtherChatsTornOff;
BOOL mIMResponseAnyone;
BOOL mIMResponseFriends;
diff --git a/indra/newview/ascentprefsvan.cpp b/indra/newview/ascentprefsvan.cpp
index 5fdc90bed..e80be45d3 100644
--- a/indra/newview/ascentprefsvan.cpp
+++ b/indra/newview/ascentprefsvan.cpp
@@ -36,6 +36,8 @@
#include "ascentprefsvan.h"
//project includes
+#include "llaudioengine.h" //For gAudiop
+#include "llstreamingaudio.h" //For LLStreamingAudioInterface
#include "llcolorswatch.h"
#include "llvoavatarself.h"
#include "llagent.h"
@@ -54,6 +56,8 @@ LLPrefsAscentVan::LLPrefsAscentVan()
{
LLUICtrlFactory::getInstance()->buildPanel(this, "panel_preferences_ascent_vanity.xml");
+ childSetVisible("announce_streaming_metadata", gAudiop && gAudiop->getStreamingAudioImpl() && gAudiop->getStreamingAudioImpl()->supportsMetaData());
+
childSetCommitCallback("tag_spoofing_combobox", onCommitClientTag, this);
childSetCommitCallback("show_my_tag_check", onCommitCheckBox, this);
@@ -152,12 +156,16 @@ void LLPrefsAscentVan::onCommitCheckBox(LLUICtrl* ctrl, void* user_data)
if (ctrl->getName() == "use_status_check")
{
- BOOL showCustomColors = gSavedSettings.getBOOL("AscentUseStatusColors");
- self->childSetEnabled("friends_color_textbox", showCustomColors);
- self->childSetEnabled("friend_color_swatch", showCustomColors);
- self->childSetEnabled("estate_owner_color_swatch", showCustomColors);
- self->childSetEnabled("linden_color_swatch", showCustomColors);
- self->childSetEnabled("muted_color_swatch", showCustomColors);
+ bool showCustomColors = gSavedSettings.getBOOL("AscentUseStatusColors");
+ self->childSetEnabled("friends_color_textbox", showCustomColors);
+ bool frColors = gSavedSettings.getBOOL("ColorFriendChat");
+ self->childSetEnabled("friend_color_swatch", showCustomColors || frColors);
+ bool eoColors = gSavedSettings.getBOOL("ColorEstateOwnerChat");
+ self->childSetEnabled("estate_owner_color_swatch", showCustomColors || eoColors);
+ bool lindColors = gSavedSettings.getBOOL("ColorLindenChat");
+ self->childSetEnabled("linden_color_swatch", showCustomColors || lindColors);
+ bool muteColors = gSavedSettings.getBOOL("ColorMutedChat");
+ self->childSetEnabled("muted_color_swatch", showCustomColors || muteColors);
}
else if (ctrl->getName() == "customize_own_tag_check")
{
@@ -172,7 +180,7 @@ void LLPrefsAscentVan::onCommitCheckBox(LLUICtrl* ctrl, void* user_data)
// Store current settings for cancel
void LLPrefsAscentVan::refreshValues()
{
- //General --------------------------------------------------------------------------------
+ //Main -----------------------------------------------------------------------------------
mUseAccountSettings = gSavedSettings.getBOOL("AscentStoreSettingsPerAccount");
mShowTPScreen = !gSavedSettings.getBOOL("AscentDisableTeleportScreens");
mPlayTPSound = gSavedSettings.getBOOL("OptionPlayTpSound");
@@ -180,6 +188,8 @@ void LLPrefsAscentVan::refreshValues()
mDisableChatAnimation = gSavedSettings.getBOOL("SGDisableChatAnimation");
mAddNotReplace = gSavedSettings.getBOOL("LiruAddNotReplace");
mTurnAround = gSavedSettings.getBOOL("TurnAroundWhenWalkingBackwards");
+ mAnnounceSnapshots = gSavedSettings.getBOOL("AnnounceSnapshots");
+ mAnnounceStreamMetadata = gSavedSettings.getBOOL("AnnounceStreamMetadata");
//Tags\Colors ----------------------------------------------------------------------------
mAscentUseTag = gSavedSettings.getBOOL("AscentUseTag");
@@ -202,6 +212,10 @@ void LLPrefsAscentVan::refreshValues()
mLindenColor = gSavedSettings.getColor4("AscentLindenColor");
mMutedColor = gSavedSettings.getColor4("AscentMutedColor");
//mCustomColor = gSavedSettings.getColor4("MoyMiniMapCustomColor");
+ mColorFriendChat = gSavedSettings.getBOOL("ColorFriendChat");
+ mColorEOChat = gSavedSettings.getBOOL("ColorEstateOwnerChat");
+ mColorLindenChat = gSavedSettings.getBOOL("ColorLindenChat");
+ mColorMutedChat = gSavedSettings.getBOOL("ColorMutedChat");
//Body Dynamics --------------------------------------------------------------------------
mBreastPhysicsToggle = gSavedSettings.getBOOL("EmeraldBreastPhysicsToggle");
@@ -219,17 +233,17 @@ void LLPrefsAscentVan::refreshValues()
// Update controls based on current settings
void LLPrefsAscentVan::refresh()
{
- //General --------------------------------------------------------------------------------
+ //Main -----------------------------------------------------------------------------------
//Tags\Colors ----------------------------------------------------------------------------
LLComboBox* combo = getChild("tag_spoofing_combobox");
combo->setCurrentByIndex(mSelectedClient);
childSetEnabled("friends_color_textbox", mUseStatusColors);
- childSetEnabled("friend_color_swatch", mUseStatusColors);
- childSetEnabled("estate_owner_color_swatch", mUseStatusColors);
- childSetEnabled("linden_color_swatch", mUseStatusColors);
- childSetEnabled("muted_color_swatch", mUseStatusColors);
+ childSetEnabled("friend_color_swatch", mUseStatusColors || mColorFriendChat);
+ childSetEnabled("estate_owner_color_swatch", mUseStatusColors || mColorEOChat);
+ childSetEnabled("linden_color_swatch", mUseStatusColors || mColorLindenChat);
+ childSetEnabled("muted_color_swatch", mUseStatusColors || mColorMutedChat);
childSetEnabled("custom_tag_label_text", mCustomTagOn);
childSetEnabled("custom_tag_label_box", mCustomTagOn);
@@ -248,7 +262,7 @@ void LLPrefsAscentVan::refresh()
// Reset settings to local copy
void LLPrefsAscentVan::cancel()
{
- //General --------------------------------------------------------------------------------
+ //Main -----------------------------------------------------------------------------------
gSavedSettings.setBOOL("AscentStoreSettingsPerAccount", mUseAccountSettings);
gSavedSettings.setBOOL("AscentDisableTeleportScreens", !mShowTPScreen);
gSavedSettings.setBOOL("OptionPlayTpSound", mPlayTPSound);
@@ -256,6 +270,8 @@ void LLPrefsAscentVan::cancel()
gSavedSettings.setBOOL("SGDisableChatAnimation", mDisableChatAnimation);
gSavedSettings.setBOOL("LiruAddNotReplace", mAddNotReplace);
gSavedSettings.setBOOL("TurnAroundWhenWalkingBackwards", mTurnAround);
+ gSavedSettings.setBOOL("AnnounceSnapshots", mAnnounceSnapshots);
+ gSavedSettings.setBOOL("AnnounceStreamMetadata", mAnnounceStreamMetadata);
//Tags\Colors ----------------------------------------------------------------------------
gSavedSettings.setBOOL("AscentUseTag", mAscentUseTag);
@@ -278,6 +294,10 @@ void LLPrefsAscentVan::cancel()
gSavedSettings.setColor4("AscentLindenColor", mLindenColor);
gSavedSettings.setColor4("AscentMutedColor", mMutedColor);
// gSavedSettings.setColor4("MoyMiniMapCustomColor", mCustomColor);
+ gSavedSettings.setBOOL("ColorFriendChat", mColorFriendChat);
+ gSavedSettings.setBOOL("ColorEstateOwnerChat", mColorEOChat);
+ gSavedSettings.setBOOL("ColorLindenChat", mColorLindenChat);
+ gSavedSettings.setBOOL("ColorMutedChat", mColorMutedChat);
//Body Dynamics --------------------------------------------------------------------------
gSavedSettings.setBOOL("EmeraldBreastPhysicsToggle", mBreastPhysicsToggle);
diff --git a/indra/newview/ascentprefsvan.h b/indra/newview/ascentprefsvan.h
index ec96b8cac..0c84ce432 100644
--- a/indra/newview/ascentprefsvan.h
+++ b/indra/newview/ascentprefsvan.h
@@ -52,7 +52,7 @@ protected:
static void onCommitCheckBox(LLUICtrl* ctrl, void* user_data);
static void onCommitTextModified(LLUICtrl* ctrl, void* userdata);
static void onManualClientUpdate(void* data);
- //General
+ //Main
BOOL mUseAccountSettings;
BOOL mShowTPScreen;
BOOL mPlayTPSound;
@@ -60,6 +60,8 @@ protected:
bool mDisableChatAnimation;
bool mAddNotReplace;
bool mTurnAround;
+ bool mAnnounceSnapshots;
+ bool mAnnounceStreamMetadata;
//Tags\Colors
BOOL mAscentUseTag;
std::string mReportClientUUID;
@@ -80,6 +82,10 @@ protected:
LLColor4 mEstateOwnerColor;
LLColor4 mLindenColor;
LLColor4 mMutedColor;
+ bool mColorFriendChat;
+ bool mColorEOChat;
+ bool mColorLindenChat;
+ bool mColorMutedChat;
//Body Dynamics
BOOL mBreastPhysicsToggle;
F32 mBoobMass;
diff --git a/indra/newview/hippogridmanager.cpp b/indra/newview/hippogridmanager.cpp
index 4de1c7ad8..222969450 100644
--- a/indra/newview/hippogridmanager.cpp
+++ b/indra/newview/hippogridmanager.cpp
@@ -76,6 +76,11 @@ bool HippoGridInfo::isOpenSimulator() const
return (mPlatform == HippoGridInfo::PLATFORM_OPENSIM);
}
+bool HippoGridInfo::isAurora() const
+{
+ return (mPlatform == HippoGridInfo::PLATFORM_AURORA);
+}
+
bool HippoGridInfo::isSecondLife() const
{
return (mPlatform == HippoGridInfo::PLATFORM_SECONDLIFE);
@@ -92,11 +97,15 @@ const std::string& HippoGridInfo::getGridName() const
return mGridName;
}
-const std::string& HippoGridInfo::getGridOwner() const {
- if(isSecondLife()) {
+const std::string& HippoGridInfo::getGridOwner() const
+{
+ if(isSecondLife())
+ {
static const std::string ll = "Linden Lab";
return ll;
- } else {
+ }
+ else
+ {
return this->getGridName();
}
}
diff --git a/indra/newview/hippogridmanager.h b/indra/newview/hippogridmanager.h
index 5d58a1b5f..310033af7 100644
--- a/indra/newview/hippogridmanager.h
+++ b/indra/newview/hippogridmanager.h
@@ -38,6 +38,7 @@ public:
Platform getPlatform();
bool isOpenSimulator() const;
+ bool isAurora() const;
bool isSecondLife() const;
bool isInProductionGrid() const; // Should only be called if isSecondLife() returns true.
const std::string& getGridName() const;
diff --git a/indra/newview/hippolimits.cpp b/indra/newview/hippolimits.cpp
index 3bdec44d3..c5aa2c7b1 100644
--- a/indra/newview/hippolimits.cpp
+++ b/indra/newview/hippolimits.cpp
@@ -21,6 +21,8 @@ void HippoLimits::setLimits()
{
if (gHippoGridManager->getConnectedGrid()->getPlatform() == HippoGridInfo::PLATFORM_SECONDLIFE) {
setSecondLifeLimits();
+ } else if (gHippoGridManager->getConnectedGrid()->getPlatform() == HippoGridInfo::PLATFORM_AURORA) {
+ setAuroraLimits();
} else {
setOpenSimLimits();
}
@@ -46,6 +48,17 @@ void HippoLimits::setOpenSimLimits()
}
}
+void HippoLimits::setAuroraLimits()
+{
+ mMaxAgentGroups = gHippoGridManager->getConnectedGrid()->getMaxAgentGroups();
+ if (mMaxAgentGroups < 0) mMaxAgentGroups = 50;
+ mMaxPrimScale = 256.0f;
+ mMinPrimScale = 0.001f;
+ mMaxHeight = 8192.0f;
+ mMinHoleSize = 0.001f;
+ mMaxHollow = 99.0f;
+}
+
void HippoLimits::setSecondLifeLimits()
{
llinfos << "Using Second Life limits." << llendl;
diff --git a/indra/newview/hippolimits.h b/indra/newview/hippolimits.h
index 78d42a7df..91625276b 100644
--- a/indra/newview/hippolimits.h
+++ b/indra/newview/hippolimits.h
@@ -26,6 +26,7 @@ private:
float mMinPrimScale;
void setOpenSimLimits();
+ void setAuroraLimits();
void setSecondLifeLimits();
};
diff --git a/indra/newview/llenvmanager.cpp b/indra/newview/llenvmanager.cpp
index 7e5377bd1..3033d4e07 100644
--- a/indra/newview/llenvmanager.cpp
+++ b/indra/newview/llenvmanager.cpp
@@ -47,6 +47,8 @@
#include "rlvhandler.h"
// [/RLVa:KB]
+#include "hippogridmanager.h"
+
std::string LLEnvPrefs::getWaterPresetName() const
{
if (mWaterPresetName.empty())
@@ -509,7 +511,8 @@ void LLEnvManagerNew::onRegionSettingsResponse(const LLSD& content)
mRegionSettingsChangeSignal();
// reset
- mInterpNextChangeMessage = false;
+ if (!gHippoGridManager->getConnectedGrid()->isAurora()) // On Aurora, the region says when to refresh
+ mInterpNextChangeMessage = false;
}
void LLEnvManagerNew::onRegionSettingsApplyResponse(bool ok)
@@ -698,3 +701,36 @@ void LLEnvManagerNew::onRegionChange(bool interpolate)
// Let interested parties know agent region has been changed.
mRegionChangeSignal();
}
+
+// Aurora-sim windlight refresh
+class WindLightRefresh : public LLHTTPNode
+{
+ /*virtual*/ void post(LLHTTPNode::ResponsePtr response, const LLSD& context, const LLSD& input) const
+ {
+ if (!input || !context || !input.isMap() || !input.has("body"))
+ {
+ llinfos << "malformed WindLightRefresh!" << llendl;
+ return;
+ }
+
+ //std::string dump = input["body"].asString();
+ //llwarns << dump << llendl;
+
+ LLSD body = input["body"];
+ LLEnvManagerNew *env = &LLEnvManagerNew::instance();
+
+ LLViewerRegion* regionp = gAgent.getRegion();
+ LLUUID region_uuid = regionp ? regionp->getRegionID() : LLUUID::null;
+
+ env->mNewRegionPrefs.clear();
+ env->mCurRegionUUID = region_uuid;
+
+ env->mInterpNextChangeMessage = !body.has("Interpolate") || body["Interpolate"].asInteger() == 1;
+
+ llinfos << "Windlight Refresh, interpolate:" << env->mInterpNextChangeMessage << llendl;
+ env->requestRegionSettings();
+ env->mRegionChangeSignal();
+ }
+};
+
+LLHTTPRegistration gHTTPRegistrationWindLightRefresh("/message/WindLightRefresh");
diff --git a/indra/newview/llenvmanager.h b/indra/newview/llenvmanager.h
index ad7550aff..8d5317996 100644
--- a/indra/newview/llenvmanager.h
+++ b/indra/newview/llenvmanager.h
@@ -35,11 +35,11 @@
#include "llmemory.h"
#include "llsd.h"
-#include
class LLWLParamManager;
class LLWaterParamManager;
class LLWLAnimator;
+class WindLightRefresh;
// generic key
struct LLEnvKey
@@ -257,6 +257,7 @@ public:
bool useRegionWater();
private:
+ friend class WindLightRefresh;
bool useDefaultSky();
bool useDefaultWater();
diff --git a/indra/newview/llfloateravatarlist.cpp b/indra/newview/llfloateravatarlist.cpp
index 2058df593..e12b95156 100644
--- a/indra/newview/llfloateravatarlist.cpp
+++ b/indra/newview/llfloateravatarlist.cpp
@@ -161,7 +161,10 @@ LLAvatarListEntry::LLAvatarListEntry(const LLUUID& id, const std::string &name,
mIsInList(false), mAge(-1), mAgeAlert(false), mTime(time(NULL))
{
if (mID.notNull())
+ {
LLAvatarPropertiesProcessor::getInstance()->addObserver(mID, this);
+ LLAvatarPropertiesProcessor::getInstance()->sendAvatarPropertiesRequest(mID);
+ }
}
LLAvatarListEntry::~LLAvatarListEntry()
@@ -175,6 +178,7 @@ void LLAvatarListEntry::processProperties(void* data, EAvatarProcessorType type)
{
if(type == APT_PROPERTIES)
{
+ LLAvatarPropertiesProcessor::getInstance()->removeObserver(mID, this);
const LLAvatarData* pAvatarData = static_cast(data);
if (pAvatarData && (pAvatarData->avatar_id != LLUUID::null))
{
@@ -608,10 +612,9 @@ void LLFloaterAvatarList::updateAvatarList()
else
{
// Avatar not there yet, add it
- LLAvatarListEntry entry(avid, name, position);
if(announce && avatarp->getRegion() == gAgent.getRegion())
announce_keys.push(avid);
- mAvatars.push_back(entry);
+ mAvatars.push_back(LLAvatarListEntryPtr(new LLAvatarListEntry(avid, name, position)));
}
}
else
@@ -640,10 +643,9 @@ void LLFloaterAvatarList::updateAvatarList()
}
else
{
- LLAvatarListEntry entry(avid, name, position);
if(announce && gAgent.getRegion()->pointInRegionGlobal(position))
announce_keys.push(avid);
- mAvatars.push_back(entry);
+ mAvatars.push_back(LLAvatarListEntryPtr(new LLAvatarListEntry(avid, name, position)));
}
}
}
@@ -707,10 +709,19 @@ void LLFloaterAvatarList::expireAvatarList()
// llinfos << "radar: expiring" << llendl;
for(av_list_t::iterator it = mAvatars.begin(); it != mAvatars.end();)
{
- if(!it->isDead())
- (it++)->getAlive();
+ LLAvatarListEntry* entry = it->get();
+ if(!entry->isDead())
+ {
+ entry->getAlive();
+ ++it;
+ }
else
{
+ if(mAvatars.back() == *it)
+ {
+ mAvatars.pop_back();
+ return;
+ }
*it = mAvatars.back();
mAvatars.pop_back();
if(mAvatars.empty())
@@ -771,17 +782,17 @@ void LLFloaterAvatarList::refreshAvatarList()
std::string av_name;
// Skip if avatar hasn't been around
- if (entry.isDead())
+ if (entry->isDead())
{
continue;
}
- entry.setInList();
+ entry->setInList();
- av_id = entry.getID();
- av_name = entry.getName().c_str();
+ av_id = entry->getID();
+ av_name = entry->getName().c_str();
- LLVector3d position = entry.getPosition();
+ LLVector3d position = entry->getPosition();
BOOL UnknownAltitude = false;
LLVector3d delta = position - mypos;
@@ -813,15 +824,12 @@ void LLFloaterAvatarList::refreshAvatarList()
continue;
}
- //Request properties here, so we'll have them later on when we need them
- LLAvatarPropertiesProcessor::getInstance()->addObserver(entry.mID, &entry);
- LLAvatarPropertiesProcessor::getInstance()->sendAvatarPropertiesRequest(entry.mID);
element["id"] = av_id;
element["columns"][LIST_MARK]["column"] = "marked";
element["columns"][LIST_MARK]["type"] = "text";
- if (entry.isMarked())
+ if (entry->isMarked())
{
element["columns"][LIST_MARK]["value"] = "X";
element["columns"][LIST_MARK]["color"] = LLColor4::blue.getValue();
@@ -835,7 +843,7 @@ void LLFloaterAvatarList::refreshAvatarList()
element["columns"][LIST_AVATAR_NAME]["column"] = "avatar_name";
element["columns"][LIST_AVATAR_NAME]["type"] = "text";
element["columns"][LIST_AVATAR_NAME]["value"] = av_name;
- if (entry.isFocused())
+ if (entry->isFocused())
{
element["columns"][LIST_AVATAR_NAME]["font-style"] = "BOLD";
}
@@ -843,7 +851,7 @@ void LLFloaterAvatarList::refreshAvatarList()
// custom colors for certain types of avatars!
//Changed a bit so people can modify them in settings. And since they're colors, again it's possibly account-based. Starting to think I need a function just to determine that. - HgB
//element["columns"][LIST_AVATAR_NAME]["color"] = gColors.getColor( "MapAvatar" ).getValue();
- LLViewerRegion* parent_estate = LLWorld::getInstance()->getRegionFromPosGlobal(entry.getPosition());
+ LLViewerRegion* parent_estate = LLWorld::getInstance()->getRegionFromPosGlobal(entry->getPosition());
LLUUID estate_owner = LLUUID::null;
if(parent_estate && parent_estate->isAlive())
{
@@ -895,7 +903,7 @@ void LLFloaterAvatarList::refreshAvatarList()
if (UnknownAltitude)
{
strcpy(temp, "?");
- if (entry.isDrawn())
+ if (entry->isDrawn())
{
color = sRadarTextDrawDist;
}
@@ -916,7 +924,7 @@ void LLFloaterAvatarList::refreshAvatarList()
}
else
{
- if (entry.isDrawn())
+ if (entry->isDrawn())
{
color = sRadarTextDrawDist;
}
@@ -975,7 +983,7 @@ void LLFloaterAvatarList::refreshAvatarList()
std::string activity_icon = "";
std::string activity_tip = "";
- switch(entry.getActivity())
+ switch(entry->getActivity())
{
case LLAvatarListEntry::ACTIVITY_MOVING:
{
@@ -1030,17 +1038,17 @@ void LLFloaterAvatarList::refreshAvatarList()
element["columns"][LIST_AGE]["column"] = "age";
element["columns"][LIST_AGE]["type"] = "text";
color = sDefaultListText;
- std::string age = boost::lexical_cast(entry.mAge);
- if (entry.mAge > -1)
+ std::string age = boost::lexical_cast(entry->mAge);
+ if (entry->mAge > -1)
{
static LLCachedControl sAvatarAgeAlertDays(gSavedSettings, "AvatarAgeAlertDays");
- if ((U32)entry.mAge < sAvatarAgeAlertDays)
+ if ((U32)entry->mAge < sAvatarAgeAlertDays)
{
color = sRadarTextYoung;
- if (!entry.mAgeAlert) //Only announce age once per entry.
+ if (!entry->mAgeAlert) //Only announce age once per entry.
{
- entry.mAgeAlert = true;
- chat_avatar_status(entry.getName().c_str(), av_id, ALERT_TYPE_AGE, true);
+ entry->mAgeAlert = true;
+ chat_avatar_status(entry->getName().c_str(), av_id, ALERT_TYPE_AGE, true);
}
}
}
@@ -1051,7 +1059,7 @@ void LLFloaterAvatarList::refreshAvatarList()
element["columns"][LIST_AGE]["value"] = age;
element["columns"][LIST_AGE]["color"] = color.getValue();
- int dur = difftime(time(NULL), entry.getTime());
+ int dur = difftime(time(NULL), entry->getTime());
int hours = dur / 3600;
int mins = (dur % 3600) / 60;
int secs = (dur % 3600) % 60;
@@ -1225,7 +1233,7 @@ LLAvatarListEntry * LLFloaterAvatarList::getAvatarEntry(LLUUID avatar)
av_list_t::iterator iter = std::find_if(mAvatars.begin(),mAvatars.end(),LLAvatarListEntry::uuidMatch(avatar));
if(iter != mAvatars.end())
- return &(*iter);
+ return iter->get();
else
return NULL;
}
@@ -1297,7 +1305,7 @@ void LLFloaterAvatarList::removeFocusFromAll()
{
BOOST_FOREACH(av_list_t::value_type& entry, mAvatars)
{
- entry.setFocus(FALSE);
+ entry->setFocus(FALSE);
}
}
@@ -1309,7 +1317,7 @@ void LLFloaterAvatarList::setFocusAvatar(const LLUUID& id)
if(!gAgentCamera.lookAtObject(id, false))
return;
removeFocusFromAll();
- iter->setFocus(TRUE);
+ (*iter)->setFocus(TRUE);
}
}
@@ -1317,22 +1325,22 @@ template
void decrement_focus_target(T begin, T end, BOOL marked_only)
{
T iter = begin;
- while(iter != end && !iter->isFocused()) ++iter;
+ while(iter != end && !(*iter)->isFocused()) ++iter;
if(iter == end)
return;
T prev_iter = iter;
while(prev_iter != begin)
{
- LLAvatarListEntry& entry = *(--prev_iter);
+ const LLAvatarListEntry& entry = *((--prev_iter)->get());
if(entry.isInList() && (entry.isMarked() || !marked_only) && gAgentCamera.lookAtObject(entry.getID(), false))
{
- iter->setFocus(FALSE);
- prev_iter->setFocus(TRUE);
- gAgentCamera.lookAtObject(prev_iter->getID(), false);
+ (*iter)->setFocus(FALSE);
+ (*prev_iter)->setFocus(TRUE);
+ gAgentCamera.lookAtObject((*prev_iter)->getID(), false);
return;
}
}
- gAgentCamera.lookAtObject(iter->getID(), false);
+ gAgentCamera.lookAtObject((*iter)->getID(), false);
}
void LLFloaterAvatarList::focusOnPrev(BOOL marked_only)
diff --git a/indra/newview/llfloateravatarlist.h b/indra/newview/llfloateravatarlist.h
index 8aa3d3665..3bcf4ea67 100644
--- a/indra/newview/llfloateravatarlist.h
+++ b/indra/newview/llfloateravatarlist.h
@@ -22,6 +22,8 @@
#include
#include
+#include
+
class LLFloaterAvatarList;
/**
@@ -130,7 +132,7 @@ enum ACTIVITY_TYPE
struct uuidMatch
{
uuidMatch(const LLUUID& id) : mID(id) {}
- bool operator()(const LLAvatarListEntry& l) { return l.getID() == mID; }
+ bool operator()(const boost::shared_ptr& l) { return l->getID() == mID; }
LLUUID mID;
};
@@ -243,7 +245,8 @@ public:
static void sound_trigger_hook(LLMessageSystem* msg,void **);
void sendKeys();
- typedef std::vector av_list_t;
+ typedef boost::shared_ptr LLAvatarListEntryPtr;
+ typedef std::vector< LLAvatarListEntryPtr > av_list_t;
private:
// when a line editor loses keyboard focus, it is committed.
diff --git a/indra/newview/llfloaterchat.cpp b/indra/newview/llfloaterchat.cpp
index 22281826d..bfb4892c6 100644
--- a/indra/newview/llfloaterchat.cpp
+++ b/indra/newview/llfloaterchat.cpp
@@ -317,8 +317,9 @@ void LLFloaterChat::addChatHistory(const LLChat& chat, bool log_to_file)
}
else
{
+ static LLCachedControl color_muted_chat("ColorMutedChat");
// desaturate muted chat
- LLColor4 muted_color = lerp(color, LLColor4::grey, 0.5f);
+ LLColor4 muted_color = lerp(color, color_muted_chat ? gSavedSettings.getColor4("AscentMutedColor") : LLColor4::grey, 0.5f);
add_timestamped_line(history_editor_with_mute, chat, muted_color);
}
@@ -493,7 +494,7 @@ void LLFloaterChat::triggerAlerts(const std::string& text)
{
// Cannot instantiate LLTextParser before logging in.
if (gDirUtilp->getLindenUserDir(true).empty())
- return;
+ return;
LLTextParser* parser = LLTextParser::getInstance();
// bool spoken=FALSE;
@@ -539,7 +540,11 @@ LLColor4 get_text_color(const LLChat& chat)
if(chat.mMuted)
{
- text_color.setVec(0.8f, 0.8f, 0.8f, 1.f);
+ static LLCachedControl color_muted_chat("ColorMutedChat");
+ if (color_muted_chat)
+ text_color = gSavedSettings.getColor4("AscentMutedColor");
+ else
+ text_color.setVec(0.8f, 0.8f, 0.8f, 1.f);
}
else
{
@@ -549,7 +554,7 @@ LLColor4 get_text_color(const LLChat& chat)
text_color = gSavedSettings.getColor4("SystemChatColor");
break;
case CHAT_SOURCE_AGENT:
- if (chat.mFromID.isNull())
+ if (chat.mFromID.isNull())
{
text_color = gSavedSettings.getColor4("SystemChatColor");
}
@@ -561,7 +566,34 @@ LLColor4 get_text_color(const LLChat& chat)
}
else
{
- text_color = gSavedSettings.getColor4("AgentChatColor");
+ static LLCachedControl color_linden_chat("ColorLindenChat");
+ if (color_linden_chat && LLMuteList::getInstance()->isLinden(chat.mFromName))
+ {
+ text_color = gSavedSettings.getColor4("AscentLindenColor");
+ }
+ else if (!gRlvHandler.hasBehaviour(RLV_BHVR_SHOWNAMES))
+ {
+ static LLCachedControl color_friend_chat("ColorFriendChat");
+ static LLCachedControl color_eo_chat("ColorEstateOwnerChat");
+ if (color_friend_chat && LLAvatarTracker::instance().isBuddy(chat.mFromID))
+ {
+ text_color = gSavedSettings.getColor4("AscentFriendColor");
+ }
+ else if (color_eo_chat)
+ {
+ LLViewerRegion* parent_estate = gAgent.getRegion();
+ if (parent_estate && parent_estate->isAlive() && chat.mFromID == parent_estate->getOwner())
+ text_color = gSavedSettings.getColor4("AscentEstateOwnerColor");
+ else
+ text_color = gSavedSettings.getColor4("AgentChatColor");
+ }
+ else
+ text_color = gSavedSettings.getColor4("AgentChatColor");
+ }
+ else
+ {
+ text_color = gSavedSettings.getColor4("AgentChatColor");
+ }
}
}
break;
diff --git a/indra/newview/llfloatercustomize.cpp b/indra/newview/llfloatercustomize.cpp
index 890d80829..680df5f05 100644
--- a/indra/newview/llfloatercustomize.cpp
+++ b/indra/newview/llfloatercustomize.cpp
@@ -32,7 +32,6 @@
#include "llviewerprecompiledheaders.h"
-#include "llappearancemgr.h"
#include "llimagejpeg.h"
#include "llfloatercustomize.h"
#include "llfontgl.h"
@@ -64,7 +63,6 @@
#include "llviewercamera.h"
#include "llappearance.h"
#include "imageids.h"
-#include "llmodaldialog.h"
#include "llassetstorage.h"
#include "lltexturectrl.h"
#include "lltextureentry.h"
@@ -79,9 +77,9 @@
#include "lluictrlfactory.h"
#include "llnotificationsutil.h"
#include "llpaneleditwearable.h"
+#include "llmakeoutfitdialog.h"
#include "statemachine/aifilepicker.h"
-#include "hippogridmanager.h"
using namespace LLVOAvatarDefines;
@@ -119,220 +117,6 @@ BOOL edit_wearable_for_teens(LLWearableType::EType type)
}
}
-class LLMakeOutfitDialog : public LLModalDialog
-{
-private:
- std::string mFolderName;
- void (*mCommitCallback)(LLMakeOutfitDialog*,void*);
- void* mCallbackUserData;
- std::vector > mCheckBoxList;
-
-public:
- LLMakeOutfitDialog( void(*commit_cb)(LLMakeOutfitDialog*,void*), void* userdata )
- : LLModalDialog(LLStringUtil::null,515, 510, TRUE ),
- mCommitCallback( commit_cb ),
- mCallbackUserData( userdata )
- {
- LLUICtrlFactory::getInstance()->buildFloater(this, "floater_new_outfit_dialog.xml");
-
- // Build list of check boxes
- for( S32 i = 0; i < LLWearableType::WT_COUNT; i++ )
- {
- std::string name = std::string("checkbox_") + LLWearableType::getTypeLabel( (LLWearableType::EType)i );
- mCheckBoxList.push_back(std::make_pair(name,i));
- // Hide teen items
- if (gAgent.isTeen() &&
- !edit_wearable_for_teens((LLWearableType::EType)i))
- {
- // hide wearable checkboxes that don't apply to this account
- std::string name = std::string("checkbox_") + LLWearableType::getTypeLabel( (LLWearableType::EType)i );
- childSetVisible(name, FALSE);
- }
- }
-
- // NOTE: .xml needs to be updated if attachments are added or their names are changed!
- LLVOAvatar* avatar = gAgentAvatarp;
- if( avatar )
- {
- for (LLVOAvatar::attachment_map_t::iterator iter = avatar->mAttachmentPoints.begin();
- iter != avatar->mAttachmentPoints.end(); )
- {
- LLVOAvatar::attachment_map_t::iterator curiter = iter++;
- LLViewerJointAttachment* attachment = curiter->second;
- S32 attachment_pt = curiter->first;
- BOOL object_attached = ( attachment->getNumObjects() > 0 );
- std::string name = std::string("checkbox_") + attachment->getName();
- mCheckBoxList.push_back(std::make_pair(name,attachment_pt));
- childSetEnabled(name, object_attached);
- }
- }
-
- if(!gHippoGridManager->getConnectedGrid()->supportsInvLinks()) {
- childSetEnabled("checkbox_use_links", FALSE);
- childSetValue("checkbox_use_links", FALSE);
- childSetEnabled("checkbox_use_outfits", FALSE);
- childSetValue("checkbox_use_outfits", FALSE);
- }
-
- childSetAction("Save", onSave, this );
- childSetAction("Cancel", onCancel, this );
- childSetAction("Check All", onCheckAll, this );
- childSetAction("Uncheck All", onUncheckAll, this );
-
- LLCheckBoxCtrl* pOutfitFoldersCtrl = getChild("checkbox_use_outfits");
- pOutfitFoldersCtrl->setCommitCallback(&LLMakeOutfitDialog::onOutfitFoldersToggle);
- pOutfitFoldersCtrl->setCallbackUserData(this);
- }
-
- bool getUseOutfits()
- {
- return childGetValue("checkbox_use_outfits").asBoolean();
- }
- bool getUseLinks()
- {
- return childGetValue("checkbox_use_links").asBoolean();
- }
- /*bool getRenameClothing()
- {
- return childGetValue("rename").asBoolean();
- }*/
- virtual void draw()
- {
- BOOL one_or_more_items_selected = FALSE;
- for( S32 i = 0; i < (S32)mCheckBoxList.size(); i++ )
- {
- if( childGetValue(mCheckBoxList[i].first).asBoolean() )
- {
- one_or_more_items_selected = TRUE;
- break;
- }
- }
-
- childSetEnabled("Save", one_or_more_items_selected );
-
- LLModalDialog::draw();
- }
-
- const std::string& getFolderName() { return mFolderName; }
-
- void setWearableToInclude( S32 wearable, S32 enabled, S32 selected )
- {
- LLWearableType::EType wtType = (LLWearableType::EType)wearable;
- if ( ( (0 <= wtType) && (wtType < LLWearableType::WT_COUNT) ) &&
- ( (LLAssetType::AT_BODYPART != LLWearableType::getAssetType(wtType)) || (!getUseOutfits()) ) )
- {
- std::string name = std::string("checkbox_") + LLWearableType::getTypeLabel(wtType);
- childSetEnabled(name, enabled);
- childSetValue(name, selected);
- }
- }
-
- void getIncludedItems( LLInventoryModel::item_array_t& item_list )
- {
- LLInventoryModel::cat_array_t *cats;
- LLInventoryModel::item_array_t *items;
- gInventory.getDirectDescendentsOf(LLAppearanceMgr::instance().getCOF(), cats, items);
- for (LLInventoryModel::item_array_t::const_iterator iter = items->begin();
- iter != items->end();
- ++iter)
- {
- LLViewerInventoryItem* item = (*iter);
- if(!item)
- continue;
- if(item->isWearableType())
- {
- LLWearableType::EType type = item->getWearableType();
- if (type < LLWearableType::WT_COUNT && childGetValue(mCheckBoxList[type].first).asBoolean())
- {
- item_list.push_back(item);
- }
- }
- else
- {
- LLViewerJointAttachment* attachment = gAgentAvatarp->getWornAttachmentPoint(item->getLinkedUUID());
- if(attachment && childGetValue(std::string("checkbox_")+attachment->getName()).asBoolean())
- {
- item_list.push_back(item);
- }
- }
- }
- }
-
- static void onSave( void* userdata )
- {
- LLMakeOutfitDialog* self = (LLMakeOutfitDialog*) userdata;
- self->mFolderName = self->childGetValue("name ed").asString();
- LLStringUtil::trim(self->mFolderName);
- if( !self->mFolderName.empty() )
- {
- if( self->mCommitCallback )
- {
- self->mCommitCallback( self, self->mCallbackUserData );
- }
- self->close(); // destroys this object
- }
- }
-
- static void onCheckAll( void* userdata )
- {
- LLMakeOutfitDialog* self = (LLMakeOutfitDialog*) userdata;
- for( S32 i = 0; i < (S32)(self->mCheckBoxList.size()); i++)
- {
- std::string name = self->mCheckBoxList[i].first;
- if(self->childIsEnabled(name))self->childSetValue(name,TRUE);
- }
- }
-
- static void onUncheckAll( void* userdata )
- {
- LLMakeOutfitDialog* self = (LLMakeOutfitDialog*) userdata;
- for( S32 i = 0; i < (S32)(self->mCheckBoxList.size()); i++)
- {
- std::string name = self->mCheckBoxList[i].first;
- if(self->childIsEnabled(name))self->childSetValue(name,FALSE);
- }
- }
-
- static void onCancel( void* userdata )
- {
- LLMakeOutfitDialog* self = (LLMakeOutfitDialog*) userdata;
- self->close(); // destroys this object
- }
-
- BOOL postBuild()
- {
- refresh();
- return TRUE;
- }
-
- void refresh()
- {
- BOOL fUseOutfits = getUseOutfits();
-
- for (S32 idxType = 0; idxType < LLWearableType::WT_COUNT; idxType++ )
- {
- LLWearableType::EType wtType = (LLWearableType::EType)idxType;
- if (LLAssetType::AT_BODYPART != LLWearableType::getAssetType(wtType))
- continue;
- LLCheckBoxCtrl* pCheckCtrl = getChild(std::string("checkbox_") + LLWearableType::getTypeLabel(wtType));
- if (!pCheckCtrl)
- continue;
-
- pCheckCtrl->setEnabled(!fUseOutfits);
- if (fUseOutfits)
- pCheckCtrl->setValue(TRUE);
- }
- childSetEnabled("checkbox_use_links", !fUseOutfits);
- }
-
- static void onOutfitFoldersToggle(LLUICtrl*, void* pParam)
- {
- LLMakeOutfitDialog* pSelf = (LLMakeOutfitDialog*)pParam;
- if (pSelf)
- pSelf->refresh();
- }
-};
-
////////////////////////////////////////////////////////////////////////////
void updateAvatarHeightDisplay()
@@ -393,13 +177,13 @@ LLFloaterCustomize::LLFloaterCustomize()
BOOL LLFloaterCustomize::postBuild()
{
- childSetAction("Make Outfit", LLFloaterCustomize::onBtnMakeOutfit, (void*)this);
- childSetAction("Ok", LLFloaterCustomize::onBtnOk, (void*)this);
- childSetAction("Cancel", LLFloater::onClickClose, (void*)this);
+ getChild("Make Outfit")->setCommitCallback(boost::bind(&LLFloaterCustomize::onBtnMakeOutfit, this));
+ getChild("Ok")->setCommitCallback(boost::bind(&LLFloaterCustomize::onBtnOk, this));
+ getChild("Cancel")->setCommitCallback(boost::bind(&LLFloater::onClickClose, this));
// reX
- childSetAction("Import", LLFloaterCustomize::onBtnImport, (void*)this);
- childSetAction("Export", LLFloaterCustomize::onBtnExport, (void*)this);
+ getChild("Import")->setCommitCallback(boost::bind(&LLFloaterCustomize::onBtnImport, this));
+ getChild("Export")->setCommitCallback(boost::bind(&LLFloaterCustomize::onBtnExport, this));
// Wearable panels
initWearablePanels();
@@ -459,7 +243,7 @@ void LLFloaterCustomize::setCurrentWearableType( LLWearableType::EType type )
}
// reX: new function
-void LLFloaterCustomize::onBtnImport( void* userdata )
+void LLFloaterCustomize::onBtnImport()
{
AIFilePicker* filepicker = AIFilePicker::create();
filepicker->open(FFLOAD_XML);
@@ -519,7 +303,7 @@ void LLFloaterCustomize::onBtnImport_continued(AIFilePicker* filepicker)
}
// reX: new function
-void LLFloaterCustomize::onBtnExport( void* userdata )
+void LLFloaterCustomize::onBtnExport()
{
AIFilePicker* filepicker = AIFilePicker::create();
filepicker->open("", FFSAVE_XML);
@@ -592,10 +376,8 @@ void LLFloaterCustomize::onBtnExport_continued(AIFilePicker* filepicker)
fclose(fp);
}
-// static
-void LLFloaterCustomize::onBtnOk( void* userdata )
+void LLFloaterCustomize::onBtnOk()
{
- LLFloaterCustomize* floater = (LLFloaterCustomize*) userdata;
gAgentWearables.saveAllWearables();
if ( gAgentAvatarp )
@@ -607,55 +389,13 @@ void LLFloaterCustomize::onBtnOk( void* userdata )
gAgent.sendAgentSetAppearance();
}
- gFloaterView->sendChildToBack(floater);
+ gFloaterView->sendChildToBack(this);
handle_reset_view(); // Calls askToSaveIfDirty
}
-// static
-void LLFloaterCustomize::onBtnMakeOutfit( void* userdata )
+void LLFloaterCustomize::onBtnMakeOutfit()
{
- LLVOAvatar* avatar = gAgentAvatarp;
- if(avatar)
- {
- LLMakeOutfitDialog* dialog = new LLMakeOutfitDialog( onMakeOutfitCommit, NULL );
- // LLMakeOutfitDialog deletes itself.
-
- for( S32 i = 0; i < LLWearableType::WT_COUNT; i++ )
- {
- BOOL enabled = (gAgentWearables.getWearableCount( (LLWearableType::EType) i )); // TODO: MULTI-WEARABLE
- BOOL selected = (enabled && (LLWearableType::WT_SHIRT <= i) && (i < LLWearableType::WT_COUNT)); // only select clothing by default
- if (gAgent.isTeen()
- && !edit_wearable_for_teens((LLWearableType::EType)i))
- {
- dialog->setWearableToInclude( i, FALSE, FALSE );
- }
- else
- {
- dialog->setWearableToInclude( i, enabled, selected );
- }
- }
- dialog->startModal();
- }
-}
-
-// static
-void LLFloaterCustomize::onMakeOutfitCommit( LLMakeOutfitDialog* dialog, void* userdata )
-{
- LLVOAvatar* avatar = gAgentAvatarp;
- if(avatar)
- {
- LLDynamicArray wearables_to_include;
- LLDynamicArray attachments_to_include; // attachment points
-
- LLInventoryModel::item_array_t item_list;
- dialog->getIncludedItems(item_list);
-
- // MULTI-WEARABLES TODO
- if(dialog->getUseOutfits())
- LLAppearanceMgr::instance().makeNewOutfitLinks( dialog->getFolderName(), item_list);
- else
- LLAppearanceMgr::instance().makeNewOutfitLegacy( dialog->getFolderName(), item_list, dialog->getUseLinks());
- }
+ new LLMakeOutfitDialog(true); // LLMakeOutfitDialog deletes itself.
}
////////////////////////////////////////////////////////////////////////////
diff --git a/indra/newview/llfloatercustomize.h b/indra/newview/llfloatercustomize.h
index e603209fe..d82d7c267 100644
--- a/indra/newview/llfloatercustomize.h
+++ b/indra/newview/llfloatercustomize.h
@@ -98,12 +98,12 @@ public:
static LLWearableType::EType getCurrentWearableType() { return sCurrentWearableType; }
// Callbacks
- static void onBtnOk( void* userdata );
- static void onBtnMakeOutfit( void* userdata );
- static void onMakeOutfitCommit( LLMakeOutfitDialog* dialog, void* userdata );
- static void onBtnImport( void* userdata );
+ void onBtnOk();
+ void onBtnMakeOutfit();
+ void onMakeOutfitCommit();
+ void onBtnImport();
static void onBtnImport_continued(AIFilePicker* filepicker);
- static void onBtnExport( void* userdata );
+ void onBtnExport();
static void onBtnExport_continued(AIFilePicker* filepicker);
static void onTabChanged( const LLSD& param );
diff --git a/indra/newview/llfloaterfriends.cpp b/indra/newview/llfloaterfriends.cpp
index 40af23889..e0ac0a06e 100644
--- a/indra/newview/llfloaterfriends.cpp
+++ b/indra/newview/llfloaterfriends.cpp
@@ -855,6 +855,8 @@ void LLPanelFriends::onClickIM(void* user_data)
const uuid_vec_t ids = panelp->mFriendsList->getSelectedIDs();
if(!ids.empty())
{
+ static LLCachedControl tear_off("OtherChatsTornOff");
+ if(!tear_off) gIMMgr->setFloaterOpen(TRUE);
if(ids.size() == 1)
{
LLUUID agent_id = ids[0];
@@ -862,13 +864,11 @@ void LLPanelFriends::onClickIM(void* user_data)
std::string fullname;
if(info && gCacheName->getFullName(agent_id, fullname))
{
- gIMMgr->setFloaterOpen(TRUE);
gIMMgr->addSession(fullname, IM_NOTHING_SPECIAL, agent_id);
}
}
else
{
- gIMMgr->setFloaterOpen(TRUE);
gIMMgr->addSession("Friends Conference", IM_SESSION_CONFERENCE_START, ids[0], ids);
}
make_ui_sound("UISndStartIM");
diff --git a/indra/newview/llfloatergroups.cpp b/indra/newview/llfloatergroups.cpp
index c786e94a6..eff6d409b 100644
--- a/indra/newview/llfloatergroups.cpp
+++ b/indra/newview/llfloatergroups.cpp
@@ -386,7 +386,9 @@ void LLPanelGroups::startIM()
LLGroupData group_data;
if (gAgent.getGroupData(group_id, group_data))
{
- gIMMgr->setFloaterOpen(TRUE);
+ static LLCachedControl tear_off("OtherChatsTornOff");
+ if (!tear_off)
+ gIMMgr->setFloaterOpen(TRUE);
gIMMgr->addSession(
group_data.mName,
IM_SESSION_GROUP_START,
diff --git a/indra/newview/llimview.cpp b/indra/newview/llimview.cpp
index d6dabcdae..92f5cd320 100644
--- a/indra/newview/llimview.cpp
+++ b/indra/newview/llimview.cpp
@@ -483,8 +483,8 @@ void LLIMMgr::addMessage(
}
//not sure why...but if it is from ourselves we set the target_id
- //to be NULL
- if( other_participant_id == gAgent.getID() )
+ //to be NULL, which seems to be breaking links on group chats, so let's not there.
+ if (other_participant_id == gAgent.getID() && !gAgent.isInGroup(session_id))
{
other_participant_id = LLUUID::null;
}
@@ -553,7 +553,6 @@ void LLIMMgr::addMessage(
// when answering questions.
if(gAgent.isGodlike())
{
- // *TODO:translate (low priority, god ability)
std::ostringstream bonus_info;
bonus_info << LLTrans::getString("***")+ " "+ LLTrans::getString("IMParentEstate") + LLTrans::getString(":") + " "
<< parent_estate_id
@@ -574,9 +573,26 @@ void LLIMMgr::addMessage(
// now add message to floater
bool is_from_system = target_id.isNull() || (from == SYSTEM_FROM);
- const LLColor4& color = ( is_from_system ?
- gSavedSettings.getColor4("SystemChatColor") :
- gSavedSettings.getColor("IMChatColor"));
+
+ static LLCachedControl color_linden_chat("ColorLindenChat");
+ bool linden = color_linden_chat && LLMuteList::getInstance()->isLinden(from);
+
+ static LLCachedControl color_friend_chat("ColorFriendChat");
+ bool contact = color_friend_chat && LLAvatarTracker::instance().isBuddy(other_participant_id);
+
+ static LLCachedControl color_eo_chat("ColorEstateOwnerChat");
+ bool estate_owner = false;
+ if (color_eo_chat)
+ {
+ LLViewerRegion* parent_estate = gAgent.getRegion();
+ estate_owner = (parent_estate && parent_estate->isAlive() && other_participant_id == parent_estate->getOwner());
+ }
+
+ const LLColor4& color = ( is_from_system ? gSavedSettings.getColor4("SystemChatColor")
+ : linden ? gSavedSettings.getColor4("AscentLindenColor")
+ : contact ? gSavedSettings.getColor4("AscentFriendColor")
+ : estate_owner ? gSavedSettings.getColor4("AscentEstateOwnerColor")
+ : gSavedSettings.getColor("IMChatColor"));
if ( !link_name )
{
floater->addHistoryLine(msg,color); // No name to prepend, so just add the message normally
@@ -731,7 +747,18 @@ LLUUID LLIMMgr::addSession(
{
noteMutedUsers(floater, ids);
}
- LLFloaterChatterBox::getInstance(LLSD())->showFloater(floater);
+
+ static LLCachedControl tear_off("OtherChatsTornOff");
+ if(tear_off)
+ {
+ // removal sets up relationship for re-attach
+ LLFloaterChatterBox::getInstance(LLSD())->removeFloater(floater);
+ // reparent to floater view
+ gFloaterView->addChild(floater);
+ gFloaterView->bringToFront(floater);
+ }
+ else
+ LLFloaterChatterBox::getInstance(LLSD())->showFloater(floater);
}
else
{
@@ -1103,6 +1130,19 @@ LLFloaterIMPanel* LLIMMgr::createFloater(
dialog);
LLTabContainer::eInsertionPoint i_pt = user_initiated ? LLTabContainer::RIGHT_OF_CURRENT : LLTabContainer::END;
LLFloaterChatterBox::getInstance(LLSD())->addFloater(floater, FALSE, i_pt);
+ static LLCachedControl tear_off("OtherChatsTornOff");
+ if (tear_off)
+ {
+ LLFloaterChatterBox::getInstance(LLSD())->removeFloater(floater); // removal sets up relationship for re-attach
+ gFloaterView->addChild(floater); // reparent to floater view
+ LLFloater* focused_floater = gFloaterView->getFocusedFloater(); // obtain the focused floater
+ floater->open(); // make the new chat floater appear
+ if (focused_floater != NULL) // there was a focused floater
+ {
+ floater->setMinimized(true); // so minimize this one, for now
+ focused_floater->setFocus(true); // and work around focus being removed by focusing on the last
+ }
+ }
mFloaters.insert(floater->getHandle());
return floater;
}
@@ -1129,6 +1169,24 @@ LLFloaterIMPanel* LLIMMgr::createFloater(
dialog);
LLTabContainer::eInsertionPoint i_pt = user_initiated ? LLTabContainer::RIGHT_OF_CURRENT : LLTabContainer::END;
LLFloaterChatterBox::getInstance(LLSD())->addFloater(floater, FALSE, i_pt);
+ static LLCachedControl tear_off("OtherChatsTornOff");
+ if (tear_off)
+ {
+ LLFloaterChatterBox::getInstance(LLSD())->removeFloater(floater); // removal sets up relationship for re-attach
+ gFloaterView->addChild(floater); // reparent to floater view
+ LLFloater* focused_floater = gFloaterView->getFocusedFloater(); // obtain the focused floater
+ floater->open(); // make the new chat floater appear
+ static LLCachedControl minimize("OtherChatsTornOffAndMinimized");
+ if (focused_floater != NULL) // there was a focused floater
+ {
+ floater->setMinimized(true); // so minimize this one, for now
+ focused_floater->setFocus(true); // and work around focus being removed by focusing on the last
+ }
+ else if (minimize)
+ {
+ floater->setMinimized(true);
+ }
+ }
mFloaters.insert(floater->getHandle());
return floater;
}
@@ -1153,7 +1211,7 @@ void LLIMMgr::noteOfflineUsers(
std::string full_name;
if (info
&& !info->isOnline()
- && gCacheName->getFullName(ids.get(i), full_name))
+ && LLAvatarNameCache::getPNSName(ids.get(i), full_name))
{
LLUIString offline = LLTrans::getString("offline_message");
offline.setArg("[NAME]", full_name);
diff --git a/indra/newview/llinventoryactions.cpp b/indra/newview/llinventoryactions.cpp
index 372b9bf83..074c4132a 100644
--- a/indra/newview/llinventoryactions.cpp
+++ b/indra/newview/llinventoryactions.cpp
@@ -67,6 +67,7 @@
#include "llinventoryclipboard.h"
#include "llinventorymodelbackgroundfetch.h"
#include "lllineeditor.h"
+#include "llmakeoutfitdialog.h"
#include "llmenugl.h"
#include "llpreviewanim.h"
#include "llpreviewgesture.h"
@@ -382,6 +383,10 @@ void do_create(LLInventoryModel *model, LLInventoryPanel *ptr, std::string type,
LLInventoryType::IT_GESTURE,
PERM_ALL);
}
+ else if ("outfit" == type)
+ {
+ new LLMakeOutfitDialog(false);
+ }
else
{
LLWearableType::EType wear_type = LLWearableType::typeNameToType(type);
diff --git a/indra/newview/lllogchat.cpp b/indra/newview/lllogchat.cpp
index e80032239..192c5f531 100644
--- a/indra/newview/lllogchat.cpp
+++ b/indra/newview/lllogchat.cpp
@@ -88,11 +88,18 @@ std::string LLLogChat::timestamp(bool withdate)
// it's daylight savings time there.
timep = utc_to_pacific_time(utc_time, gPacificDaylightTime);
+ static LLCachedControl withseconds("SecondsInLog");
std::string text;
if (withdate)
- text = llformat("[%d/%02d/%02d %02d:%02d] ", (timep->tm_year-100)+2000, timep->tm_mon+1, timep->tm_mday, timep->tm_hour, timep->tm_min);
+ if (withseconds)
+ text = llformat("[%d-%02d-%02d %02d:%02d:%02d] ", (timep->tm_year-100)+2000, timep->tm_mon+1, timep->tm_mday, timep->tm_hour, timep->tm_min, timep->tm_sec);
+ else
+ text = llformat("[%d/%02d/%02d %02d:%02d] ", (timep->tm_year-100)+2000, timep->tm_mon+1, timep->tm_mday, timep->tm_hour, timep->tm_min);
else
- text = llformat("[%02d:%02d] ", timep->tm_hour, timep->tm_min);
+ if (withseconds)
+ text = llformat("[%02d:%02d:%02d] ", timep->tm_hour, timep->tm_min, timep->tm_sec);
+ else
+ text = llformat("[%02d:%02d] ", timep->tm_hour, timep->tm_min);
return text;
}
diff --git a/indra/newview/llmakeoutfitdialog.cpp b/indra/newview/llmakeoutfitdialog.cpp
new file mode 100644
index 000000000..b84e668b6
--- /dev/null
+++ b/indra/newview/llmakeoutfitdialog.cpp
@@ -0,0 +1,218 @@
+/**
+ * @file llmakeoutfitdialog.cpp
+ * @brief The Make Outfit Dialog, triggered by "Make Outfit" and similar UICtrls.
+ *
+ * $LicenseInfo:firstyear=2002&license=viewergpl$
+ *
+ * Copyright (c) 2002-2009, Linden Research, Inc.
+ *
+ * Second Life Viewer Source Code
+ * The source code in this file ("Source Code") is provided by Linden Lab
+ * to you under the terms of the GNU General Public License, version 2.0
+ * ("GPL"), unless you have obtained a separate licensing agreement
+ * ("Other License"), formally executed by you and Linden Lab. Terms of
+ * the GPL can be found in doc/GPL-license.txt in this distribution, or
+ * online at http://secondlifegrid.net/programs/open_source/licensing/gplv2
+ *
+ * There are special exceptions to the terms and conditions of the GPL as
+ * it is applied to this Source Code. View the full text of the exception
+ * in the file doc/FLOSS-exception.txt in this software distribution, or
+ * online at
+ * http://secondlifegrid.net/programs/open_source/licensing/flossexception
+ *
+ * By copying, modifying or distributing this software, you acknowledge
+ * that you have read and understood your obligations described above,
+ * and agree to abide by those obligations.
+ *
+ * ALL LINDEN LAB SOURCE CODE IS PROVIDED "AS IS." LINDEN LAB MAKES NO
+ * WARRANTIES, EXPRESS, IMPLIED OR OTHERWISE, REGARDING ITS ACCURACY,
+ * COMPLETENESS OR PERFORMANCE.
+ * $/LicenseInfo$
+ */
+
+#include "llviewerprecompiledheaders.h"
+
+#include "llmakeoutfitdialog.h"
+
+#include "llagent.h"
+#include "llappearancemgr.h"
+#include "lluictrlfactory.h"
+#include "llvoavatarself.h"
+
+#include "hippogridmanager.h"
+
+LLMakeOutfitDialog::LLMakeOutfitDialog(bool modal) : LLModalDialog(LLStringUtil::null, 515, 510, modal)
+{
+ LLUICtrlFactory::getInstance()->buildFloater(this, "floater_new_outfit_dialog.xml");
+
+ setCanClose(!modal);
+ setCanMinimize(!modal);
+
+ // Build list of check boxes
+ for (S32 i = 0; i < LLWearableType::WT_COUNT; i++)
+ {
+ std::string name = std::string("checkbox_") + LLWearableType::getTypeLabel((LLWearableType::EType)i);
+ mCheckBoxList.push_back(std::make_pair(name, i));
+ // Hide undergarments from teens
+ if (gAgent.isTeen() && ((LLWearableType::WT_UNDERSHIRT == (LLWearableType::EType)i) || (LLWearableType::WT_UNDERPANTS == (LLWearableType::EType)i)))
+ {
+ childSetVisible(name, false); // Lest they know what's beyond their reach.
+ }
+ else
+ {
+ bool enabled = gAgentWearables.getWearableCount((LLWearableType::EType)i); // TODO: MULTI-WEARABLE
+ bool selected = enabled && (LLWearableType::WT_SHIRT <= i); // only select clothing by default
+ childSetEnabled(name, enabled);
+ childSetValue(name, selected);
+ }
+ }
+
+ // NOTE: .xml needs to be updated if attachments are added or their names are changed!
+ LLVOAvatar* avatar = gAgentAvatarp;
+ if (avatar)
+ {
+ for (LLVOAvatar::attachment_map_t::iterator iter = avatar->mAttachmentPoints.begin(); iter != avatar->mAttachmentPoints.end();)
+ {
+ LLVOAvatar::attachment_map_t::iterator curiter = iter++;
+ LLViewerJointAttachment* attachment = curiter->second;
+ S32 attachment_pt = curiter->first;
+ bool object_attached = (attachment->getNumObjects() > 0);
+ std::string name = std::string("checkbox_") + attachment->getName();
+ mCheckBoxList.push_back(std::make_pair(name, attachment_pt));
+ childSetEnabled(name, object_attached);
+ }
+ }
+
+ if (!gHippoGridManager->getConnectedGrid()->supportsInvLinks())
+ {
+ childSetEnabled("checkbox_use_links", false);
+ childSetValue("checkbox_use_links", false);
+ childSetEnabled("checkbox_use_outfits", false);
+ childSetValue("checkbox_use_outfits", false);
+ }
+
+ getChild("Save")->setCommitCallback(boost::bind(&LLMakeOutfitDialog::onSave, this));
+ getChild("Cancel")->setCommitCallback(boost::bind(&LLMakeOutfitDialog::close, this, _1));
+ getChild("Check All")->setCommitCallback(boost::bind(&LLMakeOutfitDialog::onCheckAll, this, true));
+ getChild("Uncheck All")->setCommitCallback(boost::bind(&LLMakeOutfitDialog::onCheckAll, this, false));
+ getChild("checkbox_use_outfits")->setCommitCallback(boost::bind(&LLMakeOutfitDialog::refresh, this));
+ startModal();
+}
+
+//virtual
+void LLMakeOutfitDialog::draw()
+{
+ bool one_or_more_items_selected = false;
+ for (S32 i = 0; i < (S32)mCheckBoxList.size(); i++)
+ {
+ if (childGetValue(mCheckBoxList[i].first).asBoolean())
+ {
+ one_or_more_items_selected = true;
+ break;
+ }
+ }
+ childSetEnabled("Save", one_or_more_items_selected);
+
+ LLModalDialog::draw();
+}
+
+BOOL LLMakeOutfitDialog::postBuild()
+{
+ refresh();
+ return true;
+}
+
+void LLMakeOutfitDialog::refresh()
+{
+ bool fUseOutfits = getUseOutfits();
+
+ for (S32 idxType = 0; idxType < LLWearableType::WT_COUNT; idxType++)
+ {
+ LLWearableType::EType wtType = (LLWearableType::EType)idxType;
+ if (LLAssetType::AT_BODYPART != LLWearableType::getAssetType(wtType))
+ continue;
+ LLUICtrl* pCheckCtrl = getChild(std::string("checkbox_") + LLWearableType::getTypeLabel(wtType));
+ if (!pCheckCtrl)
+ continue;
+
+ pCheckCtrl->setEnabled(!fUseOutfits);
+ if (fUseOutfits)
+ pCheckCtrl->setValue(true);
+ }
+ childSetEnabled("checkbox_use_links", !fUseOutfits);
+}
+
+
+void LLMakeOutfitDialog::setWearableToInclude(S32 wearable, bool enabled, bool selected)
+{
+ LLWearableType::EType wtType = (LLWearableType::EType)wearable;
+ if (((0 <= wtType) && (wtType < LLWearableType::WT_COUNT)) &&
+ ((LLAssetType::AT_BODYPART != LLWearableType::getAssetType(wtType)) || !getUseOutfits()))
+ {
+ std::string name = std::string("checkbox_") + LLWearableType::getTypeLabel(wtType);
+ childSetEnabled(name, enabled);
+ childSetValue(name, selected);
+ }
+}
+
+void LLMakeOutfitDialog::getIncludedItems(LLInventoryModel::item_array_t& item_list)
+{
+ LLInventoryModel::cat_array_t *cats;
+ LLInventoryModel::item_array_t *items;
+ gInventory.getDirectDescendentsOf(LLAppearanceMgr::instance().getCOF(), cats, items);
+ for (LLInventoryModel::item_array_t::const_iterator iter = items->begin(); iter != items->end(); ++iter)
+ {
+ LLViewerInventoryItem* item = (*iter);
+ if (!item)
+ continue;
+ if (item->isWearableType())
+ {
+ LLWearableType::EType type = item->getWearableType();
+ if (type < LLWearableType::WT_COUNT && childGetValue(mCheckBoxList[type].first).asBoolean())
+ {
+ item_list.push_back(item);
+ }
+ }
+ else
+ {
+ LLViewerJointAttachment* attachment = gAgentAvatarp->getWornAttachmentPoint(item->getLinkedUUID());
+ if (attachment && childGetValue(std::string("checkbox_")+attachment->getName()).asBoolean())
+ {
+ item_list.push_back(item);
+ }
+ }
+ }
+}
+
+void LLMakeOutfitDialog::onSave()
+{
+ std::string folder_name = childGetValue("name ed").asString();
+ LLStringUtil::trim(folder_name);
+ if (!folder_name.empty())
+ {
+ makeOutfit(folder_name);
+ close(); // destroys this object
+ }
+}
+
+void LLMakeOutfitDialog::onCheckAll(bool check)
+{
+ for (S32 i = 0; i < (S32)(mCheckBoxList.size()); i++)
+ {
+ std::string name = mCheckBoxList[i].first;
+ if (childIsEnabled(name)) childSetValue(name, check);
+ }
+}
+
+void LLMakeOutfitDialog::makeOutfit(const std::string folder_name)
+{
+ LLInventoryModel::item_array_t item_list;
+ getIncludedItems(item_list);
+
+ // MULTI-WEARABLES TODO
+ if (getUseOutfits())
+ LLAppearanceMgr::instance().makeNewOutfitLinks(folder_name, item_list);
+ else
+ LLAppearanceMgr::instance().makeNewOutfitLegacy(folder_name, item_list, getUseLinks());
+}
+
diff --git a/indra/newview/llmakeoutfitdialog.h b/indra/newview/llmakeoutfitdialog.h
new file mode 100644
index 000000000..caed1ceef
--- /dev/null
+++ b/indra/newview/llmakeoutfitdialog.h
@@ -0,0 +1,66 @@
+/**
+ * @file llmakeoutfitdialog.h
+ * @brief The Make Outfit Dialog, triggered by "Make Outfit" and similar UICtrls.
+ *
+ * $LicenseInfo:firstyear=2002&license=viewergpl$
+ *
+ * Copyright (c) 2002-2009, Linden Research, Inc.
+ *
+ * Second Life Viewer Source Code
+ * The source code in this file ("Source Code") is provided by Linden Lab
+ * to you under the terms of the GNU General Public License, version 2.0
+ * ("GPL"), unless you have obtained a separate licensing agreement
+ * ("Other License"), formally executed by you and Linden Lab. Terms of
+ * the GPL can be found in doc/GPL-license.txt in this distribution, or
+ * online at http://secondlifegrid.net/programs/open_source/licensing/gplv2
+ *
+ * There are special exceptions to the terms and conditions of the GPL as
+ * it is applied to this Source Code. View the full text of the exception
+ * in the file doc/FLOSS-exception.txt in this software distribution, or
+ * online at
+ * http://secondlifegrid.net/programs/open_source/licensing/flossexception
+ *
+ * By copying, modifying or distributing this software, you acknowledge
+ * that you have read and understood your obligations described above,
+ * and agree to abide by those obligations.
+ *
+ * ALL LINDEN LAB SOURCE CODE IS PROVIDED "AS IS." LINDEN LAB MAKES NO
+ * WARRANTIES, EXPRESS, IMPLIED OR OTHERWISE, REGARDING ITS ACCURACY,
+ * COMPLETENESS OR PERFORMANCE.
+ * $/LicenseInfo$
+ */
+
+#ifndef LLMAKEOUTFITDIALOG_H
+#define LLMAKEOUTFITDIALOG_H
+
+
+#include "llinventorymodel.h"
+#include "llmodaldialog.h"
+
+class LLMakeOutfitDialog : public LLModalDialog
+{
+private:
+ std::vector > mCheckBoxList;
+
+public:
+ LLMakeOutfitDialog(bool modal = true);
+ /*virtual*/ void draw();
+ BOOL postBuild();
+ void refresh();
+
+ void setWearableToInclude(S32 wearable, bool enabled, bool selected); //TODO: Call this when Wearables are added or removed to update the Dialog in !modal mode.
+ void onSave();
+ void onCheckAll(bool check);
+
+ //Accessors
+ void getIncludedItems(LLInventoryModel::item_array_t& item_list);
+ bool getUseOutfits() { return childGetValue("checkbox_use_outfits").asBoolean(); }
+ bool getUseLinks() { return childGetValue("checkbox_use_links").asBoolean(); }
+ //bool getRenameClothing() { return childGetValue("rename").asBoolean(); }
+
+protected:
+ void makeOutfit(const std::string folder_name);
+};
+
+#endif //LLMAKEOUTFITDIALOG_H
+
diff --git a/indra/newview/llmediaremotectrl.cpp b/indra/newview/llmediaremotectrl.cpp
index 50d3276b8..e5fa89e16 100644
--- a/indra/newview/llmediaremotectrl.cpp
+++ b/indra/newview/llmediaremotectrl.cpp
@@ -35,6 +35,8 @@
#include "llmediaremotectrl.h"
#include "llaudioengine.h"
+#include "llchat.h"
+#include "llfloaterchat.h"
#include "lliconctrl.h"
#include "llmimetypes.h"
#include "lloverlaybar.h"
@@ -53,6 +55,7 @@
//
static LLRegisterWidget r("media_remote");
+static std::string sLastTooltip;
LLMediaRemoteCtrl::LLMediaRemoteCtrl()
{
@@ -263,10 +266,22 @@ void LLMediaRemoteCtrl::enableMediaButtons()
if(artist.isDefined() && title.isDefined())
info_text = artist.asString() + " -- " + title.asString();
else if(title.isDefined())
- info_text = std::string("Title: ") + title.asString();
+ info_text = getString("Title") + ": " + title.asString();
else if(artist.isDefined())
- info_text = std::string("Artist: ") + artist.asString();
- music_pause_btn->setToolTip(info_text);
+ info_text = getString("Artist") + ": " + artist.asString();
+ if(music_pause_btn->getToolTip() != info_text) //Has info_text changed since last call?
+ {
+ music_pause_btn->setToolTip(info_text);
+ static LLCachedControl announce_stream_metadata("AnnounceStreamMetadata");
+ if(announce_stream_metadata && info_text != sLastTooltip && info_text != "Loading...") //Are we announcing? Don't annoounce what we've last announced. Don't announce Loading.
+ {
+ sLastTooltip = info_text;
+ LLChat chat;
+ chat.mText = getString("Now_playing") + " " + info_text;
+ chat.mSourceType = CHAT_SOURCE_SYSTEM;
+ LLFloaterChat::addChat(chat);
+ }
+ }
}
else
music_pause_btn->setToolTip(mCachedPauseTip);
diff --git a/indra/newview/llviewermenu.cpp b/indra/newview/llviewermenu.cpp
index d4fc9c02c..c8fa64f01 100644
--- a/indra/newview/llviewermenu.cpp
+++ b/indra/newview/llviewermenu.cpp
@@ -178,7 +178,7 @@
#include "llinventorypanel.h"
#include "llinventorybridge.h"
#include "llkeyboard.h"
-#include "llpanellogin.h"
+#include "llmakeoutfitdialog.h"
#include "llmenucommands.h"
#include "llmenugl.h"
#include "llmimetypes.h"
@@ -187,6 +187,7 @@
#include "llmoveview.h"
#include "llmutelist.h"
#include "llnotify.h"
+#include "llpanellogin.h"
#include "llpanelobject.h"
#include "llparcel.h"
@@ -6524,6 +6525,10 @@ class LLShowFloater : public view_listener_t
gAgentCamera.changeCameraToCustomizeAvatar();
}
}
+ else if (floater_name == "outfit")
+ {
+ new LLMakeOutfitDialog(false);
+ }
// Phoenix: Wolfspirit: Enabled Show Floater out of viewer menu
else if (floater_name == "displayname")
{
diff --git a/indra/newview/llvoavatar.cpp b/indra/newview/llvoavatar.cpp
index bbaa976da..9e6fbb461 100644
--- a/indra/newview/llvoavatar.cpp
+++ b/indra/newview/llvoavatar.cpp
@@ -5606,7 +5606,9 @@ BOOL LLVOAvatar::processSingleAnimationStateChange( const LLUUID& anim_id, BOOL
if ( start ) // start animation
{
- if (anim_id == ANIM_AGENT_TYPE && gSavedSettings.getBOOL("PlayTypingSound"))
+ static LLCachedControl play_typing_sound("PlayTypingSound");
+ static LLCachedControl announce_snapshots("AnnounceSnapshots");
+ if (anim_id == ANIM_AGENT_TYPE && play_typing_sound)
{
if (gAudiop)
{
@@ -5632,6 +5634,17 @@ BOOL LLVOAvatar::processSingleAnimationStateChange( const LLUUID& anim_id, BOOL
{
sitDown(TRUE);
}
+ else if(anim_id == ANIM_AGENT_SNAPSHOT && announce_snapshots)
+ {
+ std::string name;
+ LLAvatarNameCache::getPNSName(mID, name);
+ LLChat chat;
+ chat.mFromName = name;
+ chat.mText = name + " " + LLTrans::getString("took_a_snapshot") + ".";
+ chat.mURL = llformat("secondlife:///app/agent/%s/about",mID.asString().c_str());
+ chat.mSourceType = CHAT_SOURCE_SYSTEM;
+ LLFloaterChat::addChat(chat);
+ }
if (startMotion(anim_id))
diff --git a/indra/newview/skins/Blackdark/colors.xml b/indra/newview/skins/Blackdark/colors.xml
new file mode 100644
index 000000000..e076f94eb
--- /dev/null
+++ b/indra/newview/skins/Blackdark/colors.xml
@@ -0,0 +1,203 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/indra/newview/skins/Blackdark/textures/0098b015-3daf-4cfe-a72f-915369ea97c2.tga b/indra/newview/skins/Blackdark/textures/0098b015-3daf-4cfe-a72f-915369ea97c2.tga
new file mode 100644
index 000000000..352bcdad2
Binary files /dev/null and b/indra/newview/skins/Blackdark/textures/0098b015-3daf-4cfe-a72f-915369ea97c2.tga differ
diff --git a/indra/newview/skins/Blackdark/textures/3c18c87e-5f50-14e2-e744-f44734aa365f.tga b/indra/newview/skins/Blackdark/textures/3c18c87e-5f50-14e2-e744-f44734aa365f.tga
new file mode 100644
index 000000000..e90ab295b
Binary files /dev/null and b/indra/newview/skins/Blackdark/textures/3c18c87e-5f50-14e2-e744-f44734aa365f.tga differ
diff --git a/indra/newview/skins/Blackdark/textures/5748decc-f629-461c-9a36-a35a221fe21f.tga b/indra/newview/skins/Blackdark/textures/5748decc-f629-461c-9a36-a35a221fe21f.tga
new file mode 100644
index 000000000..55e379309
Binary files /dev/null and b/indra/newview/skins/Blackdark/textures/5748decc-f629-461c-9a36-a35a221fe21f.tga differ
diff --git a/indra/newview/skins/Blackdark/textures/7a0b1bdb-b5d9-4df5-bac2-ba230da93b5b.tga b/indra/newview/skins/Blackdark/textures/7a0b1bdb-b5d9-4df5-bac2-ba230da93b5b.tga
new file mode 100644
index 000000000..a79430cef
Binary files /dev/null and b/indra/newview/skins/Blackdark/textures/7a0b1bdb-b5d9-4df5-bac2-ba230da93b5b.tga differ
diff --git a/indra/newview/skins/Blackdark/textures/7dabc040-ec13-2309-ddf7-4f161f6de2f4.tga b/indra/newview/skins/Blackdark/textures/7dabc040-ec13-2309-ddf7-4f161f6de2f4.tga
new file mode 100644
index 000000000..534ecba91
Binary files /dev/null and b/indra/newview/skins/Blackdark/textures/7dabc040-ec13-2309-ddf7-4f161f6de2f4.tga differ
diff --git a/indra/newview/skins/Blackdark/textures/89e9fc7c-0b16-457d-be4f-136270759c4d.tga b/indra/newview/skins/Blackdark/textures/89e9fc7c-0b16-457d-be4f-136270759c4d.tga
new file mode 100644
index 000000000..6cc9ea194
Binary files /dev/null and b/indra/newview/skins/Blackdark/textures/89e9fc7c-0b16-457d-be4f-136270759c4d.tga differ
diff --git a/indra/newview/skins/Blackdark/textures/9cad3e6d-2d6d-107d-f8ab-5ba272b5bfe1.tga b/indra/newview/skins/Blackdark/textures/9cad3e6d-2d6d-107d-f8ab-5ba272b5bfe1.tga
new file mode 100644
index 000000000..e90ab295b
Binary files /dev/null and b/indra/newview/skins/Blackdark/textures/9cad3e6d-2d6d-107d-f8ab-5ba272b5bfe1.tga differ
diff --git a/indra/newview/skins/Blackdark/textures/active_speakers.tga b/indra/newview/skins/Blackdark/textures/active_speakers.tga
new file mode 100644
index 000000000..1e0eb5a32
Binary files /dev/null and b/indra/newview/skins/Blackdark/textures/active_speakers.tga differ
diff --git a/indra/newview/skins/Blackdark/textures/active_voice_tab.tga b/indra/newview/skins/Blackdark/textures/active_voice_tab.tga
new file mode 100644
index 000000000..c104ba289
Binary files /dev/null and b/indra/newview/skins/Blackdark/textures/active_voice_tab.tga differ
diff --git a/indra/newview/skins/Blackdark/textures/arrow_down.tga b/indra/newview/skins/Blackdark/textures/arrow_down.tga
new file mode 100644
index 000000000..89a793bcb
Binary files /dev/null and b/indra/newview/skins/Blackdark/textures/arrow_down.tga differ
diff --git a/indra/newview/skins/Blackdark/textures/arrow_up.tga b/indra/newview/skins/Blackdark/textures/arrow_up.tga
new file mode 100644
index 000000000..5b03c5433
Binary files /dev/null and b/indra/newview/skins/Blackdark/textures/arrow_up.tga differ
diff --git a/indra/newview/skins/Blackdark/textures/b4870163-6208-42a9-9801-93133bf9a6cd.tga b/indra/newview/skins/Blackdark/textures/b4870163-6208-42a9-9801-93133bf9a6cd.tga
new file mode 100644
index 000000000..35d979972
Binary files /dev/null and b/indra/newview/skins/Blackdark/textures/b4870163-6208-42a9-9801-93133bf9a6cd.tga differ
diff --git a/indra/newview/skins/Blackdark/textures/badge_error.j2c b/indra/newview/skins/Blackdark/textures/badge_error.j2c
new file mode 100644
index 000000000..efb5c375c
Binary files /dev/null and b/indra/newview/skins/Blackdark/textures/badge_error.j2c differ
diff --git a/indra/newview/skins/Blackdark/textures/badge_note.j2c b/indra/newview/skins/Blackdark/textures/badge_note.j2c
new file mode 100644
index 000000000..ef5db9e0d
Binary files /dev/null and b/indra/newview/skins/Blackdark/textures/badge_note.j2c differ
diff --git a/indra/newview/skins/Blackdark/textures/badge_ok.j2c b/indra/newview/skins/Blackdark/textures/badge_ok.j2c
new file mode 100644
index 000000000..8ceee01c6
Binary files /dev/null and b/indra/newview/skins/Blackdark/textures/badge_ok.j2c differ
diff --git a/indra/newview/skins/Blackdark/textures/badge_warn.j2c b/indra/newview/skins/Blackdark/textures/badge_warn.j2c
new file mode 100644
index 000000000..8fb85be69
Binary files /dev/null and b/indra/newview/skins/Blackdark/textures/badge_warn.j2c differ
diff --git a/indra/newview/skins/Blackdark/textures/black.tga b/indra/newview/skins/Blackdark/textures/black.tga
new file mode 100644
index 000000000..e368ea496
Binary files /dev/null and b/indra/newview/skins/Blackdark/textures/black.tga differ
diff --git a/indra/newview/skins/Blackdark/textures/btn_chatbar.tga b/indra/newview/skins/Blackdark/textures/btn_chatbar.tga
new file mode 100644
index 000000000..07117925a
Binary files /dev/null and b/indra/newview/skins/Blackdark/textures/btn_chatbar.tga differ
diff --git a/indra/newview/skins/Blackdark/textures/btn_chatbar_selected.tga b/indra/newview/skins/Blackdark/textures/btn_chatbar_selected.tga
new file mode 100644
index 000000000..a935ed396
Binary files /dev/null and b/indra/newview/skins/Blackdark/textures/btn_chatbar_selected.tga differ
diff --git a/indra/newview/skins/Blackdark/textures/button_anim_pause.tga b/indra/newview/skins/Blackdark/textures/button_anim_pause.tga
new file mode 100644
index 000000000..5a8f2f544
Binary files /dev/null and b/indra/newview/skins/Blackdark/textures/button_anim_pause.tga differ
diff --git a/indra/newview/skins/Blackdark/textures/button_anim_pause_selected.tga b/indra/newview/skins/Blackdark/textures/button_anim_pause_selected.tga
new file mode 100644
index 000000000..380e00416
Binary files /dev/null and b/indra/newview/skins/Blackdark/textures/button_anim_pause_selected.tga differ
diff --git a/indra/newview/skins/Blackdark/textures/button_anim_play.tga b/indra/newview/skins/Blackdark/textures/button_anim_play.tga
new file mode 100644
index 000000000..d7a7220d4
Binary files /dev/null and b/indra/newview/skins/Blackdark/textures/button_anim_play.tga differ
diff --git a/indra/newview/skins/Blackdark/textures/button_anim_play_selected.tga b/indra/newview/skins/Blackdark/textures/button_anim_play_selected.tga
new file mode 100644
index 000000000..778fbf062
Binary files /dev/null and b/indra/newview/skins/Blackdark/textures/button_anim_play_selected.tga differ
diff --git a/indra/newview/skins/Blackdark/textures/button_anim_stop.tga b/indra/newview/skins/Blackdark/textures/button_anim_stop.tga
new file mode 100644
index 000000000..f470fa927
Binary files /dev/null and b/indra/newview/skins/Blackdark/textures/button_anim_stop.tga differ
diff --git a/indra/newview/skins/Blackdark/textures/button_anim_stop_selected.tga b/indra/newview/skins/Blackdark/textures/button_anim_stop_selected.tga
new file mode 100644
index 000000000..e07ea176a
Binary files /dev/null and b/indra/newview/skins/Blackdark/textures/button_anim_stop_selected.tga differ
diff --git a/indra/newview/skins/Blackdark/textures/button_disabled_32x128.tga b/indra/newview/skins/Blackdark/textures/button_disabled_32x128.tga
new file mode 100644
index 000000000..fd117209f
Binary files /dev/null and b/indra/newview/skins/Blackdark/textures/button_disabled_32x128.tga differ
diff --git a/indra/newview/skins/Blackdark/textures/button_enabled_32x128.tga b/indra/newview/skins/Blackdark/textures/button_enabled_32x128.tga
new file mode 100644
index 000000000..fd117209f
Binary files /dev/null and b/indra/newview/skins/Blackdark/textures/button_enabled_32x128.tga differ
diff --git a/indra/newview/skins/Blackdark/textures/button_enabled_selected_32x128.tga b/indra/newview/skins/Blackdark/textures/button_enabled_selected_32x128.tga
new file mode 100644
index 000000000..138b908b2
Binary files /dev/null and b/indra/newview/skins/Blackdark/textures/button_enabled_selected_32x128.tga differ
diff --git a/indra/newview/skins/Blackdark/textures/c1e21504-f136-451d-b8e9-929037812f1d.tga b/indra/newview/skins/Blackdark/textures/c1e21504-f136-451d-b8e9-929037812f1d.tga
new file mode 100644
index 000000000..53c8959a6
Binary files /dev/null and b/indra/newview/skins/Blackdark/textures/c1e21504-f136-451d-b8e9-929037812f1d.tga differ
diff --git a/indra/newview/skins/Blackdark/textures/c63f124c-6340-4fbf-b59e-0869a44adb64.tga b/indra/newview/skins/Blackdark/textures/c63f124c-6340-4fbf-b59e-0869a44adb64.tga
new file mode 100644
index 000000000..cbc02b4a4
Binary files /dev/null and b/indra/newview/skins/Blackdark/textures/c63f124c-6340-4fbf-b59e-0869a44adb64.tga differ
diff --git a/indra/newview/skins/Blackdark/textures/cam_rotate_in.tga b/indra/newview/skins/Blackdark/textures/cam_rotate_in.tga
new file mode 100644
index 000000000..84c647202
Binary files /dev/null and b/indra/newview/skins/Blackdark/textures/cam_rotate_in.tga differ
diff --git a/indra/newview/skins/Blackdark/textures/cam_rotate_out.tga b/indra/newview/skins/Blackdark/textures/cam_rotate_out.tga
new file mode 100644
index 000000000..2bcd371a7
Binary files /dev/null and b/indra/newview/skins/Blackdark/textures/cam_rotate_out.tga differ
diff --git a/indra/newview/skins/Blackdark/textures/cam_tracking_in.tga b/indra/newview/skins/Blackdark/textures/cam_tracking_in.tga
new file mode 100644
index 000000000..c23119944
Binary files /dev/null and b/indra/newview/skins/Blackdark/textures/cam_tracking_in.tga differ
diff --git a/indra/newview/skins/Blackdark/textures/cam_tracking_out.tga b/indra/newview/skins/Blackdark/textures/cam_tracking_out.tga
new file mode 100644
index 000000000..9cc25d21c
Binary files /dev/null and b/indra/newview/skins/Blackdark/textures/cam_tracking_out.tga differ
diff --git a/indra/newview/skins/Blackdark/textures/cam_zoom_minus_in.tga b/indra/newview/skins/Blackdark/textures/cam_zoom_minus_in.tga
new file mode 100644
index 000000000..29261e484
Binary files /dev/null and b/indra/newview/skins/Blackdark/textures/cam_zoom_minus_in.tga differ
diff --git a/indra/newview/skins/Blackdark/textures/cam_zoom_out.tga b/indra/newview/skins/Blackdark/textures/cam_zoom_out.tga
new file mode 100644
index 000000000..c0e771aab
Binary files /dev/null and b/indra/newview/skins/Blackdark/textures/cam_zoom_out.tga differ
diff --git a/indra/newview/skins/Blackdark/textures/cam_zoom_plus_in.tga b/indra/newview/skins/Blackdark/textures/cam_zoom_plus_in.tga
new file mode 100644
index 000000000..b342dde08
Binary files /dev/null and b/indra/newview/skins/Blackdark/textures/cam_zoom_plus_in.tga differ
diff --git a/indra/newview/skins/Blackdark/textures/ce15fd63-b0b6-463c-a37d-ea6393208b3e.tga b/indra/newview/skins/Blackdark/textures/ce15fd63-b0b6-463c-a37d-ea6393208b3e.tga
new file mode 100644
index 000000000..0717b393e
Binary files /dev/null and b/indra/newview/skins/Blackdark/textures/ce15fd63-b0b6-463c-a37d-ea6393208b3e.tga differ
diff --git a/indra/newview/skins/Blackdark/textures/checkbox_disabled_false.tga b/indra/newview/skins/Blackdark/textures/checkbox_disabled_false.tga
new file mode 100644
index 000000000..aa57cd211
Binary files /dev/null and b/indra/newview/skins/Blackdark/textures/checkbox_disabled_false.tga differ
diff --git a/indra/newview/skins/Blackdark/textures/checkbox_disabled_true.tga b/indra/newview/skins/Blackdark/textures/checkbox_disabled_true.tga
new file mode 100644
index 000000000..5dfee7d46
Binary files /dev/null and b/indra/newview/skins/Blackdark/textures/checkbox_disabled_true.tga differ
diff --git a/indra/newview/skins/Blackdark/textures/checkbox_enabled_false.tga b/indra/newview/skins/Blackdark/textures/checkbox_enabled_false.tga
new file mode 100644
index 000000000..fb8265b18
Binary files /dev/null and b/indra/newview/skins/Blackdark/textures/checkbox_enabled_false.tga differ
diff --git a/indra/newview/skins/Blackdark/textures/checkbox_enabled_true.tga b/indra/newview/skins/Blackdark/textures/checkbox_enabled_true.tga
new file mode 100644
index 000000000..8372e309b
Binary files /dev/null and b/indra/newview/skins/Blackdark/textures/checkbox_enabled_true.tga differ
diff --git a/indra/newview/skins/Blackdark/textures/circle.tga b/indra/newview/skins/Blackdark/textures/circle.tga
new file mode 100644
index 000000000..d7097e3a3
Binary files /dev/null and b/indra/newview/skins/Blackdark/textures/circle.tga differ
diff --git a/indra/newview/skins/Blackdark/textures/close_in_blue.tga b/indra/newview/skins/Blackdark/textures/close_in_blue.tga
new file mode 100644
index 000000000..c58e052b8
Binary files /dev/null and b/indra/newview/skins/Blackdark/textures/close_in_blue.tga differ
diff --git a/indra/newview/skins/Blackdark/textures/close_inactive.tga b/indra/newview/skins/Blackdark/textures/close_inactive.tga
new file mode 100644
index 000000000..30f6e7b5f
Binary files /dev/null and b/indra/newview/skins/Blackdark/textures/close_inactive.tga differ
diff --git a/indra/newview/skins/Blackdark/textures/close_inactive_blue.tga b/indra/newview/skins/Blackdark/textures/close_inactive_blue.tga
new file mode 100644
index 000000000..2f912df59
Binary files /dev/null and b/indra/newview/skins/Blackdark/textures/close_inactive_blue.tga differ
diff --git a/indra/newview/skins/Blackdark/textures/closebox.tga b/indra/newview/skins/Blackdark/textures/closebox.tga
new file mode 100644
index 000000000..5e1195526
Binary files /dev/null and b/indra/newview/skins/Blackdark/textures/closebox.tga differ
diff --git a/indra/newview/skins/Blackdark/textures/combobox_arrow.tga b/indra/newview/skins/Blackdark/textures/combobox_arrow.tga
new file mode 100644
index 000000000..4bdcf6e14
Binary files /dev/null and b/indra/newview/skins/Blackdark/textures/combobox_arrow.tga differ
diff --git a/indra/newview/skins/Blackdark/textures/d07f6eed-b96a-47cd-b51d-400ad4a1c428.j2c b/indra/newview/skins/Blackdark/textures/d07f6eed-b96a-47cd-b51d-400ad4a1c428.j2c
new file mode 100644
index 000000000..4b73b25ac
Binary files /dev/null and b/indra/newview/skins/Blackdark/textures/d07f6eed-b96a-47cd-b51d-400ad4a1c428.j2c differ
diff --git a/indra/newview/skins/Blackdark/textures/darkgray.tga b/indra/newview/skins/Blackdark/textures/darkgray.tga
new file mode 100644
index 000000000..e69be0893
Binary files /dev/null and b/indra/newview/skins/Blackdark/textures/darkgray.tga differ
diff --git a/indra/newview/skins/Blackdark/textures/default_land_picture.j2c b/indra/newview/skins/Blackdark/textures/default_land_picture.j2c
new file mode 100644
index 000000000..6e2a85a46
Binary files /dev/null and b/indra/newview/skins/Blackdark/textures/default_land_picture.j2c differ
diff --git a/indra/newview/skins/Blackdark/textures/default_profile_picture.j2c b/indra/newview/skins/Blackdark/textures/default_profile_picture.j2c
new file mode 100644
index 000000000..31d741e88
Binary files /dev/null and b/indra/newview/skins/Blackdark/textures/default_profile_picture.j2c differ
diff --git a/indra/newview/skins/Blackdark/textures/direction_arrow.tga b/indra/newview/skins/Blackdark/textures/direction_arrow.tga
new file mode 100644
index 000000000..59149e1d5
Binary files /dev/null and b/indra/newview/skins/Blackdark/textures/direction_arrow.tga differ
diff --git a/indra/newview/skins/Blackdark/textures/down_arrow.png b/indra/newview/skins/Blackdark/textures/down_arrow.png
new file mode 100644
index 000000000..46bb251f5
Binary files /dev/null and b/indra/newview/skins/Blackdark/textures/down_arrow.png differ
diff --git a/indra/newview/skins/Blackdark/textures/eye_button_active.tga b/indra/newview/skins/Blackdark/textures/eye_button_active.tga
new file mode 100644
index 000000000..d4a9c2455
Binary files /dev/null and b/indra/newview/skins/Blackdark/textures/eye_button_active.tga differ
diff --git a/indra/newview/skins/Blackdark/textures/eye_button_inactive.tga b/indra/newview/skins/Blackdark/textures/eye_button_inactive.tga
new file mode 100644
index 000000000..edfdeba45
Binary files /dev/null and b/indra/newview/skins/Blackdark/textures/eye_button_inactive.tga differ
diff --git a/indra/newview/skins/Blackdark/textures/ff9a71eb-7414-4cf8-866e-a701deb7c3cf.tga b/indra/newview/skins/Blackdark/textures/ff9a71eb-7414-4cf8-866e-a701deb7c3cf.tga
new file mode 100644
index 000000000..534ecba91
Binary files /dev/null and b/indra/newview/skins/Blackdark/textures/ff9a71eb-7414-4cf8-866e-a701deb7c3cf.tga differ
diff --git a/indra/newview/skins/Blackdark/textures/ff_edit_mine_button.tga b/indra/newview/skins/Blackdark/textures/ff_edit_mine_button.tga
new file mode 100644
index 000000000..150354d99
Binary files /dev/null and b/indra/newview/skins/Blackdark/textures/ff_edit_mine_button.tga differ
diff --git a/indra/newview/skins/Blackdark/textures/ff_edit_theirs_button.tga b/indra/newview/skins/Blackdark/textures/ff_edit_theirs_button.tga
new file mode 100644
index 000000000..2a0efd61f
Binary files /dev/null and b/indra/newview/skins/Blackdark/textures/ff_edit_theirs_button.tga differ
diff --git a/indra/newview/skins/Blackdark/textures/ff_online_status_button.tga b/indra/newview/skins/Blackdark/textures/ff_online_status_button.tga
new file mode 100644
index 000000000..058a66f26
Binary files /dev/null and b/indra/newview/skins/Blackdark/textures/ff_online_status_button.tga differ
diff --git a/indra/newview/skins/Blackdark/textures/ff_visible_map_button.tga b/indra/newview/skins/Blackdark/textures/ff_visible_map_button.tga
new file mode 100644
index 000000000..9053eed64
Binary files /dev/null and b/indra/newview/skins/Blackdark/textures/ff_visible_map_button.tga differ
diff --git a/indra/newview/skins/Blackdark/textures/ff_visible_online_button.tga b/indra/newview/skins/Blackdark/textures/ff_visible_online_button.tga
new file mode 100644
index 000000000..8d4d3a8d2
Binary files /dev/null and b/indra/newview/skins/Blackdark/textures/ff_visible_online_button.tga differ
diff --git a/indra/newview/skins/Blackdark/textures/flyout_btn_left.tga b/indra/newview/skins/Blackdark/textures/flyout_btn_left.tga
new file mode 100644
index 000000000..1ff9aea29
Binary files /dev/null and b/indra/newview/skins/Blackdark/textures/flyout_btn_left.tga differ
diff --git a/indra/newview/skins/Blackdark/textures/flyout_btn_left_disabled.tga b/indra/newview/skins/Blackdark/textures/flyout_btn_left_disabled.tga
new file mode 100644
index 000000000..1ff9aea29
Binary files /dev/null and b/indra/newview/skins/Blackdark/textures/flyout_btn_left_disabled.tga differ
diff --git a/indra/newview/skins/Blackdark/textures/flyout_btn_left_selected.tga b/indra/newview/skins/Blackdark/textures/flyout_btn_left_selected.tga
new file mode 100644
index 000000000..c0245c65d
Binary files /dev/null and b/indra/newview/skins/Blackdark/textures/flyout_btn_left_selected.tga differ
diff --git a/indra/newview/skins/Blackdark/textures/flyout_btn_right.tga b/indra/newview/skins/Blackdark/textures/flyout_btn_right.tga
new file mode 100644
index 000000000..932e39abd
Binary files /dev/null and b/indra/newview/skins/Blackdark/textures/flyout_btn_right.tga differ
diff --git a/indra/newview/skins/Blackdark/textures/flyout_btn_right_disabled.tga b/indra/newview/skins/Blackdark/textures/flyout_btn_right_disabled.tga
new file mode 100644
index 000000000..932e39abd
Binary files /dev/null and b/indra/newview/skins/Blackdark/textures/flyout_btn_right_disabled.tga differ
diff --git a/indra/newview/skins/Blackdark/textures/flyout_btn_right_selected.tga b/indra/newview/skins/Blackdark/textures/flyout_btn_right_selected.tga
new file mode 100644
index 000000000..9a69d39d9
Binary files /dev/null and b/indra/newview/skins/Blackdark/textures/flyout_btn_right_selected.tga differ
diff --git a/indra/newview/skins/Blackdark/textures/flyout_left.tga b/indra/newview/skins/Blackdark/textures/flyout_left.tga
new file mode 100644
index 000000000..af599c019
Binary files /dev/null and b/indra/newview/skins/Blackdark/textures/flyout_left.tga differ
diff --git a/indra/newview/skins/Blackdark/textures/flyout_left_disabled.tga b/indra/newview/skins/Blackdark/textures/flyout_left_disabled.tga
new file mode 100644
index 000000000..af599c019
Binary files /dev/null and b/indra/newview/skins/Blackdark/textures/flyout_left_disabled.tga differ
diff --git a/indra/newview/skins/Blackdark/textures/flyout_left_selected.tga b/indra/newview/skins/Blackdark/textures/flyout_left_selected.tga
new file mode 100644
index 000000000..b55567d88
Binary files /dev/null and b/indra/newview/skins/Blackdark/textures/flyout_left_selected.tga differ
diff --git a/indra/newview/skins/Blackdark/textures/folder_arrow.tga b/indra/newview/skins/Blackdark/textures/folder_arrow.tga
new file mode 100644
index 000000000..734a00a84
Binary files /dev/null and b/indra/newview/skins/Blackdark/textures/folder_arrow.tga differ
diff --git a/indra/newview/skins/Blackdark/textures/icn_active-speakers-dot-lvl0.tga b/indra/newview/skins/Blackdark/textures/icn_active-speakers-dot-lvl0.tga
new file mode 100644
index 000000000..35846cef3
Binary files /dev/null and b/indra/newview/skins/Blackdark/textures/icn_active-speakers-dot-lvl0.tga differ
diff --git a/indra/newview/skins/Blackdark/textures/icn_active-speakers-dot-lvl1.tga b/indra/newview/skins/Blackdark/textures/icn_active-speakers-dot-lvl1.tga
new file mode 100644
index 000000000..1f9f564fa
Binary files /dev/null and b/indra/newview/skins/Blackdark/textures/icn_active-speakers-dot-lvl1.tga differ
diff --git a/indra/newview/skins/Blackdark/textures/icn_active-speakers-dot-lvl2.tga b/indra/newview/skins/Blackdark/textures/icn_active-speakers-dot-lvl2.tga
new file mode 100644
index 000000000..b2e5609f1
Binary files /dev/null and b/indra/newview/skins/Blackdark/textures/icn_active-speakers-dot-lvl2.tga differ
diff --git a/indra/newview/skins/Blackdark/textures/icn_active-speakers-typing1.tga b/indra/newview/skins/Blackdark/textures/icn_active-speakers-typing1.tga
new file mode 100644
index 000000000..3706c96e0
Binary files /dev/null and b/indra/newview/skins/Blackdark/textures/icn_active-speakers-typing1.tga differ
diff --git a/indra/newview/skins/Blackdark/textures/icn_active-speakers-typing2.tga b/indra/newview/skins/Blackdark/textures/icn_active-speakers-typing2.tga
new file mode 100644
index 000000000..0d127f946
Binary files /dev/null and b/indra/newview/skins/Blackdark/textures/icn_active-speakers-typing2.tga differ
diff --git a/indra/newview/skins/Blackdark/textures/icn_active-speakers-typing3.tga b/indra/newview/skins/Blackdark/textures/icn_active-speakers-typing3.tga
new file mode 100644
index 000000000..031b3ad34
Binary files /dev/null and b/indra/newview/skins/Blackdark/textures/icn_active-speakers-typing3.tga differ
diff --git a/indra/newview/skins/Blackdark/textures/icn_chatbar.tga b/indra/newview/skins/Blackdark/textures/icn_chatbar.tga
new file mode 100644
index 000000000..b89dfc432
Binary files /dev/null and b/indra/newview/skins/Blackdark/textures/icn_chatbar.tga differ
diff --git a/indra/newview/skins/Blackdark/textures/icn_clear_lineeditor.tga b/indra/newview/skins/Blackdark/textures/icn_clear_lineeditor.tga
new file mode 100644
index 000000000..8cd8310c6
Binary files /dev/null and b/indra/newview/skins/Blackdark/textures/icn_clear_lineeditor.tga differ
diff --git a/indra/newview/skins/Blackdark/textures/icn_label_media.tga b/indra/newview/skins/Blackdark/textures/icn_label_media.tga
new file mode 100644
index 000000000..b16c528e9
Binary files /dev/null and b/indra/newview/skins/Blackdark/textures/icn_label_media.tga differ
diff --git a/indra/newview/skins/Blackdark/textures/icn_label_music.tga b/indra/newview/skins/Blackdark/textures/icn_label_music.tga
new file mode 100644
index 000000000..515f170b6
Binary files /dev/null and b/indra/newview/skins/Blackdark/textures/icn_label_music.tga differ
diff --git a/indra/newview/skins/Blackdark/textures/icn_label_web.tga b/indra/newview/skins/Blackdark/textures/icn_label_web.tga
new file mode 100644
index 000000000..6cacfad7a
Binary files /dev/null and b/indra/newview/skins/Blackdark/textures/icn_label_web.tga differ
diff --git a/indra/newview/skins/Blackdark/textures/icn_media-pause_active.tga b/indra/newview/skins/Blackdark/textures/icn_media-pause_active.tga
new file mode 100644
index 000000000..8988829aa
Binary files /dev/null and b/indra/newview/skins/Blackdark/textures/icn_media-pause_active.tga differ
diff --git a/indra/newview/skins/Blackdark/textures/icn_media-pause_disabled.tga b/indra/newview/skins/Blackdark/textures/icn_media-pause_disabled.tga
new file mode 100644
index 000000000..4690f4256
Binary files /dev/null and b/indra/newview/skins/Blackdark/textures/icn_media-pause_disabled.tga differ
diff --git a/indra/newview/skins/Blackdark/textures/icn_media-pause_enabled.tga b/indra/newview/skins/Blackdark/textures/icn_media-pause_enabled.tga
new file mode 100644
index 000000000..c01399e27
Binary files /dev/null and b/indra/newview/skins/Blackdark/textures/icn_media-pause_enabled.tga differ
diff --git a/indra/newview/skins/Blackdark/textures/icn_media-play_enabled.tga b/indra/newview/skins/Blackdark/textures/icn_media-play_enabled.tga
new file mode 100644
index 000000000..accac38b0
Binary files /dev/null and b/indra/newview/skins/Blackdark/textures/icn_media-play_enabled.tga differ
diff --git a/indra/newview/skins/Blackdark/textures/icn_media-stop_enabled.tga b/indra/newview/skins/Blackdark/textures/icn_media-stop_enabled.tga
new file mode 100644
index 000000000..d935fa317
Binary files /dev/null and b/indra/newview/skins/Blackdark/textures/icn_media-stop_enabled.tga differ
diff --git a/indra/newview/skins/Blackdark/textures/icn_media.tga b/indra/newview/skins/Blackdark/textures/icn_media.tga
new file mode 100644
index 000000000..2a035ba5d
Binary files /dev/null and b/indra/newview/skins/Blackdark/textures/icn_media.tga differ
diff --git a/indra/newview/skins/Blackdark/textures/icn_media_movie.tga b/indra/newview/skins/Blackdark/textures/icn_media_movie.tga
new file mode 100644
index 000000000..b16c528e9
Binary files /dev/null and b/indra/newview/skins/Blackdark/textures/icn_media_movie.tga differ
diff --git a/indra/newview/skins/Blackdark/textures/icn_media_web.tga b/indra/newview/skins/Blackdark/textures/icn_media_web.tga
new file mode 100644
index 000000000..a92ae962b
Binary files /dev/null and b/indra/newview/skins/Blackdark/textures/icn_media_web.tga differ
diff --git a/indra/newview/skins/Blackdark/textures/icn_music.tga b/indra/newview/skins/Blackdark/textures/icn_music.tga
new file mode 100644
index 000000000..81da5abcf
Binary files /dev/null and b/indra/newview/skins/Blackdark/textures/icn_music.tga differ
diff --git a/indra/newview/skins/Blackdark/textures/icn_pause.tga b/indra/newview/skins/Blackdark/textures/icn_pause.tga
new file mode 100644
index 000000000..3bc286f5f
Binary files /dev/null and b/indra/newview/skins/Blackdark/textures/icn_pause.tga differ
diff --git a/indra/newview/skins/Blackdark/textures/icn_play.tga b/indra/newview/skins/Blackdark/textures/icn_play.tga
new file mode 100644
index 000000000..a23ef52e3
Binary files /dev/null and b/indra/newview/skins/Blackdark/textures/icn_play.tga differ
diff --git a/indra/newview/skins/Blackdark/textures/icn_rounded-text-field.tga b/indra/newview/skins/Blackdark/textures/icn_rounded-text-field.tga
new file mode 100644
index 000000000..1f1e72572
Binary files /dev/null and b/indra/newview/skins/Blackdark/textures/icn_rounded-text-field.tga differ
diff --git a/indra/newview/skins/Blackdark/textures/icn_scrollbar.tga b/indra/newview/skins/Blackdark/textures/icn_scrollbar.tga
new file mode 100644
index 000000000..5b56da71a
Binary files /dev/null and b/indra/newview/skins/Blackdark/textures/icn_scrollbar.tga differ
diff --git a/indra/newview/skins/Blackdark/textures/icn_scrollbar_bg.tga b/indra/newview/skins/Blackdark/textures/icn_scrollbar_bg.tga
new file mode 100644
index 000000000..5b56da71a
Binary files /dev/null and b/indra/newview/skins/Blackdark/textures/icn_scrollbar_bg.tga differ
diff --git a/indra/newview/skins/Blackdark/textures/icn_scrollbar_thumb.tga b/indra/newview/skins/Blackdark/textures/icn_scrollbar_thumb.tga
new file mode 100644
index 000000000..5b56da71a
Binary files /dev/null and b/indra/newview/skins/Blackdark/textures/icn_scrollbar_thumb.tga differ
diff --git a/indra/newview/skins/Blackdark/textures/icn_slide-groove_dark.tga b/indra/newview/skins/Blackdark/textures/icn_slide-groove_dark.tga
new file mode 100644
index 000000000..d893fada0
Binary files /dev/null and b/indra/newview/skins/Blackdark/textures/icn_slide-groove_dark.tga differ
diff --git a/indra/newview/skins/Blackdark/textures/icn_slide-highlight.tga b/indra/newview/skins/Blackdark/textures/icn_slide-highlight.tga
new file mode 100644
index 000000000..d371cd066
Binary files /dev/null and b/indra/newview/skins/Blackdark/textures/icn_slide-highlight.tga differ
diff --git a/indra/newview/skins/Blackdark/textures/icn_slide-thumb_dark.tga b/indra/newview/skins/Blackdark/textures/icn_slide-thumb_dark.tga
new file mode 100644
index 000000000..cf96786fd
Binary files /dev/null and b/indra/newview/skins/Blackdark/textures/icn_slide-thumb_dark.tga differ
diff --git a/indra/newview/skins/Blackdark/textures/icn_speaker-muted_dark.tga b/indra/newview/skins/Blackdark/textures/icn_speaker-muted_dark.tga
new file mode 100644
index 000000000..8f2c80dd2
Binary files /dev/null and b/indra/newview/skins/Blackdark/textures/icn_speaker-muted_dark.tga differ
diff --git a/indra/newview/skins/Blackdark/textures/icn_speaker_dark.tga b/indra/newview/skins/Blackdark/textures/icn_speaker_dark.tga
new file mode 100644
index 000000000..c2ee04044
Binary files /dev/null and b/indra/newview/skins/Blackdark/textures/icn_speaker_dark.tga differ
diff --git a/indra/newview/skins/Blackdark/textures/icn_stop.tga b/indra/newview/skins/Blackdark/textures/icn_stop.tga
new file mode 100644
index 000000000..2925b3853
Binary files /dev/null and b/indra/newview/skins/Blackdark/textures/icn_stop.tga differ
diff --git a/indra/newview/skins/Blackdark/textures/icn_toolbar_build.tga b/indra/newview/skins/Blackdark/textures/icn_toolbar_build.tga
new file mode 100644
index 000000000..c7cab6b38
Binary files /dev/null and b/indra/newview/skins/Blackdark/textures/icn_toolbar_build.tga differ
diff --git a/indra/newview/skins/Blackdark/textures/icn_toolbar_fly.tga b/indra/newview/skins/Blackdark/textures/icn_toolbar_fly.tga
new file mode 100644
index 000000000..c7cab6b38
Binary files /dev/null and b/indra/newview/skins/Blackdark/textures/icn_toolbar_fly.tga differ
diff --git a/indra/newview/skins/Blackdark/textures/icn_toolbar_inventory.tga b/indra/newview/skins/Blackdark/textures/icn_toolbar_inventory.tga
new file mode 100644
index 000000000..c7cab6b38
Binary files /dev/null and b/indra/newview/skins/Blackdark/textures/icn_toolbar_inventory.tga differ
diff --git a/indra/newview/skins/Blackdark/textures/icn_toolbar_map.tga b/indra/newview/skins/Blackdark/textures/icn_toolbar_map.tga
new file mode 100644
index 000000000..c7cab6b38
Binary files /dev/null and b/indra/newview/skins/Blackdark/textures/icn_toolbar_map.tga differ
diff --git a/indra/newview/skins/Blackdark/textures/icn_toolbar_minimap.tga b/indra/newview/skins/Blackdark/textures/icn_toolbar_minimap.tga
new file mode 100644
index 000000000..c7cab6b38
Binary files /dev/null and b/indra/newview/skins/Blackdark/textures/icn_toolbar_minimap.tga differ
diff --git a/indra/newview/skins/Blackdark/textures/icn_toolbar_radar.tga b/indra/newview/skins/Blackdark/textures/icn_toolbar_radar.tga
new file mode 100644
index 000000000..d1a55ed74
Binary files /dev/null and b/indra/newview/skins/Blackdark/textures/icn_toolbar_radar.tga differ
diff --git a/indra/newview/skins/Blackdark/textures/icn_toolbar_search.tga b/indra/newview/skins/Blackdark/textures/icn_toolbar_search.tga
new file mode 100644
index 000000000..c7cab6b38
Binary files /dev/null and b/indra/newview/skins/Blackdark/textures/icn_toolbar_search.tga differ
diff --git a/indra/newview/skins/Blackdark/textures/icn_toolbar_snapshot.tga b/indra/newview/skins/Blackdark/textures/icn_toolbar_snapshot.tga
new file mode 100644
index 000000000..c7cab6b38
Binary files /dev/null and b/indra/newview/skins/Blackdark/textures/icn_toolbar_snapshot.tga differ
diff --git a/indra/newview/skins/Blackdark/textures/icn_voice-call-end.tga b/indra/newview/skins/Blackdark/textures/icn_voice-call-end.tga
new file mode 100644
index 000000000..84056b90a
Binary files /dev/null and b/indra/newview/skins/Blackdark/textures/icn_voice-call-end.tga differ
diff --git a/indra/newview/skins/Blackdark/textures/icn_voice-call-start.tga b/indra/newview/skins/Blackdark/textures/icn_voice-call-start.tga
new file mode 100644
index 000000000..7babfd318
Binary files /dev/null and b/indra/newview/skins/Blackdark/textures/icn_voice-call-start.tga differ
diff --git a/indra/newview/skins/Blackdark/textures/icn_voice-groupfocus.tga b/indra/newview/skins/Blackdark/textures/icn_voice-groupfocus.tga
new file mode 100644
index 000000000..913bd0969
Binary files /dev/null and b/indra/newview/skins/Blackdark/textures/icn_voice-groupfocus.tga differ
diff --git a/indra/newview/skins/Blackdark/textures/icn_voice-localchat.tga b/indra/newview/skins/Blackdark/textures/icn_voice-localchat.tga
new file mode 100644
index 000000000..5c1456602
Binary files /dev/null and b/indra/newview/skins/Blackdark/textures/icn_voice-localchat.tga differ
diff --git a/indra/newview/skins/Blackdark/textures/icn_voice-pvtfocus.tga b/indra/newview/skins/Blackdark/textures/icn_voice-pvtfocus.tga
new file mode 100644
index 000000000..76e72fd3a
Binary files /dev/null and b/indra/newview/skins/Blackdark/textures/icn_voice-pvtfocus.tga differ
diff --git a/indra/newview/skins/Blackdark/textures/icn_voice_ptt-off.tga b/indra/newview/skins/Blackdark/textures/icn_voice_ptt-off.tga
new file mode 100644
index 000000000..530425dd7
Binary files /dev/null and b/indra/newview/skins/Blackdark/textures/icn_voice_ptt-off.tga differ
diff --git a/indra/newview/skins/Blackdark/textures/icn_voice_ptt-on-lvl1.tga b/indra/newview/skins/Blackdark/textures/icn_voice_ptt-on-lvl1.tga
new file mode 100644
index 000000000..95cadd33d
Binary files /dev/null and b/indra/newview/skins/Blackdark/textures/icn_voice_ptt-on-lvl1.tga differ
diff --git a/indra/newview/skins/Blackdark/textures/icn_voice_ptt-on-lvl2.tga b/indra/newview/skins/Blackdark/textures/icn_voice_ptt-on-lvl2.tga
new file mode 100644
index 000000000..aeae781c5
Binary files /dev/null and b/indra/newview/skins/Blackdark/textures/icn_voice_ptt-on-lvl2.tga differ
diff --git a/indra/newview/skins/Blackdark/textures/icn_voice_ptt-on-lvl3.tga b/indra/newview/skins/Blackdark/textures/icn_voice_ptt-on-lvl3.tga
new file mode 100644
index 000000000..081265efb
Binary files /dev/null and b/indra/newview/skins/Blackdark/textures/icn_voice_ptt-on-lvl3.tga differ
diff --git a/indra/newview/skins/Blackdark/textures/icn_voice_ptt-on.tga b/indra/newview/skins/Blackdark/textures/icn_voice_ptt-on.tga
new file mode 100644
index 000000000..78f21cc59
Binary files /dev/null and b/indra/newview/skins/Blackdark/textures/icn_voice_ptt-on.tga differ
diff --git a/indra/newview/skins/Blackdark/textures/icon_auction.tga b/indra/newview/skins/Blackdark/textures/icon_auction.tga
new file mode 100644
index 000000000..3aa21d323
Binary files /dev/null and b/indra/newview/skins/Blackdark/textures/icon_auction.tga differ
diff --git a/indra/newview/skins/Blackdark/textures/icon_avatar_offline.tga b/indra/newview/skins/Blackdark/textures/icon_avatar_offline.tga
new file mode 100644
index 000000000..620e0f7c1
Binary files /dev/null and b/indra/newview/skins/Blackdark/textures/icon_avatar_offline.tga differ
diff --git a/indra/newview/skins/Blackdark/textures/icon_avatar_online.tga b/indra/newview/skins/Blackdark/textures/icon_avatar_online.tga
new file mode 100644
index 000000000..6350237ee
Binary files /dev/null and b/indra/newview/skins/Blackdark/textures/icon_avatar_online.tga differ
diff --git a/indra/newview/skins/Blackdark/textures/icon_event.tga b/indra/newview/skins/Blackdark/textures/icon_event.tga
new file mode 100644
index 000000000..23f246b91
Binary files /dev/null and b/indra/newview/skins/Blackdark/textures/icon_event.tga differ
diff --git a/indra/newview/skins/Blackdark/textures/icon_event_adult.tga b/indra/newview/skins/Blackdark/textures/icon_event_adult.tga
new file mode 100644
index 000000000..7202e6734
Binary files /dev/null and b/indra/newview/skins/Blackdark/textures/icon_event_adult.tga differ
diff --git a/indra/newview/skins/Blackdark/textures/icon_event_mature.tga b/indra/newview/skins/Blackdark/textures/icon_event_mature.tga
new file mode 100644
index 000000000..103c5e535
Binary files /dev/null and b/indra/newview/skins/Blackdark/textures/icon_event_mature.tga differ
diff --git a/indra/newview/skins/Blackdark/textures/icon_for_sale.tga b/indra/newview/skins/Blackdark/textures/icon_for_sale.tga
new file mode 100644
index 000000000..09405d383
Binary files /dev/null and b/indra/newview/skins/Blackdark/textures/icon_for_sale.tga differ
diff --git a/indra/newview/skins/Blackdark/textures/icon_for_sale_adult.tga b/indra/newview/skins/Blackdark/textures/icon_for_sale_adult.tga
new file mode 100644
index 000000000..147f724e7
Binary files /dev/null and b/indra/newview/skins/Blackdark/textures/icon_for_sale_adult.tga differ
diff --git a/indra/newview/skins/Blackdark/textures/icon_group.tga b/indra/newview/skins/Blackdark/textures/icon_group.tga
new file mode 100644
index 000000000..1e5c31aa3
Binary files /dev/null and b/indra/newview/skins/Blackdark/textures/icon_group.tga differ
diff --git a/indra/newview/skins/Blackdark/textures/icon_groupnotice.tga b/indra/newview/skins/Blackdark/textures/icon_groupnotice.tga
new file mode 100644
index 000000000..b8cd107d3
Binary files /dev/null and b/indra/newview/skins/Blackdark/textures/icon_groupnotice.tga differ
diff --git a/indra/newview/skins/Blackdark/textures/icon_groupnoticeinventory.tga b/indra/newview/skins/Blackdark/textures/icon_groupnoticeinventory.tga
new file mode 100644
index 000000000..9749e5779
Binary files /dev/null and b/indra/newview/skins/Blackdark/textures/icon_groupnoticeinventory.tga differ
diff --git a/indra/newview/skins/Blackdark/textures/icon_lock.tga b/indra/newview/skins/Blackdark/textures/icon_lock.tga
new file mode 100644
index 000000000..5de6cc10e
Binary files /dev/null and b/indra/newview/skins/Blackdark/textures/icon_lock.tga differ
diff --git a/indra/newview/skins/Blackdark/textures/icon_place.tga b/indra/newview/skins/Blackdark/textures/icon_place.tga
new file mode 100644
index 000000000..7f842ba65
Binary files /dev/null and b/indra/newview/skins/Blackdark/textures/icon_place.tga differ
diff --git a/indra/newview/skins/Blackdark/textures/icon_popular.tga b/indra/newview/skins/Blackdark/textures/icon_popular.tga
new file mode 100644
index 000000000..6bdc6ede3
Binary files /dev/null and b/indra/newview/skins/Blackdark/textures/icon_popular.tga differ
diff --git a/indra/newview/skins/Blackdark/textures/icon_top_pick.tga b/indra/newview/skins/Blackdark/textures/icon_top_pick.tga
new file mode 100644
index 000000000..4466e8be7
Binary files /dev/null and b/indra/newview/skins/Blackdark/textures/icon_top_pick.tga differ
diff --git a/indra/newview/skins/Blackdark/textures/inv_folder_animation.tga b/indra/newview/skins/Blackdark/textures/inv_folder_animation.tga
new file mode 100644
index 000000000..b7eae76e3
Binary files /dev/null and b/indra/newview/skins/Blackdark/textures/inv_folder_animation.tga differ
diff --git a/indra/newview/skins/Blackdark/textures/inv_folder_bodypart.tga b/indra/newview/skins/Blackdark/textures/inv_folder_bodypart.tga
new file mode 100644
index 000000000..17658d7b0
Binary files /dev/null and b/indra/newview/skins/Blackdark/textures/inv_folder_bodypart.tga differ
diff --git a/indra/newview/skins/Blackdark/textures/inv_folder_callingcard.tga b/indra/newview/skins/Blackdark/textures/inv_folder_callingcard.tga
new file mode 100644
index 000000000..dd42c8c68
Binary files /dev/null and b/indra/newview/skins/Blackdark/textures/inv_folder_callingcard.tga differ
diff --git a/indra/newview/skins/Blackdark/textures/inv_folder_clothing.tga b/indra/newview/skins/Blackdark/textures/inv_folder_clothing.tga
new file mode 100644
index 000000000..bc4f71a5a
Binary files /dev/null and b/indra/newview/skins/Blackdark/textures/inv_folder_clothing.tga differ
diff --git a/indra/newview/skins/Blackdark/textures/inv_folder_gesture.tga b/indra/newview/skins/Blackdark/textures/inv_folder_gesture.tga
new file mode 100644
index 000000000..f3a775c29
Binary files /dev/null and b/indra/newview/skins/Blackdark/textures/inv_folder_gesture.tga differ
diff --git a/indra/newview/skins/Blackdark/textures/inv_folder_landmark.tga b/indra/newview/skins/Blackdark/textures/inv_folder_landmark.tga
new file mode 100644
index 000000000..2b7ca30d6
Binary files /dev/null and b/indra/newview/skins/Blackdark/textures/inv_folder_landmark.tga differ
diff --git a/indra/newview/skins/Blackdark/textures/inv_folder_lostandfound.tga b/indra/newview/skins/Blackdark/textures/inv_folder_lostandfound.tga
new file mode 100644
index 000000000..dbef38773
Binary files /dev/null and b/indra/newview/skins/Blackdark/textures/inv_folder_lostandfound.tga differ
diff --git a/indra/newview/skins/Blackdark/textures/inv_folder_notecard.tga b/indra/newview/skins/Blackdark/textures/inv_folder_notecard.tga
new file mode 100644
index 000000000..675717e8d
Binary files /dev/null and b/indra/newview/skins/Blackdark/textures/inv_folder_notecard.tga differ
diff --git a/indra/newview/skins/Blackdark/textures/inv_folder_object.tga b/indra/newview/skins/Blackdark/textures/inv_folder_object.tga
new file mode 100644
index 000000000..a477d020f
Binary files /dev/null and b/indra/newview/skins/Blackdark/textures/inv_folder_object.tga differ
diff --git a/indra/newview/skins/Blackdark/textures/inv_folder_plain_closed.tga b/indra/newview/skins/Blackdark/textures/inv_folder_plain_closed.tga
new file mode 100644
index 000000000..824dd9569
Binary files /dev/null and b/indra/newview/skins/Blackdark/textures/inv_folder_plain_closed.tga differ
diff --git a/indra/newview/skins/Blackdark/textures/inv_folder_plain_open.tga b/indra/newview/skins/Blackdark/textures/inv_folder_plain_open.tga
new file mode 100644
index 000000000..c5f6ee59c
Binary files /dev/null and b/indra/newview/skins/Blackdark/textures/inv_folder_plain_open.tga differ
diff --git a/indra/newview/skins/Blackdark/textures/inv_folder_script.tga b/indra/newview/skins/Blackdark/textures/inv_folder_script.tga
new file mode 100644
index 000000000..919967843
Binary files /dev/null and b/indra/newview/skins/Blackdark/textures/inv_folder_script.tga differ
diff --git a/indra/newview/skins/Blackdark/textures/inv_folder_snapshot.tga b/indra/newview/skins/Blackdark/textures/inv_folder_snapshot.tga
new file mode 100644
index 000000000..8610eb5ae
Binary files /dev/null and b/indra/newview/skins/Blackdark/textures/inv_folder_snapshot.tga differ
diff --git a/indra/newview/skins/Blackdark/textures/inv_folder_sound.tga b/indra/newview/skins/Blackdark/textures/inv_folder_sound.tga
new file mode 100644
index 000000000..f9988a916
Binary files /dev/null and b/indra/newview/skins/Blackdark/textures/inv_folder_sound.tga differ
diff --git a/indra/newview/skins/Blackdark/textures/inv_folder_texture.tga b/indra/newview/skins/Blackdark/textures/inv_folder_texture.tga
new file mode 100644
index 000000000..924224ec1
Binary files /dev/null and b/indra/newview/skins/Blackdark/textures/inv_folder_texture.tga differ
diff --git a/indra/newview/skins/Blackdark/textures/inv_folder_trash.tga b/indra/newview/skins/Blackdark/textures/inv_folder_trash.tga
new file mode 100644
index 000000000..7613d8cde
Binary files /dev/null and b/indra/newview/skins/Blackdark/textures/inv_folder_trash.tga differ
diff --git a/indra/newview/skins/Blackdark/textures/inv_item_animation.tga b/indra/newview/skins/Blackdark/textures/inv_item_animation.tga
new file mode 100644
index 000000000..527cef6d0
Binary files /dev/null and b/indra/newview/skins/Blackdark/textures/inv_item_animation.tga differ
diff --git a/indra/newview/skins/Blackdark/textures/inv_item_attach.tga b/indra/newview/skins/Blackdark/textures/inv_item_attach.tga
new file mode 100644
index 000000000..d5ed000d3
Binary files /dev/null and b/indra/newview/skins/Blackdark/textures/inv_item_attach.tga differ
diff --git a/indra/newview/skins/Blackdark/textures/inv_item_callingcard_offline.tga b/indra/newview/skins/Blackdark/textures/inv_item_callingcard_offline.tga
new file mode 100644
index 000000000..e47b728ac
Binary files /dev/null and b/indra/newview/skins/Blackdark/textures/inv_item_callingcard_offline.tga differ
diff --git a/indra/newview/skins/Blackdark/textures/inv_item_callingcard_online.tga b/indra/newview/skins/Blackdark/textures/inv_item_callingcard_online.tga
new file mode 100644
index 000000000..e42058b76
Binary files /dev/null and b/indra/newview/skins/Blackdark/textures/inv_item_callingcard_online.tga differ
diff --git a/indra/newview/skins/Blackdark/textures/inv_item_clothing.tga b/indra/newview/skins/Blackdark/textures/inv_item_clothing.tga
new file mode 100644
index 000000000..10fa1b05a
Binary files /dev/null and b/indra/newview/skins/Blackdark/textures/inv_item_clothing.tga differ
diff --git a/indra/newview/skins/Blackdark/textures/inv_item_eyes.tga b/indra/newview/skins/Blackdark/textures/inv_item_eyes.tga
new file mode 100644
index 000000000..4ddf340fa
Binary files /dev/null and b/indra/newview/skins/Blackdark/textures/inv_item_eyes.tga differ
diff --git a/indra/newview/skins/Blackdark/textures/inv_item_gesture.tga b/indra/newview/skins/Blackdark/textures/inv_item_gesture.tga
new file mode 100644
index 000000000..93b4194f6
Binary files /dev/null and b/indra/newview/skins/Blackdark/textures/inv_item_gesture.tga differ
diff --git a/indra/newview/skins/Blackdark/textures/inv_item_gloves.tga b/indra/newview/skins/Blackdark/textures/inv_item_gloves.tga
new file mode 100644
index 000000000..d09ae8d9d
Binary files /dev/null and b/indra/newview/skins/Blackdark/textures/inv_item_gloves.tga differ
diff --git a/indra/newview/skins/Blackdark/textures/inv_item_hair.tga b/indra/newview/skins/Blackdark/textures/inv_item_hair.tga
new file mode 100644
index 000000000..98bb2e62f
Binary files /dev/null and b/indra/newview/skins/Blackdark/textures/inv_item_hair.tga differ
diff --git a/indra/newview/skins/Blackdark/textures/inv_item_jacket.tga b/indra/newview/skins/Blackdark/textures/inv_item_jacket.tga
new file mode 100644
index 000000000..3056bbea3
Binary files /dev/null and b/indra/newview/skins/Blackdark/textures/inv_item_jacket.tga differ
diff --git a/indra/newview/skins/Blackdark/textures/inv_item_landmark.tga b/indra/newview/skins/Blackdark/textures/inv_item_landmark.tga
new file mode 100644
index 000000000..aed756f7e
Binary files /dev/null and b/indra/newview/skins/Blackdark/textures/inv_item_landmark.tga differ
diff --git a/indra/newview/skins/Blackdark/textures/inv_item_landmark_visited.tga b/indra/newview/skins/Blackdark/textures/inv_item_landmark_visited.tga
new file mode 100644
index 000000000..6260fc544
Binary files /dev/null and b/indra/newview/skins/Blackdark/textures/inv_item_landmark_visited.tga differ
diff --git a/indra/newview/skins/Blackdark/textures/inv_item_notecard.tga b/indra/newview/skins/Blackdark/textures/inv_item_notecard.tga
new file mode 100644
index 000000000..ca3b77fdf
Binary files /dev/null and b/indra/newview/skins/Blackdark/textures/inv_item_notecard.tga differ
diff --git a/indra/newview/skins/Blackdark/textures/inv_item_object.tga b/indra/newview/skins/Blackdark/textures/inv_item_object.tga
new file mode 100644
index 000000000..447dc0f0b
Binary files /dev/null and b/indra/newview/skins/Blackdark/textures/inv_item_object.tga differ
diff --git a/indra/newview/skins/Blackdark/textures/inv_item_object_multi.tga b/indra/newview/skins/Blackdark/textures/inv_item_object_multi.tga
new file mode 100644
index 000000000..85c0142f7
Binary files /dev/null and b/indra/newview/skins/Blackdark/textures/inv_item_object_multi.tga differ
diff --git a/indra/newview/skins/Blackdark/textures/inv_item_pants.tga b/indra/newview/skins/Blackdark/textures/inv_item_pants.tga
new file mode 100644
index 000000000..f2c55a7e0
Binary files /dev/null and b/indra/newview/skins/Blackdark/textures/inv_item_pants.tga differ
diff --git a/indra/newview/skins/Blackdark/textures/inv_item_script.tga b/indra/newview/skins/Blackdark/textures/inv_item_script.tga
new file mode 100644
index 000000000..310049e71
Binary files /dev/null and b/indra/newview/skins/Blackdark/textures/inv_item_script.tga differ
diff --git a/indra/newview/skins/Blackdark/textures/inv_item_script_dangerous.tga b/indra/newview/skins/Blackdark/textures/inv_item_script_dangerous.tga
new file mode 100644
index 000000000..2898a5f97
Binary files /dev/null and b/indra/newview/skins/Blackdark/textures/inv_item_script_dangerous.tga differ
diff --git a/indra/newview/skins/Blackdark/textures/inv_item_shape.tga b/indra/newview/skins/Blackdark/textures/inv_item_shape.tga
new file mode 100644
index 000000000..051a5cb3f
Binary files /dev/null and b/indra/newview/skins/Blackdark/textures/inv_item_shape.tga differ
diff --git a/indra/newview/skins/Blackdark/textures/inv_item_shirt.tga b/indra/newview/skins/Blackdark/textures/inv_item_shirt.tga
new file mode 100644
index 000000000..10fa1b05a
Binary files /dev/null and b/indra/newview/skins/Blackdark/textures/inv_item_shirt.tga differ
diff --git a/indra/newview/skins/Blackdark/textures/inv_item_shoes.tga b/indra/newview/skins/Blackdark/textures/inv_item_shoes.tga
new file mode 100644
index 000000000..4888cb8a6
Binary files /dev/null and b/indra/newview/skins/Blackdark/textures/inv_item_shoes.tga differ
diff --git a/indra/newview/skins/Blackdark/textures/inv_item_skin.tga b/indra/newview/skins/Blackdark/textures/inv_item_skin.tga
new file mode 100644
index 000000000..f9db6b04c
Binary files /dev/null and b/indra/newview/skins/Blackdark/textures/inv_item_skin.tga differ
diff --git a/indra/newview/skins/Blackdark/textures/inv_item_skirt.tga b/indra/newview/skins/Blackdark/textures/inv_item_skirt.tga
new file mode 100644
index 000000000..af9f20482
Binary files /dev/null and b/indra/newview/skins/Blackdark/textures/inv_item_skirt.tga differ
diff --git a/indra/newview/skins/Blackdark/textures/inv_item_snapshot.tga b/indra/newview/skins/Blackdark/textures/inv_item_snapshot.tga
new file mode 100644
index 000000000..97dea8760
Binary files /dev/null and b/indra/newview/skins/Blackdark/textures/inv_item_snapshot.tga differ
diff --git a/indra/newview/skins/Blackdark/textures/inv_item_socks.tga b/indra/newview/skins/Blackdark/textures/inv_item_socks.tga
new file mode 100644
index 000000000..57dbc1841
Binary files /dev/null and b/indra/newview/skins/Blackdark/textures/inv_item_socks.tga differ
diff --git a/indra/newview/skins/Blackdark/textures/inv_item_sound.tga b/indra/newview/skins/Blackdark/textures/inv_item_sound.tga
new file mode 100644
index 000000000..4f4e6b1ee
Binary files /dev/null and b/indra/newview/skins/Blackdark/textures/inv_item_sound.tga differ
diff --git a/indra/newview/skins/Blackdark/textures/inv_item_texture.tga b/indra/newview/skins/Blackdark/textures/inv_item_texture.tga
new file mode 100644
index 000000000..f67e02571
Binary files /dev/null and b/indra/newview/skins/Blackdark/textures/inv_item_texture.tga differ
diff --git a/indra/newview/skins/Blackdark/textures/inv_item_underpants.tga b/indra/newview/skins/Blackdark/textures/inv_item_underpants.tga
new file mode 100644
index 000000000..017a890cf
Binary files /dev/null and b/indra/newview/skins/Blackdark/textures/inv_item_underpants.tga differ
diff --git a/indra/newview/skins/Blackdark/textures/inv_item_undershirt.tga b/indra/newview/skins/Blackdark/textures/inv_item_undershirt.tga
new file mode 100644
index 000000000..2eca04dbd
Binary files /dev/null and b/indra/newview/skins/Blackdark/textures/inv_item_undershirt.tga differ
diff --git a/indra/newview/skins/Blackdark/textures/lightgray.tga b/indra/newview/skins/Blackdark/textures/lightgray.tga
new file mode 100644
index 000000000..e69be0893
Binary files /dev/null and b/indra/newview/skins/Blackdark/textures/lightgray.tga differ
diff --git a/indra/newview/skins/Blackdark/textures/map_avatar_16.tga b/indra/newview/skins/Blackdark/textures/map_avatar_16.tga
new file mode 100644
index 000000000..42d8c1e29
Binary files /dev/null and b/indra/newview/skins/Blackdark/textures/map_avatar_16.tga differ
diff --git a/indra/newview/skins/Blackdark/textures/map_avatar_8.tga b/indra/newview/skins/Blackdark/textures/map_avatar_8.tga
new file mode 100644
index 000000000..7eb7c20f1
Binary files /dev/null and b/indra/newview/skins/Blackdark/textures/map_avatar_8.tga differ
diff --git a/indra/newview/skins/Blackdark/textures/map_avatar_above_8.tga b/indra/newview/skins/Blackdark/textures/map_avatar_above_8.tga
new file mode 100644
index 000000000..6faefccc7
Binary files /dev/null and b/indra/newview/skins/Blackdark/textures/map_avatar_above_8.tga differ
diff --git a/indra/newview/skins/Blackdark/textures/map_avatar_below_8.tga b/indra/newview/skins/Blackdark/textures/map_avatar_below_8.tga
new file mode 100644
index 000000000..5ad671c26
Binary files /dev/null and b/indra/newview/skins/Blackdark/textures/map_avatar_below_8.tga differ
diff --git a/indra/newview/skins/Blackdark/textures/map_avatar_you_8.tga b/indra/newview/skins/Blackdark/textures/map_avatar_you_8.tga
new file mode 100644
index 000000000..f10f96b10
Binary files /dev/null and b/indra/newview/skins/Blackdark/textures/map_avatar_you_8.tga differ
diff --git a/indra/newview/skins/Blackdark/textures/map_event.tga b/indra/newview/skins/Blackdark/textures/map_event.tga
new file mode 100644
index 000000000..103c5e535
Binary files /dev/null and b/indra/newview/skins/Blackdark/textures/map_event.tga differ
diff --git a/indra/newview/skins/Blackdark/textures/map_event_adult.tga b/indra/newview/skins/Blackdark/textures/map_event_adult.tga
new file mode 100644
index 000000000..7202e6734
Binary files /dev/null and b/indra/newview/skins/Blackdark/textures/map_event_adult.tga differ
diff --git a/indra/newview/skins/Blackdark/textures/map_event_mature.tga b/indra/newview/skins/Blackdark/textures/map_event_mature.tga
new file mode 100644
index 000000000..23f246b91
Binary files /dev/null and b/indra/newview/skins/Blackdark/textures/map_event_mature.tga differ
diff --git a/indra/newview/skins/Blackdark/textures/map_home.tga b/indra/newview/skins/Blackdark/textures/map_home.tga
new file mode 100644
index 000000000..85dde9ef7
Binary files /dev/null and b/indra/newview/skins/Blackdark/textures/map_home.tga differ
diff --git a/indra/newview/skins/Blackdark/textures/map_infohub.tga b/indra/newview/skins/Blackdark/textures/map_infohub.tga
new file mode 100644
index 000000000..173b93e39
Binary files /dev/null and b/indra/newview/skins/Blackdark/textures/map_infohub.tga differ
diff --git a/indra/newview/skins/Blackdark/textures/map_telehub.tga b/indra/newview/skins/Blackdark/textures/map_telehub.tga
new file mode 100644
index 000000000..d89bcfa40
Binary files /dev/null and b/indra/newview/skins/Blackdark/textures/map_telehub.tga differ
diff --git a/indra/newview/skins/Blackdark/textures/map_track_16.tga b/indra/newview/skins/Blackdark/textures/map_track_16.tga
new file mode 100644
index 000000000..14d49b93b
Binary files /dev/null and b/indra/newview/skins/Blackdark/textures/map_track_16.tga differ
diff --git a/indra/newview/skins/Blackdark/textures/map_track_8.tga b/indra/newview/skins/Blackdark/textures/map_track_8.tga
new file mode 100644
index 000000000..d9605dde1
Binary files /dev/null and b/indra/newview/skins/Blackdark/textures/map_track_8.tga differ
diff --git a/indra/newview/skins/Blackdark/textures/minimize.tga b/indra/newview/skins/Blackdark/textures/minimize.tga
new file mode 100644
index 000000000..151a3078f
Binary files /dev/null and b/indra/newview/skins/Blackdark/textures/minimize.tga differ
diff --git a/indra/newview/skins/Blackdark/textures/minimize_inactive.tga b/indra/newview/skins/Blackdark/textures/minimize_inactive.tga
new file mode 100644
index 000000000..d7e1b4057
Binary files /dev/null and b/indra/newview/skins/Blackdark/textures/minimize_inactive.tga differ
diff --git a/indra/newview/skins/Blackdark/textures/minimize_pressed.tga b/indra/newview/skins/Blackdark/textures/minimize_pressed.tga
new file mode 100644
index 000000000..573452ce9
Binary files /dev/null and b/indra/newview/skins/Blackdark/textures/minimize_pressed.tga differ
diff --git a/indra/newview/skins/Blackdark/textures/move_backward_in.tga b/indra/newview/skins/Blackdark/textures/move_backward_in.tga
new file mode 100644
index 000000000..56b605382
Binary files /dev/null and b/indra/newview/skins/Blackdark/textures/move_backward_in.tga differ
diff --git a/indra/newview/skins/Blackdark/textures/move_backward_out.tga b/indra/newview/skins/Blackdark/textures/move_backward_out.tga
new file mode 100644
index 000000000..b8064fd58
Binary files /dev/null and b/indra/newview/skins/Blackdark/textures/move_backward_out.tga differ
diff --git a/indra/newview/skins/Blackdark/textures/move_down_in.tga b/indra/newview/skins/Blackdark/textures/move_down_in.tga
new file mode 100644
index 000000000..eec8f5764
Binary files /dev/null and b/indra/newview/skins/Blackdark/textures/move_down_in.tga differ
diff --git a/indra/newview/skins/Blackdark/textures/move_down_out.tga b/indra/newview/skins/Blackdark/textures/move_down_out.tga
new file mode 100644
index 000000000..47993a89e
Binary files /dev/null and b/indra/newview/skins/Blackdark/textures/move_down_out.tga differ
diff --git a/indra/newview/skins/Blackdark/textures/move_forward_in.tga b/indra/newview/skins/Blackdark/textures/move_forward_in.tga
new file mode 100644
index 000000000..3a9644124
Binary files /dev/null and b/indra/newview/skins/Blackdark/textures/move_forward_in.tga differ
diff --git a/indra/newview/skins/Blackdark/textures/move_forward_out.tga b/indra/newview/skins/Blackdark/textures/move_forward_out.tga
new file mode 100644
index 000000000..f0f72d1d6
Binary files /dev/null and b/indra/newview/skins/Blackdark/textures/move_forward_out.tga differ
diff --git a/indra/newview/skins/Blackdark/textures/move_left_in.tga b/indra/newview/skins/Blackdark/textures/move_left_in.tga
new file mode 100644
index 000000000..5c0e910a7
Binary files /dev/null and b/indra/newview/skins/Blackdark/textures/move_left_in.tga differ
diff --git a/indra/newview/skins/Blackdark/textures/move_left_out.tga b/indra/newview/skins/Blackdark/textures/move_left_out.tga
new file mode 100644
index 000000000..68947f297
Binary files /dev/null and b/indra/newview/skins/Blackdark/textures/move_left_out.tga differ
diff --git a/indra/newview/skins/Blackdark/textures/move_right_in.tga b/indra/newview/skins/Blackdark/textures/move_right_in.tga
new file mode 100644
index 000000000..086e24bfd
Binary files /dev/null and b/indra/newview/skins/Blackdark/textures/move_right_in.tga differ
diff --git a/indra/newview/skins/Blackdark/textures/move_right_out.tga b/indra/newview/skins/Blackdark/textures/move_right_out.tga
new file mode 100644
index 000000000..b242201ca
Binary files /dev/null and b/indra/newview/skins/Blackdark/textures/move_right_out.tga differ
diff --git a/indra/newview/skins/Blackdark/textures/move_turn_left_in.tga b/indra/newview/skins/Blackdark/textures/move_turn_left_in.tga
new file mode 100644
index 000000000..6aad5b2c6
Binary files /dev/null and b/indra/newview/skins/Blackdark/textures/move_turn_left_in.tga differ
diff --git a/indra/newview/skins/Blackdark/textures/move_turn_left_out.tga b/indra/newview/skins/Blackdark/textures/move_turn_left_out.tga
new file mode 100644
index 000000000..c6e3c4f8f
Binary files /dev/null and b/indra/newview/skins/Blackdark/textures/move_turn_left_out.tga differ
diff --git a/indra/newview/skins/Blackdark/textures/move_turn_right_in.tga b/indra/newview/skins/Blackdark/textures/move_turn_right_in.tga
new file mode 100644
index 000000000..f8b56235b
Binary files /dev/null and b/indra/newview/skins/Blackdark/textures/move_turn_right_in.tga differ
diff --git a/indra/newview/skins/Blackdark/textures/move_turn_right_out.tga b/indra/newview/skins/Blackdark/textures/move_turn_right_out.tga
new file mode 100644
index 000000000..f20a6cfac
Binary files /dev/null and b/indra/newview/skins/Blackdark/textures/move_turn_right_out.tga differ
diff --git a/indra/newview/skins/Blackdark/textures/move_up_in.tga b/indra/newview/skins/Blackdark/textures/move_up_in.tga
new file mode 100644
index 000000000..9d2da6942
Binary files /dev/null and b/indra/newview/skins/Blackdark/textures/move_up_in.tga differ
diff --git a/indra/newview/skins/Blackdark/textures/move_up_out.tga b/indra/newview/skins/Blackdark/textures/move_up_out.tga
new file mode 100644
index 000000000..8caed0655
Binary files /dev/null and b/indra/newview/skins/Blackdark/textures/move_up_out.tga differ
diff --git a/indra/newview/skins/Blackdark/textures/mute_icon.tga b/indra/newview/skins/Blackdark/textures/mute_icon.tga
new file mode 100644
index 000000000..879b9e618
Binary files /dev/null and b/indra/newview/skins/Blackdark/textures/mute_icon.tga differ
diff --git a/indra/newview/skins/Blackdark/textures/notify_box_icon.tga b/indra/newview/skins/Blackdark/textures/notify_box_icon.tga
new file mode 100644
index 000000000..880aca9b4
Binary files /dev/null and b/indra/newview/skins/Blackdark/textures/notify_box_icon.tga differ
diff --git a/indra/newview/skins/Blackdark/textures/notify_caution_icon.tga b/indra/newview/skins/Blackdark/textures/notify_caution_icon.tga
new file mode 100644
index 000000000..ac6660c16
Binary files /dev/null and b/indra/newview/skins/Blackdark/textures/notify_caution_icon.tga differ
diff --git a/indra/newview/skins/Blackdark/textures/notify_next.png b/indra/newview/skins/Blackdark/textures/notify_next.png
new file mode 100644
index 000000000..9b371e03e
Binary files /dev/null and b/indra/newview/skins/Blackdark/textures/notify_next.png differ
diff --git a/indra/newview/skins/Blackdark/textures/notify_tip_icon.tga b/indra/newview/skins/Blackdark/textures/notify_tip_icon.tga
new file mode 100644
index 000000000..0451da099
Binary files /dev/null and b/indra/newview/skins/Blackdark/textures/notify_tip_icon.tga differ
diff --git a/indra/newview/skins/Blackdark/textures/object_cone.tga b/indra/newview/skins/Blackdark/textures/object_cone.tga
new file mode 100644
index 000000000..13f0ef4c3
Binary files /dev/null and b/indra/newview/skins/Blackdark/textures/object_cone.tga differ
diff --git a/indra/newview/skins/Blackdark/textures/object_cone_active.tga b/indra/newview/skins/Blackdark/textures/object_cone_active.tga
new file mode 100644
index 000000000..6d537ffc0
Binary files /dev/null and b/indra/newview/skins/Blackdark/textures/object_cone_active.tga differ
diff --git a/indra/newview/skins/Blackdark/textures/object_cube.tga b/indra/newview/skins/Blackdark/textures/object_cube.tga
new file mode 100644
index 000000000..4ff84f30a
Binary files /dev/null and b/indra/newview/skins/Blackdark/textures/object_cube.tga differ
diff --git a/indra/newview/skins/Blackdark/textures/object_cube_active.tga b/indra/newview/skins/Blackdark/textures/object_cube_active.tga
new file mode 100644
index 000000000..69baee736
Binary files /dev/null and b/indra/newview/skins/Blackdark/textures/object_cube_active.tga differ
diff --git a/indra/newview/skins/Blackdark/textures/object_cylinder.tga b/indra/newview/skins/Blackdark/textures/object_cylinder.tga
new file mode 100644
index 000000000..bf379550b
Binary files /dev/null and b/indra/newview/skins/Blackdark/textures/object_cylinder.tga differ
diff --git a/indra/newview/skins/Blackdark/textures/object_cylinder_active.tga b/indra/newview/skins/Blackdark/textures/object_cylinder_active.tga
new file mode 100644
index 000000000..fdf9edc10
Binary files /dev/null and b/indra/newview/skins/Blackdark/textures/object_cylinder_active.tga differ
diff --git a/indra/newview/skins/Blackdark/textures/object_grass.tga b/indra/newview/skins/Blackdark/textures/object_grass.tga
new file mode 100644
index 000000000..4ab3ee64d
Binary files /dev/null and b/indra/newview/skins/Blackdark/textures/object_grass.tga differ
diff --git a/indra/newview/skins/Blackdark/textures/object_grass_active.tga b/indra/newview/skins/Blackdark/textures/object_grass_active.tga
new file mode 100644
index 000000000..4457a81b8
Binary files /dev/null and b/indra/newview/skins/Blackdark/textures/object_grass_active.tga differ
diff --git a/indra/newview/skins/Blackdark/textures/object_hemi_cone.tga b/indra/newview/skins/Blackdark/textures/object_hemi_cone.tga
new file mode 100644
index 000000000..89b17d3dc
Binary files /dev/null and b/indra/newview/skins/Blackdark/textures/object_hemi_cone.tga differ
diff --git a/indra/newview/skins/Blackdark/textures/object_hemi_cone_active.tga b/indra/newview/skins/Blackdark/textures/object_hemi_cone_active.tga
new file mode 100644
index 000000000..1cffd21f3
Binary files /dev/null and b/indra/newview/skins/Blackdark/textures/object_hemi_cone_active.tga differ
diff --git a/indra/newview/skins/Blackdark/textures/object_hemi_cylinder.tga b/indra/newview/skins/Blackdark/textures/object_hemi_cylinder.tga
new file mode 100644
index 000000000..933c42f52
Binary files /dev/null and b/indra/newview/skins/Blackdark/textures/object_hemi_cylinder.tga differ
diff --git a/indra/newview/skins/Blackdark/textures/object_hemi_cylinder_active.tga b/indra/newview/skins/Blackdark/textures/object_hemi_cylinder_active.tga
new file mode 100644
index 000000000..18ee8cf14
Binary files /dev/null and b/indra/newview/skins/Blackdark/textures/object_hemi_cylinder_active.tga differ
diff --git a/indra/newview/skins/Blackdark/textures/object_hemi_sphere.tga b/indra/newview/skins/Blackdark/textures/object_hemi_sphere.tga
new file mode 100644
index 000000000..7293b45a7
Binary files /dev/null and b/indra/newview/skins/Blackdark/textures/object_hemi_sphere.tga differ
diff --git a/indra/newview/skins/Blackdark/textures/object_hemi_sphere_active.tga b/indra/newview/skins/Blackdark/textures/object_hemi_sphere_active.tga
new file mode 100644
index 000000000..5fe5bbf3c
Binary files /dev/null and b/indra/newview/skins/Blackdark/textures/object_hemi_sphere_active.tga differ
diff --git a/indra/newview/skins/Blackdark/textures/object_prism.tga b/indra/newview/skins/Blackdark/textures/object_prism.tga
new file mode 100644
index 000000000..f1fccda62
Binary files /dev/null and b/indra/newview/skins/Blackdark/textures/object_prism.tga differ
diff --git a/indra/newview/skins/Blackdark/textures/object_prism_active.tga b/indra/newview/skins/Blackdark/textures/object_prism_active.tga
new file mode 100644
index 000000000..30f16efb1
Binary files /dev/null and b/indra/newview/skins/Blackdark/textures/object_prism_active.tga differ
diff --git a/indra/newview/skins/Blackdark/textures/object_pyramid.tga b/indra/newview/skins/Blackdark/textures/object_pyramid.tga
new file mode 100644
index 000000000..f4d1d46e1
Binary files /dev/null and b/indra/newview/skins/Blackdark/textures/object_pyramid.tga differ
diff --git a/indra/newview/skins/Blackdark/textures/object_pyramid_active.tga b/indra/newview/skins/Blackdark/textures/object_pyramid_active.tga
new file mode 100644
index 000000000..9b2e5ceab
Binary files /dev/null and b/indra/newview/skins/Blackdark/textures/object_pyramid_active.tga differ
diff --git a/indra/newview/skins/Blackdark/textures/object_ring.tga b/indra/newview/skins/Blackdark/textures/object_ring.tga
new file mode 100644
index 000000000..aaf5783f5
Binary files /dev/null and b/indra/newview/skins/Blackdark/textures/object_ring.tga differ
diff --git a/indra/newview/skins/Blackdark/textures/object_ring_active.tga b/indra/newview/skins/Blackdark/textures/object_ring_active.tga
new file mode 100644
index 000000000..2e133b3bf
Binary files /dev/null and b/indra/newview/skins/Blackdark/textures/object_ring_active.tga differ
diff --git a/indra/newview/skins/Blackdark/textures/object_sphere.tga b/indra/newview/skins/Blackdark/textures/object_sphere.tga
new file mode 100644
index 000000000..5875478ba
Binary files /dev/null and b/indra/newview/skins/Blackdark/textures/object_sphere.tga differ
diff --git a/indra/newview/skins/Blackdark/textures/object_sphere_active.tga b/indra/newview/skins/Blackdark/textures/object_sphere_active.tga
new file mode 100644
index 000000000..0abbb0247
Binary files /dev/null and b/indra/newview/skins/Blackdark/textures/object_sphere_active.tga differ
diff --git a/indra/newview/skins/Blackdark/textures/object_tetrahedron.tga b/indra/newview/skins/Blackdark/textures/object_tetrahedron.tga
new file mode 100644
index 000000000..808456f85
Binary files /dev/null and b/indra/newview/skins/Blackdark/textures/object_tetrahedron.tga differ
diff --git a/indra/newview/skins/Blackdark/textures/object_tetrahedron_active.tga b/indra/newview/skins/Blackdark/textures/object_tetrahedron_active.tga
new file mode 100644
index 000000000..3eedb5b92
Binary files /dev/null and b/indra/newview/skins/Blackdark/textures/object_tetrahedron_active.tga differ
diff --git a/indra/newview/skins/Blackdark/textures/object_torus.tga b/indra/newview/skins/Blackdark/textures/object_torus.tga
new file mode 100644
index 000000000..3ef02f88d
Binary files /dev/null and b/indra/newview/skins/Blackdark/textures/object_torus.tga differ
diff --git a/indra/newview/skins/Blackdark/textures/object_torus_active.tga b/indra/newview/skins/Blackdark/textures/object_torus_active.tga
new file mode 100644
index 000000000..df5120ae4
Binary files /dev/null and b/indra/newview/skins/Blackdark/textures/object_torus_active.tga differ
diff --git a/indra/newview/skins/Blackdark/textures/object_tree.tga b/indra/newview/skins/Blackdark/textures/object_tree.tga
new file mode 100644
index 000000000..b4df5cd6c
Binary files /dev/null and b/indra/newview/skins/Blackdark/textures/object_tree.tga differ
diff --git a/indra/newview/skins/Blackdark/textures/object_tree_active.tga b/indra/newview/skins/Blackdark/textures/object_tree_active.tga
new file mode 100644
index 000000000..38099b213
Binary files /dev/null and b/indra/newview/skins/Blackdark/textures/object_tree_active.tga differ
diff --git a/indra/newview/skins/Blackdark/textures/object_tube.tga b/indra/newview/skins/Blackdark/textures/object_tube.tga
new file mode 100644
index 000000000..c89c56846
Binary files /dev/null and b/indra/newview/skins/Blackdark/textures/object_tube.tga differ
diff --git a/indra/newview/skins/Blackdark/textures/object_tube_active.tga b/indra/newview/skins/Blackdark/textures/object_tube_active.tga
new file mode 100644
index 000000000..1ba9ebc70
Binary files /dev/null and b/indra/newview/skins/Blackdark/textures/object_tube_active.tga differ
diff --git a/indra/newview/skins/Blackdark/textures/preview.png b/indra/newview/skins/Blackdark/textures/preview.png
new file mode 100644
index 000000000..2022d7c88
Binary files /dev/null and b/indra/newview/skins/Blackdark/textures/preview.png differ
diff --git a/indra/newview/skins/Blackdark/textures/progress_fill.tga b/indra/newview/skins/Blackdark/textures/progress_fill.tga
new file mode 100644
index 000000000..bbdf5dd0b
Binary files /dev/null and b/indra/newview/skins/Blackdark/textures/progress_fill.tga differ
diff --git a/indra/newview/skins/Blackdark/textures/progressbar_fill.tga b/indra/newview/skins/Blackdark/textures/progressbar_fill.tga
new file mode 100644
index 000000000..144c18790
Binary files /dev/null and b/indra/newview/skins/Blackdark/textures/progressbar_fill.tga differ
diff --git a/indra/newview/skins/Blackdark/textures/progressbar_track.tga b/indra/newview/skins/Blackdark/textures/progressbar_track.tga
new file mode 100644
index 000000000..4b84e9ec9
Binary files /dev/null and b/indra/newview/skins/Blackdark/textures/progressbar_track.tga differ
diff --git a/indra/newview/skins/Blackdark/textures/ptt_lock_off.tga b/indra/newview/skins/Blackdark/textures/ptt_lock_off.tga
new file mode 100644
index 000000000..d66f49840
Binary files /dev/null and b/indra/newview/skins/Blackdark/textures/ptt_lock_off.tga differ
diff --git a/indra/newview/skins/Blackdark/textures/ptt_lock_on.tga b/indra/newview/skins/Blackdark/textures/ptt_lock_on.tga
new file mode 100644
index 000000000..432db2f00
Binary files /dev/null and b/indra/newview/skins/Blackdark/textures/ptt_lock_on.tga differ
diff --git a/indra/newview/skins/Blackdark/textures/radio_active_false.tga b/indra/newview/skins/Blackdark/textures/radio_active_false.tga
new file mode 100644
index 000000000..6a83f31fe
Binary files /dev/null and b/indra/newview/skins/Blackdark/textures/radio_active_false.tga differ
diff --git a/indra/newview/skins/Blackdark/textures/radio_active_true.tga b/indra/newview/skins/Blackdark/textures/radio_active_true.tga
new file mode 100644
index 000000000..feac2ee2b
Binary files /dev/null and b/indra/newview/skins/Blackdark/textures/radio_active_true.tga differ
diff --git a/indra/newview/skins/Blackdark/textures/radio_inactive_false.tga b/indra/newview/skins/Blackdark/textures/radio_inactive_false.tga
new file mode 100644
index 000000000..950f09c39
Binary files /dev/null and b/indra/newview/skins/Blackdark/textures/radio_inactive_false.tga differ
diff --git a/indra/newview/skins/Blackdark/textures/radio_inactive_true.tga b/indra/newview/skins/Blackdark/textures/radio_inactive_true.tga
new file mode 100644
index 000000000..8e57118ae
Binary files /dev/null and b/indra/newview/skins/Blackdark/textures/radio_inactive_true.tga differ
diff --git a/indra/newview/skins/Blackdark/textures/resize_handle_bottom_right_blue.tga b/indra/newview/skins/Blackdark/textures/resize_handle_bottom_right_blue.tga
new file mode 100644
index 000000000..8290bfa65
Binary files /dev/null and b/indra/newview/skins/Blackdark/textures/resize_handle_bottom_right_blue.tga differ
diff --git a/indra/newview/skins/Blackdark/textures/restore.tga b/indra/newview/skins/Blackdark/textures/restore.tga
new file mode 100644
index 000000000..5e369fdfc
Binary files /dev/null and b/indra/newview/skins/Blackdark/textures/restore.tga differ
diff --git a/indra/newview/skins/Blackdark/textures/restore_inactive.tga b/indra/newview/skins/Blackdark/textures/restore_inactive.tga
new file mode 100644
index 000000000..ce545d90d
Binary files /dev/null and b/indra/newview/skins/Blackdark/textures/restore_inactive.tga differ
diff --git a/indra/newview/skins/Blackdark/textures/restore_pressed.tga b/indra/newview/skins/Blackdark/textures/restore_pressed.tga
new file mode 100644
index 000000000..8a25087be
Binary files /dev/null and b/indra/newview/skins/Blackdark/textures/restore_pressed.tga differ
diff --git a/indra/newview/skins/Blackdark/textures/rounded_square.j2c b/indra/newview/skins/Blackdark/textures/rounded_square.j2c
new file mode 100644
index 000000000..c3dfe8f10
Binary files /dev/null and b/indra/newview/skins/Blackdark/textures/rounded_square.j2c differ
diff --git a/indra/newview/skins/Blackdark/textures/rounded_square.tga b/indra/newview/skins/Blackdark/textures/rounded_square.tga
new file mode 100644
index 000000000..4f4bf05f8
Binary files /dev/null and b/indra/newview/skins/Blackdark/textures/rounded_square.tga differ
diff --git a/indra/newview/skins/Blackdark/textures/rounded_square_soft.tga b/indra/newview/skins/Blackdark/textures/rounded_square_soft.tga
new file mode 100644
index 000000000..4f4bf05f8
Binary files /dev/null and b/indra/newview/skins/Blackdark/textures/rounded_square_soft.tga differ
diff --git a/indra/newview/skins/Blackdark/textures/script_error.j2c b/indra/newview/skins/Blackdark/textures/script_error.j2c
new file mode 100644
index 000000000..ad6be04a7
Binary files /dev/null and b/indra/newview/skins/Blackdark/textures/script_error.j2c differ
diff --git a/indra/newview/skins/Blackdark/textures/script_error.tga b/indra/newview/skins/Blackdark/textures/script_error.tga
new file mode 100644
index 000000000..8fa12e711
Binary files /dev/null and b/indra/newview/skins/Blackdark/textures/script_error.tga differ
diff --git a/indra/newview/skins/Blackdark/textures/scrollbutton_down_in_blue.tga b/indra/newview/skins/Blackdark/textures/scrollbutton_down_in_blue.tga
new file mode 100644
index 000000000..4bdcf6e14
Binary files /dev/null and b/indra/newview/skins/Blackdark/textures/scrollbutton_down_in_blue.tga differ
diff --git a/indra/newview/skins/Blackdark/textures/scrollbutton_down_out_blue.tga b/indra/newview/skins/Blackdark/textures/scrollbutton_down_out_blue.tga
new file mode 100644
index 000000000..4bdcf6e14
Binary files /dev/null and b/indra/newview/skins/Blackdark/textures/scrollbutton_down_out_blue.tga differ
diff --git a/indra/newview/skins/Blackdark/textures/scrollbutton_left_in_blue.tga b/indra/newview/skins/Blackdark/textures/scrollbutton_left_in_blue.tga
new file mode 100644
index 000000000..e90ab295b
Binary files /dev/null and b/indra/newview/skins/Blackdark/textures/scrollbutton_left_in_blue.tga differ
diff --git a/indra/newview/skins/Blackdark/textures/scrollbutton_left_out_blue.tga b/indra/newview/skins/Blackdark/textures/scrollbutton_left_out_blue.tga
new file mode 100644
index 000000000..e90ab295b
Binary files /dev/null and b/indra/newview/skins/Blackdark/textures/scrollbutton_left_out_blue.tga differ
diff --git a/indra/newview/skins/Blackdark/textures/scrollbutton_right_in_blue.tga b/indra/newview/skins/Blackdark/textures/scrollbutton_right_in_blue.tga
new file mode 100644
index 000000000..534ecba91
Binary files /dev/null and b/indra/newview/skins/Blackdark/textures/scrollbutton_right_in_blue.tga differ
diff --git a/indra/newview/skins/Blackdark/textures/scrollbutton_right_out_blue.tga b/indra/newview/skins/Blackdark/textures/scrollbutton_right_out_blue.tga
new file mode 100644
index 000000000..534ecba91
Binary files /dev/null and b/indra/newview/skins/Blackdark/textures/scrollbutton_right_out_blue.tga differ
diff --git a/indra/newview/skins/Blackdark/textures/scrollbutton_up_in_blue.tga b/indra/newview/skins/Blackdark/textures/scrollbutton_up_in_blue.tga
new file mode 100644
index 000000000..2e2f58339
Binary files /dev/null and b/indra/newview/skins/Blackdark/textures/scrollbutton_up_in_blue.tga differ
diff --git a/indra/newview/skins/Blackdark/textures/scrollbutton_up_out_blue.tga b/indra/newview/skins/Blackdark/textures/scrollbutton_up_out_blue.tga
new file mode 100644
index 000000000..2e2f58339
Binary files /dev/null and b/indra/newview/skins/Blackdark/textures/scrollbutton_up_out_blue.tga differ
diff --git a/indra/newview/skins/Blackdark/textures/sm_rounded_corners_simple.tga b/indra/newview/skins/Blackdark/textures/sm_rounded_corners_simple.tga
new file mode 100644
index 000000000..054fdd39a
Binary files /dev/null and b/indra/newview/skins/Blackdark/textures/sm_rounded_corners_simple.tga differ
diff --git a/indra/newview/skins/Blackdark/textures/spacer24.tga b/indra/newview/skins/Blackdark/textures/spacer24.tga
new file mode 100644
index 000000000..c7cab6b38
Binary files /dev/null and b/indra/newview/skins/Blackdark/textures/spacer24.tga differ
diff --git a/indra/newview/skins/Blackdark/textures/spacer35.tga b/indra/newview/skins/Blackdark/textures/spacer35.tga
new file mode 100644
index 000000000..b88bc6680
Binary files /dev/null and b/indra/newview/skins/Blackdark/textures/spacer35.tga differ
diff --git a/indra/newview/skins/Blackdark/textures/spin_down_in_blue.tga b/indra/newview/skins/Blackdark/textures/spin_down_in_blue.tga
new file mode 100644
index 000000000..bcbf526f1
Binary files /dev/null and b/indra/newview/skins/Blackdark/textures/spin_down_in_blue.tga differ
diff --git a/indra/newview/skins/Blackdark/textures/spin_down_out_blue.tga b/indra/newview/skins/Blackdark/textures/spin_down_out_blue.tga
new file mode 100644
index 000000000..1af2ed9cb
Binary files /dev/null and b/indra/newview/skins/Blackdark/textures/spin_down_out_blue.tga differ
diff --git a/indra/newview/skins/Blackdark/textures/spin_up_in_blue.tga b/indra/newview/skins/Blackdark/textures/spin_up_in_blue.tga
new file mode 100644
index 000000000..6bf3c1306
Binary files /dev/null and b/indra/newview/skins/Blackdark/textures/spin_up_in_blue.tga differ
diff --git a/indra/newview/skins/Blackdark/textures/spin_up_out_blue.tga b/indra/newview/skins/Blackdark/textures/spin_up_out_blue.tga
new file mode 100644
index 000000000..9a9bc6468
Binary files /dev/null and b/indra/newview/skins/Blackdark/textures/spin_up_out_blue.tga differ
diff --git a/indra/newview/skins/Blackdark/textures/square_btn_32x128.tga b/indra/newview/skins/Blackdark/textures/square_btn_32x128.tga
new file mode 100644
index 000000000..d23d413aa
Binary files /dev/null and b/indra/newview/skins/Blackdark/textures/square_btn_32x128.tga differ
diff --git a/indra/newview/skins/Blackdark/textures/square_btn_selected_32x128.tga b/indra/newview/skins/Blackdark/textures/square_btn_selected_32x128.tga
new file mode 100644
index 000000000..2f48098d2
Binary files /dev/null and b/indra/newview/skins/Blackdark/textures/square_btn_selected_32x128.tga differ
diff --git a/indra/newview/skins/Blackdark/textures/startup_logo.j2c b/indra/newview/skins/Blackdark/textures/startup_logo.j2c
new file mode 100644
index 000000000..ab28cf37d
Binary files /dev/null and b/indra/newview/skins/Blackdark/textures/startup_logo.j2c differ
diff --git a/indra/newview/skins/Blackdark/textures/status_buy_currency.tga b/indra/newview/skins/Blackdark/textures/status_buy_currency.tga
new file mode 100644
index 000000000..f4a28b32b
Binary files /dev/null and b/indra/newview/skins/Blackdark/textures/status_buy_currency.tga differ
diff --git a/indra/newview/skins/Blackdark/textures/status_buy_currency_pressed.tga b/indra/newview/skins/Blackdark/textures/status_buy_currency_pressed.tga
new file mode 100644
index 000000000..f4a28b32b
Binary files /dev/null and b/indra/newview/skins/Blackdark/textures/status_buy_currency_pressed.tga differ
diff --git a/indra/newview/skins/Blackdark/textures/status_buy_land.tga b/indra/newview/skins/Blackdark/textures/status_buy_land.tga
new file mode 100644
index 000000000..60c395c03
Binary files /dev/null and b/indra/newview/skins/Blackdark/textures/status_buy_land.tga differ
diff --git a/indra/newview/skins/Blackdark/textures/status_buy_land_pressed.tga b/indra/newview/skins/Blackdark/textures/status_buy_land_pressed.tga
new file mode 100644
index 000000000..60c395c03
Binary files /dev/null and b/indra/newview/skins/Blackdark/textures/status_buy_land_pressed.tga differ
diff --git a/indra/newview/skins/Blackdark/textures/status_health.tga b/indra/newview/skins/Blackdark/textures/status_health.tga
new file mode 100644
index 000000000..f5eefc5a9
Binary files /dev/null and b/indra/newview/skins/Blackdark/textures/status_health.tga differ
diff --git a/indra/newview/skins/Blackdark/textures/status_no_build.tga b/indra/newview/skins/Blackdark/textures/status_no_build.tga
new file mode 100644
index 000000000..41934a600
Binary files /dev/null and b/indra/newview/skins/Blackdark/textures/status_no_build.tga differ
diff --git a/indra/newview/skins/Blackdark/textures/status_no_fly.tga b/indra/newview/skins/Blackdark/textures/status_no_fly.tga
new file mode 100644
index 000000000..0aa7fa71d
Binary files /dev/null and b/indra/newview/skins/Blackdark/textures/status_no_fly.tga differ
diff --git a/indra/newview/skins/Blackdark/textures/status_no_push.tga b/indra/newview/skins/Blackdark/textures/status_no_push.tga
new file mode 100644
index 000000000..6d5987217
Binary files /dev/null and b/indra/newview/skins/Blackdark/textures/status_no_push.tga differ
diff --git a/indra/newview/skins/Blackdark/textures/status_no_scripts.tga b/indra/newview/skins/Blackdark/textures/status_no_scripts.tga
new file mode 100644
index 000000000..3bce6ad6f
Binary files /dev/null and b/indra/newview/skins/Blackdark/textures/status_no_scripts.tga differ
diff --git a/indra/newview/skins/Blackdark/textures/status_no_voice.tga b/indra/newview/skins/Blackdark/textures/status_no_voice.tga
new file mode 100644
index 000000000..aeeed6ed0
Binary files /dev/null and b/indra/newview/skins/Blackdark/textures/status_no_voice.tga differ
diff --git a/indra/newview/skins/Blackdark/textures/status_script_debug.tga b/indra/newview/skins/Blackdark/textures/status_script_debug.tga
new file mode 100644
index 000000000..7d895eb0a
Binary files /dev/null and b/indra/newview/skins/Blackdark/textures/status_script_debug.tga differ
diff --git a/indra/newview/skins/Blackdark/textures/status_search_btn.png b/indra/newview/skins/Blackdark/textures/status_search_btn.png
new file mode 100644
index 000000000..b755f6f10
Binary files /dev/null and b/indra/newview/skins/Blackdark/textures/status_search_btn.png differ
diff --git a/indra/newview/skins/Blackdark/textures/status_search_btn_pressed.png b/indra/newview/skins/Blackdark/textures/status_search_btn_pressed.png
new file mode 100644
index 000000000..c19945885
Binary files /dev/null and b/indra/newview/skins/Blackdark/textures/status_search_btn_pressed.png differ
diff --git a/indra/newview/skins/Blackdark/textures/status_voice.tga b/indra/newview/skins/Blackdark/textures/status_voice.tga
new file mode 100644
index 000000000..aeeed6ed0
Binary files /dev/null and b/indra/newview/skins/Blackdark/textures/status_voice.tga differ
diff --git a/indra/newview/skins/Blackdark/textures/tab_bottom_blue.tga b/indra/newview/skins/Blackdark/textures/tab_bottom_blue.tga
new file mode 100644
index 000000000..e6de7a5a1
Binary files /dev/null and b/indra/newview/skins/Blackdark/textures/tab_bottom_blue.tga differ
diff --git a/indra/newview/skins/Blackdark/textures/tab_bottom_selected_blue.tga b/indra/newview/skins/Blackdark/textures/tab_bottom_selected_blue.tga
new file mode 100644
index 000000000..b7f6db9b8
Binary files /dev/null and b/indra/newview/skins/Blackdark/textures/tab_bottom_selected_blue.tga differ
diff --git a/indra/newview/skins/Blackdark/textures/tab_left.tga b/indra/newview/skins/Blackdark/textures/tab_left.tga
new file mode 100644
index 000000000..4348b19ce
Binary files /dev/null and b/indra/newview/skins/Blackdark/textures/tab_left.tga differ
diff --git a/indra/newview/skins/Blackdark/textures/tab_left_selected.tga b/indra/newview/skins/Blackdark/textures/tab_left_selected.tga
new file mode 100644
index 000000000..63932fc15
Binary files /dev/null and b/indra/newview/skins/Blackdark/textures/tab_left_selected.tga differ
diff --git a/indra/newview/skins/Blackdark/textures/tab_top_blue.tga b/indra/newview/skins/Blackdark/textures/tab_top_blue.tga
new file mode 100644
index 000000000..ddcd519f2
Binary files /dev/null and b/indra/newview/skins/Blackdark/textures/tab_top_blue.tga differ
diff --git a/indra/newview/skins/Blackdark/textures/tab_top_selected_blue.tga b/indra/newview/skins/Blackdark/textures/tab_top_selected_blue.tga
new file mode 100644
index 000000000..3b7df6e46
Binary files /dev/null and b/indra/newview/skins/Blackdark/textures/tab_top_selected_blue.tga differ
diff --git a/indra/newview/skins/Blackdark/textures/tabarea.tga b/indra/newview/skins/Blackdark/textures/tabarea.tga
new file mode 100644
index 000000000..5517aebfc
Binary files /dev/null and b/indra/newview/skins/Blackdark/textures/tabarea.tga differ
diff --git a/indra/newview/skins/Blackdark/textures/tearoff_pressed.tga b/indra/newview/skins/Blackdark/textures/tearoff_pressed.tga
new file mode 100644
index 000000000..8581ab701
Binary files /dev/null and b/indra/newview/skins/Blackdark/textures/tearoff_pressed.tga differ
diff --git a/indra/newview/skins/Blackdark/textures/tearoffbox.tga b/indra/newview/skins/Blackdark/textures/tearoffbox.tga
new file mode 100644
index 000000000..27af31c4d
Binary files /dev/null and b/indra/newview/skins/Blackdark/textures/tearoffbox.tga differ
diff --git a/indra/newview/skins/Blackdark/textures/textures.xml b/indra/newview/skins/Blackdark/textures/textures.xml
new file mode 100644
index 000000000..5955a8ede
--- /dev/null
+++ b/indra/newview/skins/Blackdark/textures/textures.xml
@@ -0,0 +1,385 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/indra/newview/skins/Blackdark/textures/tool_dozer.tga b/indra/newview/skins/Blackdark/textures/tool_dozer.tga
new file mode 100644
index 000000000..e4b05a581
Binary files /dev/null and b/indra/newview/skins/Blackdark/textures/tool_dozer.tga differ
diff --git a/indra/newview/skins/Blackdark/textures/tool_dozer_active.tga b/indra/newview/skins/Blackdark/textures/tool_dozer_active.tga
new file mode 100644
index 000000000..d76f7d5d1
Binary files /dev/null and b/indra/newview/skins/Blackdark/textures/tool_dozer_active.tga differ
diff --git a/indra/newview/skins/Blackdark/textures/tool_zoom.tga b/indra/newview/skins/Blackdark/textures/tool_zoom.tga
new file mode 100644
index 000000000..72fe14195
Binary files /dev/null and b/indra/newview/skins/Blackdark/textures/tool_zoom.tga differ
diff --git a/indra/newview/skins/Blackdark/textures/tool_zoom_active.tga b/indra/newview/skins/Blackdark/textures/tool_zoom_active.tga
new file mode 100644
index 000000000..9579aef2e
Binary files /dev/null and b/indra/newview/skins/Blackdark/textures/tool_zoom_active.tga differ
diff --git a/indra/newview/skins/Blackdark/textures/toolbar_bg.tga b/indra/newview/skins/Blackdark/textures/toolbar_bg.tga
new file mode 100644
index 000000000..dbea376a4
Binary files /dev/null and b/indra/newview/skins/Blackdark/textures/toolbar_bg.tga differ
diff --git a/indra/newview/skins/Blackdark/textures/toolbar_btn_disabled.tga b/indra/newview/skins/Blackdark/textures/toolbar_btn_disabled.tga
new file mode 100644
index 000000000..fd117209f
Binary files /dev/null and b/indra/newview/skins/Blackdark/textures/toolbar_btn_disabled.tga differ
diff --git a/indra/newview/skins/Blackdark/textures/toolbar_btn_enabled.tga b/indra/newview/skins/Blackdark/textures/toolbar_btn_enabled.tga
new file mode 100644
index 000000000..fd117209f
Binary files /dev/null and b/indra/newview/skins/Blackdark/textures/toolbar_btn_enabled.tga differ
diff --git a/indra/newview/skins/Blackdark/textures/toolbar_btn_selected.tga b/indra/newview/skins/Blackdark/textures/toolbar_btn_selected.tga
new file mode 100644
index 000000000..86dc40f09
Binary files /dev/null and b/indra/newview/skins/Blackdark/textures/toolbar_btn_selected.tga differ
diff --git a/indra/newview/skins/Blackdark/textures/toolbar_tab.tga b/indra/newview/skins/Blackdark/textures/toolbar_tab.tga
new file mode 100644
index 000000000..610d2f335
Binary files /dev/null and b/indra/newview/skins/Blackdark/textures/toolbar_tab.tga differ
diff --git a/indra/newview/skins/Blackdark/textures/up_arrow.png b/indra/newview/skins/Blackdark/textures/up_arrow.png
new file mode 100644
index 000000000..5c60a61db
Binary files /dev/null and b/indra/newview/skins/Blackdark/textures/up_arrow.png differ
diff --git a/indra/newview/skins/Blackdark/textures/white.tga b/indra/newview/skins/Blackdark/textures/white.tga
new file mode 100644
index 000000000..55e379309
Binary files /dev/null and b/indra/newview/skins/Blackdark/textures/white.tga differ
diff --git a/indra/newview/skins/Blacklightblue/License and Credit.txt b/indra/newview/skins/Blacklightblue/License and Credit.txt
new file mode 100644
index 000000000..8e57c5ba0
--- /dev/null
+++ b/indra/newview/skins/Blacklightblue/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/indra/newview/skins/Blacklightblue/colors.xml b/indra/newview/skins/Blacklightblue/colors.xml
new file mode 100644
index 000000000..ac4ad8772
--- /dev/null
+++ b/indra/newview/skins/Blacklightblue/colors.xml
@@ -0,0 +1,203 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/indra/newview/skins/Blacklightblue/textures/0098b015-3daf-4cfe-a72f-915369ea97c2.tga b/indra/newview/skins/Blacklightblue/textures/0098b015-3daf-4cfe-a72f-915369ea97c2.tga
new file mode 100644
index 000000000..a60bd521f
Binary files /dev/null and b/indra/newview/skins/Blacklightblue/textures/0098b015-3daf-4cfe-a72f-915369ea97c2.tga differ
diff --git a/indra/newview/skins/Blacklightblue/textures/3c18c87e-5f50-14e2-e744-f44734aa365f.tga b/indra/newview/skins/Blacklightblue/textures/3c18c87e-5f50-14e2-e744-f44734aa365f.tga
new file mode 100644
index 000000000..e90ab295b
Binary files /dev/null and b/indra/newview/skins/Blacklightblue/textures/3c18c87e-5f50-14e2-e744-f44734aa365f.tga differ
diff --git a/indra/newview/skins/Blacklightblue/textures/7a0b1bdb-b5d9-4df5-bac2-ba230da93b5b.tga b/indra/newview/skins/Blacklightblue/textures/7a0b1bdb-b5d9-4df5-bac2-ba230da93b5b.tga
new file mode 100644
index 000000000..b776b11d0
Binary files /dev/null and b/indra/newview/skins/Blacklightblue/textures/7a0b1bdb-b5d9-4df5-bac2-ba230da93b5b.tga differ
diff --git a/indra/newview/skins/Blacklightblue/textures/7dabc040-ec13-2309-ddf7-4f161f6de2f4.tga b/indra/newview/skins/Blacklightblue/textures/7dabc040-ec13-2309-ddf7-4f161f6de2f4.tga
new file mode 100644
index 000000000..534ecba91
Binary files /dev/null and b/indra/newview/skins/Blacklightblue/textures/7dabc040-ec13-2309-ddf7-4f161f6de2f4.tga differ
diff --git a/indra/newview/skins/Blacklightblue/textures/9cad3e6d-2d6d-107d-f8ab-5ba272b5bfe1.tga b/indra/newview/skins/Blacklightblue/textures/9cad3e6d-2d6d-107d-f8ab-5ba272b5bfe1.tga
new file mode 100644
index 000000000..e90ab295b
Binary files /dev/null and b/indra/newview/skins/Blacklightblue/textures/9cad3e6d-2d6d-107d-f8ab-5ba272b5bfe1.tga differ
diff --git a/indra/newview/skins/Blacklightblue/textures/active_speakers.tga b/indra/newview/skins/Blacklightblue/textures/active_speakers.tga
new file mode 100644
index 000000000..ec097fcd4
Binary files /dev/null and b/indra/newview/skins/Blacklightblue/textures/active_speakers.tga differ
diff --git a/indra/newview/skins/Blacklightblue/textures/active_voice_tab.tga b/indra/newview/skins/Blacklightblue/textures/active_voice_tab.tga
new file mode 100644
index 000000000..3037e9668
Binary files /dev/null and b/indra/newview/skins/Blacklightblue/textures/active_voice_tab.tga differ
diff --git a/indra/newview/skins/Blacklightblue/textures/arrow_down.tga b/indra/newview/skins/Blacklightblue/textures/arrow_down.tga
new file mode 100644
index 000000000..89a793bcb
Binary files /dev/null and b/indra/newview/skins/Blacklightblue/textures/arrow_down.tga differ
diff --git a/indra/newview/skins/Blacklightblue/textures/arrow_up.tga b/indra/newview/skins/Blacklightblue/textures/arrow_up.tga
new file mode 100644
index 000000000..5b03c5433
Binary files /dev/null and b/indra/newview/skins/Blacklightblue/textures/arrow_up.tga differ
diff --git a/indra/newview/skins/Blacklightblue/textures/b4870163-6208-42a9-9801-93133bf9a6cd.tga b/indra/newview/skins/Blacklightblue/textures/b4870163-6208-42a9-9801-93133bf9a6cd.tga
new file mode 100644
index 000000000..54f7c6ece
Binary files /dev/null and b/indra/newview/skins/Blacklightblue/textures/b4870163-6208-42a9-9801-93133bf9a6cd.tga differ
diff --git a/indra/newview/skins/Blacklightblue/textures/badge_error.j2c b/indra/newview/skins/Blacklightblue/textures/badge_error.j2c
new file mode 100644
index 000000000..efb5c375c
Binary files /dev/null and b/indra/newview/skins/Blacklightblue/textures/badge_error.j2c differ
diff --git a/indra/newview/skins/Blacklightblue/textures/badge_note.j2c b/indra/newview/skins/Blacklightblue/textures/badge_note.j2c
new file mode 100644
index 000000000..ef5db9e0d
Binary files /dev/null and b/indra/newview/skins/Blacklightblue/textures/badge_note.j2c differ
diff --git a/indra/newview/skins/Blacklightblue/textures/badge_ok.j2c b/indra/newview/skins/Blacklightblue/textures/badge_ok.j2c
new file mode 100644
index 000000000..8ceee01c6
Binary files /dev/null and b/indra/newview/skins/Blacklightblue/textures/badge_ok.j2c differ
diff --git a/indra/newview/skins/Blacklightblue/textures/badge_warn.j2c b/indra/newview/skins/Blacklightblue/textures/badge_warn.j2c
new file mode 100644
index 000000000..8fb85be69
Binary files /dev/null and b/indra/newview/skins/Blacklightblue/textures/badge_warn.j2c differ
diff --git a/indra/newview/skins/Blacklightblue/textures/btn_chatbar.tga b/indra/newview/skins/Blacklightblue/textures/btn_chatbar.tga
new file mode 100644
index 000000000..07117925a
Binary files /dev/null and b/indra/newview/skins/Blacklightblue/textures/btn_chatbar.tga differ
diff --git a/indra/newview/skins/Blacklightblue/textures/btn_chatbar_selected.tga b/indra/newview/skins/Blacklightblue/textures/btn_chatbar_selected.tga
new file mode 100644
index 000000000..3446bf168
Binary files /dev/null and b/indra/newview/skins/Blacklightblue/textures/btn_chatbar_selected.tga differ
diff --git a/indra/newview/skins/Blacklightblue/textures/button_anim_pause.tga b/indra/newview/skins/Blacklightblue/textures/button_anim_pause.tga
new file mode 100644
index 000000000..f4ad7adc0
Binary files /dev/null and b/indra/newview/skins/Blacklightblue/textures/button_anim_pause.tga differ
diff --git a/indra/newview/skins/Blacklightblue/textures/button_anim_pause_selected.tga b/indra/newview/skins/Blacklightblue/textures/button_anim_pause_selected.tga
new file mode 100644
index 000000000..64268de2c
Binary files /dev/null and b/indra/newview/skins/Blacklightblue/textures/button_anim_pause_selected.tga differ
diff --git a/indra/newview/skins/Blacklightblue/textures/button_anim_play.tga b/indra/newview/skins/Blacklightblue/textures/button_anim_play.tga
new file mode 100644
index 000000000..9843aec5f
Binary files /dev/null and b/indra/newview/skins/Blacklightblue/textures/button_anim_play.tga differ
diff --git a/indra/newview/skins/Blacklightblue/textures/button_anim_play_selected.tga b/indra/newview/skins/Blacklightblue/textures/button_anim_play_selected.tga
new file mode 100644
index 000000000..d102c2b06
Binary files /dev/null and b/indra/newview/skins/Blacklightblue/textures/button_anim_play_selected.tga differ
diff --git a/indra/newview/skins/Blacklightblue/textures/button_anim_stop.tga b/indra/newview/skins/Blacklightblue/textures/button_anim_stop.tga
new file mode 100644
index 000000000..4c28986bf
Binary files /dev/null and b/indra/newview/skins/Blacklightblue/textures/button_anim_stop.tga differ
diff --git a/indra/newview/skins/Blacklightblue/textures/button_anim_stop_selected.tga b/indra/newview/skins/Blacklightblue/textures/button_anim_stop_selected.tga
new file mode 100644
index 000000000..afb1536e0
Binary files /dev/null and b/indra/newview/skins/Blacklightblue/textures/button_anim_stop_selected.tga differ
diff --git a/indra/newview/skins/Blacklightblue/textures/button_disabled_32x128.tga b/indra/newview/skins/Blacklightblue/textures/button_disabled_32x128.tga
new file mode 100644
index 000000000..d33fbe464
Binary files /dev/null and b/indra/newview/skins/Blacklightblue/textures/button_disabled_32x128.tga differ
diff --git a/indra/newview/skins/Blacklightblue/textures/button_enabled_32x128.tga b/indra/newview/skins/Blacklightblue/textures/button_enabled_32x128.tga
new file mode 100644
index 000000000..d33fbe464
Binary files /dev/null and b/indra/newview/skins/Blacklightblue/textures/button_enabled_32x128.tga differ
diff --git a/indra/newview/skins/Blacklightblue/textures/button_enabled_selected_32x128.tga b/indra/newview/skins/Blacklightblue/textures/button_enabled_selected_32x128.tga
new file mode 100644
index 000000000..a7ef5b78d
Binary files /dev/null and b/indra/newview/skins/Blacklightblue/textures/button_enabled_selected_32x128.tga differ
diff --git a/indra/newview/skins/Blacklightblue/textures/c1e21504-f136-451d-b8e9-929037812f1d.tga b/indra/newview/skins/Blacklightblue/textures/c1e21504-f136-451d-b8e9-929037812f1d.tga
new file mode 100644
index 000000000..0db2e5061
Binary files /dev/null and b/indra/newview/skins/Blacklightblue/textures/c1e21504-f136-451d-b8e9-929037812f1d.tga differ
diff --git a/indra/newview/skins/Blacklightblue/textures/c63f124c-6340-4fbf-b59e-0869a44adb64.tga b/indra/newview/skins/Blacklightblue/textures/c63f124c-6340-4fbf-b59e-0869a44adb64.tga
new file mode 100644
index 000000000..2e8d54b35
Binary files /dev/null and b/indra/newview/skins/Blacklightblue/textures/c63f124c-6340-4fbf-b59e-0869a44adb64.tga differ
diff --git a/indra/newview/skins/Blacklightblue/textures/cam_rotate_in.tga b/indra/newview/skins/Blacklightblue/textures/cam_rotate_in.tga
new file mode 100644
index 000000000..129c9982e
Binary files /dev/null and b/indra/newview/skins/Blacklightblue/textures/cam_rotate_in.tga differ
diff --git a/indra/newview/skins/Blacklightblue/textures/cam_rotate_out.tga b/indra/newview/skins/Blacklightblue/textures/cam_rotate_out.tga
new file mode 100644
index 000000000..bd7c80e29
Binary files /dev/null and b/indra/newview/skins/Blacklightblue/textures/cam_rotate_out.tga differ
diff --git a/indra/newview/skins/Blacklightblue/textures/cam_tracking_in.tga b/indra/newview/skins/Blacklightblue/textures/cam_tracking_in.tga
new file mode 100644
index 000000000..1d5b32a3c
Binary files /dev/null and b/indra/newview/skins/Blacklightblue/textures/cam_tracking_in.tga differ
diff --git a/indra/newview/skins/Blacklightblue/textures/cam_tracking_out.tga b/indra/newview/skins/Blacklightblue/textures/cam_tracking_out.tga
new file mode 100644
index 000000000..8bac4a1f2
Binary files /dev/null and b/indra/newview/skins/Blacklightblue/textures/cam_tracking_out.tga differ
diff --git a/indra/newview/skins/Blacklightblue/textures/cam_zoom_minus_in.tga b/indra/newview/skins/Blacklightblue/textures/cam_zoom_minus_in.tga
new file mode 100644
index 000000000..58cb426be
Binary files /dev/null and b/indra/newview/skins/Blacklightblue/textures/cam_zoom_minus_in.tga differ
diff --git a/indra/newview/skins/Blacklightblue/textures/cam_zoom_out.tga b/indra/newview/skins/Blacklightblue/textures/cam_zoom_out.tga
new file mode 100644
index 000000000..6b117abc1
Binary files /dev/null and b/indra/newview/skins/Blacklightblue/textures/cam_zoom_out.tga differ
diff --git a/indra/newview/skins/Blacklightblue/textures/cam_zoom_plus_in.tga b/indra/newview/skins/Blacklightblue/textures/cam_zoom_plus_in.tga
new file mode 100644
index 000000000..c427f4ba9
Binary files /dev/null and b/indra/newview/skins/Blacklightblue/textures/cam_zoom_plus_in.tga differ
diff --git a/indra/newview/skins/Blacklightblue/textures/ce15fd63-b0b6-463c-a37d-ea6393208b3e.tga b/indra/newview/skins/Blacklightblue/textures/ce15fd63-b0b6-463c-a37d-ea6393208b3e.tga
new file mode 100644
index 000000000..dfe32943a
Binary files /dev/null and b/indra/newview/skins/Blacklightblue/textures/ce15fd63-b0b6-463c-a37d-ea6393208b3e.tga differ
diff --git a/indra/newview/skins/Blacklightblue/textures/checkbox_disabled_false.tga b/indra/newview/skins/Blacklightblue/textures/checkbox_disabled_false.tga
new file mode 100644
index 000000000..aa57cd211
Binary files /dev/null and b/indra/newview/skins/Blacklightblue/textures/checkbox_disabled_false.tga differ
diff --git a/indra/newview/skins/Blacklightblue/textures/checkbox_disabled_true.tga b/indra/newview/skins/Blacklightblue/textures/checkbox_disabled_true.tga
new file mode 100644
index 000000000..30bc6d4c9
Binary files /dev/null and b/indra/newview/skins/Blacklightblue/textures/checkbox_disabled_true.tga differ
diff --git a/indra/newview/skins/Blacklightblue/textures/checkbox_enabled_false.tga b/indra/newview/skins/Blacklightblue/textures/checkbox_enabled_false.tga
new file mode 100644
index 000000000..fb8265b18
Binary files /dev/null and b/indra/newview/skins/Blacklightblue/textures/checkbox_enabled_false.tga differ
diff --git a/indra/newview/skins/Blacklightblue/textures/checkbox_enabled_true.tga b/indra/newview/skins/Blacklightblue/textures/checkbox_enabled_true.tga
new file mode 100644
index 000000000..1b43d2abb
Binary files /dev/null and b/indra/newview/skins/Blacklightblue/textures/checkbox_enabled_true.tga differ
diff --git a/indra/newview/skins/Blacklightblue/textures/close_in_blue.tga b/indra/newview/skins/Blacklightblue/textures/close_in_blue.tga
new file mode 100644
index 000000000..c58e052b8
Binary files /dev/null and b/indra/newview/skins/Blacklightblue/textures/close_in_blue.tga differ
diff --git a/indra/newview/skins/Blacklightblue/textures/close_inactive_blue.tga b/indra/newview/skins/Blacklightblue/textures/close_inactive_blue.tga
new file mode 100644
index 000000000..2f912df59
Binary files /dev/null and b/indra/newview/skins/Blacklightblue/textures/close_inactive_blue.tga differ
diff --git a/indra/newview/skins/Blacklightblue/textures/closebox.tga b/indra/newview/skins/Blacklightblue/textures/closebox.tga
new file mode 100644
index 000000000..5e1195526
Binary files /dev/null and b/indra/newview/skins/Blacklightblue/textures/closebox.tga differ
diff --git a/indra/newview/skins/Blacklightblue/textures/combobox_arrow.tga b/indra/newview/skins/Blacklightblue/textures/combobox_arrow.tga
new file mode 100644
index 000000000..cd592c3df
Binary files /dev/null and b/indra/newview/skins/Blacklightblue/textures/combobox_arrow.tga differ
diff --git a/indra/newview/skins/Blacklightblue/textures/d07f6eed-b96a-47cd-b51d-400ad4a1c428.j2c b/indra/newview/skins/Blacklightblue/textures/d07f6eed-b96a-47cd-b51d-400ad4a1c428.j2c
new file mode 100644
index 000000000..4b73b25ac
Binary files /dev/null and b/indra/newview/skins/Blacklightblue/textures/d07f6eed-b96a-47cd-b51d-400ad4a1c428.j2c differ
diff --git a/indra/newview/skins/Blacklightblue/textures/default_land_picture.j2c b/indra/newview/skins/Blacklightblue/textures/default_land_picture.j2c
new file mode 100644
index 000000000..6e2a85a46
Binary files /dev/null and b/indra/newview/skins/Blacklightblue/textures/default_land_picture.j2c differ
diff --git a/indra/newview/skins/Blacklightblue/textures/default_profile_picture.j2c b/indra/newview/skins/Blacklightblue/textures/default_profile_picture.j2c
new file mode 100644
index 000000000..31d741e88
Binary files /dev/null and b/indra/newview/skins/Blacklightblue/textures/default_profile_picture.j2c differ
diff --git a/indra/newview/skins/Blacklightblue/textures/direction_arrow.tga b/indra/newview/skins/Blacklightblue/textures/direction_arrow.tga
new file mode 100644
index 000000000..59149e1d5
Binary files /dev/null and b/indra/newview/skins/Blacklightblue/textures/direction_arrow.tga differ
diff --git a/indra/newview/skins/Blacklightblue/textures/down_arrow.png b/indra/newview/skins/Blacklightblue/textures/down_arrow.png
new file mode 100644
index 000000000..88c8c8481
Binary files /dev/null and b/indra/newview/skins/Blacklightblue/textures/down_arrow.png differ
diff --git a/indra/newview/skins/Blacklightblue/textures/eye_button_active.tga b/indra/newview/skins/Blacklightblue/textures/eye_button_active.tga
new file mode 100644
index 000000000..8cda9a6a0
Binary files /dev/null and b/indra/newview/skins/Blacklightblue/textures/eye_button_active.tga differ
diff --git a/indra/newview/skins/Blacklightblue/textures/eye_button_inactive.tga b/indra/newview/skins/Blacklightblue/textures/eye_button_inactive.tga
new file mode 100644
index 000000000..92a289f11
Binary files /dev/null and b/indra/newview/skins/Blacklightblue/textures/eye_button_inactive.tga differ
diff --git a/indra/newview/skins/Blacklightblue/textures/ff9a71eb-7414-4cf8-866e-a701deb7c3cf.tga b/indra/newview/skins/Blacklightblue/textures/ff9a71eb-7414-4cf8-866e-a701deb7c3cf.tga
new file mode 100644
index 000000000..534ecba91
Binary files /dev/null and b/indra/newview/skins/Blacklightblue/textures/ff9a71eb-7414-4cf8-866e-a701deb7c3cf.tga differ
diff --git a/indra/newview/skins/Blacklightblue/textures/ff_edit_mine_button.tga b/indra/newview/skins/Blacklightblue/textures/ff_edit_mine_button.tga
new file mode 100644
index 000000000..d2feac64b
Binary files /dev/null and b/indra/newview/skins/Blacklightblue/textures/ff_edit_mine_button.tga differ
diff --git a/indra/newview/skins/Blacklightblue/textures/ff_edit_theirs_button.tga b/indra/newview/skins/Blacklightblue/textures/ff_edit_theirs_button.tga
new file mode 100644
index 000000000..ae0f5c977
Binary files /dev/null and b/indra/newview/skins/Blacklightblue/textures/ff_edit_theirs_button.tga differ
diff --git a/indra/newview/skins/Blacklightblue/textures/ff_online_status_button.tga b/indra/newview/skins/Blacklightblue/textures/ff_online_status_button.tga
new file mode 100644
index 000000000..30b70ccd4
Binary files /dev/null and b/indra/newview/skins/Blacklightblue/textures/ff_online_status_button.tga differ
diff --git a/indra/newview/skins/Blacklightblue/textures/ff_visible_map.tga b/indra/newview/skins/Blacklightblue/textures/ff_visible_map.tga
new file mode 100644
index 000000000..d8ed32336
Binary files /dev/null and b/indra/newview/skins/Blacklightblue/textures/ff_visible_map.tga differ
diff --git a/indra/newview/skins/Blacklightblue/textures/ff_visible_map_button.tga b/indra/newview/skins/Blacklightblue/textures/ff_visible_map_button.tga
new file mode 100644
index 000000000..ca1bb7697
Binary files /dev/null and b/indra/newview/skins/Blacklightblue/textures/ff_visible_map_button.tga differ
diff --git a/indra/newview/skins/Blacklightblue/textures/ff_visible_online.tga b/indra/newview/skins/Blacklightblue/textures/ff_visible_online.tga
new file mode 100644
index 000000000..2b76d72ec
Binary files /dev/null and b/indra/newview/skins/Blacklightblue/textures/ff_visible_online.tga differ
diff --git a/indra/newview/skins/Blacklightblue/textures/ff_visible_online_button.tga b/indra/newview/skins/Blacklightblue/textures/ff_visible_online_button.tga
new file mode 100644
index 000000000..f0a4414e0
Binary files /dev/null and b/indra/newview/skins/Blacklightblue/textures/ff_visible_online_button.tga differ
diff --git a/indra/newview/skins/Blacklightblue/textures/flyout_btn_left.tga b/indra/newview/skins/Blacklightblue/textures/flyout_btn_left.tga
new file mode 100644
index 000000000..3e4e2625c
Binary files /dev/null and b/indra/newview/skins/Blacklightblue/textures/flyout_btn_left.tga differ
diff --git a/indra/newview/skins/Blacklightblue/textures/flyout_btn_left_disabled.tga b/indra/newview/skins/Blacklightblue/textures/flyout_btn_left_disabled.tga
new file mode 100644
index 000000000..3e4e2625c
Binary files /dev/null and b/indra/newview/skins/Blacklightblue/textures/flyout_btn_left_disabled.tga differ
diff --git a/indra/newview/skins/Blacklightblue/textures/flyout_btn_left_selected.tga b/indra/newview/skins/Blacklightblue/textures/flyout_btn_left_selected.tga
new file mode 100644
index 000000000..b8e809c57
Binary files /dev/null and b/indra/newview/skins/Blacklightblue/textures/flyout_btn_left_selected.tga differ
diff --git a/indra/newview/skins/Blacklightblue/textures/flyout_btn_right.tga b/indra/newview/skins/Blacklightblue/textures/flyout_btn_right.tga
new file mode 100644
index 000000000..c59ad0043
Binary files /dev/null and b/indra/newview/skins/Blacklightblue/textures/flyout_btn_right.tga differ
diff --git a/indra/newview/skins/Blacklightblue/textures/flyout_btn_right_disabled.tga b/indra/newview/skins/Blacklightblue/textures/flyout_btn_right_disabled.tga
new file mode 100644
index 000000000..c59ad0043
Binary files /dev/null and b/indra/newview/skins/Blacklightblue/textures/flyout_btn_right_disabled.tga differ
diff --git a/indra/newview/skins/Blacklightblue/textures/flyout_btn_right_selected.tga b/indra/newview/skins/Blacklightblue/textures/flyout_btn_right_selected.tga
new file mode 100644
index 000000000..70afe2d34
Binary files /dev/null and b/indra/newview/skins/Blacklightblue/textures/flyout_btn_right_selected.tga differ
diff --git a/indra/newview/skins/Blacklightblue/textures/flyout_left.tga b/indra/newview/skins/Blacklightblue/textures/flyout_left.tga
new file mode 100644
index 000000000..a759112e1
Binary files /dev/null and b/indra/newview/skins/Blacklightblue/textures/flyout_left.tga differ
diff --git a/indra/newview/skins/Blacklightblue/textures/flyout_left_disabled.tga b/indra/newview/skins/Blacklightblue/textures/flyout_left_disabled.tga
new file mode 100644
index 000000000..a759112e1
Binary files /dev/null and b/indra/newview/skins/Blacklightblue/textures/flyout_left_disabled.tga differ
diff --git a/indra/newview/skins/Blacklightblue/textures/flyout_left_selected.tga b/indra/newview/skins/Blacklightblue/textures/flyout_left_selected.tga
new file mode 100644
index 000000000..783dc6270
Binary files /dev/null and b/indra/newview/skins/Blacklightblue/textures/flyout_left_selected.tga differ
diff --git a/indra/newview/skins/Blacklightblue/textures/folder_arrow.tga b/indra/newview/skins/Blacklightblue/textures/folder_arrow.tga
new file mode 100644
index 000000000..734a00a84
Binary files /dev/null and b/indra/newview/skins/Blacklightblue/textures/folder_arrow.tga differ
diff --git a/indra/newview/skins/Blacklightblue/textures/icn_chatbar.tga b/indra/newview/skins/Blacklightblue/textures/icn_chatbar.tga
new file mode 100644
index 000000000..b89dfc432
Binary files /dev/null and b/indra/newview/skins/Blacklightblue/textures/icn_chatbar.tga differ
diff --git a/indra/newview/skins/Blacklightblue/textures/icn_label_media.tga b/indra/newview/skins/Blacklightblue/textures/icn_label_media.tga
new file mode 100644
index 000000000..b16c528e9
Binary files /dev/null and b/indra/newview/skins/Blacklightblue/textures/icn_label_media.tga differ
diff --git a/indra/newview/skins/Blacklightblue/textures/icn_label_music.tga b/indra/newview/skins/Blacklightblue/textures/icn_label_music.tga
new file mode 100644
index 000000000..515f170b6
Binary files /dev/null and b/indra/newview/skins/Blacklightblue/textures/icn_label_music.tga differ
diff --git a/indra/newview/skins/Blacklightblue/textures/icn_label_web.tga b/indra/newview/skins/Blacklightblue/textures/icn_label_web.tga
new file mode 100644
index 000000000..6cacfad7a
Binary files /dev/null and b/indra/newview/skins/Blacklightblue/textures/icn_label_web.tga differ
diff --git a/indra/newview/skins/Blacklightblue/textures/icn_media-pause_active.tga b/indra/newview/skins/Blacklightblue/textures/icn_media-pause_active.tga
new file mode 100644
index 000000000..4d10aff70
Binary files /dev/null and b/indra/newview/skins/Blacklightblue/textures/icn_media-pause_active.tga differ
diff --git a/indra/newview/skins/Blacklightblue/textures/icn_media-pause_disabled.tga b/indra/newview/skins/Blacklightblue/textures/icn_media-pause_disabled.tga
new file mode 100644
index 000000000..7689cb709
Binary files /dev/null and b/indra/newview/skins/Blacklightblue/textures/icn_media-pause_disabled.tga differ
diff --git a/indra/newview/skins/Blacklightblue/textures/icn_media-pause_enabled.tga b/indra/newview/skins/Blacklightblue/textures/icn_media-pause_enabled.tga
new file mode 100644
index 000000000..6ea800a30
Binary files /dev/null and b/indra/newview/skins/Blacklightblue/textures/icn_media-pause_enabled.tga differ
diff --git a/indra/newview/skins/Blacklightblue/textures/icn_media-play_active.tga b/indra/newview/skins/Blacklightblue/textures/icn_media-play_active.tga
new file mode 100644
index 000000000..fb7d843a3
Binary files /dev/null and b/indra/newview/skins/Blacklightblue/textures/icn_media-play_active.tga differ
diff --git a/indra/newview/skins/Blacklightblue/textures/icn_media-play_disabled.tga b/indra/newview/skins/Blacklightblue/textures/icn_media-play_disabled.tga
new file mode 100644
index 000000000..0306e94c6
Binary files /dev/null and b/indra/newview/skins/Blacklightblue/textures/icn_media-play_disabled.tga differ
diff --git a/indra/newview/skins/Blacklightblue/textures/icn_media-play_enabled.tga b/indra/newview/skins/Blacklightblue/textures/icn_media-play_enabled.tga
new file mode 100644
index 000000000..51b6807ae
Binary files /dev/null and b/indra/newview/skins/Blacklightblue/textures/icn_media-play_enabled.tga differ
diff --git a/indra/newview/skins/Blacklightblue/textures/icn_media-stop_active.tga b/indra/newview/skins/Blacklightblue/textures/icn_media-stop_active.tga
new file mode 100644
index 000000000..de0644867
Binary files /dev/null and b/indra/newview/skins/Blacklightblue/textures/icn_media-stop_active.tga differ
diff --git a/indra/newview/skins/Blacklightblue/textures/icn_media-stop_disabled.tga b/indra/newview/skins/Blacklightblue/textures/icn_media-stop_disabled.tga
new file mode 100644
index 000000000..6c18bbeda
Binary files /dev/null and b/indra/newview/skins/Blacklightblue/textures/icn_media-stop_disabled.tga differ
diff --git a/indra/newview/skins/Blacklightblue/textures/icn_media-stop_enabled.tga b/indra/newview/skins/Blacklightblue/textures/icn_media-stop_enabled.tga
new file mode 100644
index 000000000..8738cdc9e
Binary files /dev/null and b/indra/newview/skins/Blacklightblue/textures/icn_media-stop_enabled.tga differ
diff --git a/indra/newview/skins/Blacklightblue/textures/icn_media.tga b/indra/newview/skins/Blacklightblue/textures/icn_media.tga
new file mode 100644
index 000000000..9743d4708
Binary files /dev/null and b/indra/newview/skins/Blacklightblue/textures/icn_media.tga differ
diff --git a/indra/newview/skins/Blacklightblue/textures/icn_media_movie.tga b/indra/newview/skins/Blacklightblue/textures/icn_media_movie.tga
new file mode 100644
index 000000000..b16c528e9
Binary files /dev/null and b/indra/newview/skins/Blacklightblue/textures/icn_media_movie.tga differ
diff --git a/indra/newview/skins/Blacklightblue/textures/icn_media_web.tga b/indra/newview/skins/Blacklightblue/textures/icn_media_web.tga
new file mode 100644
index 000000000..a92ae962b
Binary files /dev/null and b/indra/newview/skins/Blacklightblue/textures/icn_media_web.tga differ
diff --git a/indra/newview/skins/Blacklightblue/textures/icn_music-play.tga b/indra/newview/skins/Blacklightblue/textures/icn_music-play.tga
new file mode 100644
index 000000000..4249627ca
Binary files /dev/null and b/indra/newview/skins/Blacklightblue/textures/icn_music-play.tga differ
diff --git a/indra/newview/skins/Blacklightblue/textures/icn_music.tga b/indra/newview/skins/Blacklightblue/textures/icn_music.tga
new file mode 100644
index 000000000..a7c2845dc
Binary files /dev/null and b/indra/newview/skins/Blacklightblue/textures/icn_music.tga differ
diff --git a/indra/newview/skins/Blacklightblue/textures/icn_pause.tga b/indra/newview/skins/Blacklightblue/textures/icn_pause.tga
new file mode 100644
index 000000000..3bc286f5f
Binary files /dev/null and b/indra/newview/skins/Blacklightblue/textures/icn_pause.tga differ
diff --git a/indra/newview/skins/Blacklightblue/textures/icn_play.tga b/indra/newview/skins/Blacklightblue/textures/icn_play.tga
new file mode 100644
index 000000000..a23ef52e3
Binary files /dev/null and b/indra/newview/skins/Blacklightblue/textures/icn_play.tga differ
diff --git a/indra/newview/skins/Blacklightblue/textures/icn_rounded-text-field.tga b/indra/newview/skins/Blacklightblue/textures/icn_rounded-text-field.tga
new file mode 100644
index 000000000..1f1e72572
Binary files /dev/null and b/indra/newview/skins/Blacklightblue/textures/icn_rounded-text-field.tga differ
diff --git a/indra/newview/skins/Blacklightblue/textures/icn_slide-groove_dark.tga b/indra/newview/skins/Blacklightblue/textures/icn_slide-groove_dark.tga
new file mode 100644
index 000000000..9b9c2e4c4
Binary files /dev/null and b/indra/newview/skins/Blacklightblue/textures/icn_slide-groove_dark.tga differ
diff --git a/indra/newview/skins/Blacklightblue/textures/icn_slide-highlight.tga b/indra/newview/skins/Blacklightblue/textures/icn_slide-highlight.tga
new file mode 100644
index 000000000..d371cd066
Binary files /dev/null and b/indra/newview/skins/Blacklightblue/textures/icn_slide-highlight.tga differ
diff --git a/indra/newview/skins/Blacklightblue/textures/icn_slide-thumb_dark.tga b/indra/newview/skins/Blacklightblue/textures/icn_slide-thumb_dark.tga
new file mode 100644
index 000000000..dd34dc0df
Binary files /dev/null and b/indra/newview/skins/Blacklightblue/textures/icn_slide-thumb_dark.tga differ
diff --git a/indra/newview/skins/Blacklightblue/textures/icn_speaker-muted_dark.tga b/indra/newview/skins/Blacklightblue/textures/icn_speaker-muted_dark.tga
new file mode 100644
index 000000000..8f2c80dd2
Binary files /dev/null and b/indra/newview/skins/Blacklightblue/textures/icn_speaker-muted_dark.tga differ
diff --git a/indra/newview/skins/Blacklightblue/textures/icn_speaker_dark.tga b/indra/newview/skins/Blacklightblue/textures/icn_speaker_dark.tga
new file mode 100644
index 000000000..c2ee04044
Binary files /dev/null and b/indra/newview/skins/Blacklightblue/textures/icn_speaker_dark.tga differ
diff --git a/indra/newview/skins/Blacklightblue/textures/icn_stop.tga b/indra/newview/skins/Blacklightblue/textures/icn_stop.tga
new file mode 100644
index 000000000..2925b3853
Binary files /dev/null and b/indra/newview/skins/Blacklightblue/textures/icn_stop.tga differ
diff --git a/indra/newview/skins/Blacklightblue/textures/icn_toolbar_radar.tga b/indra/newview/skins/Blacklightblue/textures/icn_toolbar_radar.tga
new file mode 100644
index 000000000..d1a55ed74
Binary files /dev/null and b/indra/newview/skins/Blacklightblue/textures/icn_toolbar_radar.tga differ
diff --git a/indra/newview/skins/Blacklightblue/textures/icn_voice-groupfocus.tga b/indra/newview/skins/Blacklightblue/textures/icn_voice-groupfocus.tga
new file mode 100644
index 000000000..913bd0969
Binary files /dev/null and b/indra/newview/skins/Blacklightblue/textures/icn_voice-groupfocus.tga differ
diff --git a/indra/newview/skins/Blacklightblue/textures/icn_voice-localchat.tga b/indra/newview/skins/Blacklightblue/textures/icn_voice-localchat.tga
new file mode 100644
index 000000000..5c1456602
Binary files /dev/null and b/indra/newview/skins/Blacklightblue/textures/icn_voice-localchat.tga differ
diff --git a/indra/newview/skins/Blacklightblue/textures/icn_voice-pvtfocus.tga b/indra/newview/skins/Blacklightblue/textures/icn_voice-pvtfocus.tga
new file mode 100644
index 000000000..76e72fd3a
Binary files /dev/null and b/indra/newview/skins/Blacklightblue/textures/icn_voice-pvtfocus.tga differ
diff --git a/indra/newview/skins/Blacklightblue/textures/icn_voice_ptt-off.tga b/indra/newview/skins/Blacklightblue/textures/icn_voice_ptt-off.tga
new file mode 100644
index 000000000..530425dd7
Binary files /dev/null and b/indra/newview/skins/Blacklightblue/textures/icn_voice_ptt-off.tga differ
diff --git a/indra/newview/skins/Blacklightblue/textures/icn_voice_ptt-on-lvl1.tga b/indra/newview/skins/Blacklightblue/textures/icn_voice_ptt-on-lvl1.tga
new file mode 100644
index 000000000..b64551cc0
Binary files /dev/null and b/indra/newview/skins/Blacklightblue/textures/icn_voice_ptt-on-lvl1.tga differ
diff --git a/indra/newview/skins/Blacklightblue/textures/icn_voice_ptt-on-lvl2.tga b/indra/newview/skins/Blacklightblue/textures/icn_voice_ptt-on-lvl2.tga
new file mode 100644
index 000000000..348591e3d
Binary files /dev/null and b/indra/newview/skins/Blacklightblue/textures/icn_voice_ptt-on-lvl2.tga differ
diff --git a/indra/newview/skins/Blacklightblue/textures/icn_voice_ptt-on-lvl3.tga b/indra/newview/skins/Blacklightblue/textures/icn_voice_ptt-on-lvl3.tga
new file mode 100644
index 000000000..081265efb
Binary files /dev/null and b/indra/newview/skins/Blacklightblue/textures/icn_voice_ptt-on-lvl3.tga differ
diff --git a/indra/newview/skins/Blacklightblue/textures/icn_voice_ptt-on.tga b/indra/newview/skins/Blacklightblue/textures/icn_voice_ptt-on.tga
new file mode 100644
index 000000000..f9eb32926
Binary files /dev/null and b/indra/newview/skins/Blacklightblue/textures/icn_voice_ptt-on.tga differ
diff --git a/indra/newview/skins/Blacklightblue/textures/icon_auction.tga b/indra/newview/skins/Blacklightblue/textures/icon_auction.tga
new file mode 100644
index 000000000..3aa21d323
Binary files /dev/null and b/indra/newview/skins/Blacklightblue/textures/icon_auction.tga differ
diff --git a/indra/newview/skins/Blacklightblue/textures/icon_avatar_offline.tga b/indra/newview/skins/Blacklightblue/textures/icon_avatar_offline.tga
new file mode 100644
index 000000000..620e0f7c1
Binary files /dev/null and b/indra/newview/skins/Blacklightblue/textures/icon_avatar_offline.tga differ
diff --git a/indra/newview/skins/Blacklightblue/textures/icon_avatar_online.tga b/indra/newview/skins/Blacklightblue/textures/icon_avatar_online.tga
new file mode 100644
index 000000000..6350237ee
Binary files /dev/null and b/indra/newview/skins/Blacklightblue/textures/icon_avatar_online.tga differ
diff --git a/indra/newview/skins/Blacklightblue/textures/icon_diurnal.tga b/indra/newview/skins/Blacklightblue/textures/icon_diurnal.tga
new file mode 100644
index 000000000..fc720c826
Binary files /dev/null and b/indra/newview/skins/Blacklightblue/textures/icon_diurnal.tga differ
diff --git a/indra/newview/skins/Blacklightblue/textures/icon_event.tga b/indra/newview/skins/Blacklightblue/textures/icon_event.tga
new file mode 100644
index 000000000..23f246b91
Binary files /dev/null and b/indra/newview/skins/Blacklightblue/textures/icon_event.tga differ
diff --git a/indra/newview/skins/Blacklightblue/textures/icon_event_adult.tga b/indra/newview/skins/Blacklightblue/textures/icon_event_adult.tga
new file mode 100644
index 000000000..7202e6734
Binary files /dev/null and b/indra/newview/skins/Blacklightblue/textures/icon_event_adult.tga differ
diff --git a/indra/newview/skins/Blacklightblue/textures/icon_event_mature.tga b/indra/newview/skins/Blacklightblue/textures/icon_event_mature.tga
new file mode 100644
index 000000000..103c5e535
Binary files /dev/null and b/indra/newview/skins/Blacklightblue/textures/icon_event_mature.tga differ
diff --git a/indra/newview/skins/Blacklightblue/textures/icon_for_sale.tga b/indra/newview/skins/Blacklightblue/textures/icon_for_sale.tga
new file mode 100644
index 000000000..09405d383
Binary files /dev/null and b/indra/newview/skins/Blacklightblue/textures/icon_for_sale.tga differ
diff --git a/indra/newview/skins/Blacklightblue/textures/icon_for_sale_adult.tga b/indra/newview/skins/Blacklightblue/textures/icon_for_sale_adult.tga
new file mode 100644
index 000000000..147f724e7
Binary files /dev/null and b/indra/newview/skins/Blacklightblue/textures/icon_for_sale_adult.tga differ
diff --git a/indra/newview/skins/Blacklightblue/textures/icon_group.tga b/indra/newview/skins/Blacklightblue/textures/icon_group.tga
new file mode 100644
index 000000000..1e5c31aa3
Binary files /dev/null and b/indra/newview/skins/Blacklightblue/textures/icon_group.tga differ
diff --git a/indra/newview/skins/Blacklightblue/textures/icon_groupnotice.tga b/indra/newview/skins/Blacklightblue/textures/icon_groupnotice.tga
new file mode 100644
index 000000000..6b312a9ec
Binary files /dev/null and b/indra/newview/skins/Blacklightblue/textures/icon_groupnotice.tga differ
diff --git a/indra/newview/skins/Blacklightblue/textures/icon_groupnoticeinventory.tga b/indra/newview/skins/Blacklightblue/textures/icon_groupnoticeinventory.tga
new file mode 100644
index 000000000..06f59e583
Binary files /dev/null and b/indra/newview/skins/Blacklightblue/textures/icon_groupnoticeinventory.tga differ
diff --git a/indra/newview/skins/Blacklightblue/textures/icon_lock.tga b/indra/newview/skins/Blacklightblue/textures/icon_lock.tga
new file mode 100644
index 000000000..5de6cc10e
Binary files /dev/null and b/indra/newview/skins/Blacklightblue/textures/icon_lock.tga differ
diff --git a/indra/newview/skins/Blacklightblue/textures/icon_place.tga b/indra/newview/skins/Blacklightblue/textures/icon_place.tga
new file mode 100644
index 000000000..7f842ba65
Binary files /dev/null and b/indra/newview/skins/Blacklightblue/textures/icon_place.tga differ
diff --git a/indra/newview/skins/Blacklightblue/textures/icon_popular.tga b/indra/newview/skins/Blacklightblue/textures/icon_popular.tga
new file mode 100644
index 000000000..6bdc6ede3
Binary files /dev/null and b/indra/newview/skins/Blacklightblue/textures/icon_popular.tga differ
diff --git a/indra/newview/skins/Blacklightblue/textures/icon_top_pick.tga b/indra/newview/skins/Blacklightblue/textures/icon_top_pick.tga
new file mode 100644
index 000000000..4466e8be7
Binary files /dev/null and b/indra/newview/skins/Blacklightblue/textures/icon_top_pick.tga differ
diff --git a/indra/newview/skins/Blacklightblue/textures/inv_folder_animation.tga b/indra/newview/skins/Blacklightblue/textures/inv_folder_animation.tga
new file mode 100644
index 000000000..ffe56a15f
Binary files /dev/null and b/indra/newview/skins/Blacklightblue/textures/inv_folder_animation.tga differ
diff --git a/indra/newview/skins/Blacklightblue/textures/inv_folder_bodypart.tga b/indra/newview/skins/Blacklightblue/textures/inv_folder_bodypart.tga
new file mode 100644
index 000000000..10076c380
Binary files /dev/null and b/indra/newview/skins/Blacklightblue/textures/inv_folder_bodypart.tga differ
diff --git a/indra/newview/skins/Blacklightblue/textures/inv_folder_callingcard.tga b/indra/newview/skins/Blacklightblue/textures/inv_folder_callingcard.tga
new file mode 100644
index 000000000..b5d08a816
Binary files /dev/null and b/indra/newview/skins/Blacklightblue/textures/inv_folder_callingcard.tga differ
diff --git a/indra/newview/skins/Blacklightblue/textures/inv_folder_clothing.tga b/indra/newview/skins/Blacklightblue/textures/inv_folder_clothing.tga
new file mode 100644
index 000000000..5467b3bf8
Binary files /dev/null and b/indra/newview/skins/Blacklightblue/textures/inv_folder_clothing.tga differ
diff --git a/indra/newview/skins/Blacklightblue/textures/inv_folder_gesture.tga b/indra/newview/skins/Blacklightblue/textures/inv_folder_gesture.tga
new file mode 100644
index 000000000..400a8e5c7
Binary files /dev/null and b/indra/newview/skins/Blacklightblue/textures/inv_folder_gesture.tga differ
diff --git a/indra/newview/skins/Blacklightblue/textures/inv_folder_landmark.tga b/indra/newview/skins/Blacklightblue/textures/inv_folder_landmark.tga
new file mode 100644
index 000000000..901526259
Binary files /dev/null and b/indra/newview/skins/Blacklightblue/textures/inv_folder_landmark.tga differ
diff --git a/indra/newview/skins/Blacklightblue/textures/inv_folder_lostandfound.tga b/indra/newview/skins/Blacklightblue/textures/inv_folder_lostandfound.tga
new file mode 100644
index 000000000..7451c35b8
Binary files /dev/null and b/indra/newview/skins/Blacklightblue/textures/inv_folder_lostandfound.tga differ
diff --git a/indra/newview/skins/Blacklightblue/textures/inv_folder_notecard.tga b/indra/newview/skins/Blacklightblue/textures/inv_folder_notecard.tga
new file mode 100644
index 000000000..d8ebca11a
Binary files /dev/null and b/indra/newview/skins/Blacklightblue/textures/inv_folder_notecard.tga differ
diff --git a/indra/newview/skins/Blacklightblue/textures/inv_folder_object.tga b/indra/newview/skins/Blacklightblue/textures/inv_folder_object.tga
new file mode 100644
index 000000000..c7951ccce
Binary files /dev/null and b/indra/newview/skins/Blacklightblue/textures/inv_folder_object.tga differ
diff --git a/indra/newview/skins/Blacklightblue/textures/inv_folder_plain_closed.tga b/indra/newview/skins/Blacklightblue/textures/inv_folder_plain_closed.tga
new file mode 100644
index 000000000..b46f97d11
Binary files /dev/null and b/indra/newview/skins/Blacklightblue/textures/inv_folder_plain_closed.tga differ
diff --git a/indra/newview/skins/Blacklightblue/textures/inv_folder_plain_open.tga b/indra/newview/skins/Blacklightblue/textures/inv_folder_plain_open.tga
new file mode 100644
index 000000000..c4b0f3f61
Binary files /dev/null and b/indra/newview/skins/Blacklightblue/textures/inv_folder_plain_open.tga differ
diff --git a/indra/newview/skins/Blacklightblue/textures/inv_folder_script.tga b/indra/newview/skins/Blacklightblue/textures/inv_folder_script.tga
new file mode 100644
index 000000000..c280d4282
Binary files /dev/null and b/indra/newview/skins/Blacklightblue/textures/inv_folder_script.tga differ
diff --git a/indra/newview/skins/Blacklightblue/textures/inv_folder_snapshot.tga b/indra/newview/skins/Blacklightblue/textures/inv_folder_snapshot.tga
new file mode 100644
index 000000000..8b2dfa5fa
Binary files /dev/null and b/indra/newview/skins/Blacklightblue/textures/inv_folder_snapshot.tga differ
diff --git a/indra/newview/skins/Blacklightblue/textures/inv_folder_sound.tga b/indra/newview/skins/Blacklightblue/textures/inv_folder_sound.tga
new file mode 100644
index 000000000..e0ebed0d3
Binary files /dev/null and b/indra/newview/skins/Blacklightblue/textures/inv_folder_sound.tga differ
diff --git a/indra/newview/skins/Blacklightblue/textures/inv_folder_texture.tga b/indra/newview/skins/Blacklightblue/textures/inv_folder_texture.tga
new file mode 100644
index 000000000..2d69c84f6
Binary files /dev/null and b/indra/newview/skins/Blacklightblue/textures/inv_folder_texture.tga differ
diff --git a/indra/newview/skins/Blacklightblue/textures/inv_folder_trash.tga b/indra/newview/skins/Blacklightblue/textures/inv_folder_trash.tga
new file mode 100644
index 000000000..e6ffad1e0
Binary files /dev/null and b/indra/newview/skins/Blacklightblue/textures/inv_folder_trash.tga differ
diff --git a/indra/newview/skins/Blacklightblue/textures/inv_item_animation.tga b/indra/newview/skins/Blacklightblue/textures/inv_item_animation.tga
new file mode 100644
index 000000000..715189fda
Binary files /dev/null and b/indra/newview/skins/Blacklightblue/textures/inv_item_animation.tga differ
diff --git a/indra/newview/skins/Blacklightblue/textures/inv_item_attach.tga b/indra/newview/skins/Blacklightblue/textures/inv_item_attach.tga
new file mode 100644
index 000000000..2da7ef8e7
Binary files /dev/null and b/indra/newview/skins/Blacklightblue/textures/inv_item_attach.tga differ
diff --git a/indra/newview/skins/Blacklightblue/textures/inv_item_callingcard_offline.tga b/indra/newview/skins/Blacklightblue/textures/inv_item_callingcard_offline.tga
new file mode 100644
index 000000000..70e7a2645
Binary files /dev/null and b/indra/newview/skins/Blacklightblue/textures/inv_item_callingcard_offline.tga differ
diff --git a/indra/newview/skins/Blacklightblue/textures/inv_item_callingcard_online.tga b/indra/newview/skins/Blacklightblue/textures/inv_item_callingcard_online.tga
new file mode 100644
index 000000000..8e394063b
Binary files /dev/null and b/indra/newview/skins/Blacklightblue/textures/inv_item_callingcard_online.tga differ
diff --git a/indra/newview/skins/Blacklightblue/textures/inv_item_clothing.tga b/indra/newview/skins/Blacklightblue/textures/inv_item_clothing.tga
new file mode 100644
index 000000000..b41096371
Binary files /dev/null and b/indra/newview/skins/Blacklightblue/textures/inv_item_clothing.tga differ
diff --git a/indra/newview/skins/Blacklightblue/textures/inv_item_eyes.tga b/indra/newview/skins/Blacklightblue/textures/inv_item_eyes.tga
new file mode 100644
index 000000000..0cfebb69d
Binary files /dev/null and b/indra/newview/skins/Blacklightblue/textures/inv_item_eyes.tga differ
diff --git a/indra/newview/skins/Blacklightblue/textures/inv_item_gesture.tga b/indra/newview/skins/Blacklightblue/textures/inv_item_gesture.tga
new file mode 100644
index 000000000..95c1da44e
Binary files /dev/null and b/indra/newview/skins/Blacklightblue/textures/inv_item_gesture.tga differ
diff --git a/indra/newview/skins/Blacklightblue/textures/inv_item_gloves.tga b/indra/newview/skins/Blacklightblue/textures/inv_item_gloves.tga
new file mode 100644
index 000000000..6f55738ee
Binary files /dev/null and b/indra/newview/skins/Blacklightblue/textures/inv_item_gloves.tga differ
diff --git a/indra/newview/skins/Blacklightblue/textures/inv_item_hair.tga b/indra/newview/skins/Blacklightblue/textures/inv_item_hair.tga
new file mode 100644
index 000000000..13ffe09c3
Binary files /dev/null and b/indra/newview/skins/Blacklightblue/textures/inv_item_hair.tga differ
diff --git a/indra/newview/skins/Blacklightblue/textures/inv_item_jacket.tga b/indra/newview/skins/Blacklightblue/textures/inv_item_jacket.tga
new file mode 100644
index 000000000..a1b518c63
Binary files /dev/null and b/indra/newview/skins/Blacklightblue/textures/inv_item_jacket.tga differ
diff --git a/indra/newview/skins/Blacklightblue/textures/inv_item_landmark.tga b/indra/newview/skins/Blacklightblue/textures/inv_item_landmark.tga
new file mode 100644
index 000000000..addf5eb0e
Binary files /dev/null and b/indra/newview/skins/Blacklightblue/textures/inv_item_landmark.tga differ
diff --git a/indra/newview/skins/Blacklightblue/textures/inv_item_landmark_visited.tga b/indra/newview/skins/Blacklightblue/textures/inv_item_landmark_visited.tga
new file mode 100644
index 000000000..b16f9a1b8
Binary files /dev/null and b/indra/newview/skins/Blacklightblue/textures/inv_item_landmark_visited.tga differ
diff --git a/indra/newview/skins/Blacklightblue/textures/inv_item_notecard.tga b/indra/newview/skins/Blacklightblue/textures/inv_item_notecard.tga
new file mode 100644
index 000000000..c7b3bf557
Binary files /dev/null and b/indra/newview/skins/Blacklightblue/textures/inv_item_notecard.tga differ
diff --git a/indra/newview/skins/Blacklightblue/textures/inv_item_object.tga b/indra/newview/skins/Blacklightblue/textures/inv_item_object.tga
new file mode 100644
index 000000000..9c407b1d5
Binary files /dev/null and b/indra/newview/skins/Blacklightblue/textures/inv_item_object.tga differ
diff --git a/indra/newview/skins/Blacklightblue/textures/inv_item_object_multi.tga b/indra/newview/skins/Blacklightblue/textures/inv_item_object_multi.tga
new file mode 100644
index 000000000..d2ed12df3
Binary files /dev/null and b/indra/newview/skins/Blacklightblue/textures/inv_item_object_multi.tga differ
diff --git a/indra/newview/skins/Blacklightblue/textures/inv_item_pants.tga b/indra/newview/skins/Blacklightblue/textures/inv_item_pants.tga
new file mode 100644
index 000000000..517c94712
Binary files /dev/null and b/indra/newview/skins/Blacklightblue/textures/inv_item_pants.tga differ
diff --git a/indra/newview/skins/Blacklightblue/textures/inv_item_script.tga b/indra/newview/skins/Blacklightblue/textures/inv_item_script.tga
new file mode 100644
index 000000000..8e602f595
Binary files /dev/null and b/indra/newview/skins/Blacklightblue/textures/inv_item_script.tga differ
diff --git a/indra/newview/skins/Blacklightblue/textures/inv_item_script_dangerous.tga b/indra/newview/skins/Blacklightblue/textures/inv_item_script_dangerous.tga
new file mode 100644
index 000000000..b5a1bc947
Binary files /dev/null and b/indra/newview/skins/Blacklightblue/textures/inv_item_script_dangerous.tga differ
diff --git a/indra/newview/skins/Blacklightblue/textures/inv_item_shape.tga b/indra/newview/skins/Blacklightblue/textures/inv_item_shape.tga
new file mode 100644
index 000000000..d28bb2583
Binary files /dev/null and b/indra/newview/skins/Blacklightblue/textures/inv_item_shape.tga differ
diff --git a/indra/newview/skins/Blacklightblue/textures/inv_item_shirt.tga b/indra/newview/skins/Blacklightblue/textures/inv_item_shirt.tga
new file mode 100644
index 000000000..b41096371
Binary files /dev/null and b/indra/newview/skins/Blacklightblue/textures/inv_item_shirt.tga differ
diff --git a/indra/newview/skins/Blacklightblue/textures/inv_item_shoes.tga b/indra/newview/skins/Blacklightblue/textures/inv_item_shoes.tga
new file mode 100644
index 000000000..f124ed458
Binary files /dev/null and b/indra/newview/skins/Blacklightblue/textures/inv_item_shoes.tga differ
diff --git a/indra/newview/skins/Blacklightblue/textures/inv_item_skin.tga b/indra/newview/skins/Blacklightblue/textures/inv_item_skin.tga
new file mode 100644
index 000000000..169fbc1d5
Binary files /dev/null and b/indra/newview/skins/Blacklightblue/textures/inv_item_skin.tga differ
diff --git a/indra/newview/skins/Blacklightblue/textures/inv_item_skirt.tga b/indra/newview/skins/Blacklightblue/textures/inv_item_skirt.tga
new file mode 100644
index 000000000..cd0292210
Binary files /dev/null and b/indra/newview/skins/Blacklightblue/textures/inv_item_skirt.tga differ
diff --git a/indra/newview/skins/Blacklightblue/textures/inv_item_snapshot.tga b/indra/newview/skins/Blacklightblue/textures/inv_item_snapshot.tga
new file mode 100644
index 000000000..fcf7316bd
Binary files /dev/null and b/indra/newview/skins/Blacklightblue/textures/inv_item_snapshot.tga differ
diff --git a/indra/newview/skins/Blacklightblue/textures/inv_item_socks.tga b/indra/newview/skins/Blacklightblue/textures/inv_item_socks.tga
new file mode 100644
index 000000000..0ccb575ce
Binary files /dev/null and b/indra/newview/skins/Blacklightblue/textures/inv_item_socks.tga differ
diff --git a/indra/newview/skins/Blacklightblue/textures/inv_item_sound.tga b/indra/newview/skins/Blacklightblue/textures/inv_item_sound.tga
new file mode 100644
index 000000000..1bb8adfa1
Binary files /dev/null and b/indra/newview/skins/Blacklightblue/textures/inv_item_sound.tga differ
diff --git a/indra/newview/skins/Blacklightblue/textures/inv_item_texture.tga b/indra/newview/skins/Blacklightblue/textures/inv_item_texture.tga
new file mode 100644
index 000000000..7016ae080
Binary files /dev/null and b/indra/newview/skins/Blacklightblue/textures/inv_item_texture.tga differ
diff --git a/indra/newview/skins/Blacklightblue/textures/inv_item_underpants.tga b/indra/newview/skins/Blacklightblue/textures/inv_item_underpants.tga
new file mode 100644
index 000000000..b9f29c688
Binary files /dev/null and b/indra/newview/skins/Blacklightblue/textures/inv_item_underpants.tga differ
diff --git a/indra/newview/skins/Blacklightblue/textures/inv_item_undershirt.tga b/indra/newview/skins/Blacklightblue/textures/inv_item_undershirt.tga
new file mode 100644
index 000000000..a62b1d853
Binary files /dev/null and b/indra/newview/skins/Blacklightblue/textures/inv_item_undershirt.tga differ
diff --git a/indra/newview/skins/Blacklightblue/textures/map_avatar_16.tga b/indra/newview/skins/Blacklightblue/textures/map_avatar_16.tga
new file mode 100644
index 000000000..42d8c1e29
Binary files /dev/null and b/indra/newview/skins/Blacklightblue/textures/map_avatar_16.tga differ
diff --git a/indra/newview/skins/Blacklightblue/textures/map_avatar_8.tga b/indra/newview/skins/Blacklightblue/textures/map_avatar_8.tga
new file mode 100644
index 000000000..7eb7c20f1
Binary files /dev/null and b/indra/newview/skins/Blacklightblue/textures/map_avatar_8.tga differ
diff --git a/indra/newview/skins/Blacklightblue/textures/map_avatar_above_8.tga b/indra/newview/skins/Blacklightblue/textures/map_avatar_above_8.tga
new file mode 100644
index 000000000..6faefccc7
Binary files /dev/null and b/indra/newview/skins/Blacklightblue/textures/map_avatar_above_8.tga differ
diff --git a/indra/newview/skins/Blacklightblue/textures/map_avatar_below_8.tga b/indra/newview/skins/Blacklightblue/textures/map_avatar_below_8.tga
new file mode 100644
index 000000000..5ad671c26
Binary files /dev/null and b/indra/newview/skins/Blacklightblue/textures/map_avatar_below_8.tga differ
diff --git a/indra/newview/skins/Blacklightblue/textures/map_avatar_you_8.tga b/indra/newview/skins/Blacklightblue/textures/map_avatar_you_8.tga
new file mode 100644
index 000000000..a865e017b
Binary files /dev/null and b/indra/newview/skins/Blacklightblue/textures/map_avatar_you_8.tga differ
diff --git a/indra/newview/skins/Blacklightblue/textures/map_event.tga b/indra/newview/skins/Blacklightblue/textures/map_event.tga
new file mode 100644
index 000000000..103c5e535
Binary files /dev/null and b/indra/newview/skins/Blacklightblue/textures/map_event.tga differ
diff --git a/indra/newview/skins/Blacklightblue/textures/map_event_adult.tga b/indra/newview/skins/Blacklightblue/textures/map_event_adult.tga
new file mode 100644
index 000000000..7202e6734
Binary files /dev/null and b/indra/newview/skins/Blacklightblue/textures/map_event_adult.tga differ
diff --git a/indra/newview/skins/Blacklightblue/textures/map_event_mature.tga b/indra/newview/skins/Blacklightblue/textures/map_event_mature.tga
new file mode 100644
index 000000000..23f246b91
Binary files /dev/null and b/indra/newview/skins/Blacklightblue/textures/map_event_mature.tga differ
diff --git a/indra/newview/skins/Blacklightblue/textures/map_home.tga b/indra/newview/skins/Blacklightblue/textures/map_home.tga
new file mode 100644
index 000000000..85dde9ef7
Binary files /dev/null and b/indra/newview/skins/Blacklightblue/textures/map_home.tga differ
diff --git a/indra/newview/skins/Blacklightblue/textures/map_infohub.tga b/indra/newview/skins/Blacklightblue/textures/map_infohub.tga
new file mode 100644
index 000000000..173b93e39
Binary files /dev/null and b/indra/newview/skins/Blacklightblue/textures/map_infohub.tga differ
diff --git a/indra/newview/skins/Blacklightblue/textures/map_telehub.tga b/indra/newview/skins/Blacklightblue/textures/map_telehub.tga
new file mode 100644
index 000000000..d89bcfa40
Binary files /dev/null and b/indra/newview/skins/Blacklightblue/textures/map_telehub.tga differ
diff --git a/indra/newview/skins/Blacklightblue/textures/map_track_16.tga b/indra/newview/skins/Blacklightblue/textures/map_track_16.tga
new file mode 100644
index 000000000..14d49b93b
Binary files /dev/null and b/indra/newview/skins/Blacklightblue/textures/map_track_16.tga differ
diff --git a/indra/newview/skins/Blacklightblue/textures/map_track_8.tga b/indra/newview/skins/Blacklightblue/textures/map_track_8.tga
new file mode 100644
index 000000000..d9605dde1
Binary files /dev/null and b/indra/newview/skins/Blacklightblue/textures/map_track_8.tga differ
diff --git a/indra/newview/skins/Blacklightblue/textures/media_icon.tga b/indra/newview/skins/Blacklightblue/textures/media_icon.tga
new file mode 100644
index 000000000..868da3734
Binary files /dev/null and b/indra/newview/skins/Blacklightblue/textures/media_icon.tga differ
diff --git a/indra/newview/skins/Blacklightblue/textures/minimize.tga b/indra/newview/skins/Blacklightblue/textures/minimize.tga
new file mode 100644
index 000000000..151a3078f
Binary files /dev/null and b/indra/newview/skins/Blacklightblue/textures/minimize.tga differ
diff --git a/indra/newview/skins/Blacklightblue/textures/minimize_inactive.tga b/indra/newview/skins/Blacklightblue/textures/minimize_inactive.tga
new file mode 100644
index 000000000..d7e1b4057
Binary files /dev/null and b/indra/newview/skins/Blacklightblue/textures/minimize_inactive.tga differ
diff --git a/indra/newview/skins/Blacklightblue/textures/minimize_pressed.tga b/indra/newview/skins/Blacklightblue/textures/minimize_pressed.tga
new file mode 100644
index 000000000..573452ce9
Binary files /dev/null and b/indra/newview/skins/Blacklightblue/textures/minimize_pressed.tga differ
diff --git a/indra/newview/skins/Blacklightblue/textures/move_backward_in.tga b/indra/newview/skins/Blacklightblue/textures/move_backward_in.tga
new file mode 100644
index 000000000..74bfba196
Binary files /dev/null and b/indra/newview/skins/Blacklightblue/textures/move_backward_in.tga differ
diff --git a/indra/newview/skins/Blacklightblue/textures/move_backward_out.tga b/indra/newview/skins/Blacklightblue/textures/move_backward_out.tga
new file mode 100644
index 000000000..0cb143cd8
Binary files /dev/null and b/indra/newview/skins/Blacklightblue/textures/move_backward_out.tga differ
diff --git a/indra/newview/skins/Blacklightblue/textures/move_down_in.tga b/indra/newview/skins/Blacklightblue/textures/move_down_in.tga
new file mode 100644
index 000000000..90b0c76d5
Binary files /dev/null and b/indra/newview/skins/Blacklightblue/textures/move_down_in.tga differ
diff --git a/indra/newview/skins/Blacklightblue/textures/move_down_out.tga b/indra/newview/skins/Blacklightblue/textures/move_down_out.tga
new file mode 100644
index 000000000..93058b043
Binary files /dev/null and b/indra/newview/skins/Blacklightblue/textures/move_down_out.tga differ
diff --git a/indra/newview/skins/Blacklightblue/textures/move_forward_in.tga b/indra/newview/skins/Blacklightblue/textures/move_forward_in.tga
new file mode 100644
index 000000000..5f1735552
Binary files /dev/null and b/indra/newview/skins/Blacklightblue/textures/move_forward_in.tga differ
diff --git a/indra/newview/skins/Blacklightblue/textures/move_forward_out.tga b/indra/newview/skins/Blacklightblue/textures/move_forward_out.tga
new file mode 100644
index 000000000..e5c826b9b
Binary files /dev/null and b/indra/newview/skins/Blacklightblue/textures/move_forward_out.tga differ
diff --git a/indra/newview/skins/Blacklightblue/textures/move_left_in.tga b/indra/newview/skins/Blacklightblue/textures/move_left_in.tga
new file mode 100644
index 000000000..8ba5abdd2
Binary files /dev/null and b/indra/newview/skins/Blacklightblue/textures/move_left_in.tga differ
diff --git a/indra/newview/skins/Blacklightblue/textures/move_left_out.tga b/indra/newview/skins/Blacklightblue/textures/move_left_out.tga
new file mode 100644
index 000000000..a428f9739
Binary files /dev/null and b/indra/newview/skins/Blacklightblue/textures/move_left_out.tga differ
diff --git a/indra/newview/skins/Blacklightblue/textures/move_right_in.tga b/indra/newview/skins/Blacklightblue/textures/move_right_in.tga
new file mode 100644
index 000000000..6dd30876f
Binary files /dev/null and b/indra/newview/skins/Blacklightblue/textures/move_right_in.tga differ
diff --git a/indra/newview/skins/Blacklightblue/textures/move_right_out.tga b/indra/newview/skins/Blacklightblue/textures/move_right_out.tga
new file mode 100644
index 000000000..bfce731ab
Binary files /dev/null and b/indra/newview/skins/Blacklightblue/textures/move_right_out.tga differ
diff --git a/indra/newview/skins/Blacklightblue/textures/move_turn_left_in.tga b/indra/newview/skins/Blacklightblue/textures/move_turn_left_in.tga
new file mode 100644
index 000000000..db410d697
Binary files /dev/null and b/indra/newview/skins/Blacklightblue/textures/move_turn_left_in.tga differ
diff --git a/indra/newview/skins/Blacklightblue/textures/move_turn_left_out.tga b/indra/newview/skins/Blacklightblue/textures/move_turn_left_out.tga
new file mode 100644
index 000000000..31bcc42a1
Binary files /dev/null and b/indra/newview/skins/Blacklightblue/textures/move_turn_left_out.tga differ
diff --git a/indra/newview/skins/Blacklightblue/textures/move_turn_right_in.tga b/indra/newview/skins/Blacklightblue/textures/move_turn_right_in.tga
new file mode 100644
index 000000000..e22898c2a
Binary files /dev/null and b/indra/newview/skins/Blacklightblue/textures/move_turn_right_in.tga differ
diff --git a/indra/newview/skins/Blacklightblue/textures/move_turn_right_out.tga b/indra/newview/skins/Blacklightblue/textures/move_turn_right_out.tga
new file mode 100644
index 000000000..69fb9f400
Binary files /dev/null and b/indra/newview/skins/Blacklightblue/textures/move_turn_right_out.tga differ
diff --git a/indra/newview/skins/Blacklightblue/textures/move_up_in.tga b/indra/newview/skins/Blacklightblue/textures/move_up_in.tga
new file mode 100644
index 000000000..54c641f5b
Binary files /dev/null and b/indra/newview/skins/Blacklightblue/textures/move_up_in.tga differ
diff --git a/indra/newview/skins/Blacklightblue/textures/move_up_out.tga b/indra/newview/skins/Blacklightblue/textures/move_up_out.tga
new file mode 100644
index 000000000..28e6f60aa
Binary files /dev/null and b/indra/newview/skins/Blacklightblue/textures/move_up_out.tga differ
diff --git a/indra/newview/skins/Blacklightblue/textures/mute_icon.tga b/indra/newview/skins/Blacklightblue/textures/mute_icon.tga
new file mode 100644
index 000000000..879b9e618
Binary files /dev/null and b/indra/newview/skins/Blacklightblue/textures/mute_icon.tga differ
diff --git a/indra/newview/skins/Blacklightblue/textures/notify_box_icon.tga b/indra/newview/skins/Blacklightblue/textures/notify_box_icon.tga
new file mode 100644
index 000000000..880aca9b4
Binary files /dev/null and b/indra/newview/skins/Blacklightblue/textures/notify_box_icon.tga differ
diff --git a/indra/newview/skins/Blacklightblue/textures/notify_caution_icon.tga b/indra/newview/skins/Blacklightblue/textures/notify_caution_icon.tga
new file mode 100644
index 000000000..ac6660c16
Binary files /dev/null and b/indra/newview/skins/Blacklightblue/textures/notify_caution_icon.tga differ
diff --git a/indra/newview/skins/Blacklightblue/textures/notify_next.png b/indra/newview/skins/Blacklightblue/textures/notify_next.png
new file mode 100644
index 000000000..9b371e03e
Binary files /dev/null and b/indra/newview/skins/Blacklightblue/textures/notify_next.png differ
diff --git a/indra/newview/skins/Blacklightblue/textures/notify_tip_icon.tga b/indra/newview/skins/Blacklightblue/textures/notify_tip_icon.tga
new file mode 100644
index 000000000..0451da099
Binary files /dev/null and b/indra/newview/skins/Blacklightblue/textures/notify_tip_icon.tga differ
diff --git a/indra/newview/skins/Blacklightblue/textures/object_cone.tga b/indra/newview/skins/Blacklightblue/textures/object_cone.tga
new file mode 100644
index 000000000..3cd51dfeb
Binary files /dev/null and b/indra/newview/skins/Blacklightblue/textures/object_cone.tga differ
diff --git a/indra/newview/skins/Blacklightblue/textures/object_cone_active.tga b/indra/newview/skins/Blacklightblue/textures/object_cone_active.tga
new file mode 100644
index 000000000..ab8137c05
Binary files /dev/null and b/indra/newview/skins/Blacklightblue/textures/object_cone_active.tga differ
diff --git a/indra/newview/skins/Blacklightblue/textures/object_cube.tga b/indra/newview/skins/Blacklightblue/textures/object_cube.tga
new file mode 100644
index 000000000..3395522c2
Binary files /dev/null and b/indra/newview/skins/Blacklightblue/textures/object_cube.tga differ
diff --git a/indra/newview/skins/Blacklightblue/textures/object_cube_active.tga b/indra/newview/skins/Blacklightblue/textures/object_cube_active.tga
new file mode 100644
index 000000000..40886cf0d
Binary files /dev/null and b/indra/newview/skins/Blacklightblue/textures/object_cube_active.tga differ
diff --git a/indra/newview/skins/Blacklightblue/textures/object_cylinder.tga b/indra/newview/skins/Blacklightblue/textures/object_cylinder.tga
new file mode 100644
index 000000000..2d13f3be6
Binary files /dev/null and b/indra/newview/skins/Blacklightblue/textures/object_cylinder.tga differ
diff --git a/indra/newview/skins/Blacklightblue/textures/object_cylinder_active.tga b/indra/newview/skins/Blacklightblue/textures/object_cylinder_active.tga
new file mode 100644
index 000000000..328d10355
Binary files /dev/null and b/indra/newview/skins/Blacklightblue/textures/object_cylinder_active.tga differ
diff --git a/indra/newview/skins/Blacklightblue/textures/object_grass.tga b/indra/newview/skins/Blacklightblue/textures/object_grass.tga
new file mode 100644
index 000000000..8b1943d18
Binary files /dev/null and b/indra/newview/skins/Blacklightblue/textures/object_grass.tga differ
diff --git a/indra/newview/skins/Blacklightblue/textures/object_grass_active.tga b/indra/newview/skins/Blacklightblue/textures/object_grass_active.tga
new file mode 100644
index 000000000..55cdbaa3a
Binary files /dev/null and b/indra/newview/skins/Blacklightblue/textures/object_grass_active.tga differ
diff --git a/indra/newview/skins/Blacklightblue/textures/object_hemi_cone.tga b/indra/newview/skins/Blacklightblue/textures/object_hemi_cone.tga
new file mode 100644
index 000000000..2cd4a33b0
Binary files /dev/null and b/indra/newview/skins/Blacklightblue/textures/object_hemi_cone.tga differ
diff --git a/indra/newview/skins/Blacklightblue/textures/object_hemi_cone_active.tga b/indra/newview/skins/Blacklightblue/textures/object_hemi_cone_active.tga
new file mode 100644
index 000000000..459c723b9
Binary files /dev/null and b/indra/newview/skins/Blacklightblue/textures/object_hemi_cone_active.tga differ
diff --git a/indra/newview/skins/Blacklightblue/textures/object_hemi_cylinder.tga b/indra/newview/skins/Blacklightblue/textures/object_hemi_cylinder.tga
new file mode 100644
index 000000000..669f78f89
Binary files /dev/null and b/indra/newview/skins/Blacklightblue/textures/object_hemi_cylinder.tga differ
diff --git a/indra/newview/skins/Blacklightblue/textures/object_hemi_cylinder_active.tga b/indra/newview/skins/Blacklightblue/textures/object_hemi_cylinder_active.tga
new file mode 100644
index 000000000..154ab9b13
Binary files /dev/null and b/indra/newview/skins/Blacklightblue/textures/object_hemi_cylinder_active.tga differ
diff --git a/indra/newview/skins/Blacklightblue/textures/object_hemi_sphere.tga b/indra/newview/skins/Blacklightblue/textures/object_hemi_sphere.tga
new file mode 100644
index 000000000..d1815a5a9
Binary files /dev/null and b/indra/newview/skins/Blacklightblue/textures/object_hemi_sphere.tga differ
diff --git a/indra/newview/skins/Blacklightblue/textures/object_hemi_sphere_active.tga b/indra/newview/skins/Blacklightblue/textures/object_hemi_sphere_active.tga
new file mode 100644
index 000000000..e5e0c45c7
Binary files /dev/null and b/indra/newview/skins/Blacklightblue/textures/object_hemi_sphere_active.tga differ
diff --git a/indra/newview/skins/Blacklightblue/textures/object_prism.tga b/indra/newview/skins/Blacklightblue/textures/object_prism.tga
new file mode 100644
index 000000000..099026cc4
Binary files /dev/null and b/indra/newview/skins/Blacklightblue/textures/object_prism.tga differ
diff --git a/indra/newview/skins/Blacklightblue/textures/object_prism_active.tga b/indra/newview/skins/Blacklightblue/textures/object_prism_active.tga
new file mode 100644
index 000000000..fa9d0b98d
Binary files /dev/null and b/indra/newview/skins/Blacklightblue/textures/object_prism_active.tga differ
diff --git a/indra/newview/skins/Blacklightblue/textures/object_pyramid.tga b/indra/newview/skins/Blacklightblue/textures/object_pyramid.tga
new file mode 100644
index 000000000..7927c8b4e
Binary files /dev/null and b/indra/newview/skins/Blacklightblue/textures/object_pyramid.tga differ
diff --git a/indra/newview/skins/Blacklightblue/textures/object_pyramid_active.tga b/indra/newview/skins/Blacklightblue/textures/object_pyramid_active.tga
new file mode 100644
index 000000000..b20b33e26
Binary files /dev/null and b/indra/newview/skins/Blacklightblue/textures/object_pyramid_active.tga differ
diff --git a/indra/newview/skins/Blacklightblue/textures/object_ring.tga b/indra/newview/skins/Blacklightblue/textures/object_ring.tga
new file mode 100644
index 000000000..49603f1bd
Binary files /dev/null and b/indra/newview/skins/Blacklightblue/textures/object_ring.tga differ
diff --git a/indra/newview/skins/Blacklightblue/textures/object_ring_active.tga b/indra/newview/skins/Blacklightblue/textures/object_ring_active.tga
new file mode 100644
index 000000000..0229818c6
Binary files /dev/null and b/indra/newview/skins/Blacklightblue/textures/object_ring_active.tga differ
diff --git a/indra/newview/skins/Blacklightblue/textures/object_sphere.tga b/indra/newview/skins/Blacklightblue/textures/object_sphere.tga
new file mode 100644
index 000000000..7bfae3b6d
Binary files /dev/null and b/indra/newview/skins/Blacklightblue/textures/object_sphere.tga differ
diff --git a/indra/newview/skins/Blacklightblue/textures/object_sphere_active.tga b/indra/newview/skins/Blacklightblue/textures/object_sphere_active.tga
new file mode 100644
index 000000000..6d27f4fc1
Binary files /dev/null and b/indra/newview/skins/Blacklightblue/textures/object_sphere_active.tga differ
diff --git a/indra/newview/skins/Blacklightblue/textures/object_tetrahedron.tga b/indra/newview/skins/Blacklightblue/textures/object_tetrahedron.tga
new file mode 100644
index 000000000..717881b4e
Binary files /dev/null and b/indra/newview/skins/Blacklightblue/textures/object_tetrahedron.tga differ
diff --git a/indra/newview/skins/Blacklightblue/textures/object_tetrahedron_active.tga b/indra/newview/skins/Blacklightblue/textures/object_tetrahedron_active.tga
new file mode 100644
index 000000000..fc0a609f6
Binary files /dev/null and b/indra/newview/skins/Blacklightblue/textures/object_tetrahedron_active.tga differ
diff --git a/indra/newview/skins/Blacklightblue/textures/object_torus.tga b/indra/newview/skins/Blacklightblue/textures/object_torus.tga
new file mode 100644
index 000000000..33d493106
Binary files /dev/null and b/indra/newview/skins/Blacklightblue/textures/object_torus.tga differ
diff --git a/indra/newview/skins/Blacklightblue/textures/object_torus_active.tga b/indra/newview/skins/Blacklightblue/textures/object_torus_active.tga
new file mode 100644
index 000000000..44f42ed8e
Binary files /dev/null and b/indra/newview/skins/Blacklightblue/textures/object_torus_active.tga differ
diff --git a/indra/newview/skins/Blacklightblue/textures/object_tree.tga b/indra/newview/skins/Blacklightblue/textures/object_tree.tga
new file mode 100644
index 000000000..880a2fa2a
Binary files /dev/null and b/indra/newview/skins/Blacklightblue/textures/object_tree.tga differ
diff --git a/indra/newview/skins/Blacklightblue/textures/object_tree_active.tga b/indra/newview/skins/Blacklightblue/textures/object_tree_active.tga
new file mode 100644
index 000000000..219f1f829
Binary files /dev/null and b/indra/newview/skins/Blacklightblue/textures/object_tree_active.tga differ
diff --git a/indra/newview/skins/Blacklightblue/textures/object_tube.tga b/indra/newview/skins/Blacklightblue/textures/object_tube.tga
new file mode 100644
index 000000000..49ee35ede
Binary files /dev/null and b/indra/newview/skins/Blacklightblue/textures/object_tube.tga differ
diff --git a/indra/newview/skins/Blacklightblue/textures/object_tube_active.tga b/indra/newview/skins/Blacklightblue/textures/object_tube_active.tga
new file mode 100644
index 000000000..655ebb01f
Binary files /dev/null and b/indra/newview/skins/Blacklightblue/textures/object_tube_active.tga differ
diff --git a/indra/newview/skins/Blacklightblue/textures/preview.png b/indra/newview/skins/Blacklightblue/textures/preview.png
new file mode 100644
index 000000000..57c16eaf3
Binary files /dev/null and b/indra/newview/skins/Blacklightblue/textures/preview.png differ
diff --git a/indra/newview/skins/Blacklightblue/textures/progress_fill.tga b/indra/newview/skins/Blacklightblue/textures/progress_fill.tga
new file mode 100644
index 000000000..a5363463a
Binary files /dev/null and b/indra/newview/skins/Blacklightblue/textures/progress_fill.tga differ
diff --git a/indra/newview/skins/Blacklightblue/textures/progressbar_fill.tga b/indra/newview/skins/Blacklightblue/textures/progressbar_fill.tga
new file mode 100644
index 000000000..266f47288
Binary files /dev/null and b/indra/newview/skins/Blacklightblue/textures/progressbar_fill.tga differ
diff --git a/indra/newview/skins/Blacklightblue/textures/progressbar_track.tga b/indra/newview/skins/Blacklightblue/textures/progressbar_track.tga
new file mode 100644
index 000000000..4b84e9ec9
Binary files /dev/null and b/indra/newview/skins/Blacklightblue/textures/progressbar_track.tga differ
diff --git a/indra/newview/skins/Blacklightblue/textures/ptt_lock_off.tga b/indra/newview/skins/Blacklightblue/textures/ptt_lock_off.tga
new file mode 100644
index 000000000..d66f49840
Binary files /dev/null and b/indra/newview/skins/Blacklightblue/textures/ptt_lock_off.tga differ
diff --git a/indra/newview/skins/Blacklightblue/textures/ptt_lock_on.tga b/indra/newview/skins/Blacklightblue/textures/ptt_lock_on.tga
new file mode 100644
index 000000000..432db2f00
Binary files /dev/null and b/indra/newview/skins/Blacklightblue/textures/ptt_lock_on.tga differ
diff --git a/indra/newview/skins/Blacklightblue/textures/radio_active_false.tga b/indra/newview/skins/Blacklightblue/textures/radio_active_false.tga
new file mode 100644
index 000000000..3fdaecb5b
Binary files /dev/null and b/indra/newview/skins/Blacklightblue/textures/radio_active_false.tga differ
diff --git a/indra/newview/skins/Blacklightblue/textures/radio_active_true.tga b/indra/newview/skins/Blacklightblue/textures/radio_active_true.tga
new file mode 100644
index 000000000..8d7520a21
Binary files /dev/null and b/indra/newview/skins/Blacklightblue/textures/radio_active_true.tga differ
diff --git a/indra/newview/skins/Blacklightblue/textures/radio_inactive_false.tga b/indra/newview/skins/Blacklightblue/textures/radio_inactive_false.tga
new file mode 100644
index 000000000..6cc182a27
Binary files /dev/null and b/indra/newview/skins/Blacklightblue/textures/radio_inactive_false.tga differ
diff --git a/indra/newview/skins/Blacklightblue/textures/radio_inactive_true.tga b/indra/newview/skins/Blacklightblue/textures/radio_inactive_true.tga
new file mode 100644
index 000000000..c8a4e5b2c
Binary files /dev/null and b/indra/newview/skins/Blacklightblue/textures/radio_inactive_true.tga differ
diff --git a/indra/newview/skins/Blacklightblue/textures/resize_handle_bottom_right_blue.tga b/indra/newview/skins/Blacklightblue/textures/resize_handle_bottom_right_blue.tga
new file mode 100644
index 000000000..8290bfa65
Binary files /dev/null and b/indra/newview/skins/Blacklightblue/textures/resize_handle_bottom_right_blue.tga differ
diff --git a/indra/newview/skins/Blacklightblue/textures/restore.tga b/indra/newview/skins/Blacklightblue/textures/restore.tga
new file mode 100644
index 000000000..5e369fdfc
Binary files /dev/null and b/indra/newview/skins/Blacklightblue/textures/restore.tga differ
diff --git a/indra/newview/skins/Blacklightblue/textures/restore_inactive.tga b/indra/newview/skins/Blacklightblue/textures/restore_inactive.tga
new file mode 100644
index 000000000..ce545d90d
Binary files /dev/null and b/indra/newview/skins/Blacklightblue/textures/restore_inactive.tga differ
diff --git a/indra/newview/skins/Blacklightblue/textures/restore_pressed.tga b/indra/newview/skins/Blacklightblue/textures/restore_pressed.tga
new file mode 100644
index 000000000..8a25087be
Binary files /dev/null and b/indra/newview/skins/Blacklightblue/textures/restore_pressed.tga differ
diff --git a/indra/newview/skins/Blacklightblue/textures/rounded_square.j2c b/indra/newview/skins/Blacklightblue/textures/rounded_square.j2c
new file mode 100644
index 000000000..c3dfe8f10
Binary files /dev/null and b/indra/newview/skins/Blacklightblue/textures/rounded_square.j2c differ
diff --git a/indra/newview/skins/Blacklightblue/textures/rounded_square.tga b/indra/newview/skins/Blacklightblue/textures/rounded_square.tga
new file mode 100644
index 000000000..4f4bf05f8
Binary files /dev/null and b/indra/newview/skins/Blacklightblue/textures/rounded_square.tga differ
diff --git a/indra/newview/skins/Blacklightblue/textures/rounded_square_soft.tga b/indra/newview/skins/Blacklightblue/textures/rounded_square_soft.tga
new file mode 100644
index 000000000..4f4bf05f8
Binary files /dev/null and b/indra/newview/skins/Blacklightblue/textures/rounded_square_soft.tga differ
diff --git a/indra/newview/skins/Blacklightblue/textures/script_error.j2c b/indra/newview/skins/Blacklightblue/textures/script_error.j2c
new file mode 100644
index 000000000..ad6be04a7
Binary files /dev/null and b/indra/newview/skins/Blacklightblue/textures/script_error.j2c differ
diff --git a/indra/newview/skins/Blacklightblue/textures/script_error.tga b/indra/newview/skins/Blacklightblue/textures/script_error.tga
new file mode 100644
index 000000000..8fa12e711
Binary files /dev/null and b/indra/newview/skins/Blacklightblue/textures/script_error.tga differ
diff --git a/indra/newview/skins/Blacklightblue/textures/scrollbutton_down_in_blue.tga b/indra/newview/skins/Blacklightblue/textures/scrollbutton_down_in_blue.tga
new file mode 100644
index 000000000..cd592c3df
Binary files /dev/null and b/indra/newview/skins/Blacklightblue/textures/scrollbutton_down_in_blue.tga differ
diff --git a/indra/newview/skins/Blacklightblue/textures/scrollbutton_down_out_blue.tga b/indra/newview/skins/Blacklightblue/textures/scrollbutton_down_out_blue.tga
new file mode 100644
index 000000000..cd592c3df
Binary files /dev/null and b/indra/newview/skins/Blacklightblue/textures/scrollbutton_down_out_blue.tga differ
diff --git a/indra/newview/skins/Blacklightblue/textures/scrollbutton_left_in_blue.tga b/indra/newview/skins/Blacklightblue/textures/scrollbutton_left_in_blue.tga
new file mode 100644
index 000000000..b65d199ae
Binary files /dev/null and b/indra/newview/skins/Blacklightblue/textures/scrollbutton_left_in_blue.tga differ
diff --git a/indra/newview/skins/Blacklightblue/textures/scrollbutton_left_out_blue.tga b/indra/newview/skins/Blacklightblue/textures/scrollbutton_left_out_blue.tga
new file mode 100644
index 000000000..b65d199ae
Binary files /dev/null and b/indra/newview/skins/Blacklightblue/textures/scrollbutton_left_out_blue.tga differ
diff --git a/indra/newview/skins/Blacklightblue/textures/scrollbutton_right_in_blue.tga b/indra/newview/skins/Blacklightblue/textures/scrollbutton_right_in_blue.tga
new file mode 100644
index 000000000..9b571add3
Binary files /dev/null and b/indra/newview/skins/Blacklightblue/textures/scrollbutton_right_in_blue.tga differ
diff --git a/indra/newview/skins/Blacklightblue/textures/scrollbutton_right_out_blue.tga b/indra/newview/skins/Blacklightblue/textures/scrollbutton_right_out_blue.tga
new file mode 100644
index 000000000..9b571add3
Binary files /dev/null and b/indra/newview/skins/Blacklightblue/textures/scrollbutton_right_out_blue.tga differ
diff --git a/indra/newview/skins/Blacklightblue/textures/scrollbutton_up_in_blue.tga b/indra/newview/skins/Blacklightblue/textures/scrollbutton_up_in_blue.tga
new file mode 100644
index 000000000..8e78742ff
Binary files /dev/null and b/indra/newview/skins/Blacklightblue/textures/scrollbutton_up_in_blue.tga differ
diff --git a/indra/newview/skins/Blacklightblue/textures/scrollbutton_up_out_blue.tga b/indra/newview/skins/Blacklightblue/textures/scrollbutton_up_out_blue.tga
new file mode 100644
index 000000000..8e78742ff
Binary files /dev/null and b/indra/newview/skins/Blacklightblue/textures/scrollbutton_up_out_blue.tga differ
diff --git a/indra/newview/skins/Blacklightblue/textures/sm_rounded_corners_simple.tga b/indra/newview/skins/Blacklightblue/textures/sm_rounded_corners_simple.tga
new file mode 100644
index 000000000..054fdd39a
Binary files /dev/null and b/indra/newview/skins/Blacklightblue/textures/sm_rounded_corners_simple.tga differ
diff --git a/indra/newview/skins/Blacklightblue/textures/smicon_warn.tga b/indra/newview/skins/Blacklightblue/textures/smicon_warn.tga
new file mode 100644
index 000000000..de8cce2a7
Binary files /dev/null and b/indra/newview/skins/Blacklightblue/textures/smicon_warn.tga differ
diff --git a/indra/newview/skins/Blacklightblue/textures/spacer24.tga b/indra/newview/skins/Blacklightblue/textures/spacer24.tga
new file mode 100644
index 000000000..c7cab6b38
Binary files /dev/null and b/indra/newview/skins/Blacklightblue/textures/spacer24.tga differ
diff --git a/indra/newview/skins/Blacklightblue/textures/spacer35.tga b/indra/newview/skins/Blacklightblue/textures/spacer35.tga
new file mode 100644
index 000000000..b88bc6680
Binary files /dev/null and b/indra/newview/skins/Blacklightblue/textures/spacer35.tga differ
diff --git a/indra/newview/skins/Blacklightblue/textures/spin_down_in_blue.tga b/indra/newview/skins/Blacklightblue/textures/spin_down_in_blue.tga
new file mode 100644
index 000000000..ebf99c3a7
Binary files /dev/null and b/indra/newview/skins/Blacklightblue/textures/spin_down_in_blue.tga differ
diff --git a/indra/newview/skins/Blacklightblue/textures/spin_down_out_blue.tga b/indra/newview/skins/Blacklightblue/textures/spin_down_out_blue.tga
new file mode 100644
index 000000000..1af2ed9cb
Binary files /dev/null and b/indra/newview/skins/Blacklightblue/textures/spin_down_out_blue.tga differ
diff --git a/indra/newview/skins/Blacklightblue/textures/spin_up_in_blue.tga b/indra/newview/skins/Blacklightblue/textures/spin_up_in_blue.tga
new file mode 100644
index 000000000..54412201e
Binary files /dev/null and b/indra/newview/skins/Blacklightblue/textures/spin_up_in_blue.tga differ
diff --git a/indra/newview/skins/Blacklightblue/textures/spin_up_out_blue.tga b/indra/newview/skins/Blacklightblue/textures/spin_up_out_blue.tga
new file mode 100644
index 000000000..9a9bc6468
Binary files /dev/null and b/indra/newview/skins/Blacklightblue/textures/spin_up_out_blue.tga differ
diff --git a/indra/newview/skins/Blacklightblue/textures/startup_logo.j2c b/indra/newview/skins/Blacklightblue/textures/startup_logo.j2c
new file mode 100644
index 000000000..e0a705489
Binary files /dev/null and b/indra/newview/skins/Blacklightblue/textures/startup_logo.j2c differ
diff --git a/indra/newview/skins/Blacklightblue/textures/status_buy_currency.tga b/indra/newview/skins/Blacklightblue/textures/status_buy_currency.tga
new file mode 100644
index 000000000..f4a28b32b
Binary files /dev/null and b/indra/newview/skins/Blacklightblue/textures/status_buy_currency.tga differ
diff --git a/indra/newview/skins/Blacklightblue/textures/status_buy_currency_pressed.tga b/indra/newview/skins/Blacklightblue/textures/status_buy_currency_pressed.tga
new file mode 100644
index 000000000..f4a28b32b
Binary files /dev/null and b/indra/newview/skins/Blacklightblue/textures/status_buy_currency_pressed.tga differ
diff --git a/indra/newview/skins/Blacklightblue/textures/status_buy_land.tga b/indra/newview/skins/Blacklightblue/textures/status_buy_land.tga
new file mode 100644
index 000000000..60c395c03
Binary files /dev/null and b/indra/newview/skins/Blacklightblue/textures/status_buy_land.tga differ
diff --git a/indra/newview/skins/Blacklightblue/textures/status_buy_land_pressed.tga b/indra/newview/skins/Blacklightblue/textures/status_buy_land_pressed.tga
new file mode 100644
index 000000000..60c395c03
Binary files /dev/null and b/indra/newview/skins/Blacklightblue/textures/status_buy_land_pressed.tga differ
diff --git a/indra/newview/skins/Blacklightblue/textures/status_health.tga b/indra/newview/skins/Blacklightblue/textures/status_health.tga
new file mode 100644
index 000000000..f5eefc5a9
Binary files /dev/null and b/indra/newview/skins/Blacklightblue/textures/status_health.tga differ
diff --git a/indra/newview/skins/Blacklightblue/textures/status_no_build.tga b/indra/newview/skins/Blacklightblue/textures/status_no_build.tga
new file mode 100644
index 000000000..41934a600
Binary files /dev/null and b/indra/newview/skins/Blacklightblue/textures/status_no_build.tga differ
diff --git a/indra/newview/skins/Blacklightblue/textures/status_no_fly.tga b/indra/newview/skins/Blacklightblue/textures/status_no_fly.tga
new file mode 100644
index 000000000..0aa7fa71d
Binary files /dev/null and b/indra/newview/skins/Blacklightblue/textures/status_no_fly.tga differ
diff --git a/indra/newview/skins/Blacklightblue/textures/status_no_push.tga b/indra/newview/skins/Blacklightblue/textures/status_no_push.tga
new file mode 100644
index 000000000..6d5987217
Binary files /dev/null and b/indra/newview/skins/Blacklightblue/textures/status_no_push.tga differ
diff --git a/indra/newview/skins/Blacklightblue/textures/status_no_scripts.tga b/indra/newview/skins/Blacklightblue/textures/status_no_scripts.tga
new file mode 100644
index 000000000..3bce6ad6f
Binary files /dev/null and b/indra/newview/skins/Blacklightblue/textures/status_no_scripts.tga differ
diff --git a/indra/newview/skins/Blacklightblue/textures/status_no_voice.tga b/indra/newview/skins/Blacklightblue/textures/status_no_voice.tga
new file mode 100644
index 000000000..aeeed6ed0
Binary files /dev/null and b/indra/newview/skins/Blacklightblue/textures/status_no_voice.tga differ
diff --git a/indra/newview/skins/Blacklightblue/textures/status_script_debug.tga b/indra/newview/skins/Blacklightblue/textures/status_script_debug.tga
new file mode 100644
index 000000000..7d895eb0a
Binary files /dev/null and b/indra/newview/skins/Blacklightblue/textures/status_script_debug.tga differ
diff --git a/indra/newview/skins/Blacklightblue/textures/status_search_btn.png b/indra/newview/skins/Blacklightblue/textures/status_search_btn.png
new file mode 100644
index 000000000..1798559e7
Binary files /dev/null and b/indra/newview/skins/Blacklightblue/textures/status_search_btn.png differ
diff --git a/indra/newview/skins/Blacklightblue/textures/status_search_btn_pressed.png b/indra/newview/skins/Blacklightblue/textures/status_search_btn_pressed.png
new file mode 100644
index 000000000..c19945885
Binary files /dev/null and b/indra/newview/skins/Blacklightblue/textures/status_search_btn_pressed.png differ
diff --git a/indra/newview/skins/Blacklightblue/textures/status_voice.tga b/indra/newview/skins/Blacklightblue/textures/status_voice.tga
new file mode 100644
index 000000000..aeeed6ed0
Binary files /dev/null and b/indra/newview/skins/Blacklightblue/textures/status_voice.tga differ
diff --git a/indra/newview/skins/Blacklightblue/textures/tab_bottom_blue.tga b/indra/newview/skins/Blacklightblue/textures/tab_bottom_blue.tga
new file mode 100644
index 000000000..e6de7a5a1
Binary files /dev/null and b/indra/newview/skins/Blacklightblue/textures/tab_bottom_blue.tga differ
diff --git a/indra/newview/skins/Blacklightblue/textures/tab_bottom_selected_blue.tga b/indra/newview/skins/Blacklightblue/textures/tab_bottom_selected_blue.tga
new file mode 100644
index 000000000..685d4da55
Binary files /dev/null and b/indra/newview/skins/Blacklightblue/textures/tab_bottom_selected_blue.tga differ
diff --git a/indra/newview/skins/Blacklightblue/textures/tab_left.tga b/indra/newview/skins/Blacklightblue/textures/tab_left.tga
new file mode 100644
index 000000000..0220020e8
Binary files /dev/null and b/indra/newview/skins/Blacklightblue/textures/tab_left.tga differ
diff --git a/indra/newview/skins/Blacklightblue/textures/tab_left_selected.tga b/indra/newview/skins/Blacklightblue/textures/tab_left_selected.tga
new file mode 100644
index 000000000..485f324d1
Binary files /dev/null and b/indra/newview/skins/Blacklightblue/textures/tab_left_selected.tga differ
diff --git a/indra/newview/skins/Blacklightblue/textures/tab_top_blue.tga b/indra/newview/skins/Blacklightblue/textures/tab_top_blue.tga
new file mode 100644
index 000000000..ddcd519f2
Binary files /dev/null and b/indra/newview/skins/Blacklightblue/textures/tab_top_blue.tga differ
diff --git a/indra/newview/skins/Blacklightblue/textures/tab_top_selected_blue.tga b/indra/newview/skins/Blacklightblue/textures/tab_top_selected_blue.tga
new file mode 100644
index 000000000..1e871986e
Binary files /dev/null and b/indra/newview/skins/Blacklightblue/textures/tab_top_selected_blue.tga differ
diff --git a/indra/newview/skins/Blacklightblue/textures/tabarea.tga b/indra/newview/skins/Blacklightblue/textures/tabarea.tga
new file mode 100644
index 000000000..5517aebfc
Binary files /dev/null and b/indra/newview/skins/Blacklightblue/textures/tabarea.tga differ
diff --git a/indra/newview/skins/Blacklightblue/textures/tearoff_pressed.tga b/indra/newview/skins/Blacklightblue/textures/tearoff_pressed.tga
new file mode 100644
index 000000000..8581ab701
Binary files /dev/null and b/indra/newview/skins/Blacklightblue/textures/tearoff_pressed.tga differ
diff --git a/indra/newview/skins/Blacklightblue/textures/tearoffbox.tga b/indra/newview/skins/Blacklightblue/textures/tearoffbox.tga
new file mode 100644
index 000000000..27af31c4d
Binary files /dev/null and b/indra/newview/skins/Blacklightblue/textures/tearoffbox.tga differ
diff --git a/indra/newview/skins/Blacklightblue/textures/textures.xml b/indra/newview/skins/Blacklightblue/textures/textures.xml
new file mode 100644
index 000000000..5955a8ede
--- /dev/null
+++ b/indra/newview/skins/Blacklightblue/textures/textures.xml
@@ -0,0 +1,385 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/indra/newview/skins/Blacklightblue/textures/tool_dozer.tga b/indra/newview/skins/Blacklightblue/textures/tool_dozer.tga
new file mode 100644
index 000000000..bf3a8999d
Binary files /dev/null and b/indra/newview/skins/Blacklightblue/textures/tool_dozer.tga differ
diff --git a/indra/newview/skins/Blacklightblue/textures/tool_dozer_active.tga b/indra/newview/skins/Blacklightblue/textures/tool_dozer_active.tga
new file mode 100644
index 000000000..09c0e79f9
Binary files /dev/null and b/indra/newview/skins/Blacklightblue/textures/tool_dozer_active.tga differ
diff --git a/indra/newview/skins/Blacklightblue/textures/tool_zoom.tga b/indra/newview/skins/Blacklightblue/textures/tool_zoom.tga
new file mode 100644
index 000000000..67692e95b
Binary files /dev/null and b/indra/newview/skins/Blacklightblue/textures/tool_zoom.tga differ
diff --git a/indra/newview/skins/Blacklightblue/textures/tool_zoom_active.tga b/indra/newview/skins/Blacklightblue/textures/tool_zoom_active.tga
new file mode 100644
index 000000000..084ff39be
Binary files /dev/null and b/indra/newview/skins/Blacklightblue/textures/tool_zoom_active.tga differ
diff --git a/indra/newview/skins/Blacklightblue/textures/toolbar_bg.tga b/indra/newview/skins/Blacklightblue/textures/toolbar_bg.tga
new file mode 100644
index 000000000..3a1127611
Binary files /dev/null and b/indra/newview/skins/Blacklightblue/textures/toolbar_bg.tga differ
diff --git a/indra/newview/skins/Blacklightblue/textures/toolbar_btn_disabled.tga b/indra/newview/skins/Blacklightblue/textures/toolbar_btn_disabled.tga
new file mode 100644
index 000000000..d33fbe464
Binary files /dev/null and b/indra/newview/skins/Blacklightblue/textures/toolbar_btn_disabled.tga differ
diff --git a/indra/newview/skins/Blacklightblue/textures/toolbar_btn_enabled.tga b/indra/newview/skins/Blacklightblue/textures/toolbar_btn_enabled.tga
new file mode 100644
index 000000000..d33fbe464
Binary files /dev/null and b/indra/newview/skins/Blacklightblue/textures/toolbar_btn_enabled.tga differ
diff --git a/indra/newview/skins/Blacklightblue/textures/toolbar_btn_selected.tga b/indra/newview/skins/Blacklightblue/textures/toolbar_btn_selected.tga
new file mode 100644
index 000000000..1b46118b9
Binary files /dev/null and b/indra/newview/skins/Blacklightblue/textures/toolbar_btn_selected.tga differ
diff --git a/indra/newview/skins/Blacklightblue/textures/toolbar_tab.tga b/indra/newview/skins/Blacklightblue/textures/toolbar_tab.tga
new file mode 100644
index 000000000..f9a7d50d2
Binary files /dev/null and b/indra/newview/skins/Blacklightblue/textures/toolbar_tab.tga differ
diff --git a/indra/newview/skins/Blacklightblue/textures/up_arrow.png b/indra/newview/skins/Blacklightblue/textures/up_arrow.png
new file mode 100644
index 000000000..1e55b6ca7
Binary files /dev/null and b/indra/newview/skins/Blacklightblue/textures/up_arrow.png differ
diff --git a/indra/newview/skins/Blacklightblue/textures/up_arrow.tga b/indra/newview/skins/Blacklightblue/textures/up_arrow.tga
new file mode 100644
index 000000000..4dcb587ca
Binary files /dev/null and b/indra/newview/skins/Blacklightblue/textures/up_arrow.tga differ
diff --git a/indra/newview/skins/Blackred/License and Credit.txt b/indra/newview/skins/Blackred/License and Credit.txt
new file mode 100644
index 000000000..fe1f04c89
--- /dev/null
+++ b/indra/newview/skins/Blackred/License and Credit.txt
@@ -0,0 +1,6 @@
+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.
+This skin was modified by LordGregGreg Back 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/indra/newview/skins/Blackred/colors.xml b/indra/newview/skins/Blackred/colors.xml
new file mode 100644
index 000000000..640ef35d9
--- /dev/null
+++ b/indra/newview/skins/Blackred/colors.xml
@@ -0,0 +1,203 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/indra/newview/skins/Blackred/textures/0098b015-3daf-4cfe-a72f-915369ea97c2.tga b/indra/newview/skins/Blackred/textures/0098b015-3daf-4cfe-a72f-915369ea97c2.tga
new file mode 100644
index 000000000..d930e8964
Binary files /dev/null and b/indra/newview/skins/Blackred/textures/0098b015-3daf-4cfe-a72f-915369ea97c2.tga differ
diff --git a/indra/newview/skins/Blackred/textures/3c18c87e-5f50-14e2-e744-f44734aa365f.tga b/indra/newview/skins/Blackred/textures/3c18c87e-5f50-14e2-e744-f44734aa365f.tga
new file mode 100644
index 000000000..e90ab295b
Binary files /dev/null and b/indra/newview/skins/Blackred/textures/3c18c87e-5f50-14e2-e744-f44734aa365f.tga differ
diff --git a/indra/newview/skins/Blackred/textures/7a0b1bdb-b5d9-4df5-bac2-ba230da93b5b.tga b/indra/newview/skins/Blackred/textures/7a0b1bdb-b5d9-4df5-bac2-ba230da93b5b.tga
new file mode 100644
index 000000000..febd7d6ee
Binary files /dev/null and b/indra/newview/skins/Blackred/textures/7a0b1bdb-b5d9-4df5-bac2-ba230da93b5b.tga differ
diff --git a/indra/newview/skins/Blackred/textures/7dabc040-ec13-2309-ddf7-4f161f6de2f4.tga b/indra/newview/skins/Blackred/textures/7dabc040-ec13-2309-ddf7-4f161f6de2f4.tga
new file mode 100644
index 000000000..534ecba91
Binary files /dev/null and b/indra/newview/skins/Blackred/textures/7dabc040-ec13-2309-ddf7-4f161f6de2f4.tga differ
diff --git a/indra/newview/skins/Blackred/textures/9cad3e6d-2d6d-107d-f8ab-5ba272b5bfe1.tga b/indra/newview/skins/Blackred/textures/9cad3e6d-2d6d-107d-f8ab-5ba272b5bfe1.tga
new file mode 100644
index 000000000..e90ab295b
Binary files /dev/null and b/indra/newview/skins/Blackred/textures/9cad3e6d-2d6d-107d-f8ab-5ba272b5bfe1.tga differ
diff --git a/indra/newview/skins/Blackred/textures/active_speakers.tga b/indra/newview/skins/Blackred/textures/active_speakers.tga
new file mode 100644
index 000000000..492669ee4
Binary files /dev/null and b/indra/newview/skins/Blackred/textures/active_speakers.tga differ
diff --git a/indra/newview/skins/Blackred/textures/active_voice_tab.tga b/indra/newview/skins/Blackred/textures/active_voice_tab.tga
new file mode 100644
index 000000000..100df0d64
Binary files /dev/null and b/indra/newview/skins/Blackred/textures/active_voice_tab.tga differ
diff --git a/indra/newview/skins/Blackred/textures/arrow_down.tga b/indra/newview/skins/Blackred/textures/arrow_down.tga
new file mode 100644
index 000000000..89a793bcb
Binary files /dev/null and b/indra/newview/skins/Blackred/textures/arrow_down.tga differ
diff --git a/indra/newview/skins/Blackred/textures/arrow_up.tga b/indra/newview/skins/Blackred/textures/arrow_up.tga
new file mode 100644
index 000000000..5b03c5433
Binary files /dev/null and b/indra/newview/skins/Blackred/textures/arrow_up.tga differ
diff --git a/indra/newview/skins/Blackred/textures/b4870163-6208-42a9-9801-93133bf9a6cd.tga b/indra/newview/skins/Blackred/textures/b4870163-6208-42a9-9801-93133bf9a6cd.tga
new file mode 100644
index 000000000..fd2743fed
Binary files /dev/null and b/indra/newview/skins/Blackred/textures/b4870163-6208-42a9-9801-93133bf9a6cd.tga differ
diff --git a/indra/newview/skins/Blackred/textures/badge_error.j2c b/indra/newview/skins/Blackred/textures/badge_error.j2c
new file mode 100644
index 000000000..efb5c375c
Binary files /dev/null and b/indra/newview/skins/Blackred/textures/badge_error.j2c differ
diff --git a/indra/newview/skins/Blackred/textures/badge_note.j2c b/indra/newview/skins/Blackred/textures/badge_note.j2c
new file mode 100644
index 000000000..ef5db9e0d
Binary files /dev/null and b/indra/newview/skins/Blackred/textures/badge_note.j2c differ
diff --git a/indra/newview/skins/Blackred/textures/badge_ok.j2c b/indra/newview/skins/Blackred/textures/badge_ok.j2c
new file mode 100644
index 000000000..8ceee01c6
Binary files /dev/null and b/indra/newview/skins/Blackred/textures/badge_ok.j2c differ
diff --git a/indra/newview/skins/Blackred/textures/badge_warn.j2c b/indra/newview/skins/Blackred/textures/badge_warn.j2c
new file mode 100644
index 000000000..8fb85be69
Binary files /dev/null and b/indra/newview/skins/Blackred/textures/badge_warn.j2c differ
diff --git a/indra/newview/skins/Blackred/textures/black.tga b/indra/newview/skins/Blackred/textures/black.tga
new file mode 100644
index 000000000..e368ea496
Binary files /dev/null and b/indra/newview/skins/Blackred/textures/black.tga differ
diff --git a/indra/newview/skins/Blackred/textures/btn_chatbar.tga b/indra/newview/skins/Blackred/textures/btn_chatbar.tga
new file mode 100644
index 000000000..07117925a
Binary files /dev/null and b/indra/newview/skins/Blackred/textures/btn_chatbar.tga differ
diff --git a/indra/newview/skins/Blackred/textures/btn_chatbar_selected.tga b/indra/newview/skins/Blackred/textures/btn_chatbar_selected.tga
new file mode 100644
index 000000000..57e515005
Binary files /dev/null and b/indra/newview/skins/Blackred/textures/btn_chatbar_selected.tga differ
diff --git a/indra/newview/skins/Blackred/textures/button_anim_pause.tga b/indra/newview/skins/Blackred/textures/button_anim_pause.tga
new file mode 100644
index 000000000..7f81d1536
Binary files /dev/null and b/indra/newview/skins/Blackred/textures/button_anim_pause.tga differ
diff --git a/indra/newview/skins/Blackred/textures/button_anim_pause_selected.tga b/indra/newview/skins/Blackred/textures/button_anim_pause_selected.tga
new file mode 100644
index 000000000..650ca0aad
Binary files /dev/null and b/indra/newview/skins/Blackred/textures/button_anim_pause_selected.tga differ
diff --git a/indra/newview/skins/Blackred/textures/button_anim_play.tga b/indra/newview/skins/Blackred/textures/button_anim_play.tga
new file mode 100644
index 000000000..a8b7b74c5
Binary files /dev/null and b/indra/newview/skins/Blackred/textures/button_anim_play.tga differ
diff --git a/indra/newview/skins/Blackred/textures/button_anim_play_selected.tga b/indra/newview/skins/Blackred/textures/button_anim_play_selected.tga
new file mode 100644
index 000000000..ff9fb98b1
Binary files /dev/null and b/indra/newview/skins/Blackred/textures/button_anim_play_selected.tga differ
diff --git a/indra/newview/skins/Blackred/textures/button_anim_stop.tga b/indra/newview/skins/Blackred/textures/button_anim_stop.tga
new file mode 100644
index 000000000..f8583d2da
Binary files /dev/null and b/indra/newview/skins/Blackred/textures/button_anim_stop.tga differ
diff --git a/indra/newview/skins/Blackred/textures/button_anim_stop_selected.tga b/indra/newview/skins/Blackred/textures/button_anim_stop_selected.tga
new file mode 100644
index 000000000..0e1b3eb8c
Binary files /dev/null and b/indra/newview/skins/Blackred/textures/button_anim_stop_selected.tga differ
diff --git a/indra/newview/skins/Blackred/textures/button_disabled_32x128.tga b/indra/newview/skins/Blackred/textures/button_disabled_32x128.tga
new file mode 100644
index 000000000..9e7f3744d
Binary files /dev/null and b/indra/newview/skins/Blackred/textures/button_disabled_32x128.tga differ
diff --git a/indra/newview/skins/Blackred/textures/button_enabled_32x128.tga b/indra/newview/skins/Blackred/textures/button_enabled_32x128.tga
new file mode 100644
index 000000000..9e7f3744d
Binary files /dev/null and b/indra/newview/skins/Blackred/textures/button_enabled_32x128.tga differ
diff --git a/indra/newview/skins/Blackred/textures/button_enabled_selected_32x128.tga b/indra/newview/skins/Blackred/textures/button_enabled_selected_32x128.tga
new file mode 100644
index 000000000..e77a70a1c
Binary files /dev/null and b/indra/newview/skins/Blackred/textures/button_enabled_selected_32x128.tga differ
diff --git a/indra/newview/skins/Blackred/textures/c1e21504-f136-451d-b8e9-929037812f1d.tga b/indra/newview/skins/Blackred/textures/c1e21504-f136-451d-b8e9-929037812f1d.tga
new file mode 100644
index 000000000..7251dcc18
Binary files /dev/null and b/indra/newview/skins/Blackred/textures/c1e21504-f136-451d-b8e9-929037812f1d.tga differ
diff --git a/indra/newview/skins/Blackred/textures/c63f124c-6340-4fbf-b59e-0869a44adb64.tga b/indra/newview/skins/Blackred/textures/c63f124c-6340-4fbf-b59e-0869a44adb64.tga
new file mode 100644
index 000000000..6fa784e11
Binary files /dev/null and b/indra/newview/skins/Blackred/textures/c63f124c-6340-4fbf-b59e-0869a44adb64.tga differ
diff --git a/indra/newview/skins/Blackred/textures/cam_rotate_in.tga b/indra/newview/skins/Blackred/textures/cam_rotate_in.tga
new file mode 100644
index 000000000..9eadb772b
Binary files /dev/null and b/indra/newview/skins/Blackred/textures/cam_rotate_in.tga differ
diff --git a/indra/newview/skins/Blackred/textures/cam_rotate_out.tga b/indra/newview/skins/Blackred/textures/cam_rotate_out.tga
new file mode 100644
index 000000000..f86135251
Binary files /dev/null and b/indra/newview/skins/Blackred/textures/cam_rotate_out.tga differ
diff --git a/indra/newview/skins/Blackred/textures/cam_tracking_in.tga b/indra/newview/skins/Blackred/textures/cam_tracking_in.tga
new file mode 100644
index 000000000..b3d5b2ad2
Binary files /dev/null and b/indra/newview/skins/Blackred/textures/cam_tracking_in.tga differ
diff --git a/indra/newview/skins/Blackred/textures/cam_tracking_out.tga b/indra/newview/skins/Blackred/textures/cam_tracking_out.tga
new file mode 100644
index 000000000..2835219ff
Binary files /dev/null and b/indra/newview/skins/Blackred/textures/cam_tracking_out.tga differ
diff --git a/indra/newview/skins/Blackred/textures/cam_zoom_minus_in.tga b/indra/newview/skins/Blackred/textures/cam_zoom_minus_in.tga
new file mode 100644
index 000000000..ac54c5332
Binary files /dev/null and b/indra/newview/skins/Blackred/textures/cam_zoom_minus_in.tga differ
diff --git a/indra/newview/skins/Blackred/textures/cam_zoom_out.tga b/indra/newview/skins/Blackred/textures/cam_zoom_out.tga
new file mode 100644
index 000000000..8e6c519a9
Binary files /dev/null and b/indra/newview/skins/Blackred/textures/cam_zoom_out.tga differ
diff --git a/indra/newview/skins/Blackred/textures/cam_zoom_plus_in.tga b/indra/newview/skins/Blackred/textures/cam_zoom_plus_in.tga
new file mode 100644
index 000000000..cd2960d8e
Binary files /dev/null and b/indra/newview/skins/Blackred/textures/cam_zoom_plus_in.tga differ
diff --git a/indra/newview/skins/Blackred/textures/ce15fd63-b0b6-463c-a37d-ea6393208b3e.tga b/indra/newview/skins/Blackred/textures/ce15fd63-b0b6-463c-a37d-ea6393208b3e.tga
new file mode 100644
index 000000000..3c7cb5594
Binary files /dev/null and b/indra/newview/skins/Blackred/textures/ce15fd63-b0b6-463c-a37d-ea6393208b3e.tga differ
diff --git a/indra/newview/skins/Blackred/textures/checkbox_disabled_false.tga b/indra/newview/skins/Blackred/textures/checkbox_disabled_false.tga
new file mode 100644
index 000000000..aa57cd211
Binary files /dev/null and b/indra/newview/skins/Blackred/textures/checkbox_disabled_false.tga differ
diff --git a/indra/newview/skins/Blackred/textures/checkbox_disabled_true.tga b/indra/newview/skins/Blackred/textures/checkbox_disabled_true.tga
new file mode 100644
index 000000000..a198113bc
Binary files /dev/null and b/indra/newview/skins/Blackred/textures/checkbox_disabled_true.tga differ
diff --git a/indra/newview/skins/Blackred/textures/checkbox_enabled_false.tga b/indra/newview/skins/Blackred/textures/checkbox_enabled_false.tga
new file mode 100644
index 000000000..fb8265b18
Binary files /dev/null and b/indra/newview/skins/Blackred/textures/checkbox_enabled_false.tga differ
diff --git a/indra/newview/skins/Blackred/textures/checkbox_enabled_true.tga b/indra/newview/skins/Blackred/textures/checkbox_enabled_true.tga
new file mode 100644
index 000000000..59d67abdf
Binary files /dev/null and b/indra/newview/skins/Blackred/textures/checkbox_enabled_true.tga differ
diff --git a/indra/newview/skins/Blackred/textures/close_in_blue.tga b/indra/newview/skins/Blackred/textures/close_in_blue.tga
new file mode 100644
index 000000000..c58e052b8
Binary files /dev/null and b/indra/newview/skins/Blackred/textures/close_in_blue.tga differ
diff --git a/indra/newview/skins/Blackred/textures/close_inactive_blue.tga b/indra/newview/skins/Blackred/textures/close_inactive_blue.tga
new file mode 100644
index 000000000..2f912df59
Binary files /dev/null and b/indra/newview/skins/Blackred/textures/close_inactive_blue.tga differ
diff --git a/indra/newview/skins/Blackred/textures/closebox.tga b/indra/newview/skins/Blackred/textures/closebox.tga
new file mode 100644
index 000000000..5e1195526
Binary files /dev/null and b/indra/newview/skins/Blackred/textures/closebox.tga differ
diff --git a/indra/newview/skins/Blackred/textures/combobox_arrow.tga b/indra/newview/skins/Blackred/textures/combobox_arrow.tga
new file mode 100644
index 000000000..3c01e32d2
Binary files /dev/null and b/indra/newview/skins/Blackred/textures/combobox_arrow.tga differ
diff --git a/indra/newview/skins/Blackred/textures/d07f6eed-b96a-47cd-b51d-400ad4a1c428.j2c b/indra/newview/skins/Blackred/textures/d07f6eed-b96a-47cd-b51d-400ad4a1c428.j2c
new file mode 100644
index 000000000..4b73b25ac
Binary files /dev/null and b/indra/newview/skins/Blackred/textures/d07f6eed-b96a-47cd-b51d-400ad4a1c428.j2c differ
diff --git a/indra/newview/skins/Blackred/textures/darkgray.tga b/indra/newview/skins/Blackred/textures/darkgray.tga
new file mode 100644
index 000000000..e69be0893
Binary files /dev/null and b/indra/newview/skins/Blackred/textures/darkgray.tga differ
diff --git a/indra/newview/skins/Blackred/textures/default_land_picture.j2c b/indra/newview/skins/Blackred/textures/default_land_picture.j2c
new file mode 100644
index 000000000..6e2a85a46
Binary files /dev/null and b/indra/newview/skins/Blackred/textures/default_land_picture.j2c differ
diff --git a/indra/newview/skins/Blackred/textures/default_profile_picture.j2c b/indra/newview/skins/Blackred/textures/default_profile_picture.j2c
new file mode 100644
index 000000000..31d741e88
Binary files /dev/null and b/indra/newview/skins/Blackred/textures/default_profile_picture.j2c differ
diff --git a/indra/newview/skins/Blackred/textures/direction_arrow.tga b/indra/newview/skins/Blackred/textures/direction_arrow.tga
new file mode 100644
index 000000000..59149e1d5
Binary files /dev/null and b/indra/newview/skins/Blackred/textures/direction_arrow.tga differ
diff --git a/indra/newview/skins/Blackred/textures/down_arrow.png b/indra/newview/skins/Blackred/textures/down_arrow.png
new file mode 100644
index 000000000..abd706481
Binary files /dev/null and b/indra/newview/skins/Blackred/textures/down_arrow.png differ
diff --git a/indra/newview/skins/Blackred/textures/eye_button_active.tga b/indra/newview/skins/Blackred/textures/eye_button_active.tga
new file mode 100644
index 000000000..d0f7f6a3f
Binary files /dev/null and b/indra/newview/skins/Blackred/textures/eye_button_active.tga differ
diff --git a/indra/newview/skins/Blackred/textures/eye_button_inactive.tga b/indra/newview/skins/Blackred/textures/eye_button_inactive.tga
new file mode 100644
index 000000000..7e7ca0619
Binary files /dev/null and b/indra/newview/skins/Blackred/textures/eye_button_inactive.tga differ
diff --git a/indra/newview/skins/Blackred/textures/ff9a71eb-7414-4cf8-866e-a701deb7c3cf.tga b/indra/newview/skins/Blackred/textures/ff9a71eb-7414-4cf8-866e-a701deb7c3cf.tga
new file mode 100644
index 000000000..534ecba91
Binary files /dev/null and b/indra/newview/skins/Blackred/textures/ff9a71eb-7414-4cf8-866e-a701deb7c3cf.tga differ
diff --git a/indra/newview/skins/Blackred/textures/ff_edit_mine_button.tga b/indra/newview/skins/Blackred/textures/ff_edit_mine_button.tga
new file mode 100644
index 000000000..0398bbae1
Binary files /dev/null and b/indra/newview/skins/Blackred/textures/ff_edit_mine_button.tga differ
diff --git a/indra/newview/skins/Blackred/textures/ff_edit_theirs_button.tga b/indra/newview/skins/Blackred/textures/ff_edit_theirs_button.tga
new file mode 100644
index 000000000..06109c1d2
Binary files /dev/null and b/indra/newview/skins/Blackred/textures/ff_edit_theirs_button.tga differ
diff --git a/indra/newview/skins/Blackred/textures/ff_online_status_button.tga b/indra/newview/skins/Blackred/textures/ff_online_status_button.tga
new file mode 100644
index 000000000..0cc4d4f10
Binary files /dev/null and b/indra/newview/skins/Blackred/textures/ff_online_status_button.tga differ
diff --git a/indra/newview/skins/Blackred/textures/ff_visible_map_button.tga b/indra/newview/skins/Blackred/textures/ff_visible_map_button.tga
new file mode 100644
index 000000000..7daf492f8
Binary files /dev/null and b/indra/newview/skins/Blackred/textures/ff_visible_map_button.tga differ
diff --git a/indra/newview/skins/Blackred/textures/ff_visible_online_button.tga b/indra/newview/skins/Blackred/textures/ff_visible_online_button.tga
new file mode 100644
index 000000000..8a18d4d44
Binary files /dev/null and b/indra/newview/skins/Blackred/textures/ff_visible_online_button.tga differ
diff --git a/indra/newview/skins/Blackred/textures/flyout_btn_left.tga b/indra/newview/skins/Blackred/textures/flyout_btn_left.tga
new file mode 100644
index 000000000..eeb4e944b
Binary files /dev/null and b/indra/newview/skins/Blackred/textures/flyout_btn_left.tga differ
diff --git a/indra/newview/skins/Blackred/textures/flyout_btn_left_disabled.tga b/indra/newview/skins/Blackred/textures/flyout_btn_left_disabled.tga
new file mode 100644
index 000000000..eeb4e944b
Binary files /dev/null and b/indra/newview/skins/Blackred/textures/flyout_btn_left_disabled.tga differ
diff --git a/indra/newview/skins/Blackred/textures/flyout_btn_left_selected.tga b/indra/newview/skins/Blackred/textures/flyout_btn_left_selected.tga
new file mode 100644
index 000000000..67df7dc38
Binary files /dev/null and b/indra/newview/skins/Blackred/textures/flyout_btn_left_selected.tga differ
diff --git a/indra/newview/skins/Blackred/textures/flyout_btn_right.tga b/indra/newview/skins/Blackred/textures/flyout_btn_right.tga
new file mode 100644
index 000000000..2f4a5bbec
Binary files /dev/null and b/indra/newview/skins/Blackred/textures/flyout_btn_right.tga differ
diff --git a/indra/newview/skins/Blackred/textures/flyout_btn_right_disabled.tga b/indra/newview/skins/Blackred/textures/flyout_btn_right_disabled.tga
new file mode 100644
index 000000000..2f4a5bbec
Binary files /dev/null and b/indra/newview/skins/Blackred/textures/flyout_btn_right_disabled.tga differ
diff --git a/indra/newview/skins/Blackred/textures/flyout_btn_right_selected.tga b/indra/newview/skins/Blackred/textures/flyout_btn_right_selected.tga
new file mode 100644
index 000000000..36f63c3de
Binary files /dev/null and b/indra/newview/skins/Blackred/textures/flyout_btn_right_selected.tga differ
diff --git a/indra/newview/skins/Blackred/textures/flyout_left.tga b/indra/newview/skins/Blackred/textures/flyout_left.tga
new file mode 100644
index 000000000..4503ddf8c
Binary files /dev/null and b/indra/newview/skins/Blackred/textures/flyout_left.tga differ
diff --git a/indra/newview/skins/Blackred/textures/flyout_left_disabled.tga b/indra/newview/skins/Blackred/textures/flyout_left_disabled.tga
new file mode 100644
index 000000000..4503ddf8c
Binary files /dev/null and b/indra/newview/skins/Blackred/textures/flyout_left_disabled.tga differ
diff --git a/indra/newview/skins/Blackred/textures/flyout_left_selected.tga b/indra/newview/skins/Blackred/textures/flyout_left_selected.tga
new file mode 100644
index 000000000..7552ba6ed
Binary files /dev/null and b/indra/newview/skins/Blackred/textures/flyout_left_selected.tga differ
diff --git a/indra/newview/skins/Blackred/textures/icn_media-pause_active.tga b/indra/newview/skins/Blackred/textures/icn_media-pause_active.tga
new file mode 100644
index 000000000..8988829aa
Binary files /dev/null and b/indra/newview/skins/Blackred/textures/icn_media-pause_active.tga differ
diff --git a/indra/newview/skins/Blackred/textures/icn_media-pause_disabled.tga b/indra/newview/skins/Blackred/textures/icn_media-pause_disabled.tga
new file mode 100644
index 000000000..4690f4256
Binary files /dev/null and b/indra/newview/skins/Blackred/textures/icn_media-pause_disabled.tga differ
diff --git a/indra/newview/skins/Blackred/textures/icn_media-pause_enabled.tga b/indra/newview/skins/Blackred/textures/icn_media-pause_enabled.tga
new file mode 100644
index 000000000..c01399e27
Binary files /dev/null and b/indra/newview/skins/Blackred/textures/icn_media-pause_enabled.tga differ
diff --git a/indra/newview/skins/Blackred/textures/icn_media-play_enabled.tga b/indra/newview/skins/Blackred/textures/icn_media-play_enabled.tga
new file mode 100644
index 000000000..accac38b0
Binary files /dev/null and b/indra/newview/skins/Blackred/textures/icn_media-play_enabled.tga differ
diff --git a/indra/newview/skins/Blackred/textures/icn_media-stop_enabled.tga b/indra/newview/skins/Blackred/textures/icn_media-stop_enabled.tga
new file mode 100644
index 000000000..d935fa317
Binary files /dev/null and b/indra/newview/skins/Blackred/textures/icn_media-stop_enabled.tga differ
diff --git a/indra/newview/skins/Blackred/textures/icn_media.tga b/indra/newview/skins/Blackred/textures/icn_media.tga
new file mode 100644
index 000000000..2a035ba5d
Binary files /dev/null and b/indra/newview/skins/Blackred/textures/icn_media.tga differ
diff --git a/indra/newview/skins/Blackred/textures/icn_music.tga b/indra/newview/skins/Blackred/textures/icn_music.tga
new file mode 100644
index 000000000..81da5abcf
Binary files /dev/null and b/indra/newview/skins/Blackred/textures/icn_music.tga differ
diff --git a/indra/newview/skins/Blackred/textures/icn_rounded-text-field.tga b/indra/newview/skins/Blackred/textures/icn_rounded-text-field.tga
new file mode 100644
index 000000000..1f1e72572
Binary files /dev/null and b/indra/newview/skins/Blackred/textures/icn_rounded-text-field.tga differ
diff --git a/indra/newview/skins/Blackred/textures/icn_slide-groove_dark.tga b/indra/newview/skins/Blackred/textures/icn_slide-groove_dark.tga
new file mode 100644
index 000000000..96a247ad9
Binary files /dev/null and b/indra/newview/skins/Blackred/textures/icn_slide-groove_dark.tga differ
diff --git a/indra/newview/skins/Blackred/textures/icn_slide-highlight.tga b/indra/newview/skins/Blackred/textures/icn_slide-highlight.tga
new file mode 100644
index 000000000..d371cd066
Binary files /dev/null and b/indra/newview/skins/Blackred/textures/icn_slide-highlight.tga differ
diff --git a/indra/newview/skins/Blackred/textures/icn_slide-thumb_dark.tga b/indra/newview/skins/Blackred/textures/icn_slide-thumb_dark.tga
new file mode 100644
index 000000000..452cdc6d1
Binary files /dev/null and b/indra/newview/skins/Blackred/textures/icn_slide-thumb_dark.tga differ
diff --git a/indra/newview/skins/Blackred/textures/icn_speaker-muted_dark.tga b/indra/newview/skins/Blackred/textures/icn_speaker-muted_dark.tga
new file mode 100644
index 000000000..8f2c80dd2
Binary files /dev/null and b/indra/newview/skins/Blackred/textures/icn_speaker-muted_dark.tga differ
diff --git a/indra/newview/skins/Blackred/textures/icn_toolbar_radar.tga b/indra/newview/skins/Blackred/textures/icn_toolbar_radar.tga
new file mode 100644
index 000000000..d1a55ed74
Binary files /dev/null and b/indra/newview/skins/Blackred/textures/icn_toolbar_radar.tga differ
diff --git a/indra/newview/skins/Blackred/textures/icn_voice-call-end.tga b/indra/newview/skins/Blackred/textures/icn_voice-call-end.tga
new file mode 100644
index 000000000..84056b90a
Binary files /dev/null and b/indra/newview/skins/Blackred/textures/icn_voice-call-end.tga differ
diff --git a/indra/newview/skins/Blackred/textures/icn_voice-call-start.tga b/indra/newview/skins/Blackred/textures/icn_voice-call-start.tga
new file mode 100644
index 000000000..7babfd318
Binary files /dev/null and b/indra/newview/skins/Blackred/textures/icn_voice-call-start.tga differ
diff --git a/indra/newview/skins/Blackred/textures/icn_voice-groupfocus.tga b/indra/newview/skins/Blackred/textures/icn_voice-groupfocus.tga
new file mode 100644
index 000000000..913bd0969
Binary files /dev/null and b/indra/newview/skins/Blackred/textures/icn_voice-groupfocus.tga differ
diff --git a/indra/newview/skins/Blackred/textures/icn_voice-localchat.tga b/indra/newview/skins/Blackred/textures/icn_voice-localchat.tga
new file mode 100644
index 000000000..5c1456602
Binary files /dev/null and b/indra/newview/skins/Blackred/textures/icn_voice-localchat.tga differ
diff --git a/indra/newview/skins/Blackred/textures/icn_voice-pvtfocus.tga b/indra/newview/skins/Blackred/textures/icn_voice-pvtfocus.tga
new file mode 100644
index 000000000..76e72fd3a
Binary files /dev/null and b/indra/newview/skins/Blackred/textures/icn_voice-pvtfocus.tga differ
diff --git a/indra/newview/skins/Blackred/textures/icn_voice_ptt-off.tga b/indra/newview/skins/Blackred/textures/icn_voice_ptt-off.tga
new file mode 100644
index 000000000..530425dd7
Binary files /dev/null and b/indra/newview/skins/Blackred/textures/icn_voice_ptt-off.tga differ
diff --git a/indra/newview/skins/Blackred/textures/icn_voice_ptt-on-lvl1.tga b/indra/newview/skins/Blackred/textures/icn_voice_ptt-on-lvl1.tga
new file mode 100644
index 000000000..818c58915
Binary files /dev/null and b/indra/newview/skins/Blackred/textures/icn_voice_ptt-on-lvl1.tga differ
diff --git a/indra/newview/skins/Blackred/textures/icn_voice_ptt-on-lvl2.tga b/indra/newview/skins/Blackred/textures/icn_voice_ptt-on-lvl2.tga
new file mode 100644
index 000000000..48d44b10a
Binary files /dev/null and b/indra/newview/skins/Blackred/textures/icn_voice_ptt-on-lvl2.tga differ
diff --git a/indra/newview/skins/Blackred/textures/icn_voice_ptt-on-lvl3.tga b/indra/newview/skins/Blackred/textures/icn_voice_ptt-on-lvl3.tga
new file mode 100644
index 000000000..081265efb
Binary files /dev/null and b/indra/newview/skins/Blackred/textures/icn_voice_ptt-on-lvl3.tga differ
diff --git a/indra/newview/skins/Blackred/textures/icn_voice_ptt-on.tga b/indra/newview/skins/Blackred/textures/icn_voice_ptt-on.tga
new file mode 100644
index 000000000..8ce21f4a6
Binary files /dev/null and b/indra/newview/skins/Blackred/textures/icn_voice_ptt-on.tga differ
diff --git a/indra/newview/skins/Blackred/textures/icon_auction.tga b/indra/newview/skins/Blackred/textures/icon_auction.tga
new file mode 100644
index 000000000..3aa21d323
Binary files /dev/null and b/indra/newview/skins/Blackred/textures/icon_auction.tga differ
diff --git a/indra/newview/skins/Blackred/textures/icon_avatar_offline.tga b/indra/newview/skins/Blackred/textures/icon_avatar_offline.tga
new file mode 100644
index 000000000..620e0f7c1
Binary files /dev/null and b/indra/newview/skins/Blackred/textures/icon_avatar_offline.tga differ
diff --git a/indra/newview/skins/Blackred/textures/icon_avatar_online.tga b/indra/newview/skins/Blackred/textures/icon_avatar_online.tga
new file mode 100644
index 000000000..6350237ee
Binary files /dev/null and b/indra/newview/skins/Blackred/textures/icon_avatar_online.tga differ
diff --git a/indra/newview/skins/Blackred/textures/icon_event.tga b/indra/newview/skins/Blackred/textures/icon_event.tga
new file mode 100644
index 000000000..23f246b91
Binary files /dev/null and b/indra/newview/skins/Blackred/textures/icon_event.tga differ
diff --git a/indra/newview/skins/Blackred/textures/icon_event_adult.tga b/indra/newview/skins/Blackred/textures/icon_event_adult.tga
new file mode 100644
index 000000000..7202e6734
Binary files /dev/null and b/indra/newview/skins/Blackred/textures/icon_event_adult.tga differ
diff --git a/indra/newview/skins/Blackred/textures/icon_event_mature.tga b/indra/newview/skins/Blackred/textures/icon_event_mature.tga
new file mode 100644
index 000000000..103c5e535
Binary files /dev/null and b/indra/newview/skins/Blackred/textures/icon_event_mature.tga differ
diff --git a/indra/newview/skins/Blackred/textures/icon_for_sale.tga b/indra/newview/skins/Blackred/textures/icon_for_sale.tga
new file mode 100644
index 000000000..09405d383
Binary files /dev/null and b/indra/newview/skins/Blackred/textures/icon_for_sale.tga differ
diff --git a/indra/newview/skins/Blackred/textures/icon_for_sale_adult.tga b/indra/newview/skins/Blackred/textures/icon_for_sale_adult.tga
new file mode 100644
index 000000000..147f724e7
Binary files /dev/null and b/indra/newview/skins/Blackred/textures/icon_for_sale_adult.tga differ
diff --git a/indra/newview/skins/Blackred/textures/icon_group.tga b/indra/newview/skins/Blackred/textures/icon_group.tga
new file mode 100644
index 000000000..1e5c31aa3
Binary files /dev/null and b/indra/newview/skins/Blackred/textures/icon_group.tga differ
diff --git a/indra/newview/skins/Blackred/textures/icon_groupnotice.tga b/indra/newview/skins/Blackred/textures/icon_groupnotice.tga
new file mode 100644
index 000000000..a3e35a0bf
Binary files /dev/null and b/indra/newview/skins/Blackred/textures/icon_groupnotice.tga differ
diff --git a/indra/newview/skins/Blackred/textures/icon_groupnoticeinventory.tga b/indra/newview/skins/Blackred/textures/icon_groupnoticeinventory.tga
new file mode 100644
index 000000000..780d6fadd
Binary files /dev/null and b/indra/newview/skins/Blackred/textures/icon_groupnoticeinventory.tga differ
diff --git a/indra/newview/skins/Blackred/textures/icon_lock.tga b/indra/newview/skins/Blackred/textures/icon_lock.tga
new file mode 100644
index 000000000..5de6cc10e
Binary files /dev/null and b/indra/newview/skins/Blackred/textures/icon_lock.tga differ
diff --git a/indra/newview/skins/Blackred/textures/icon_place.tga b/indra/newview/skins/Blackred/textures/icon_place.tga
new file mode 100644
index 000000000..7f842ba65
Binary files /dev/null and b/indra/newview/skins/Blackred/textures/icon_place.tga differ
diff --git a/indra/newview/skins/Blackred/textures/icon_popular.tga b/indra/newview/skins/Blackred/textures/icon_popular.tga
new file mode 100644
index 000000000..6bdc6ede3
Binary files /dev/null and b/indra/newview/skins/Blackred/textures/icon_popular.tga differ
diff --git a/indra/newview/skins/Blackred/textures/icon_top_pick.tga b/indra/newview/skins/Blackred/textures/icon_top_pick.tga
new file mode 100644
index 000000000..4466e8be7
Binary files /dev/null and b/indra/newview/skins/Blackred/textures/icon_top_pick.tga differ
diff --git a/indra/newview/skins/Blackred/textures/inv_folder_animation.tga b/indra/newview/skins/Blackred/textures/inv_folder_animation.tga
new file mode 100644
index 000000000..2054a466d
Binary files /dev/null and b/indra/newview/skins/Blackred/textures/inv_folder_animation.tga differ
diff --git a/indra/newview/skins/Blackred/textures/inv_folder_bodypart.tga b/indra/newview/skins/Blackred/textures/inv_folder_bodypart.tga
new file mode 100644
index 000000000..9a17c90b8
Binary files /dev/null and b/indra/newview/skins/Blackred/textures/inv_folder_bodypart.tga differ
diff --git a/indra/newview/skins/Blackred/textures/inv_folder_callingcard.tga b/indra/newview/skins/Blackred/textures/inv_folder_callingcard.tga
new file mode 100644
index 000000000..514cc6095
Binary files /dev/null and b/indra/newview/skins/Blackred/textures/inv_folder_callingcard.tga differ
diff --git a/indra/newview/skins/Blackred/textures/inv_folder_clothing.tga b/indra/newview/skins/Blackred/textures/inv_folder_clothing.tga
new file mode 100644
index 000000000..c61e15c66
Binary files /dev/null and b/indra/newview/skins/Blackred/textures/inv_folder_clothing.tga differ
diff --git a/indra/newview/skins/Blackred/textures/inv_folder_gesture.tga b/indra/newview/skins/Blackred/textures/inv_folder_gesture.tga
new file mode 100644
index 000000000..761b1b87b
Binary files /dev/null and b/indra/newview/skins/Blackred/textures/inv_folder_gesture.tga differ
diff --git a/indra/newview/skins/Blackred/textures/inv_folder_landmark.tga b/indra/newview/skins/Blackred/textures/inv_folder_landmark.tga
new file mode 100644
index 000000000..94bf17e62
Binary files /dev/null and b/indra/newview/skins/Blackred/textures/inv_folder_landmark.tga differ
diff --git a/indra/newview/skins/Blackred/textures/inv_folder_lostandfound.tga b/indra/newview/skins/Blackred/textures/inv_folder_lostandfound.tga
new file mode 100644
index 000000000..c31b71f15
Binary files /dev/null and b/indra/newview/skins/Blackred/textures/inv_folder_lostandfound.tga differ
diff --git a/indra/newview/skins/Blackred/textures/inv_folder_notecard.tga b/indra/newview/skins/Blackred/textures/inv_folder_notecard.tga
new file mode 100644
index 000000000..8fe38da90
Binary files /dev/null and b/indra/newview/skins/Blackred/textures/inv_folder_notecard.tga differ
diff --git a/indra/newview/skins/Blackred/textures/inv_folder_object.tga b/indra/newview/skins/Blackred/textures/inv_folder_object.tga
new file mode 100644
index 000000000..56bce2ca0
Binary files /dev/null and b/indra/newview/skins/Blackred/textures/inv_folder_object.tga differ
diff --git a/indra/newview/skins/Blackred/textures/inv_folder_plain_closed.tga b/indra/newview/skins/Blackred/textures/inv_folder_plain_closed.tga
new file mode 100644
index 000000000..28c78ce39
Binary files /dev/null and b/indra/newview/skins/Blackred/textures/inv_folder_plain_closed.tga differ
diff --git a/indra/newview/skins/Blackred/textures/inv_folder_plain_open.tga b/indra/newview/skins/Blackred/textures/inv_folder_plain_open.tga
new file mode 100644
index 000000000..baf6db64a
Binary files /dev/null and b/indra/newview/skins/Blackred/textures/inv_folder_plain_open.tga differ
diff --git a/indra/newview/skins/Blackred/textures/inv_folder_script.tga b/indra/newview/skins/Blackred/textures/inv_folder_script.tga
new file mode 100644
index 000000000..b42b464fa
Binary files /dev/null and b/indra/newview/skins/Blackred/textures/inv_folder_script.tga differ
diff --git a/indra/newview/skins/Blackred/textures/inv_folder_snapshot.tga b/indra/newview/skins/Blackred/textures/inv_folder_snapshot.tga
new file mode 100644
index 000000000..d3c02d31d
Binary files /dev/null and b/indra/newview/skins/Blackred/textures/inv_folder_snapshot.tga differ
diff --git a/indra/newview/skins/Blackred/textures/inv_folder_sound.tga b/indra/newview/skins/Blackred/textures/inv_folder_sound.tga
new file mode 100644
index 000000000..d7cf45f11
Binary files /dev/null and b/indra/newview/skins/Blackred/textures/inv_folder_sound.tga differ
diff --git a/indra/newview/skins/Blackred/textures/inv_folder_texture.tga b/indra/newview/skins/Blackred/textures/inv_folder_texture.tga
new file mode 100644
index 000000000..684ca9d43
Binary files /dev/null and b/indra/newview/skins/Blackred/textures/inv_folder_texture.tga differ
diff --git a/indra/newview/skins/Blackred/textures/inv_folder_trash.tga b/indra/newview/skins/Blackred/textures/inv_folder_trash.tga
new file mode 100644
index 000000000..50ad9dacd
Binary files /dev/null and b/indra/newview/skins/Blackred/textures/inv_folder_trash.tga differ
diff --git a/indra/newview/skins/Blackred/textures/inv_item_animation.tga b/indra/newview/skins/Blackred/textures/inv_item_animation.tga
new file mode 100644
index 000000000..1269e7c7b
Binary files /dev/null and b/indra/newview/skins/Blackred/textures/inv_item_animation.tga differ
diff --git a/indra/newview/skins/Blackred/textures/inv_item_attach.tga b/indra/newview/skins/Blackred/textures/inv_item_attach.tga
new file mode 100644
index 000000000..38204e590
Binary files /dev/null and b/indra/newview/skins/Blackred/textures/inv_item_attach.tga differ
diff --git a/indra/newview/skins/Blackred/textures/inv_item_callingcard_offline.tga b/indra/newview/skins/Blackred/textures/inv_item_callingcard_offline.tga
new file mode 100644
index 000000000..7373451db
Binary files /dev/null and b/indra/newview/skins/Blackred/textures/inv_item_callingcard_offline.tga differ
diff --git a/indra/newview/skins/Blackred/textures/inv_item_callingcard_online.tga b/indra/newview/skins/Blackred/textures/inv_item_callingcard_online.tga
new file mode 100644
index 000000000..602648494
Binary files /dev/null and b/indra/newview/skins/Blackred/textures/inv_item_callingcard_online.tga differ
diff --git a/indra/newview/skins/Blackred/textures/inv_item_clothing.tga b/indra/newview/skins/Blackred/textures/inv_item_clothing.tga
new file mode 100644
index 000000000..0dd6ddb90
Binary files /dev/null and b/indra/newview/skins/Blackred/textures/inv_item_clothing.tga differ
diff --git a/indra/newview/skins/Blackred/textures/inv_item_eyes.tga b/indra/newview/skins/Blackred/textures/inv_item_eyes.tga
new file mode 100644
index 000000000..c75ebbccf
Binary files /dev/null and b/indra/newview/skins/Blackred/textures/inv_item_eyes.tga differ
diff --git a/indra/newview/skins/Blackred/textures/inv_item_gesture.tga b/indra/newview/skins/Blackred/textures/inv_item_gesture.tga
new file mode 100644
index 000000000..45e94bb0f
Binary files /dev/null and b/indra/newview/skins/Blackred/textures/inv_item_gesture.tga differ
diff --git a/indra/newview/skins/Blackred/textures/inv_item_gloves.tga b/indra/newview/skins/Blackred/textures/inv_item_gloves.tga
new file mode 100644
index 000000000..f380dd9af
Binary files /dev/null and b/indra/newview/skins/Blackred/textures/inv_item_gloves.tga differ
diff --git a/indra/newview/skins/Blackred/textures/inv_item_hair.tga b/indra/newview/skins/Blackred/textures/inv_item_hair.tga
new file mode 100644
index 000000000..dce7798af
Binary files /dev/null and b/indra/newview/skins/Blackred/textures/inv_item_hair.tga differ
diff --git a/indra/newview/skins/Blackred/textures/inv_item_jacket.tga b/indra/newview/skins/Blackred/textures/inv_item_jacket.tga
new file mode 100644
index 000000000..af742f687
Binary files /dev/null and b/indra/newview/skins/Blackred/textures/inv_item_jacket.tga differ
diff --git a/indra/newview/skins/Blackred/textures/inv_item_landmark.tga b/indra/newview/skins/Blackred/textures/inv_item_landmark.tga
new file mode 100644
index 000000000..db67487fb
Binary files /dev/null and b/indra/newview/skins/Blackred/textures/inv_item_landmark.tga differ
diff --git a/indra/newview/skins/Blackred/textures/inv_item_landmark_visited.tga b/indra/newview/skins/Blackred/textures/inv_item_landmark_visited.tga
new file mode 100644
index 000000000..c74745070
Binary files /dev/null and b/indra/newview/skins/Blackred/textures/inv_item_landmark_visited.tga differ
diff --git a/indra/newview/skins/Blackred/textures/inv_item_notecard.tga b/indra/newview/skins/Blackred/textures/inv_item_notecard.tga
new file mode 100644
index 000000000..c7d3decc8
Binary files /dev/null and b/indra/newview/skins/Blackred/textures/inv_item_notecard.tga differ
diff --git a/indra/newview/skins/Blackred/textures/inv_item_object.tga b/indra/newview/skins/Blackred/textures/inv_item_object.tga
new file mode 100644
index 000000000..8431a6081
Binary files /dev/null and b/indra/newview/skins/Blackred/textures/inv_item_object.tga differ
diff --git a/indra/newview/skins/Blackred/textures/inv_item_object_multi.tga b/indra/newview/skins/Blackred/textures/inv_item_object_multi.tga
new file mode 100644
index 000000000..f1485c0ae
Binary files /dev/null and b/indra/newview/skins/Blackred/textures/inv_item_object_multi.tga differ
diff --git a/indra/newview/skins/Blackred/textures/inv_item_pants.tga b/indra/newview/skins/Blackred/textures/inv_item_pants.tga
new file mode 100644
index 000000000..fc2f1779c
Binary files /dev/null and b/indra/newview/skins/Blackred/textures/inv_item_pants.tga differ
diff --git a/indra/newview/skins/Blackred/textures/inv_item_script.tga b/indra/newview/skins/Blackred/textures/inv_item_script.tga
new file mode 100644
index 000000000..1ac3df150
Binary files /dev/null and b/indra/newview/skins/Blackred/textures/inv_item_script.tga differ
diff --git a/indra/newview/skins/Blackred/textures/inv_item_script_dangerous.tga b/indra/newview/skins/Blackred/textures/inv_item_script_dangerous.tga
new file mode 100644
index 000000000..613f80445
Binary files /dev/null and b/indra/newview/skins/Blackred/textures/inv_item_script_dangerous.tga differ
diff --git a/indra/newview/skins/Blackred/textures/inv_item_shape.tga b/indra/newview/skins/Blackred/textures/inv_item_shape.tga
new file mode 100644
index 000000000..fb78f6c6f
Binary files /dev/null and b/indra/newview/skins/Blackred/textures/inv_item_shape.tga differ
diff --git a/indra/newview/skins/Blackred/textures/inv_item_shirt.tga b/indra/newview/skins/Blackred/textures/inv_item_shirt.tga
new file mode 100644
index 000000000..0dd6ddb90
Binary files /dev/null and b/indra/newview/skins/Blackred/textures/inv_item_shirt.tga differ
diff --git a/indra/newview/skins/Blackred/textures/inv_item_shoes.tga b/indra/newview/skins/Blackred/textures/inv_item_shoes.tga
new file mode 100644
index 000000000..c46fddc01
Binary files /dev/null and b/indra/newview/skins/Blackred/textures/inv_item_shoes.tga differ
diff --git a/indra/newview/skins/Blackred/textures/inv_item_skin.tga b/indra/newview/skins/Blackred/textures/inv_item_skin.tga
new file mode 100644
index 000000000..9e9b952a9
Binary files /dev/null and b/indra/newview/skins/Blackred/textures/inv_item_skin.tga differ
diff --git a/indra/newview/skins/Blackred/textures/inv_item_skirt.tga b/indra/newview/skins/Blackred/textures/inv_item_skirt.tga
new file mode 100644
index 000000000..cf1b928f4
Binary files /dev/null and b/indra/newview/skins/Blackred/textures/inv_item_skirt.tga differ
diff --git a/indra/newview/skins/Blackred/textures/inv_item_snapshot.tga b/indra/newview/skins/Blackred/textures/inv_item_snapshot.tga
new file mode 100644
index 000000000..59e032d8e
Binary files /dev/null and b/indra/newview/skins/Blackred/textures/inv_item_snapshot.tga differ
diff --git a/indra/newview/skins/Blackred/textures/inv_item_socks.tga b/indra/newview/skins/Blackred/textures/inv_item_socks.tga
new file mode 100644
index 000000000..2b80ebca0
Binary files /dev/null and b/indra/newview/skins/Blackred/textures/inv_item_socks.tga differ
diff --git a/indra/newview/skins/Blackred/textures/inv_item_sound.tga b/indra/newview/skins/Blackred/textures/inv_item_sound.tga
new file mode 100644
index 000000000..d43a10e1d
Binary files /dev/null and b/indra/newview/skins/Blackred/textures/inv_item_sound.tga differ
diff --git a/indra/newview/skins/Blackred/textures/inv_item_texture.tga b/indra/newview/skins/Blackred/textures/inv_item_texture.tga
new file mode 100644
index 000000000..ede9fd9a8
Binary files /dev/null and b/indra/newview/skins/Blackred/textures/inv_item_texture.tga differ
diff --git a/indra/newview/skins/Blackred/textures/inv_item_underpants.tga b/indra/newview/skins/Blackred/textures/inv_item_underpants.tga
new file mode 100644
index 000000000..abcffc3bd
Binary files /dev/null and b/indra/newview/skins/Blackred/textures/inv_item_underpants.tga differ
diff --git a/indra/newview/skins/Blackred/textures/inv_item_undershirt.tga b/indra/newview/skins/Blackred/textures/inv_item_undershirt.tga
new file mode 100644
index 000000000..22c47f8df
Binary files /dev/null and b/indra/newview/skins/Blackred/textures/inv_item_undershirt.tga differ
diff --git a/indra/newview/skins/Blackred/textures/lightgray.tga b/indra/newview/skins/Blackred/textures/lightgray.tga
new file mode 100644
index 000000000..e69be0893
Binary files /dev/null and b/indra/newview/skins/Blackred/textures/lightgray.tga differ
diff --git a/indra/newview/skins/Blackred/textures/map_avatar_16.tga b/indra/newview/skins/Blackred/textures/map_avatar_16.tga
new file mode 100644
index 000000000..42d8c1e29
Binary files /dev/null and b/indra/newview/skins/Blackred/textures/map_avatar_16.tga differ
diff --git a/indra/newview/skins/Blackred/textures/map_avatar_8.tga b/indra/newview/skins/Blackred/textures/map_avatar_8.tga
new file mode 100644
index 000000000..7eb7c20f1
Binary files /dev/null and b/indra/newview/skins/Blackred/textures/map_avatar_8.tga differ
diff --git a/indra/newview/skins/Blackred/textures/map_avatar_above_8.tga b/indra/newview/skins/Blackred/textures/map_avatar_above_8.tga
new file mode 100644
index 000000000..6faefccc7
Binary files /dev/null and b/indra/newview/skins/Blackred/textures/map_avatar_above_8.tga differ
diff --git a/indra/newview/skins/Blackred/textures/map_avatar_below_8.tga b/indra/newview/skins/Blackred/textures/map_avatar_below_8.tga
new file mode 100644
index 000000000..5ad671c26
Binary files /dev/null and b/indra/newview/skins/Blackred/textures/map_avatar_below_8.tga differ
diff --git a/indra/newview/skins/Blackred/textures/map_avatar_you_8.tga b/indra/newview/skins/Blackred/textures/map_avatar_you_8.tga
new file mode 100644
index 000000000..673b30e19
Binary files /dev/null and b/indra/newview/skins/Blackred/textures/map_avatar_you_8.tga differ
diff --git a/indra/newview/skins/Blackred/textures/map_event.tga b/indra/newview/skins/Blackred/textures/map_event.tga
new file mode 100644
index 000000000..103c5e535
Binary files /dev/null and b/indra/newview/skins/Blackred/textures/map_event.tga differ
diff --git a/indra/newview/skins/Blackred/textures/map_event_adult.tga b/indra/newview/skins/Blackred/textures/map_event_adult.tga
new file mode 100644
index 000000000..7202e6734
Binary files /dev/null and b/indra/newview/skins/Blackred/textures/map_event_adult.tga differ
diff --git a/indra/newview/skins/Blackred/textures/map_event_mature.tga b/indra/newview/skins/Blackred/textures/map_event_mature.tga
new file mode 100644
index 000000000..23f246b91
Binary files /dev/null and b/indra/newview/skins/Blackred/textures/map_event_mature.tga differ
diff --git a/indra/newview/skins/Blackred/textures/map_home.tga b/indra/newview/skins/Blackred/textures/map_home.tga
new file mode 100644
index 000000000..85dde9ef7
Binary files /dev/null and b/indra/newview/skins/Blackred/textures/map_home.tga differ
diff --git a/indra/newview/skins/Blackred/textures/map_infohub.tga b/indra/newview/skins/Blackred/textures/map_infohub.tga
new file mode 100644
index 000000000..173b93e39
Binary files /dev/null and b/indra/newview/skins/Blackred/textures/map_infohub.tga differ
diff --git a/indra/newview/skins/Blackred/textures/map_telehub.tga b/indra/newview/skins/Blackred/textures/map_telehub.tga
new file mode 100644
index 000000000..d89bcfa40
Binary files /dev/null and b/indra/newview/skins/Blackred/textures/map_telehub.tga differ
diff --git a/indra/newview/skins/Blackred/textures/map_track_16.tga b/indra/newview/skins/Blackred/textures/map_track_16.tga
new file mode 100644
index 000000000..14d49b93b
Binary files /dev/null and b/indra/newview/skins/Blackred/textures/map_track_16.tga differ
diff --git a/indra/newview/skins/Blackred/textures/map_track_8.tga b/indra/newview/skins/Blackred/textures/map_track_8.tga
new file mode 100644
index 000000000..d9605dde1
Binary files /dev/null and b/indra/newview/skins/Blackred/textures/map_track_8.tga differ
diff --git a/indra/newview/skins/Blackred/textures/minimize.tga b/indra/newview/skins/Blackred/textures/minimize.tga
new file mode 100644
index 000000000..151a3078f
Binary files /dev/null and b/indra/newview/skins/Blackred/textures/minimize.tga differ
diff --git a/indra/newview/skins/Blackred/textures/minimize_inactive.tga b/indra/newview/skins/Blackred/textures/minimize_inactive.tga
new file mode 100644
index 000000000..d7e1b4057
Binary files /dev/null and b/indra/newview/skins/Blackred/textures/minimize_inactive.tga differ
diff --git a/indra/newview/skins/Blackred/textures/minimize_pressed.tga b/indra/newview/skins/Blackred/textures/minimize_pressed.tga
new file mode 100644
index 000000000..573452ce9
Binary files /dev/null and b/indra/newview/skins/Blackred/textures/minimize_pressed.tga differ
diff --git a/indra/newview/skins/Blackred/textures/move_backward_in.tga b/indra/newview/skins/Blackred/textures/move_backward_in.tga
new file mode 100644
index 000000000..8fe21404c
Binary files /dev/null and b/indra/newview/skins/Blackred/textures/move_backward_in.tga differ
diff --git a/indra/newview/skins/Blackred/textures/move_backward_out.tga b/indra/newview/skins/Blackred/textures/move_backward_out.tga
new file mode 100644
index 000000000..f46c021f9
Binary files /dev/null and b/indra/newview/skins/Blackred/textures/move_backward_out.tga differ
diff --git a/indra/newview/skins/Blackred/textures/move_down_in.tga b/indra/newview/skins/Blackred/textures/move_down_in.tga
new file mode 100644
index 000000000..6405730ff
Binary files /dev/null and b/indra/newview/skins/Blackred/textures/move_down_in.tga differ
diff --git a/indra/newview/skins/Blackred/textures/move_down_out.tga b/indra/newview/skins/Blackred/textures/move_down_out.tga
new file mode 100644
index 000000000..8d3efee37
Binary files /dev/null and b/indra/newview/skins/Blackred/textures/move_down_out.tga differ
diff --git a/indra/newview/skins/Blackred/textures/move_forward_in.tga b/indra/newview/skins/Blackred/textures/move_forward_in.tga
new file mode 100644
index 000000000..ba3454a95
Binary files /dev/null and b/indra/newview/skins/Blackred/textures/move_forward_in.tga differ
diff --git a/indra/newview/skins/Blackred/textures/move_forward_out.tga b/indra/newview/skins/Blackred/textures/move_forward_out.tga
new file mode 100644
index 000000000..67e407a41
Binary files /dev/null and b/indra/newview/skins/Blackred/textures/move_forward_out.tga differ
diff --git a/indra/newview/skins/Blackred/textures/move_left_in.tga b/indra/newview/skins/Blackred/textures/move_left_in.tga
new file mode 100644
index 000000000..11109bff1
Binary files /dev/null and b/indra/newview/skins/Blackred/textures/move_left_in.tga differ
diff --git a/indra/newview/skins/Blackred/textures/move_left_out.tga b/indra/newview/skins/Blackred/textures/move_left_out.tga
new file mode 100644
index 000000000..a2ea88a82
Binary files /dev/null and b/indra/newview/skins/Blackred/textures/move_left_out.tga differ
diff --git a/indra/newview/skins/Blackred/textures/move_right_in.tga b/indra/newview/skins/Blackred/textures/move_right_in.tga
new file mode 100644
index 000000000..2634947d2
Binary files /dev/null and b/indra/newview/skins/Blackred/textures/move_right_in.tga differ
diff --git a/indra/newview/skins/Blackred/textures/move_right_out.tga b/indra/newview/skins/Blackred/textures/move_right_out.tga
new file mode 100644
index 000000000..cab385318
Binary files /dev/null and b/indra/newview/skins/Blackred/textures/move_right_out.tga differ
diff --git a/indra/newview/skins/Blackred/textures/move_turn_left_in.tga b/indra/newview/skins/Blackred/textures/move_turn_left_in.tga
new file mode 100644
index 000000000..5dc8a0e6b
Binary files /dev/null and b/indra/newview/skins/Blackred/textures/move_turn_left_in.tga differ
diff --git a/indra/newview/skins/Blackred/textures/move_turn_left_out.tga b/indra/newview/skins/Blackred/textures/move_turn_left_out.tga
new file mode 100644
index 000000000..00c4bfebe
Binary files /dev/null and b/indra/newview/skins/Blackred/textures/move_turn_left_out.tga differ
diff --git a/indra/newview/skins/Blackred/textures/move_turn_right_in.tga b/indra/newview/skins/Blackred/textures/move_turn_right_in.tga
new file mode 100644
index 000000000..17ddb7b72
Binary files /dev/null and b/indra/newview/skins/Blackred/textures/move_turn_right_in.tga differ
diff --git a/indra/newview/skins/Blackred/textures/move_turn_right_out.tga b/indra/newview/skins/Blackred/textures/move_turn_right_out.tga
new file mode 100644
index 000000000..c26cb2c2c
Binary files /dev/null and b/indra/newview/skins/Blackred/textures/move_turn_right_out.tga differ
diff --git a/indra/newview/skins/Blackred/textures/move_up_in.tga b/indra/newview/skins/Blackred/textures/move_up_in.tga
new file mode 100644
index 000000000..251a561bf
Binary files /dev/null and b/indra/newview/skins/Blackred/textures/move_up_in.tga differ
diff --git a/indra/newview/skins/Blackred/textures/move_up_out.tga b/indra/newview/skins/Blackred/textures/move_up_out.tga
new file mode 100644
index 000000000..e1e377d09
Binary files /dev/null and b/indra/newview/skins/Blackred/textures/move_up_out.tga differ
diff --git a/indra/newview/skins/Blackred/textures/notify_box_icon.tga b/indra/newview/skins/Blackred/textures/notify_box_icon.tga
new file mode 100644
index 000000000..880aca9b4
Binary files /dev/null and b/indra/newview/skins/Blackred/textures/notify_box_icon.tga differ
diff --git a/indra/newview/skins/Blackred/textures/notify_caution_icon.tga b/indra/newview/skins/Blackred/textures/notify_caution_icon.tga
new file mode 100644
index 000000000..ac6660c16
Binary files /dev/null and b/indra/newview/skins/Blackred/textures/notify_caution_icon.tga differ
diff --git a/indra/newview/skins/Blackred/textures/notify_next.png b/indra/newview/skins/Blackred/textures/notify_next.png
new file mode 100644
index 000000000..9b371e03e
Binary files /dev/null and b/indra/newview/skins/Blackred/textures/notify_next.png differ
diff --git a/indra/newview/skins/Blackred/textures/notify_tip_icon.tga b/indra/newview/skins/Blackred/textures/notify_tip_icon.tga
new file mode 100644
index 000000000..0451da099
Binary files /dev/null and b/indra/newview/skins/Blackred/textures/notify_tip_icon.tga differ
diff --git a/indra/newview/skins/Blackred/textures/object_cone.tga b/indra/newview/skins/Blackred/textures/object_cone.tga
new file mode 100644
index 000000000..943433322
Binary files /dev/null and b/indra/newview/skins/Blackred/textures/object_cone.tga differ
diff --git a/indra/newview/skins/Blackred/textures/object_cone_active.tga b/indra/newview/skins/Blackred/textures/object_cone_active.tga
new file mode 100644
index 000000000..44055b403
Binary files /dev/null and b/indra/newview/skins/Blackred/textures/object_cone_active.tga differ
diff --git a/indra/newview/skins/Blackred/textures/object_cube.tga b/indra/newview/skins/Blackred/textures/object_cube.tga
new file mode 100644
index 000000000..d62bdb89c
Binary files /dev/null and b/indra/newview/skins/Blackred/textures/object_cube.tga differ
diff --git a/indra/newview/skins/Blackred/textures/object_cube_active.tga b/indra/newview/skins/Blackred/textures/object_cube_active.tga
new file mode 100644
index 000000000..07ca2cd7c
Binary files /dev/null and b/indra/newview/skins/Blackred/textures/object_cube_active.tga differ
diff --git a/indra/newview/skins/Blackred/textures/object_cylinder.tga b/indra/newview/skins/Blackred/textures/object_cylinder.tga
new file mode 100644
index 000000000..82bf54261
Binary files /dev/null and b/indra/newview/skins/Blackred/textures/object_cylinder.tga differ
diff --git a/indra/newview/skins/Blackred/textures/object_cylinder_active.tga b/indra/newview/skins/Blackred/textures/object_cylinder_active.tga
new file mode 100644
index 000000000..2ab658cbb
Binary files /dev/null and b/indra/newview/skins/Blackred/textures/object_cylinder_active.tga differ
diff --git a/indra/newview/skins/Blackred/textures/object_grass.tga b/indra/newview/skins/Blackred/textures/object_grass.tga
new file mode 100644
index 000000000..6f91db20d
Binary files /dev/null and b/indra/newview/skins/Blackred/textures/object_grass.tga differ
diff --git a/indra/newview/skins/Blackred/textures/object_grass_active.tga b/indra/newview/skins/Blackred/textures/object_grass_active.tga
new file mode 100644
index 000000000..58f54ac9b
Binary files /dev/null and b/indra/newview/skins/Blackred/textures/object_grass_active.tga differ
diff --git a/indra/newview/skins/Blackred/textures/object_hemi_cone.tga b/indra/newview/skins/Blackred/textures/object_hemi_cone.tga
new file mode 100644
index 000000000..44ce6d4be
Binary files /dev/null and b/indra/newview/skins/Blackred/textures/object_hemi_cone.tga differ
diff --git a/indra/newview/skins/Blackred/textures/object_hemi_cone_active.tga b/indra/newview/skins/Blackred/textures/object_hemi_cone_active.tga
new file mode 100644
index 000000000..011206ec5
Binary files /dev/null and b/indra/newview/skins/Blackred/textures/object_hemi_cone_active.tga differ
diff --git a/indra/newview/skins/Blackred/textures/object_hemi_cylinder.tga b/indra/newview/skins/Blackred/textures/object_hemi_cylinder.tga
new file mode 100644
index 000000000..1d1eca748
Binary files /dev/null and b/indra/newview/skins/Blackred/textures/object_hemi_cylinder.tga differ
diff --git a/indra/newview/skins/Blackred/textures/object_hemi_cylinder_active.tga b/indra/newview/skins/Blackred/textures/object_hemi_cylinder_active.tga
new file mode 100644
index 000000000..24f68e9f9
Binary files /dev/null and b/indra/newview/skins/Blackred/textures/object_hemi_cylinder_active.tga differ
diff --git a/indra/newview/skins/Blackred/textures/object_hemi_sphere.tga b/indra/newview/skins/Blackred/textures/object_hemi_sphere.tga
new file mode 100644
index 000000000..fbce7dcfc
Binary files /dev/null and b/indra/newview/skins/Blackred/textures/object_hemi_sphere.tga differ
diff --git a/indra/newview/skins/Blackred/textures/object_hemi_sphere_active.tga b/indra/newview/skins/Blackred/textures/object_hemi_sphere_active.tga
new file mode 100644
index 000000000..a9a0e6939
Binary files /dev/null and b/indra/newview/skins/Blackred/textures/object_hemi_sphere_active.tga differ
diff --git a/indra/newview/skins/Blackred/textures/object_prism.tga b/indra/newview/skins/Blackred/textures/object_prism.tga
new file mode 100644
index 000000000..e5586d59e
Binary files /dev/null and b/indra/newview/skins/Blackred/textures/object_prism.tga differ
diff --git a/indra/newview/skins/Blackred/textures/object_prism_active.tga b/indra/newview/skins/Blackred/textures/object_prism_active.tga
new file mode 100644
index 000000000..961efc9bd
Binary files /dev/null and b/indra/newview/skins/Blackred/textures/object_prism_active.tga differ
diff --git a/indra/newview/skins/Blackred/textures/object_pyramid.tga b/indra/newview/skins/Blackred/textures/object_pyramid.tga
new file mode 100644
index 000000000..bbf8164ce
Binary files /dev/null and b/indra/newview/skins/Blackred/textures/object_pyramid.tga differ
diff --git a/indra/newview/skins/Blackred/textures/object_pyramid_active.tga b/indra/newview/skins/Blackred/textures/object_pyramid_active.tga
new file mode 100644
index 000000000..fec59ac62
Binary files /dev/null and b/indra/newview/skins/Blackred/textures/object_pyramid_active.tga differ
diff --git a/indra/newview/skins/Blackred/textures/object_ring.tga b/indra/newview/skins/Blackred/textures/object_ring.tga
new file mode 100644
index 000000000..37d242f41
Binary files /dev/null and b/indra/newview/skins/Blackred/textures/object_ring.tga differ
diff --git a/indra/newview/skins/Blackred/textures/object_ring_active.tga b/indra/newview/skins/Blackred/textures/object_ring_active.tga
new file mode 100644
index 000000000..ba9e01c81
Binary files /dev/null and b/indra/newview/skins/Blackred/textures/object_ring_active.tga differ
diff --git a/indra/newview/skins/Blackred/textures/object_sphere.tga b/indra/newview/skins/Blackred/textures/object_sphere.tga
new file mode 100644
index 000000000..3d6d9ca39
Binary files /dev/null and b/indra/newview/skins/Blackred/textures/object_sphere.tga differ
diff --git a/indra/newview/skins/Blackred/textures/object_sphere_active.tga b/indra/newview/skins/Blackred/textures/object_sphere_active.tga
new file mode 100644
index 000000000..201006ddb
Binary files /dev/null and b/indra/newview/skins/Blackred/textures/object_sphere_active.tga differ
diff --git a/indra/newview/skins/Blackred/textures/object_tetrahedron.tga b/indra/newview/skins/Blackred/textures/object_tetrahedron.tga
new file mode 100644
index 000000000..4808cb3f3
Binary files /dev/null and b/indra/newview/skins/Blackred/textures/object_tetrahedron.tga differ
diff --git a/indra/newview/skins/Blackred/textures/object_tetrahedron_active.tga b/indra/newview/skins/Blackred/textures/object_tetrahedron_active.tga
new file mode 100644
index 000000000..ddbf9ddfb
Binary files /dev/null and b/indra/newview/skins/Blackred/textures/object_tetrahedron_active.tga differ
diff --git a/indra/newview/skins/Blackred/textures/object_torus.tga b/indra/newview/skins/Blackred/textures/object_torus.tga
new file mode 100644
index 000000000..70154676b
Binary files /dev/null and b/indra/newview/skins/Blackred/textures/object_torus.tga differ
diff --git a/indra/newview/skins/Blackred/textures/object_torus_active.tga b/indra/newview/skins/Blackred/textures/object_torus_active.tga
new file mode 100644
index 000000000..99ef2666b
Binary files /dev/null and b/indra/newview/skins/Blackred/textures/object_torus_active.tga differ
diff --git a/indra/newview/skins/Blackred/textures/object_tree.tga b/indra/newview/skins/Blackred/textures/object_tree.tga
new file mode 100644
index 000000000..246ad80f6
Binary files /dev/null and b/indra/newview/skins/Blackred/textures/object_tree.tga differ
diff --git a/indra/newview/skins/Blackred/textures/object_tree_active.tga b/indra/newview/skins/Blackred/textures/object_tree_active.tga
new file mode 100644
index 000000000..1adf9c3f3
Binary files /dev/null and b/indra/newview/skins/Blackred/textures/object_tree_active.tga differ
diff --git a/indra/newview/skins/Blackred/textures/object_tube.tga b/indra/newview/skins/Blackred/textures/object_tube.tga
new file mode 100644
index 000000000..15e0a1c3d
Binary files /dev/null and b/indra/newview/skins/Blackred/textures/object_tube.tga differ
diff --git a/indra/newview/skins/Blackred/textures/object_tube_active.tga b/indra/newview/skins/Blackred/textures/object_tube_active.tga
new file mode 100644
index 000000000..d382e740e
Binary files /dev/null and b/indra/newview/skins/Blackred/textures/object_tube_active.tga differ
diff --git a/indra/newview/skins/Blackred/textures/preview.png b/indra/newview/skins/Blackred/textures/preview.png
new file mode 100644
index 000000000..294a6a03a
Binary files /dev/null and b/indra/newview/skins/Blackred/textures/preview.png differ
diff --git a/indra/newview/skins/Blackred/textures/progress_fill.tga b/indra/newview/skins/Blackred/textures/progress_fill.tga
new file mode 100644
index 000000000..bbdf5dd0b
Binary files /dev/null and b/indra/newview/skins/Blackred/textures/progress_fill.tga differ
diff --git a/indra/newview/skins/Blackred/textures/progressbar_fill.tga b/indra/newview/skins/Blackred/textures/progressbar_fill.tga
new file mode 100644
index 000000000..03601c432
Binary files /dev/null and b/indra/newview/skins/Blackred/textures/progressbar_fill.tga differ
diff --git a/indra/newview/skins/Blackred/textures/progressbar_track.tga b/indra/newview/skins/Blackred/textures/progressbar_track.tga
new file mode 100644
index 000000000..4b84e9ec9
Binary files /dev/null and b/indra/newview/skins/Blackred/textures/progressbar_track.tga differ
diff --git a/indra/newview/skins/Blackred/textures/ptt_lock_off.tga b/indra/newview/skins/Blackred/textures/ptt_lock_off.tga
new file mode 100644
index 000000000..d66f49840
Binary files /dev/null and b/indra/newview/skins/Blackred/textures/ptt_lock_off.tga differ
diff --git a/indra/newview/skins/Blackred/textures/ptt_lock_on.tga b/indra/newview/skins/Blackred/textures/ptt_lock_on.tga
new file mode 100644
index 000000000..432db2f00
Binary files /dev/null and b/indra/newview/skins/Blackred/textures/ptt_lock_on.tga differ
diff --git a/indra/newview/skins/Blackred/textures/radio_active_false.tga b/indra/newview/skins/Blackred/textures/radio_active_false.tga
new file mode 100644
index 000000000..c3a3c2951
Binary files /dev/null and b/indra/newview/skins/Blackred/textures/radio_active_false.tga differ
diff --git a/indra/newview/skins/Blackred/textures/radio_active_true.tga b/indra/newview/skins/Blackred/textures/radio_active_true.tga
new file mode 100644
index 000000000..9c03e4f16
Binary files /dev/null and b/indra/newview/skins/Blackred/textures/radio_active_true.tga differ
diff --git a/indra/newview/skins/Blackred/textures/radio_inactive_false.tga b/indra/newview/skins/Blackred/textures/radio_inactive_false.tga
new file mode 100644
index 000000000..5154d2511
Binary files /dev/null and b/indra/newview/skins/Blackred/textures/radio_inactive_false.tga differ
diff --git a/indra/newview/skins/Blackred/textures/radio_inactive_true.tga b/indra/newview/skins/Blackred/textures/radio_inactive_true.tga
new file mode 100644
index 000000000..c1b5c829f
Binary files /dev/null and b/indra/newview/skins/Blackred/textures/radio_inactive_true.tga differ
diff --git a/indra/newview/skins/Blackred/textures/resize_handle_bottom_right_blue.tga b/indra/newview/skins/Blackred/textures/resize_handle_bottom_right_blue.tga
new file mode 100644
index 000000000..8290bfa65
Binary files /dev/null and b/indra/newview/skins/Blackred/textures/resize_handle_bottom_right_blue.tga differ
diff --git a/indra/newview/skins/Blackred/textures/restore.tga b/indra/newview/skins/Blackred/textures/restore.tga
new file mode 100644
index 000000000..5e369fdfc
Binary files /dev/null and b/indra/newview/skins/Blackred/textures/restore.tga differ
diff --git a/indra/newview/skins/Blackred/textures/restore_inactive.tga b/indra/newview/skins/Blackred/textures/restore_inactive.tga
new file mode 100644
index 000000000..ce545d90d
Binary files /dev/null and b/indra/newview/skins/Blackred/textures/restore_inactive.tga differ
diff --git a/indra/newview/skins/Blackred/textures/restore_pressed.tga b/indra/newview/skins/Blackred/textures/restore_pressed.tga
new file mode 100644
index 000000000..8a25087be
Binary files /dev/null and b/indra/newview/skins/Blackred/textures/restore_pressed.tga differ
diff --git a/indra/newview/skins/Blackred/textures/rounded_square.j2c b/indra/newview/skins/Blackred/textures/rounded_square.j2c
new file mode 100644
index 000000000..c3dfe8f10
Binary files /dev/null and b/indra/newview/skins/Blackred/textures/rounded_square.j2c differ
diff --git a/indra/newview/skins/Blackred/textures/rounded_square.tga b/indra/newview/skins/Blackred/textures/rounded_square.tga
new file mode 100644
index 000000000..4f4bf05f8
Binary files /dev/null and b/indra/newview/skins/Blackred/textures/rounded_square.tga differ
diff --git a/indra/newview/skins/Blackred/textures/rounded_square_soft.tga b/indra/newview/skins/Blackred/textures/rounded_square_soft.tga
new file mode 100644
index 000000000..4f4bf05f8
Binary files /dev/null and b/indra/newview/skins/Blackred/textures/rounded_square_soft.tga differ
diff --git a/indra/newview/skins/Blackred/textures/script_error.j2c b/indra/newview/skins/Blackred/textures/script_error.j2c
new file mode 100644
index 000000000..ad6be04a7
Binary files /dev/null and b/indra/newview/skins/Blackred/textures/script_error.j2c differ
diff --git a/indra/newview/skins/Blackred/textures/script_error.tga b/indra/newview/skins/Blackred/textures/script_error.tga
new file mode 100644
index 000000000..8fa12e711
Binary files /dev/null and b/indra/newview/skins/Blackred/textures/script_error.tga differ
diff --git a/indra/newview/skins/Blackred/textures/scrollbutton_down_in_blue.tga b/indra/newview/skins/Blackred/textures/scrollbutton_down_in_blue.tga
new file mode 100644
index 000000000..3c01e32d2
Binary files /dev/null and b/indra/newview/skins/Blackred/textures/scrollbutton_down_in_blue.tga differ
diff --git a/indra/newview/skins/Blackred/textures/scrollbutton_down_out_blue.tga b/indra/newview/skins/Blackred/textures/scrollbutton_down_out_blue.tga
new file mode 100644
index 000000000..3c01e32d2
Binary files /dev/null and b/indra/newview/skins/Blackred/textures/scrollbutton_down_out_blue.tga differ
diff --git a/indra/newview/skins/Blackred/textures/scrollbutton_left_in_blue.tga b/indra/newview/skins/Blackred/textures/scrollbutton_left_in_blue.tga
new file mode 100644
index 000000000..6e2de5448
Binary files /dev/null and b/indra/newview/skins/Blackred/textures/scrollbutton_left_in_blue.tga differ
diff --git a/indra/newview/skins/Blackred/textures/scrollbutton_left_out_blue.tga b/indra/newview/skins/Blackred/textures/scrollbutton_left_out_blue.tga
new file mode 100644
index 000000000..6e2de5448
Binary files /dev/null and b/indra/newview/skins/Blackred/textures/scrollbutton_left_out_blue.tga differ
diff --git a/indra/newview/skins/Blackred/textures/scrollbutton_right_in_blue.tga b/indra/newview/skins/Blackred/textures/scrollbutton_right_in_blue.tga
new file mode 100644
index 000000000..bd5b99a6e
Binary files /dev/null and b/indra/newview/skins/Blackred/textures/scrollbutton_right_in_blue.tga differ
diff --git a/indra/newview/skins/Blackred/textures/scrollbutton_right_out_blue.tga b/indra/newview/skins/Blackred/textures/scrollbutton_right_out_blue.tga
new file mode 100644
index 000000000..bd5b99a6e
Binary files /dev/null and b/indra/newview/skins/Blackred/textures/scrollbutton_right_out_blue.tga differ
diff --git a/indra/newview/skins/Blackred/textures/scrollbutton_up_in_blue.tga b/indra/newview/skins/Blackred/textures/scrollbutton_up_in_blue.tga
new file mode 100644
index 000000000..e513eb409
Binary files /dev/null and b/indra/newview/skins/Blackred/textures/scrollbutton_up_in_blue.tga differ
diff --git a/indra/newview/skins/Blackred/textures/scrollbutton_up_out_blue.tga b/indra/newview/skins/Blackred/textures/scrollbutton_up_out_blue.tga
new file mode 100644
index 000000000..e513eb409
Binary files /dev/null and b/indra/newview/skins/Blackred/textures/scrollbutton_up_out_blue.tga differ
diff --git a/indra/newview/skins/Blackred/textures/sm_rounded_corners_simple.tga b/indra/newview/skins/Blackred/textures/sm_rounded_corners_simple.tga
new file mode 100644
index 000000000..054fdd39a
Binary files /dev/null and b/indra/newview/skins/Blackred/textures/sm_rounded_corners_simple.tga differ
diff --git a/indra/newview/skins/Blackred/textures/spin_down_in_blue.tga b/indra/newview/skins/Blackred/textures/spin_down_in_blue.tga
new file mode 100644
index 000000000..c52fbce3a
Binary files /dev/null and b/indra/newview/skins/Blackred/textures/spin_down_in_blue.tga differ
diff --git a/indra/newview/skins/Blackred/textures/spin_down_out_blue.tga b/indra/newview/skins/Blackred/textures/spin_down_out_blue.tga
new file mode 100644
index 000000000..1af2ed9cb
Binary files /dev/null and b/indra/newview/skins/Blackred/textures/spin_down_out_blue.tga differ
diff --git a/indra/newview/skins/Blackred/textures/spin_up_in_blue.tga b/indra/newview/skins/Blackred/textures/spin_up_in_blue.tga
new file mode 100644
index 000000000..03e45db36
Binary files /dev/null and b/indra/newview/skins/Blackred/textures/spin_up_in_blue.tga differ
diff --git a/indra/newview/skins/Blackred/textures/spin_up_out_blue.tga b/indra/newview/skins/Blackred/textures/spin_up_out_blue.tga
new file mode 100644
index 000000000..9a9bc6468
Binary files /dev/null and b/indra/newview/skins/Blackred/textures/spin_up_out_blue.tga differ
diff --git a/indra/newview/skins/Blackred/textures/square_btn_32x128.tga b/indra/newview/skins/Blackred/textures/square_btn_32x128.tga
new file mode 100644
index 000000000..d23d413aa
Binary files /dev/null and b/indra/newview/skins/Blackred/textures/square_btn_32x128.tga differ
diff --git a/indra/newview/skins/Blackred/textures/square_btn_selected_32x128.tga b/indra/newview/skins/Blackred/textures/square_btn_selected_32x128.tga
new file mode 100644
index 000000000..2f48098d2
Binary files /dev/null and b/indra/newview/skins/Blackred/textures/square_btn_selected_32x128.tga differ
diff --git a/indra/newview/skins/Blackred/textures/startup_logo.j2c b/indra/newview/skins/Blackred/textures/startup_logo.j2c
new file mode 100644
index 000000000..b28219f36
Binary files /dev/null and b/indra/newview/skins/Blackred/textures/startup_logo.j2c differ
diff --git a/indra/newview/skins/Blackred/textures/status_buy_currency.tga b/indra/newview/skins/Blackred/textures/status_buy_currency.tga
new file mode 100644
index 000000000..f4a28b32b
Binary files /dev/null and b/indra/newview/skins/Blackred/textures/status_buy_currency.tga differ
diff --git a/indra/newview/skins/Blackred/textures/status_buy_currency_pressed.tga b/indra/newview/skins/Blackred/textures/status_buy_currency_pressed.tga
new file mode 100644
index 000000000..f4a28b32b
Binary files /dev/null and b/indra/newview/skins/Blackred/textures/status_buy_currency_pressed.tga differ
diff --git a/indra/newview/skins/Blackred/textures/status_buy_land.tga b/indra/newview/skins/Blackred/textures/status_buy_land.tga
new file mode 100644
index 000000000..60c395c03
Binary files /dev/null and b/indra/newview/skins/Blackred/textures/status_buy_land.tga differ
diff --git a/indra/newview/skins/Blackred/textures/status_buy_land_pressed.tga b/indra/newview/skins/Blackred/textures/status_buy_land_pressed.tga
new file mode 100644
index 000000000..60c395c03
Binary files /dev/null and b/indra/newview/skins/Blackred/textures/status_buy_land_pressed.tga differ
diff --git a/indra/newview/skins/Blackred/textures/status_health.tga b/indra/newview/skins/Blackred/textures/status_health.tga
new file mode 100644
index 000000000..f5eefc5a9
Binary files /dev/null and b/indra/newview/skins/Blackred/textures/status_health.tga differ
diff --git a/indra/newview/skins/Blackred/textures/status_no_build.tga b/indra/newview/skins/Blackred/textures/status_no_build.tga
new file mode 100644
index 000000000..41934a600
Binary files /dev/null and b/indra/newview/skins/Blackred/textures/status_no_build.tga differ
diff --git a/indra/newview/skins/Blackred/textures/status_no_fly.tga b/indra/newview/skins/Blackred/textures/status_no_fly.tga
new file mode 100644
index 000000000..0aa7fa71d
Binary files /dev/null and b/indra/newview/skins/Blackred/textures/status_no_fly.tga differ
diff --git a/indra/newview/skins/Blackred/textures/status_no_push.tga b/indra/newview/skins/Blackred/textures/status_no_push.tga
new file mode 100644
index 000000000..6d5987217
Binary files /dev/null and b/indra/newview/skins/Blackred/textures/status_no_push.tga differ
diff --git a/indra/newview/skins/Blackred/textures/status_no_scripts.tga b/indra/newview/skins/Blackred/textures/status_no_scripts.tga
new file mode 100644
index 000000000..3bce6ad6f
Binary files /dev/null and b/indra/newview/skins/Blackred/textures/status_no_scripts.tga differ
diff --git a/indra/newview/skins/Blackred/textures/status_no_voice.tga b/indra/newview/skins/Blackred/textures/status_no_voice.tga
new file mode 100644
index 000000000..aeeed6ed0
Binary files /dev/null and b/indra/newview/skins/Blackred/textures/status_no_voice.tga differ
diff --git a/indra/newview/skins/Blackred/textures/status_script_debug.tga b/indra/newview/skins/Blackred/textures/status_script_debug.tga
new file mode 100644
index 000000000..7d895eb0a
Binary files /dev/null and b/indra/newview/skins/Blackred/textures/status_script_debug.tga differ
diff --git a/indra/newview/skins/Blackred/textures/status_search_btn.png b/indra/newview/skins/Blackred/textures/status_search_btn.png
new file mode 100644
index 000000000..f6db36fbc
Binary files /dev/null and b/indra/newview/skins/Blackred/textures/status_search_btn.png differ
diff --git a/indra/newview/skins/Blackred/textures/status_search_btn_pressed.png b/indra/newview/skins/Blackred/textures/status_search_btn_pressed.png
new file mode 100644
index 000000000..c19945885
Binary files /dev/null and b/indra/newview/skins/Blackred/textures/status_search_btn_pressed.png differ
diff --git a/indra/newview/skins/Blackred/textures/status_voice.tga b/indra/newview/skins/Blackred/textures/status_voice.tga
new file mode 100644
index 000000000..aeeed6ed0
Binary files /dev/null and b/indra/newview/skins/Blackred/textures/status_voice.tga differ
diff --git a/indra/newview/skins/Blackred/textures/tab_bottom_blue.tga b/indra/newview/skins/Blackred/textures/tab_bottom_blue.tga
new file mode 100644
index 000000000..e6de7a5a1
Binary files /dev/null and b/indra/newview/skins/Blackred/textures/tab_bottom_blue.tga differ
diff --git a/indra/newview/skins/Blackred/textures/tab_bottom_selected_blue.tga b/indra/newview/skins/Blackred/textures/tab_bottom_selected_blue.tga
new file mode 100644
index 000000000..ae38121e0
Binary files /dev/null and b/indra/newview/skins/Blackred/textures/tab_bottom_selected_blue.tga differ
diff --git a/indra/newview/skins/Blackred/textures/tab_left.tga b/indra/newview/skins/Blackred/textures/tab_left.tga
new file mode 100644
index 000000000..db15d2734
Binary files /dev/null and b/indra/newview/skins/Blackred/textures/tab_left.tga differ
diff --git a/indra/newview/skins/Blackred/textures/tab_left_selected.tga b/indra/newview/skins/Blackred/textures/tab_left_selected.tga
new file mode 100644
index 000000000..212e58575
Binary files /dev/null and b/indra/newview/skins/Blackred/textures/tab_left_selected.tga differ
diff --git a/indra/newview/skins/Blackred/textures/tab_top_blue.tga b/indra/newview/skins/Blackred/textures/tab_top_blue.tga
new file mode 100644
index 000000000..ddcd519f2
Binary files /dev/null and b/indra/newview/skins/Blackred/textures/tab_top_blue.tga differ
diff --git a/indra/newview/skins/Blackred/textures/tab_top_selected_blue.tga b/indra/newview/skins/Blackred/textures/tab_top_selected_blue.tga
new file mode 100644
index 000000000..93a5695a6
Binary files /dev/null and b/indra/newview/skins/Blackred/textures/tab_top_selected_blue.tga differ
diff --git a/indra/newview/skins/Blackred/textures/tearoff_pressed.tga b/indra/newview/skins/Blackred/textures/tearoff_pressed.tga
new file mode 100644
index 000000000..8581ab701
Binary files /dev/null and b/indra/newview/skins/Blackred/textures/tearoff_pressed.tga differ
diff --git a/indra/newview/skins/Blackred/textures/tearoffbox.tga b/indra/newview/skins/Blackred/textures/tearoffbox.tga
new file mode 100644
index 000000000..27af31c4d
Binary files /dev/null and b/indra/newview/skins/Blackred/textures/tearoffbox.tga differ
diff --git a/indra/newview/skins/Blackred/textures/textures.xml b/indra/newview/skins/Blackred/textures/textures.xml
new file mode 100644
index 000000000..5955a8ede
--- /dev/null
+++ b/indra/newview/skins/Blackred/textures/textures.xml
@@ -0,0 +1,385 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/indra/newview/skins/Blackred/textures/tool_dozer.tga b/indra/newview/skins/Blackred/textures/tool_dozer.tga
new file mode 100644
index 000000000..a8814a1ac
Binary files /dev/null and b/indra/newview/skins/Blackred/textures/tool_dozer.tga differ
diff --git a/indra/newview/skins/Blackred/textures/tool_dozer_active.tga b/indra/newview/skins/Blackred/textures/tool_dozer_active.tga
new file mode 100644
index 000000000..40557c9cb
Binary files /dev/null and b/indra/newview/skins/Blackred/textures/tool_dozer_active.tga differ
diff --git a/indra/newview/skins/Blackred/textures/tool_zoom.tga b/indra/newview/skins/Blackred/textures/tool_zoom.tga
new file mode 100644
index 000000000..3ebbe4fcd
Binary files /dev/null and b/indra/newview/skins/Blackred/textures/tool_zoom.tga differ
diff --git a/indra/newview/skins/Blackred/textures/tool_zoom_active.tga b/indra/newview/skins/Blackred/textures/tool_zoom_active.tga
new file mode 100644
index 000000000..df1b379e9
Binary files /dev/null and b/indra/newview/skins/Blackred/textures/tool_zoom_active.tga differ
diff --git a/indra/newview/skins/Blackred/textures/toolbar_bg.tga b/indra/newview/skins/Blackred/textures/toolbar_bg.tga
new file mode 100644
index 000000000..bddb1f41c
Binary files /dev/null and b/indra/newview/skins/Blackred/textures/toolbar_bg.tga differ
diff --git a/indra/newview/skins/Blackred/textures/toolbar_btn_disabled.tga b/indra/newview/skins/Blackred/textures/toolbar_btn_disabled.tga
new file mode 100644
index 000000000..9e7f3744d
Binary files /dev/null and b/indra/newview/skins/Blackred/textures/toolbar_btn_disabled.tga differ
diff --git a/indra/newview/skins/Blackred/textures/toolbar_btn_enabled.tga b/indra/newview/skins/Blackred/textures/toolbar_btn_enabled.tga
new file mode 100644
index 000000000..9e7f3744d
Binary files /dev/null and b/indra/newview/skins/Blackred/textures/toolbar_btn_enabled.tga differ
diff --git a/indra/newview/skins/Blackred/textures/toolbar_btn_selected.tga b/indra/newview/skins/Blackred/textures/toolbar_btn_selected.tga
new file mode 100644
index 000000000..d37f2d872
Binary files /dev/null and b/indra/newview/skins/Blackred/textures/toolbar_btn_selected.tga differ
diff --git a/indra/newview/skins/Blackred/textures/toolbar_tab.tga b/indra/newview/skins/Blackred/textures/toolbar_tab.tga
new file mode 100644
index 000000000..a79d8bc43
Binary files /dev/null and b/indra/newview/skins/Blackred/textures/toolbar_tab.tga differ
diff --git a/indra/newview/skins/Blackred/textures/up_arrow.png b/indra/newview/skins/Blackred/textures/up_arrow.png
new file mode 100644
index 000000000..6beea5fd7
Binary files /dev/null and b/indra/newview/skins/Blackred/textures/up_arrow.png differ
diff --git a/indra/newview/skins/apollo/colors.xml b/indra/newview/skins/apollo/colors.xml
index 434115514..eb3cbaeb0 100644
--- a/indra/newview/skins/apollo/colors.xml
+++ b/indra/newview/skins/apollo/colors.xml
@@ -152,7 +152,7 @@
-
+
diff --git a/indra/newview/skins/blackdark.xml b/indra/newview/skins/blackdark.xml
new file mode 100644
index 000000000..8f83e11f1
--- /dev/null
+++ b/indra/newview/skins/blackdark.xml
@@ -0,0 +1,14 @@
+
+
+ skin_name
+ Black Dark
+ author_name
+ Unknown
+ additional_author_names
+ Linden Lab
+ skin_info
+
+ folder_name
+ Blackdark
+
+
diff --git a/indra/newview/skins/blacklightblue.xml b/indra/newview/skins/blacklightblue.xml
new file mode 100644
index 000000000..8ade2a477
--- /dev/null
+++ b/indra/newview/skins/blacklightblue.xml
@@ -0,0 +1,14 @@
+
+
+ skin_name
+ Black Light Blue
+ author_name
+ Chalice Yao
+ additional_author_names
+ JB Kraft, Linden Lab
+ skin_info
+
+ folder_name
+ Blacklightblue
+
+
diff --git a/indra/newview/skins/blackred.xml b/indra/newview/skins/blackred.xml
new file mode 100644
index 000000000..93a2ed074
--- /dev/null
+++ b/indra/newview/skins/blackred.xml
@@ -0,0 +1,14 @@
+
+
+ skin_name
+ Black Red
+ author_name
+ LordGregGreg Back
+ additional_author_names
+ Chalice Yao, JB Kraft, Linden Lab
+ skin_info
+
+ folder_name
+ Blackred
+
+
diff --git a/indra/newview/skins/default/xui/en-us/floater_inventory.xml b/indra/newview/skins/default/xui/en-us/floater_inventory.xml
index aa860ce0b..28da7d9a7 100644
--- a/indra/newview/skins/default/xui/en-us/floater_inventory.xml
+++ b/indra/newview/skins/default/xui/en-us/floater_inventory.xml
@@ -190,6 +190,10 @@
+
+
+
diff --git a/indra/newview/skins/default/xui/en-us/panel_media_remote_expanded.xml b/indra/newview/skins/default/xui/en-us/panel_media_remote_expanded.xml
index 726653614..94702ca97 100644
--- a/indra/newview/skins/default/xui/en-us/panel_media_remote_expanded.xml
+++ b/indra/newview/skins/default/xui/en-us/panel_media_remote_expanded.xml
@@ -15,6 +15,9 @@
Pause
+ Title
+ Artist
+ Now playing
No Media Specified
diff --git a/indra/newview/skins/default/xui/en-us/panel_preferences_ascent_chat.xml b/indra/newview/skins/default/xui/en-us/panel_preferences_ascent_chat.xml
index 4517105a2..f912135af 100644
--- a/indra/newview/skins/default/xui/en-us/panel_preferences_ascent_chat.xml
+++ b/indra/newview/skins/default/xui/en-us/panel_preferences_ascent_chat.xml
@@ -6,12 +6,11 @@
IMs:
+
-
-
-
+
+
-
+
+
+
@@ -40,6 +42,11 @@
+ Use colors for chat:
+
+
+
+
diff --git a/indra/newview/skins/default/xui/en-us/strings.xml b/indra/newview/skins/default/xui/en-us/strings.xml
index 1570f8114..43a32c59d 100644
--- a/indra/newview/skins/default/xui/en-us/strings.xml
+++ b/indra/newview/skins/default/xui/en-us/strings.xml
@@ -2946,6 +2946,9 @@ Where tag = tag string to match. Removes bot's matching the tag.
Currently set to an item not on this account
Not logged in
+
+ took a snapshot
+
Not Away
Away
diff --git a/indra/newview/skins/default/xui/es/floater_about.xml b/indra/newview/skins/default/xui/es/floater_about.xml
index 5ea3ab9b8..285988210 100644
--- a/indra/newview/skins/default/xui/es/floater_about.xml
+++ b/indra/newview/skins/default/xui/es/floater_about.xml
@@ -7,7 +7,7 @@
-
+
Estás en [POSITION]
diff --git a/indra/newview/skins/default/xui/es/floater_about_land.xml b/indra/newview/skins/default/xui/es/floater_about_land.xml
index d376e512b..857acecb2 100644
--- a/indra/newview/skins/default/xui/es/floater_about_land.xml
+++ b/indra/newview/skins/default/xui/es/floater_about_land.xml
@@ -75,7 +75,7 @@
-
+
@@ -251,6 +251,8 @@ Ve al Menú Mundo > Acerca del terreno o selecciona otra parcela para ver sus
Autoretorno de objetos a otros residentes (minutos; 0 para desactivar):
+
Propietarios de los objetos:
@@ -291,7 +293,7 @@ Ve al Menú Mundo > Acerca del terreno o selecciona otra parcela para ver sus
Opciones del terreno:
-
+
Permitir que aparezca esta parcela en los resultados de la búsqueda
@@ -413,7 +415,6 @@ Sólo las parcelas más grandes pueden listarse en la búsqueda.
Permitir a residentes en otras parcelas:
-
Foto:
@@ -503,7 +504,7 @@ Selecciona la miniatura para elegir una textura diferente.
- Música:
+ Sonido:
diff --git a/indra/newview/skins/default/xui/es/floater_day_cycle_options.xml b/indra/newview/skins/default/xui/es/floater_day_cycle_options.xml
index 24f65d541..d10df252d 100644
--- a/indra/newview/skins/default/xui/es/floater_day_cycle_options.xml
+++ b/indra/newview/skins/default/xui/es/floater_day_cycle_options.xml
@@ -57,8 +57,8 @@
|
-
-
+
+
Configuración fotográma clave:
diff --git a/indra/newview/skins/default/xui/es/floater_directory.xml b/indra/newview/skins/default/xui/es/floater_directory.xml
index 325e472a4..28c71c729 100644
--- a/indra/newview/skins/default/xui/es/floater_directory.xml
+++ b/indra/newview/skins/default/xui/es/floater_directory.xml
@@ -63,7 +63,7 @@
-
+
Cualquier Categoría
@@ -239,14 +239,16 @@ subasta. Para comprarlo directamente, visítalo y pulsa en el nombre del terreno
En Venta - Estado
-
+
[CURRENCY]
-
-
+
+
m²
+
+
diff --git a/indra/newview/skins/default/xui/es/floater_post_process.xml b/indra/newview/skins/default/xui/es/floater_post_process.xml
index 3702fa168..092678f42 100644
--- a/indra/newview/skins/default/xui/es/floater_post_process.xml
+++ b/indra/newview/skins/default/xui/es/floater_post_process.xml
@@ -28,68 +28,68 @@
-
-
-
+
+
+
Pasos a aplicar
-
+
-
-
-
+
+
+
Amplificación Múltiple de luz
-
-
+
+
Tamaño del Ruido
-
-
+
+
Fuerza del Ruido
-
+
-
-
+
+
Número de Capa
-
+
-
-
-
+
+
+
Intensidad desenfoque
-
+
-
-
-
+
+
+
Intensidad
-
-
+
+
Radio
-
-
+
+
Oscuridad
-
-
+
+
Intensidad de Desaturación
-
-
+
+
Aberración Cromática
-
+
-
+
diff --git a/indra/newview/skins/default/xui/es/floater_radar.xml b/indra/newview/skins/default/xui/es/floater_radar.xml
index 32bad7e50..1e6386dd6 100644
--- a/indra/newview/skins/default/xui/es/floater_radar.xml
+++ b/indra/newview/skins/default/xui/es/floater_radar.xml
@@ -1,5 +1,8 @@
+ Radar
+ Radar (1 Avatar)
+ Radar ([COUNT] Avatares)
@@ -7,6 +10,8 @@
+
+
@@ -29,19 +34,19 @@
-
+
-
+
-
+
@@ -51,9 +56,9 @@
-
+
-
+
@@ -74,10 +79,33 @@
+
+
+
+
+ Ocultar Columnas:
+
+
+
+
+
+
+
+
+ Moviéndose
+ Ejecutando un Gesto
+ Ejecutando un sonido
+ Rezeando objectos
+ Emitiendo partículas
+ Recién Llegado
+ Escribiendo
+ ha disparado el Alerta de Edad de Avatar
+ [NAME] [ACTION] [RANGE].
ha entrado en
se ha retirado de
+
este sim
la distancia de dibujo
la distancia de grito
diff --git a/indra/newview/skins/default/xui/es/floater_snapshot.xml b/indra/newview/skins/default/xui/es/floater_snapshot.xml
index 5ee5f1fd6..38acc6a11 100644
--- a/indra/newview/skins/default/xui/es/floater_snapshot.xml
+++ b/indra/newview/skins/default/xui/es/floater_snapshot.xml
@@ -123,10 +123,10 @@
Profundidad
-
-
+
+
-
+
diff --git a/indra/newview/skins/default/xui/es/floater_tools.xml b/indra/newview/skins/default/xui/es/floater_tools.xml
index 54a153485..d9ea51d1f 100644
--- a/indra/newview/skins/default/xui/es/floater_tools.xml
+++ b/indra/newview/skins/default/xui/es/floater_tools.xml
@@ -3,11 +3,11 @@
-
-
-
-
-
+
+
+
+
+
@@ -32,7 +32,7 @@
Regla:
-
+
Mundo
@@ -117,29 +117,29 @@
Thrax Linden
-
+
Propietario:
Thrax Linden
-
+
- Último Propietario:
+ Últ.Propietario:
Thrax Linden
-
+
Grupo:
The Lindens
-
-
+
+
Permisos:
@@ -530,9 +530,9 @@
-
-
Tipo de Forma Física:
@@ -673,13 +673,13 @@
Alinear textura para Media
(Se debe subir primero)
-
+
Parámetros
de Textura
-
-
+
+
@@ -736,7 +736,7 @@ name="button abandon land"/>
Pulsa y arrastra para cambiar la vista
- Arrastrar para moverDrag , Ctrl Vertical, Ctrl-Mayús para girar
+ Arrastrar para mover, Ctrl Vertical, Ctrl-Mayús para girar
Pulsa en el mundo para construir
diff --git a/indra/newview/skins/default/xui/es/menu_viewer.xml b/indra/newview/skins/default/xui/es/menu_viewer.xml
index 7d24bc22a..2b4ae3fee 100644
--- a/indra/newview/skins/default/xui/es/menu_viewer.xml
+++ b/indra/newview/skins/default/xui/es/menu_viewer.xml
@@ -175,6 +175,7 @@
+
Terreno propiedad del grupo
- /text>
+
@@ -23,7 +23,7 @@
-
+
Contribución Total:
diff --git a/indra/newview/skins/default/xui/es/panel_media_remote_expanded.xml b/indra/newview/skins/default/xui/es/panel_media_remote_expanded.xml
index 8bd40ca20..ed6868f9a 100644
--- a/indra/newview/skins/default/xui/es/panel_media_remote_expanded.xml
+++ b/indra/newview/skins/default/xui/es/panel_media_remote_expanded.xml
@@ -1,8 +1,6 @@
-
-
Reproducir
@@ -12,6 +10,15 @@
Pausa
+
+ Título
+
+
+ Artista
+
+
+ Ejecutándose ahora
+
No se ha especificado media
diff --git a/indra/newview/skins/default/xui/es/panel_overlaybar.xml b/indra/newview/skins/default/xui/es/panel_overlaybar.xml
index 39bd65025..c29157bef 100644
--- a/indra/newview/skins/default/xui/es/panel_overlaybar.xml
+++ b/indra/newview/skins/default/xui/es/panel_overlaybar.xml
@@ -27,7 +27,7 @@
-
+
diff --git a/indra/newview/skins/default/xui/es/panel_preferences_ascent_system.xml b/indra/newview/skins/default/xui/es/panel_preferences_ascent_system.xml
index 453b4231a..f37bf0160 100644
--- a/indra/newview/skins/default/xui/es/panel_preferences_ascent_system.xml
+++ b/indra/newview/skins/default/xui/es/panel_preferences_ascent_system.xml
@@ -6,7 +6,8 @@
-
+
+
diff --git a/indra/newview/skins/default/xui/es/panel_preferences_ascent_vanity.xml b/indra/newview/skins/default/xui/es/panel_preferences_ascent_vanity.xml
index a93543b4f..f994779a7 100644
--- a/indra/newview/skins/default/xui/es/panel_preferences_ascent_vanity.xml
+++ b/indra/newview/skins/default/xui/es/panel_preferences_ascent_vanity.xml
@@ -7,7 +7,10 @@
-
+
+
+
+
diff --git a/indra/newview/skins/default/xui/es/panel_preferences_audio.xml b/indra/newview/skins/default/xui/es/panel_preferences_audio.xml
index dbf22303b..de7b9e524 100644
--- a/indra/newview/skins/default/xui/es/panel_preferences_audio.xml
+++ b/indra/newview/skins/default/xui/es/panel_preferences_audio.xml
@@ -15,8 +15,9 @@
-
-
-
-
+
+
+
+
+
diff --git a/indra/newview/skins/default/xui/es/panel_preferences_input.xml b/indra/newview/skins/default/xui/es/panel_preferences_input.xml
index 57f1c4646..731c94103 100644
--- a/indra/newview/skins/default/xui/es/panel_preferences_input.xml
+++ b/indra/newview/skins/default/xui/es/panel_preferences_input.xml
@@ -8,9 +8,11 @@
-
- Opciones de Vuelo:
+
+ Opciones de Movimiento:
+
+
Opciones de Cámara:
@@ -25,5 +27,6 @@
+
diff --git a/indra/newview/skins/default/xui/es/panel_top_pick.xml b/indra/newview/skins/default/xui/es/panel_top_pick.xml
index b8c4bebda..d6d8fc98e 100644
--- a/indra/newview/skins/default/xui/es/panel_top_pick.xml
+++ b/indra/newview/skins/default/xui/es/panel_top_pick.xml
@@ -1,8 +1,8 @@
-
-
+
+
Ordenar:
diff --git a/indra/newview/skins/default/xui/es/strings.xml b/indra/newview/skins/default/xui/es/strings.xml
index 751c0e87a..2bb878930 100644
--- a/indra/newview/skins/default/xui/es/strings.xml
+++ b/indra/newview/skins/default/xui/es/strings.xml
@@ -2817,6 +2817,9 @@ Where tag = tag string to match. Removes bot's matching the tag.
Un artículo no está en esta cuenta
Desconectado
+
+ ha tomado una fotografía
+
No ausente
Ausente
@@ -2918,7 +2921,8 @@ Arrastra carpetas a esta zona y pulsa "Enviar al Mercado" para listarlos y poner
Comprar
-
+
+
Piedra
Metal
diff --git a/indra/newview/skins/default/xui/es/wlfPanel_AdvSettings_expanded.xml b/indra/newview/skins/default/xui/es/wlfPanel_AdvSettings_expanded.xml
index e65851cea..e69815a84 100644
--- a/indra/newview/skins/default/xui/es/wlfPanel_AdvSettings_expanded.xml
+++ b/indra/newview/skins/default/xui/es/wlfPanel_AdvSettings_expanded.xml
@@ -1,11 +1,11 @@
-
-
+
+
-
+
@@ -14,7 +14,7 @@
-
+
diff --git a/indra/newview/skins/gemini/colors.xml b/indra/newview/skins/gemini/colors.xml
index 331979419..f7afd3e12 100644
--- a/indra/newview/skins/gemini/colors.xml
+++ b/indra/newview/skins/gemini/colors.xml
@@ -151,7 +151,7 @@
-
+