Second Life viewer sources 1.20.14

author: Jacek Antonelli 2008-08-15 23:46:01 -0500
committer: Jacek Antonelli 2008-08-15 23:46:01 -0500
commit: ae88605f72ef43be7b619b8c1c11a508ebae5057 (patch)
tree: f27474fe2d1186124211e2a5b2ad31927a3ab5bc /linden
parent: Second Life viewer sources 1.20.13 (diff)
download: meta-impy-ae88605f72ef43be7b619b8c1c11a508ebae5057.zip
meta-impy-ae88605f72ef43be7b619b8c1c11a508ebae5057.tar.gz
meta-impy-ae88605f72ef43be7b619b8c1c11a508ebae5057.tar.bz2
meta-impy-ae88605f72ef43be7b619b8c1c11a508ebae5057.tar.xz
63 files changed, 691 insertions, 301 deletions
diff --git a/linden/indra/llcommon/llversionviewer.h b/linden/indra/llcommon/llversionviewer.h
index c93718a..21f7286 100644
--- a/linden/indra/llcommon/llversionviewer.h
+++ b/linden/indra/llcommon/llversionviewer.h
@@ -34,7 +34,7 @@
 const S32 LL_VERSION_MAJOR = 1;
 const S32 LL_VERSION_MINOR = 20;
-const S32 LL_VERSION_PATCH = 13;
+const S32 LL_VERSION_PATCH = 14;
 const S32 LL_VERSION_BUILD = 0;
 const char * const LL_CHANNEL = "Second Life Release";
diff --git a/linden/indra/llui/llscrolllistctrl.h b/linden/indra/llui/llscrolllistctrl.h
index 8a31154..667a89a 100644
--- a/linden/indra/llui/llscrolllistctrl.h
+++ b/linden/indra/llui/llscrolllistctrl.h
@@ -212,7 +212,8 @@ public:
                mMaxContentWidth(0),
                mIndex(-1), 
                mParentCtrl(NULL), 
-                mHeader(NULL) 
+                mHeader(NULL),
+                mFontAlignment(LLFontGL::LEFT)
        { }
        LLScrollListColumn(const LLSD &sd)
@@ -256,6 +257,10 @@ public:
                {
                        mFontAlignment = (LLFontGL::HAlign)llclamp(sd.get("halign").asInteger(), (S32)LLFontGL::LEFT, (S32)LLFontGL::HCENTER);
                }
+                else
+                {
+                        mFontAlignment = LLFontGL::LEFT;
+                }
                mIndex = -1;
                mParentCtrl = NULL;
diff --git a/linden/indra/newview/app_settings/settings.xml b/linden/indra/newview/app_settings/settings.xml
index 4957948..e31c149 100644
--- a/linden/indra/newview/app_settings/settings.xml
+++ b/linden/indra/newview/app_settings/settings.xml
@@ -7714,6 +7714,17 @@
        <integer>4</integer>
      </array>
    </map>
+    <key>TutorialURL</key>
+    <map>
+      <key>Comment</key>
+      <string>URL for tutorial menu item, set automatically during login</string>
+      <key>Persist</key>
+      <integer>0</integer>
+      <key>Type</key>
+      <string>String</string>
+      <key>Value</key>
+      <string />
+    </map>
    <key>TypeAheadTimeout</key>
    <map>
      <key>Comment</key>
diff --git a/linden/indra/newview/app_settings/shaders/class1/objects/fullbrightF.glsl b/linden/indra/newview/app_settings/shaders/class1/objects/fullbrightF.glsl
index 1b0ffb9..1b0ffb9 100755..100644
--- a/linden/indra/newview/app_settings/shaders/class1/objects/fullbrightF.glsl
+++ b/linden/indra/newview/app_settings/shaders/class1/objects/fullbrightF.glsl
diff --git a/linden/indra/newview/app_settings/shaders/class1/objects/fullbrightShinyV.glsl b/linden/indra/newview/app_settings/shaders/class1/objects/fullbrightShinyV.glsl
index ba2aa02..ba2aa02 100755..100644
--- a/linden/indra/newview/app_settings/shaders/class1/objects/fullbrightShinyV.glsl
+++ b/linden/indra/newview/app_settings/shaders/class1/objects/fullbrightShinyV.glsl
diff --git a/linden/indra/newview/app_settings/shaders/class1/objects/fullbrightV.glsl b/linden/indra/newview/app_settings/shaders/class1/objects/fullbrightV.glsl
index e64ccb8..e64ccb8 100755..100644
--- a/linden/indra/newview/app_settings/shaders/class1/objects/fullbrightV.glsl
+++ b/linden/indra/newview/app_settings/shaders/class1/objects/fullbrightV.glsl
diff --git a/linden/indra/newview/app_settings/shaders/class1/objects/fullbrightWaterF.glsl b/linden/indra/newview/app_settings/shaders/class1/objects/fullbrightWaterF.glsl
index fd855aa..fd855aa 100755..100644
--- a/linden/indra/newview/app_settings/shaders/class1/objects/fullbrightWaterF.glsl
+++ b/linden/indra/newview/app_settings/shaders/class1/objects/fullbrightWaterF.glsl
diff --git a/linden/indra/newview/app_settings/shaders/class1/objects/shinyWaterF.glsl b/linden/indra/newview/app_settings/shaders/class1/objects/shinyWaterF.glsl
index 0a2a5f6..0a2a5f6 100755..100644
--- a/linden/indra/newview/app_settings/shaders/class1/objects/shinyWaterF.glsl
+++ b/linden/indra/newview/app_settings/shaders/class1/objects/shinyWaterF.glsl
diff --git a/linden/indra/newview/app_settings/shaders/class1/objects/simpleWaterF.glsl b/linden/indra/newview/app_settings/shaders/class1/objects/simpleWaterF.glsl
index e066b3d..e066b3d 100755..100644
--- a/linden/indra/newview/app_settings/shaders/class1/objects/simpleWaterF.glsl
+++ b/linden/indra/newview/app_settings/shaders/class1/objects/simpleWaterF.glsl
diff --git a/linden/indra/newview/app_settings/shaders/class2/environment/terrainWaterF.glsl b/linden/indra/newview/app_settings/shaders/class2/environment/terrainWaterF.glsl
index 3a98970..3a98970 100755..100644
--- a/linden/indra/newview/app_settings/shaders/class2/environment/terrainWaterF.glsl
+++ b/linden/indra/newview/app_settings/shaders/class2/environment/terrainWaterF.glsl
diff --git a/linden/indra/newview/app_settings/shaders/class2/objects/shinyV.glsl b/linden/indra/newview/app_settings/shaders/class2/objects/shinyV.glsl
index 0d52f32..0d52f32 100755..100644
--- a/linden/indra/newview/app_settings/shaders/class2/objects/shinyV.glsl
+++ b/linden/indra/newview/app_settings/shaders/class2/objects/shinyV.glsl
diff --git a/linden/indra/newview/installers/windows/installer_template.nsi b/linden/indra/newview/installers/windows/installer_template.nsi
index 836780d..d1c8d0c 100644
--- a/linden/indra/newview/installers/windows/installer_template.nsi
+++ b/linden/indra/newview/installers/windows/installer_template.nsi
@@ -111,6 +111,10 @@ Call RemoveNSIS					; Check for old NSIS install to remove
 Call RemoveOldShaders
 ;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
+;;; Need to clean out old XUI files that predate skinning
+Call RemoveOldXUI
+;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
 ;;; Files
 ;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
 ;; This placeholder is replaced by the complete list of all the files in the installer, by viewer_manifest.py
@@ -489,6 +493,22 @@ RMDir /r "$INSTDIR\app_settings\shaders\*"
 FunctionEnd
 ;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
+;;; Delete the installed XUI files
+;;; We've changed the directory hierarchy for skins, putting all XUI and texture
+;;; files under a specific skin directory, i.e. skins/default/xui/en-us as opposed
+;;; to skins/xui/en-us.  Need to clean up the old path when upgrading
+;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
+Function RemoveOldXUI
+;; remove old XUI and texture files
+RmDir /r "$INSTDIR\skins\html"
+RmDir /r "$INSTDIR\skins\xui"
+RmDir /r "$INSTDIR\skins\textures"
+Delete "$INSTDIR\skins\*.txt"
+FunctionEnd
+;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
 ; Delete files in Documents and Settings\<user>\SecondLife
 ; Delete files in Documents and Settings\All Users\SecondLife
 ;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
diff --git a/linden/indra/newview/llfloaterhud.cpp b/linden/indra/newview/llfloaterhud.cpp
index 8b34cb9..3ec08e3 100644
--- a/linden/indra/newview/llfloaterhud.cpp
+++ b/linden/indra/newview/llfloaterhud.cpp
@@ -39,7 +39,6 @@
 // statics 
 LLFloaterHUD* LLFloaterHUD::sInstance = 0; 
-std::string LLFloaterHUD::sTutorialUrl = "";
 ///----------------------------------------------------------------------------
 /// Class LLFloaterHUD
@@ -87,7 +86,9 @@ LLFloaterHUD::LLFloaterHUD()
                        language = gSavedSettings.getString("SystemLanguage");
                }
        
-                std::string url = sTutorialUrl + language + "/";
+                std::string base_url = gSavedSettings.getString("TutorialURL");
+                std::string url = base_url + language + "/";
                mWebBrowser->navigateTo(url);
        }
@@ -122,7 +123,7 @@ LLFloaterHUD::~LLFloaterHUD()
 void LLFloaterHUD::show()
 {
        // do not build the floater if there the url is empty
-        if (sTutorialUrl == "")
+        if (gSavedSettings.getString("TutorialURL") == "")
        {
                LLAlertDialog::showXml("TutorialNotFound");
                return;
diff --git a/linden/indra/newview/llfloaterhud.h b/linden/indra/newview/llfloaterhud.h
index 95c0f8d..a0b1d9f 100644
--- a/linden/indra/newview/llfloaterhud.h
+++ b/linden/indra/newview/llfloaterhud.h
@@ -49,8 +49,6 @@ public:
        static LLFloaterHUD* getInstance(); ///< get instance creating if necessary
        virtual ~LLFloaterHUD(); ///< virtual destructor
-        static std::string sTutorialUrl;
        static void show(); ///< show the HUD
        static void close(); ///< close the HUD (destroys floater)
diff --git a/linden/indra/newview/llfloaterpostcard.cpp b/linden/indra/newview/llfloaterpostcard.cpp
index b140b1c..fbd8e72 100644
--- a/linden/indra/newview/llfloaterpostcard.cpp
+++ b/linden/indra/newview/llfloaterpostcard.cpp
@@ -393,6 +393,8 @@ void LLFloaterPostcard::sendPostcard()
                gAssetStorage->storeAssetData(mTransactionID, LLAssetType::AT_IMAGE_JPEG, &uploadCallback, (void *)this, FALSE);
        }
+        // give user feedback of the event
+        gViewerWindow->playSnapshotAnimAndSound();
        LLUploadDialog::modalUploadDialog("Uploading...\n\nPostcard");
        // don't destroy the window until the upload is done
diff --git a/linden/indra/newview/llfloaterpreference.cpp b/linden/indra/newview/llfloaterpreference.cpp
index ff766a3..b466952 100644
--- a/linden/indra/newview/llfloaterpreference.cpp
+++ b/linden/indra/newview/llfloaterpreference.cpp
@@ -132,22 +132,18 @@ S32 pref_min_height()
 LLPreferenceCore::LLPreferenceCore(LLTabContainer* tab_container, LLButton * default_btn) :
        mTabContainer(tab_container),
        mGeneralPanel(NULL),
-        mSkinsPanel(NULL),
        mInputPanel(NULL),
        mNetworkPanel(NULL),
        mDisplayPanel(NULL),
        mAudioPanel(NULL),
        mMsgPanel(NULL),
+        mSkinsPanel(NULL),
        mLCDPanel(NULL)
 {
        mGeneralPanel = new LLPanelGeneral();
        mTabContainer->addTabPanel(mGeneralPanel, mGeneralPanel->getLabel(), FALSE, onTabChanged, mTabContainer);
        mGeneralPanel->setDefaultBtn(default_btn);
-        mSkinsPanel = new LLPanelSkins();
-        mTabContainer->addTabPanel(mSkinsPanel, mSkinsPanel->getLabel(), FALSE, onTabChanged, mTabContainer);
-        mSkinsPanel->setDefaultBtn(default_btn);
        mInputPanel = new LLPanelInput();
        mTabContainer->addTabPanel(mInputPanel, mInputPanel->getLabel(), FALSE, onTabChanged, mTabContainer);
        mInputPanel->setDefaultBtn(default_btn);
@@ -197,6 +193,10 @@ LLPreferenceCore::LLPreferenceCore(LLTabContainer* tab_container, LLButton * def
        mMsgPanel = new LLPanelMsgs();
        mTabContainer->addTabPanel(mMsgPanel, mMsgPanel->getLabel(), FALSE, onTabChanged, mTabContainer);
        mMsgPanel->setDefaultBtn(default_btn);
+        
+        mSkinsPanel = new LLPanelSkins();
+        mTabContainer->addTabPanel(mSkinsPanel, mSkinsPanel->getLabel(), FALSE, onTabChanged, mTabContainer);
+        mSkinsPanel->setDefaultBtn(default_btn);
        if (!mTabContainer->selectTab(gSavedSettings.getS32("LastPrefTab")))
        {
@@ -211,11 +211,6 @@ LLPreferenceCore::~LLPreferenceCore()
                delete mGeneralPanel;
                mGeneralPanel = NULL;
        }
-        if (mSkinsPanel)
-        {
-                delete mSkinsPanel;
-                mSkinsPanel = NULL;
-        }
        if (mInputPanel)
        {
                delete mInputPanel;
@@ -257,13 +252,18 @@ LLPreferenceCore::~LLPreferenceCore()
                delete mWebPanel;
                mWebPanel = NULL;
        }
+        if (mSkinsPanel)
+        {
+                delete mSkinsPanel;
+                mSkinsPanel = NULL;
+        }
 }
 void LLPreferenceCore::apply()
 {
        mGeneralPanel->apply();
-        mSkinsPanel->apply();
        mInputPanel->apply();
        mNetworkPanel->apply();
        mDisplayPanel->apply();
@@ -271,6 +271,7 @@ void LLPreferenceCore::apply()
        mPrefsVoice->apply();
        mPrefsIM->apply();
        mMsgPanel->apply();
+        mSkinsPanel->apply();
        // hardware menu apply
        LLFloaterHardwareSettings::instance()->apply();
@@ -290,7 +291,6 @@ void LLPreferenceCore::apply()
 void LLPreferenceCore::cancel()
 {
        mGeneralPanel->cancel();
-        mSkinsPanel->cancel();
        mInputPanel->cancel();
        mNetworkPanel->cancel();
        mDisplayPanel->cancel();
@@ -299,6 +299,7 @@ void LLPreferenceCore::cancel()
        mPrefsVoice->cancel();
        mPrefsIM->cancel();
        mMsgPanel->cancel();
+        mSkinsPanel->cancel();
        // cancel hardware menu
        LLFloaterHardwareSettings::instance()->cancel();
diff --git a/linden/indra/newview/llfloatersnapshot.cpp b/linden/indra/newview/llfloatersnapshot.cpp
index c83eba3..291c437 100644
--- a/linden/indra/newview/llfloatersnapshot.cpp
+++ b/linden/indra/newview/llfloatersnapshot.cpp
@@ -183,7 +183,6 @@ protected:
        LLQuaternion                            mCameraRot;
        BOOL                                            mSnapshotActive;
        LLViewerWindow::ESnapshotType mSnapshotBufferType;
-        bool                                            mSnapshotSoundPlayed;
 public:
        static std::set<LLSnapshotLivePreview*> sList;
@@ -209,8 +208,7 @@ LLSnapshotLivePreview::LLSnapshotLivePreview (const LLRect& rect) :
        mCameraPos(LLViewerCamera::getInstance()->getOrigin()),
        mCameraRot(LLViewerCamera::getInstance()->getQuaternion()),
        mSnapshotActive(FALSE),
-        mSnapshotBufferType(LLViewerWindow::SNAPSHOT_TYPE_COLOR),
+        mSnapshotBufferType(LLViewerWindow::SNAPSHOT_TYPE_COLOR)
-        mSnapshotSoundPlayed(false)
 {
        mSnapshotDelayTimer.setTimerExpirySec(0.0f);
        mSnapshotDelayTimer.start();
@@ -767,19 +765,6 @@ void LLSnapshotLivePreview::onIdle( void* snapshot_preview )
                {
                        previewp->mRawImageEncoded->resize(previewp->mRawImage->getWidth(), previewp->mRawImage->getHeight(), previewp->mRawImage->getComponents());
-                        if (!gSavedSettings.getBOOL("QuietSnapshotsToDisk"))
-                        {
-                                // Always play the sound once, on window open.
-                                // Don't keep playing if automatic
-                                // updates are enabled. It's too invasive. JC
-                                if (!previewp->mSnapshotSoundPlayed
-                                        || !gSavedSettings.getBOOL("AutoSnapshot") )
-                                {
-                                        gViewerWindow->playSnapshotAnimAndSound();
-                                        previewp->mSnapshotSoundPlayed = true;
-                                }
-                        }
                        if (previewp->getSnapshotType() == SNAPSHOT_POSTCARD)
                        {
                                // *FIX: just resize and reuse existing jpeg?
@@ -923,6 +908,7 @@ void LLSnapshotLivePreview::saveTexture()
                                                        LLInventoryType::IT_SNAPSHOT,
                                                        PERM_ALL,
                                                        "Snapshot : " + pos_string);
+                gViewerWindow->playSnapshotAnimAndSound();
        }
        else
        {
@@ -935,7 +921,12 @@ void LLSnapshotLivePreview::saveTexture()
 BOOL LLSnapshotLivePreview::saveLocal()
 {
-        return gViewerWindow->saveImageNumbered(mRawImage);
+        BOOL success = gViewerWindow->saveImageNumbered(mRawImage);
+        if(success)
+        {
+                gViewerWindow->playSnapshotAnimAndSound();
+        }
+        return success;
 }
 ///----------------------------------------------------------------------------
@@ -1079,10 +1070,6 @@ void LLFloaterSnapshot::Impl::updateLayout(LLFloaterSnapshot* floaterp)
        }
        bool use_freeze_frame = floaterp->childGetValue("freeze_frame_check").asBoolean();
-        // For now, auto-snapshot only works in freeze frame mode.
-        // This can be changed in the future by taking the FreezeTime check
-        // out of the onIdle() camera movement detection. JC
-        floaterp->childSetEnabled("auto_snapshot_check", use_freeze_frame);
        if (use_freeze_frame)
        {
@@ -1119,9 +1106,6 @@ void LLFloaterSnapshot::Impl::updateLayout(LLFloaterSnapshot* floaterp)
        }
        else // turning off freeze frame mode
        {
-                // Force off auto-snapshot, see comment above about onIdle. JC
-                gSavedSettings.setBOOL("AutoSnapshot", FALSE);
                floaterp->getParent()->setMouseOpaque(FALSE);
                floaterp->reshape(floaterp->getRect().getWidth(), floaterp->getUIWinHeightLong() + delta_height);
                if (previewp)
@@ -1294,8 +1278,6 @@ void LLFloaterSnapshot::Impl::onClickKeep(void* data)
        
        if (previewp)
        {
-                BOOL succeeded = TRUE; // Only used for saveLocal for now
                if (previewp->getSnapshotType() == LLSnapshotLivePreview::SNAPSHOT_POSTCARD)
                {
                        LLFloaterPostcard* floater = previewp->savePostcard();
@@ -1314,7 +1296,7 @@ void LLFloaterSnapshot::Impl::onClickKeep(void* data)
                }
                else
                {
-                        succeeded = previewp->saveLocal();
+                        previewp->saveLocal();
                }
                if (gSavedSettings.getBOOL("CloseSnapshotOnKeep"))
diff --git a/linden/indra/newview/llimpanel.cpp b/linden/indra/newview/llimpanel.cpp
index b25521d..ae8bd4b 100644
--- a/linden/indra/newview/llimpanel.cpp
+++ b/linden/indra/newview/llimpanel.cpp
@@ -1862,9 +1862,27 @@ void deliver_message(const std::string& utf8_text,
                im_session_id);
        gAgent.sendReliableMessage();
-        if (LLMuteList::getInstance())
+        // If there is a mute list and this is not a group chat...
+        if ( LLMuteList::getInstance() )
        {
-                LLMuteList::getInstance()->autoRemove(other_participant_id, LLMuteList::AR_IM);
+                // ... the target should not be in our mute list for some message types.
+                // Auto-remove them if present.
+                switch( dialog )
+                {
+                case IM_NOTHING_SPECIAL:
+                case IM_GROUP_INVITATION:
+                case IM_INVENTORY_OFFERED:
+                case IM_SESSION_INVITE:
+                case IM_SESSION_P2P_INVITE:
+                case IM_SESSION_CONFERENCE_START:
+                case IM_SESSION_SEND: // This one is marginal - erring on the side of hearing.
+                case IM_LURE_USER:
+                case IM_GODLIKE_LURE_USER:
+                case IM_FRIENDSHIP_OFFERED:
+                        LLMuteList::getInstance()->autoRemove(other_participant_id, LLMuteList::AR_IM);
+                        break;
+                default: ; // do nothing
+                }
        }
 }
diff --git a/linden/indra/newview/llimview.cpp b/linden/indra/newview/llimview.cpp
index 797c2a4..e6169d5 100644
--- a/linden/indra/newview/llimview.cpp
+++ b/linden/indra/newview/llimview.cpp
@@ -69,9 +69,6 @@
 #include "llfirstuse.h"
-const EInstantMessage GROUP_DIALOG = IM_SESSION_GROUP_START;
-const EInstantMessage DEFAULT_DIALOG = IM_NOTHING_SPECIAL;
 //
 // Globals
 //
@@ -158,11 +155,12 @@ LLFloaterIM::LLFloaterIM()
 BOOL LLFloaterIM::postBuild()
 {
+        // IM session initiation warnings
        sOnlyUserMessage = getString("only_user_message");
        sOfflineMessage = getUIString("offline_message");
+        sMutedMessage = getUIString("muted_message");
        sInviteMessage = getUIString("invite_message");
-        sMutedMessage = childGetText("muted_message");
        if ( sErrorStringsMap.find("generic") == sErrorStringsMap.end() )
        {
@@ -617,7 +615,12 @@ LLUUID LLIMMgr::addSession(
                noteOfflineUsers(floater, ids);
                LLFloaterChatterBox::showInstance(session_id);
-                noteMutedUsers(floater, ids);
+                // Only warn for regular IMs - not group IMs
+                if( dialog == IM_NOTHING_SPECIAL )
+                {
+                        noteMutedUsers(floater, ids);
+                }
                LLFloaterChatterBox::getInstance(LLSD())->showFloater(floater);
        }
        else
@@ -663,7 +666,12 @@ LLUUID LLIMMgr::addSession(
                noteOfflineUsers(floater, ids);
                LLFloaterChatterBox::showInstance(session_id);
-                noteMutedUsers(floater, ids);
+                // Only warn for regular IMs - not group IMs
+                if( dialog == IM_NOTHING_SPECIAL )
+                {
+                        noteMutedUsers(floater, ids);
+                }
        }
        else
        {
@@ -1240,23 +1248,23 @@ void LLIMMgr::noteOfflineUsers(
 void LLIMMgr::noteMutedUsers(LLFloaterIMPanel* floater,
                                                                  const LLDynamicArray<LLUUID>& ids)
 {
+        // Don't do this if we don't have a mute list.
+        LLMuteList *ml = LLMuteList::getInstance();
+        if( !ml )
+        {
+                return;
+        }
        S32 count = ids.count();
        if(count > 0)
        {
-                const LLRelationship* info = NULL;
-                LLAvatarTracker& at = LLAvatarTracker::instance();
                for(S32 i = 0; i < count; ++i)
                {
-                        info = at.getBuddyInfo(ids.get(i));
+                        if( ml->isMuted(ids.get(i)) )
-                        char first[DB_FIRST_NAME_BUF_SIZE];             /*Flawfinder: ignore*/
-                        char last[DB_LAST_NAME_BUF_SIZE];               /*Flawfinder: ignore*/
-                        if(info && LLMuteList::getInstance() && LLMuteList::getInstance()->isMuted(ids.get(i))
-                           && gCacheName->getName(ids.get(i), first, last))
                        {
                                LLUIString muted = sMutedMessage;
-                                muted.setArg("[FIRST]", first);
-                                muted.setArg("[LAST]", last);
                                floater->addHistoryLine(muted);
+                                break;
                        }
                }
        }
diff --git a/linden/indra/newview/llpanellogin.cpp b/linden/indra/newview/llpanellogin.cpp
index 065e429..d7fecfd 100644
--- a/linden/indra/newview/llpanellogin.cpp
+++ b/linden/indra/newview/llpanellogin.cpp
@@ -406,7 +406,9 @@ LLPanelLogin::LLPanelLogin(const LLRect &rect,
        combo->setCommitCallback( &LLPanelGeneral::set_start_location );
-        childSetCommitCallback("server_combo", onSelectServer, this);
+        LLComboBox* server_choice_combo = sInstance->getChild<LLComboBox>("server_combo");
+        server_choice_combo->setCommitCallback(onSelectServer);
+        server_choice_combo->setFocusLostCallback(onServerComboLostFocus);
        childSetAction("connect_btn", onClickConnect, this);
@@ -1141,6 +1143,10 @@ void LLPanelLogin::onPassKey(LLLineEditor* caller, void* user_data)
 // static
 void LLPanelLogin::onSelectServer(LLUICtrl*, void*)
 {
+        // *NOTE: The paramters for this method are ignored. 
+        // LLPanelLogin::onServerComboLostFocus(LLFocusableElement* fe, void*)
+        // calls this method.
        // The user twiddled with the grid choice ui.
        // apply the selection to the grid setting.
        LLString grid_label;
@@ -1183,3 +1189,12 @@ void LLPanelLogin::onSelectServer(LLUICtrl*, void*)
        // grid changed so show new splash screen (possibly)
        loadLoginPage();
 }
+void LLPanelLogin::onServerComboLostFocus(LLFocusableElement* fe, void*)
+{
+        LLComboBox* combo = sInstance->getChild<LLComboBox>("server_combo");
+        if(fe == combo)
+        {
+                onSelectServer(combo, NULL);    
+        }
+}
diff --git a/linden/indra/newview/llpanellogin.h b/linden/indra/newview/llpanellogin.h
index e73ac1c..b15e5e7 100644
--- a/linden/indra/newview/llpanellogin.h
+++ b/linden/indra/newview/llpanellogin.h
@@ -114,6 +114,7 @@ private:
        static void onClickForgotPassword(void*);
        static void onPassKey(LLLineEditor* caller, void* user_data);
        static void onSelectServer(LLUICtrl*, void*);
+        static void onServerComboLostFocus(LLFocusableElement*, void*);
        
 private:
        LLPointer<LLUIImage> mLogoImage;
diff --git a/linden/indra/newview/llstartup.cpp b/linden/indra/newview/llstartup.cpp
index 1eb0654..b5ab0ee 100644
--- a/linden/indra/newview/llstartup.cpp
+++ b/linden/indra/newview/llstartup.cpp
@@ -1943,7 +1943,8 @@ BOOL idle_startup()
                                option_it = (*it).find("tutorial_url");
                                if(option_it != (*it).end())
                                {
-                                        LLFloaterHUD::sTutorialUrl = option_it->second;
+                                        // Tutorial floater will append language code
+                                        gSavedSettings.setString("TutorialURL", option_it->second);
                                }
                                option_it = (*it).find("use_tutorial");
                                if(option_it != (*it).end())
diff --git a/linden/indra/newview/llviewercontrol.h b/linden/indra/newview/llviewercontrol.h
index 5de3e38..2475984 100644
--- a/linden/indra/newview/llviewercontrol.h
+++ b/linden/indra/newview/llviewercontrol.h
@@ -173,6 +173,6 @@ template <> eControlType get_control_type<LLSD>(const LLSD& in, LLSD& out);
 //#define TEST_CACHED_CONTROL 1
 #ifdef TEST_CACHED_CONTROL
 void test_cached_control();
-#endif TEST_CACHED_CONTROL
+#endif // TEST_CACHED_CONTROL
 #endif // LL_LLVIEWERCONTROL_H
diff --git a/linden/indra/newview/llviewerimage.cpp b/linden/indra/newview/llviewerimage.cpp
index 5559491..d436cd0 100644
--- a/linden/indra/newview/llviewerimage.cpp
+++ b/linden/indra/newview/llviewerimage.cpp
@@ -208,9 +208,9 @@ LLViewerImage::LLViewerImage(const LLUUID& id, BOOL usemipmaps)
 LLViewerImage::LLViewerImage(const LLString& filename, const LLUUID& id, BOOL usemipmaps)
        : LLImageGL(usemipmaps),
-          mID(id)
+          mID(id),
+          mLocalFileName(filename)
 {
-        mLocalFileName = gDirUtilp->findSkinnedFilename("textures", filename);
        init(true);
        sImageCount++;
 }
diff --git a/linden/indra/newview/llviewerimagelist.cpp b/linden/indra/newview/llviewerimagelist.cpp
index 6f0605c..3ff0013 100644
--- a/linden/indra/newview/llviewerimagelist.cpp
+++ b/linden/indra/newview/llviewerimagelist.cpp
@@ -321,8 +321,10 @@ LLViewerImage* LLViewerImageList::getImageFromFile(const LLString& filename,
                return getImage(IMG_DEFAULT, TRUE, TRUE);
        }
-        if (filename.empty())
+        std::string full_path = gDirUtilp->findSkinnedFilename("textures", filename);
+        if (full_path.empty())
        {
+                llwarns << "Failed to find local image file: " << filename << llendl;
                return getImage(IMG_DEFAULT, TRUE, TRUE);
        }
@@ -334,14 +336,14 @@ LLViewerImage* LLViewerImageList::getImageFromFile(const LLString& filename,
        }
        else
        {
-                new_id.generate(std::string(filename));
+                new_id.generate(std::string(full_path));
        }
        LLPointer<LLViewerImage> imagep = hasImage(new_id);
        
        if (imagep.isNull())
        {
-                imagep = new LLViewerImage(filename, new_id, usemipmaps);
+                imagep = new LLViewerImage(full_path, new_id, usemipmaps);
                
                if (internal_format && primary_format)
                {
@@ -1386,7 +1388,7 @@ bool LLUIImageList::initFromFile()
                if (pass == PASS_DECODE_NOW && !gSavedSettings.getBOOL("NoPreload"))
                {
-                        gImageList.decodeAllImages(2.f); // decode preloaded images
+                        gImageList.decodeAllImages(10.f); // decode preloaded images
                }
        }
        return true;
diff --git a/linden/indra/newview/llviewermenufile.cpp b/linden/indra/newview/llviewermenufile.cpp
index b8a4f65..6f2d8e2 100644
--- a/linden/indra/newview/llviewermenufile.cpp
+++ b/linden/indra/newview/llviewermenufile.cpp
@@ -402,10 +402,7 @@ class LLFileTakeSnapshotToDisk : public view_listener_t
                                                                           gSavedSettings.getBOOL("RenderUIInSnapshot"),
                                                                           FALSE))
                {
-                        if (!gSavedSettings.getBOOL("QuietSnapshotsToDisk"))
+                        gViewerWindow->playSnapshotAnimAndSound();
-                        {
-                                gViewerWindow->playSnapshotAnimAndSound();
-                        }
                        LLImageBase::setSizeOverride(TRUE);
                        gViewerWindow->saveImageNumbered(raw);
                        LLImageBase::setSizeOverride(FALSE);
diff --git a/linden/indra/newview/llviewerwindow.cpp b/linden/indra/newview/llviewerwindow.cpp
index 8134a36..ca2cfd5 100644
--- a/linden/indra/newview/llviewerwindow.cpp
+++ b/linden/indra/newview/llviewerwindow.cpp
@@ -4242,6 +4242,10 @@ BOOL LLViewerWindow::saveSnapshot( const LLString& filepath, S32 image_width, S3
 void LLViewerWindow::playSnapshotAnimAndSound()
 {
+        if (gSavedSettings.getBOOL("QuietSnapshotsToDisk"))
+        {
+                return;
+        }
        gAgent.sendAnimationRequest(ANIM_AGENT_SNAPSHOT, ANIM_REQUEST_START);
        send_sound_trigger(LLUUID(gSavedSettings.getString("UISndSnapshot")), 1.0f);
 }
diff --git a/linden/indra/newview/mozilla-theme/classic.jar b/linden/indra/newview/mozilla-theme/classic.jar
index 0f33170..9626bcb 100644
--- a/linden/indra/newview/mozilla-theme/classic.jar
+++ b/linden/indra/newview/mozilla-theme/classic.jar
Binary files differ
diff --git a/linden/indra/newview/newview.vcproj b/linden/indra/newview/newview.vcproj
index 5a21941..aa2283f 100644
--- a/linden/indra/newview/newview.vcproj
+++ b/linden/indra/newview/newview.vcproj
@@ -3295,6 +3295,9 @@
                                RelativePath=".\skins\xui\en-us\role_actions.xml">
                        </File>
                        <File
+                                RelativePath=".\app_settings\settings.xml">
+                        </File>
+                        <File
                                RelativePath=".\app_settings\std_bump.ini">
                        </File>
                        <File
diff --git a/linden/indra/newview/releasenotes.txt b/linden/indra/newview/releasenotes.txt
index bed1e27..b083966 100644
--- a/linden/indra/newview/releasenotes.txt
+++ b/linden/indra/newview/releasenotes.txt
@@ -4,15 +4,60 @@
 |  http://wiki.secondlife.com/wiki/Beta_Release_Notes  |
 +------------------------------------------------------+
+Release Notes for Second Life 1.20(14) July 16, 2008
+=====================================
+KNOWN ISSUES:
+* This 1.20 Viewer will not run on a Mac PowerPC that is running Mac OS X 10.3.9.  The minimum requirements for running Second Life
+is using Mac OS X 10.4.11 or higher. Please see http://secondlife.com/support/sysreqs.php for more information.
+** The 1.19.1 Viewer still supports the Mac PowerPC that is running Mac OS X 10.3.9.
+* On some Macs, there are reports of periodic and cyclic freezing of the computer when running Viewer 1.20.
+WORKAROUND: One workaround that may help is to use an additional argument "-set YieldTime 20" in the Arguments.txt:
+** To set this argument, right-click (or control-click) the Second Life application and choose "Show package contents".
+** In the resulting finder window, open Resources and in there should be a file named "arguments.txt". Open in text edit, add the argument to the end of the line in there and Save.
+** Close the text edit and run Second Life application.
+** This causes the Viewer to sleep for 20 milliseconds every frame. It will slow the frame rate down a little, but may help with freezing.
+* When running Second Life in Full Screen mode on computers with some NVIDIA graphics cards, you may be unable to scroll up/down on webpages
+that are shown inworld.  This includes the web-based interfaces of Search > All tab, and Search > Groups tab.  We are investigating this issue.
+WORKAROUND: You must run Second Life in a window to avoid this problem. Go to Preferences > Graphics > Run Second Life in a window.
+Changes:
+* Moved the Preferences > Skins tab to the bottom of the tab list.
+Fixes:
+* Fixed: VWR-7353: Auto-snapshot should not be tied to Freeze Frame (full screen preview) when taking a picture in Snapshots
+* Fixed: VWR-7344: "Shutter sound" should not play every time Snapshot Preview window opens or when a setting is modified
+* Fixed: The upgrade from RC12 to the new RC leaves the old /skins/html and /skins/xui files on the hard drive
+* Fixed: Grid selection on the login screen is not set, unless you hit return
+* Fixed: The list on Preferences>Popups is right justified on the Mac PowerPC
+* Fixed: Enlarge the browser tutorial window slightly
+* Fixed: A new debug setting "TutorialURL" to change the URL used by the Tutorial window
+* Fixed: VWR-7389: String is missing when opening an IM window to a muted resident (string that the resident is currently muted)
+* Fixed: VWR-7510: Muted resident is unmuted if he/she initiates a Group chat
+* Fixed: Some dropdown selection boxes are clipped
+* Fixed: All HTML floaters have Dazzle scrollbar art
+Localization Fixes:
+* Fixed: some text overlaps in Buy Land floater in Portuguese
+* Fixed: add final translations for Preferences>Skins options in German, Japanese, Korean
+* Fixed: Update the viewer credits in About>Second Life...
 Release Notes for Second Life 1.20(13) July 9th, 2008
 =====================================
+Changes:
+* The viewer installs with a default classic grey color of the User Interface. This can be changed in Preferences > Skins
+(It requires a restart of the viewer to take effect.)
 Fixes:
-* Fixed: VWR-7893 create a 'Classic' skin for the viewer
+* Fixed: VWR-7893: create a Classic skin for the viewer
-* Fixed: VWR-5059: add option to switch between a Classic and modern theme from within Preferences
+* Fixed: VWR-5059: add option to switch between a Classic and Silver theme from within Preferences
 * Fixed: VWR-3529: WindLight: Saving snapshots to disk crashes viewer
-* Fixed: Advanced > XUI > Edit UI... tool will cause a crash if moved up past 'root' 
+* Fixed: Assign user agent strings with the name of skin in the internal Mozilla browser
-* Fixed: Enlarged the Tutorial floater slightly
+* Fixed: The user-agent string in the browser is not HTTP 1.1 compliant
+* Fixed: A new debug setting "SkinCurrent" is used to persist the chosen skin, to avoid crashing older builds
 Release Notes for Second Life 1.20(12) July 2nd, 2008
 =====================================
diff --git a/linden/indra/newview/skins/default/colors_base.xml b/linden/indra/newview/skins/default/colors_base.xml
index e803465..608ba55 100644
--- a/linden/indra/newview/skins/default/colors_base.xml
+++ b/linden/indra/newview/skins/default/colors_base.xml
@@ -53,7 +53,7 @@
 <TextCursorColor value="0, 0, 0, 255" />
 <TextFgColor value="0, 0, 0, 255" />
 <TextFgReadOnlyColor value="255, 255, 255, 200" />
-<TextFgTentativeColor value="0, 0, 0, 255" />
+<TextFgTentativeColor value="0, 0, 0, 128" />
 <TextEmbeddedItemReadOnlyColor value="58, 147, 242, 255" />     <!-- i.e. About Land name that you don't own -->
 <TextEmbeddedItemColor value="0, 0, 128, 255" />
 <TextDefaultColor value="0, 20, 0, 255"/>
diff --git a/linden/indra/newview/skins/default/textures/textures.xml b/linden/indra/newview/skins/default/textures/textures.xml
index 3c866e7..88e6dfc 100644
--- a/linden/indra/newview/skins/default/textures/textures.xml
+++ b/linden/indra/newview/skins/default/textures/textures.xml
@@ -165,7 +165,7 @@
  
  <texture name="notify_tip_icon.tga"/>
  <texture name="notify_caution_icon.tga"/>
-  <texture name="notify_next.tga" preload="true"/>
+  <texture name="notify_next.png" preload="true"/>
  <texture name="notify_box_icon.tga"/>
  
  <texture name="object_cone.tga"/>
@@ -368,4 +368,7 @@
  <texture name="skin_thumbnail_modern.png" preload="true"/>
  <texture name="skin_thumbnail_classic.png" preload="true"/>
  <texture name="cloud-particle.j2c" use_mips="true"/>
+  
+  <texture name="skin_thumbnail_default.png" preload="true" />
+  <texture name="skin_thumbnail_silver.png" preload="true" />
 </textures>
 \ No newline at end of file
diff --git a/linden/indra/newview/skins/default/xui/de/alerts.xml b/linden/indra/newview/skins/default/xui/de/alerts.xml
index dcaaa0e..d829632 100644
--- a/linden/indra/newview/skins/default/xui/de/alerts.xml
+++ b/linden/indra/newview/skins/default/xui/de/alerts.xml
@@ -735,6 +735,11 @@ Möchten Sie auf www.secondlife.com ein Konto anlegen?
                        Abbrechen
                </option>
        </alert>
+        <alert name="ChangeSkin">
+                <message name="message">
+                        Die neue Benutzeroberfläche wird nach einem Neustart von [SECOND_LIFE] angewendet.
+                </message>
+        </alert>
        <alert name="UnsupportedGLRequirements">
                <message name="message">
                        Ihr Computer entspricht nicht den Hardwareanforderungen von Second Life. Second Life setzt eine OpenGL-Grafikkarte mit Multitextur-Unterstützung voraus. Falls Ihre Grafikkarte diese Funktion unterstützt, installieren Sie die neuesten Treiber sowie die aktuellen Service Packs und Patches für Ihr Betriebssystem.
diff --git a/linden/indra/newview/skins/default/xui/de/floater_about.xml b/linden/indra/newview/skins/default/xui/de/floater_about.xml
index 65d572e..6490d8b 100644
--- a/linden/indra/newview/skins/default/xui/de/floater_about.xml
+++ b/linden/indra/newview/skins/default/xui/de/floater_about.xml
@@ -1,9 +1,9 @@
 <?xml version="1.0" encoding="utf-8" standalone="yes" ?>
 <floater name="floater_about" title="Über Second Life">
        <text_editor name="credits_editor">
-                Second Life wird Ihnen präsentiert von Philip, Andrew, Tessa, Cory, Frank, James, Doug, Hunter, Richard, John, Eric, Avi, AaronB, AaronY, Ian, Peter, Mark, Robin, Stephen, Tracy, Ryan, Alberto, Haney, Tanya, JimJ, Dan, Ben, Stephanie, Tim, Evan, Catherine, Colin, Chris, Reuben, Charity, Jeska, James, JonHenry, Kelly, Callum, Char, Daniel, DavidF, Don, Jeff, Lauren, Lee, Michael, Ramzi, Vektor, Steve, TomY, Tess, Kona, Brent, Clarissa, PeterP, Jesse, Annette, Cyn, Blue, Ginsu, Jonathan, Karen, Adam, Nova, Deana, Lizzie, Patsy, DavidK, Isaac, Pathfinder, Monroe, Jill, Benny, Altruima, Rheya, Jennifer, Jack, DaveP, Brad, Mick, Babbage, Elisabeth, Brian, Beth, Data, Ethan, Wendy, Nicole, Sky, Jeffrey, Zero, Coffee, Tesla, Kenny, Makiko, Nigel, Teeple, Lucy, Mia, Dee, Guy, Harry, Liana, Branka, Jimbo, Aura, Vasuda, SarahD, bethanye, Torley, Runitai, MikeS, PaulM, Milo, Hermia, JoeM, Melanie, Rejean, DSmith, SMiller, Susan, Jose, DongYun, Justin, Andrey, Syrah, Donovan, Henrik, Nora, Lexie, AC, Donna, ChrisC, Alex, Leyla, Kyle, Mathew, Devin, Joshua, DanC, Jessica, Harmony, Claudia, Tramel, Glenn, Betsy, Fritz, Jun, Adam, Cassandra, Ken, RyanW, Spike, Tofu, Varas, Andy, Luke, RobLa, Chiyo, JohnZ, Dustin, George, Del, PeterP, Migyeong, Matthew, RMullane, CChampion, JTurbin, JamesC, Viola, Lightfoot, Jacqui, Sturm, Adrian, Buttercup, Alfred, Sunil, Alfred, Noel, Irfan, Jill, Yool, Jane, Yuki, Yoz, Matthew, Arthur, Jennifer, Karl, Brian, Ben, Janine, Christopher, Madhavi, Everett, Anthony, Joon, Jake, sean, Adreanne, Stephany, KellyJo, Jeremy, Pramod, Joshua, Sean, Christopher, Amy, Ceren, Katherine, jon, Sudheendra, James, Stephan, Kari, Kartic, Todd, Thomas, Joki, Rebecca, Belinda, Bert, Roger, Bridie, Kristi, Brian, Maria, John, Aric, Nathanel, Melinda, Darrell, Jennifer, Sandy, Greg, Rob, Brad, Chris, Eric, Palmer, Asi, Katja, Lisa, Minda, Jen, Aaron, Bryan, Mark, Jonathan, Jamie, Laurel, William, Matthew, Steve, David, Remy, James, Tim, Lee, Brian, Ashlei, Sam, Mike, Ethan, Austin, Wanda, Paul, Brian, Rachel, Valentyn, Emma Williams, Autum, Steven, Laley, Charles, Jessica, Sue, Gillian, CG, Kip, Kristen, Shamiran, Blake, Brett, Erica, Kent, Joel, Plexus, Twilight, Joppa, Enus, Kraft, Naveen, Simon, Q, Ronp, Laurap, Ram, KyleJM, Marty, Kend, Daveh, Prospero, Melissa, Nat, Hamilton, Green, Seraph, Ekim, Miz, Jimmy, Kosmo, Rome, Doris, JT, Benoc, Whump, Mango, Trinity, Patch, TJ, Christy, Bao, Joohwan, Kate, Oreh, Angela, Johan, Cheah, Lan, Matias, Brandy, Cogsworth, Aleks,  Mitchell, Space, Einstein, Bambers, Colton, Malbers, Maggie, Umesh, Santosh, Rose, Stash, Rothman, Winnie, Stella, Niall und vielen anderen.
+                Second Life wird Ihnen präsentiert von Philip, Tessa, Andrew, Cory, Ben, Bunny, Char, Charlie, Colin, Dan, Daniel, Doug, Eric, Hamlet, Haney, Hunter, Ian, Jeff, Jim, John, Lee, Mark, Peter, Phoenix, Richard, Robin, Xenon, Steve, Tanya, Eddie, Frank, Bruce, Aaron, Alice, Bob, Debra, Eileen, Helen, Janet, Louie, Leviathania, Stefan, Ray, Kevin, Tom, Mikeb, MikeT, Burgess, Elena, Tracy, BillTodd, Ryan, Zach, Sarah, Nova, Otakon, Tim, Stephanie, Michael, Evan, Nicolas, Catherine, Rachelle, Dave, Holly, Bub, Kelly, Magellan, Ramzi, Don, Sabin, Jill, Rheya, DanceStar, Jeska, Hungry, Torley, Kona, Callum, Charity, Ventrella, Jack, Uncle, Vektor, Iris, Chris, Nicole, Mick, Reuben, Blue, Babbage, Yedwab, Deana, Lauren, Brent, Pathfinder, Chadrick, Altruima, Jesse, Monroe, David, Tess, Lizzie, Patsy, Pony, Isaac, Lawrence, Cyn, Bo, Gia, Annette, Marius, Tbone, Jonathan, Karen, Ginsu, Yuko, Makiko, Thomas, Harry, Seth, Alexei, Brian, Guy, Runitai, Ethan, Data, Cornelius, Kenny, Swiss, Zero, Natria, Wendy, Stephen, Teeple, Thumper, Lucy, Dee, Mia, Liana, Warren, Branka, Aura, beez, Milo, Hermia, Red, Thrax, Joe, Sally, Magenta, Paul, Jose, Rejean, Henrik, Lexie, Amber, Logan, Xan, Nora, Morpheus, Donovan, Leyla, MichaelFrancis, Beast, Cube, Bucky, Joshua, Stryfe, Harmony, Teresa, Claudia, Walker, Glenn, Fritz, Fordak, June, Cleopetra, Jean, Ivy, Betsy, Roosevelt, Spike, Ken, Which, Tofu, Chiyo, Rob, Zee, dustin, George, Del, Matthew, Cat, Jacqui, Lightfoot, Adrian, Viola, Alfred, Noel, Irfan, Sunil, Yool, Rika, Jane, Xtreme, Frontier, a2, Neo, Siobhan, Yoz, Justin, Elle, Qarl, Benjamin, Isabel, Gulliver, Everett, Christopher, Izzy, Stephany, Garry, Sejong, Sean, Tobin, Iridium, Meta, Anthony, Jeremy, JP, Jake, Maurice, Madhavi, Leopard, Kyle, Joon, Kari, Bert, Belinda, Jon, Kristi, Bridie, Pramod, KJ, Socrates, Maria, Ivan, Aric, Yamasaki, Adreanne, Jay, MitchK, Ceren, Coco, Durl, Jenny, Periapse, Kartic, Storrs, Lotte, Sandy, Colossus, Zen, BigPapi, Brad, Pastrami, Kurz, Mani, Neuro, Jaime, MJ, Rowan, Sgt, Elvis, Gecko, Samuel, Sardonyx, Leo, Bryan, Niko, Soft, Poppy, Rachel, Aki, Angelo, Banzai, Alexa, Sue, CeeLo, Bender, CG, Gillian, Pelle, Nick, Echo, Zara, Christine, Shamiran, Emma, Blake, Keiko, Plexus, Joppa, Sidewinder, Erica, Ashlei, Twilight, Kristen, Brett, Q, Enus, Simon, Bevis, Kraft, Kip, Chandler, Ron, LauraP, Ram, KyleJM, Scouse, Prospero, Melissa, Marty, Nat, Hamilton, Kend, Lordan, Jimmy, Kosmo, Seraph, Green, Ekim, Wiggo, JT, Rome, Doris, Miz, Benoc, Whump, Trinity, Patch, Kate, TJ, Bao, Joohwan, Christy, Sofia, Matias, Cogsworth, Johan, Oreh, Cheah, Angela, Brandy, Mango, Lan, Aleks, Gloria, Heidy, Mitchell, Space, Colton, Bambers, Einstein, Maggie, Malbers, Rose, Winnie, Stella, Milton, Rothman, Niall, Marin, Allison, James, Katie, Dawn, Katt, Kalpana, Judy, Andrea, Ambroff, Infinity, Gail, Rico, Raymond, Yi, William, Christa, M, Teagan, Scout, Molly, Dante, Corr, Dynamike, Usi, Kaylee, Lil, Danica, Sascha, Kelv, Jacob, Nya, Rodney, Brandon, Elsie, Blondin, Grant, Katrin, Nyx, Gabriel, Locklainn, Claire, Devin, Minerva, Monty, Austin, Bradford, Si, Keira, H, Caitlin, Dita, Makai, Jenn und vielen anderen.
-  Vielen Dank den folgenden Einwohnern, die uns geholfen haben, dies zur bisher besten Version zu machen: aaron23 decuir, Abelv Vollmar, Abyssin Otoro, ActingIll Igaly, Adamas Carter, Addy Broome, Adelia Menges, Alexandra Rucker, Alexandrea Fride, Alissa Sabre, Alyx Jonson, Ann Otoole, Anton Fargis, Aradia Dielli, Araina jewell, Arcane Clawtooth, arcangelo vantelli, Are Sperber, Argent Stonecutter, arkady yost, Ashcroft Burnham, Ashen Arida, Auron Forcella, Azadine Umarov, Azildin Furst, Balp Allen, Balpien Hammerer, Barney Boomslang, Barrett Slade, becky pippen, Beeflin Grut, Beer Dailey, Behemoth Greenwood, bigmanu greene, bitova loon, Bonca Chikuwa, Bonnie Bechir, Brandon Catteneo, buttonpusher jones, Carina Raymaker, Ceera Murakami, Celierra Darling, ChatNoir Moonsoo, Cheetah Hammerer, chet neurocam, Cinthya Loveless, Cold Spitteler, Coral Quinnell, Crash Pointe, CrazyTB Oh, Creem Pye, Crom Chaffe, ctrl althouse, dade carver, Dael Ra, dakota schwade, Dale Innis, Damian McLeod, Danger Lytton, danielluh ashton, DanOfWA Flanagan, Davec Horsforth, Davidius Morigi, davie zinner, Day Oh, DBDigital Epsilon, Deany Fall, deBruce Munro, Decaf Coffey, Dedric Mauriac, Deeso Saeed, Dekka Raymaker, dexter eberhart, Dildo Spitz, Dizzy Banjo, djcabello klaar, Dnali Anabuki, Domchi Underwood, Doran Zemlja, Drew Dwi, Duckless Vandyke, Duncan Stenvaag, Dylan Rickenbacker, dzogchen Moody, Dzonatas Sol, Eddy Stryker, Edward Griffith, Edward Pearse, ein duesenburg, Elle Pollack, Elle74 Zaftig, Emileigh Starbrook, Emma Nowhere, ener bing, Erdrick Balbozar, eric domela, Evangeline Biedermann, Excalibur Longstaff, Fake Fitzgerald, Feldspar Millgrove, Feynt Mistral, Fluf Fredriksson, Forbid Utorid, Fortyniner Beck, Francesco Despres, Francisco Koolhoven, Franta Burt, Fury Rosewood, garde Burrel, Garmin Kawaguichi, Gavin Ichigo, Gellan Glenelg, Genie Demina, Gennifer Meredith, Gigs Taggart, Goldie Katsu, Gwyneth Llewelyn, Haravikk Mistral, Harleen Gretzky, Haruki Watanabe, Heather Manatiso, Henri Beauchamp, Honey Fairweather, Hypatia Callisto, Ice Brodie, icktoofay Kamachi, IntLibber Brautigan, Janise Dreamscape, Jay Shinobu, Jenni Ryba, Jeremy Ondricek, JetZep Zabelin, Jims Smythe, Jini Hammerer, Jopy Weber, JustOneMore Loon, Kaluura Boa, Kara Markova, Kevin Susenko, Khyra Ares, Kii Lilliehook, Kitty Barnett, Kris Kuttelwascher, Lanita Wingtips, Laura18 Streeter, Lee Ludd, Lettrius Jewell, Liberty Tesla, LilyAnna Carter, Lindal Kidd, Lisa Lowe, Lisa McConnell, Lola Machin, luca peck, Lupus Clawtooth, M1sha Dallin, Macsima Dagostino, Mana Janus, Mani Canning, Manjusri Binder, marceledward edman, march Korda, marchino villota, Marcus Llewellyn, MartinRJ Fayray, Matthew Dowd, Max Kleiber, mazzy fastback, McCabe Maxsted, Mckailen Kohnke, Meghan Dench, Melvin Starbrook, Mercia Mcmahon, Miakoda Carnell, Michelle2 Zenovka, Michi Lumin, mick parnall, Milla Michinaga, Millie Thompson, miranda Ashby, Mircea Lobo, MIssSara Beck, mouse mimistrobell, Myria Boa, Nanci Barthelmess, Nargus Asturias, Natalya Debevec, Nedrae Messmer, Nexeus Fatale, Niky Zenovka, Nimrod Szondi, Ninane Yoshikawa, Noch Tripsa, nokithecat writer, Nyko Merlin, Onyx Halberd, oryx tempel, Osprey Therian, Pac Hyun, Panagea McMillan, Patrick Ferrentino, PattehPh0x Katsu, ponk bing, Poppy Linden, Prajna Vella, Precious Rhiano, Prokofy Neva, Randall Lovenkraft, Rascal Ratelle, Raydon Writer, Rhaorth Antonelli, Rock Hayek, Ron Crimson, Ron Khondji, Ronald Richez, Rui Clary, Ruud Lathrop, Sakkano Imako, Sam Reinard, Sascha Vandyke, Scrippy Scofield, Sean18 McCarey, Sedona Mills, Sekonda Huet, Seraph Nephilim, Sergei Milos, Shadowquine Maltz, shai khalifa, sheilah flatley, Sheri Underwood, Shuggy Husky, Sierra Janus, Sigma Avro, Simil Miles, simon kline, Simon Nolan, Sindy Tsure, Sparks Keynes, Squirrel Wood, Stahi Columbia, StarSong Bright, Summer Seale, Sunn Thunders, Susan Koltai, Syler Zhora, Synack Fitzgerald, Tayra Dagostino, Tee Cramer, Teravus Ousley, Thomas Shikami, Tia Araw, Tillie Ariantho, Topher Brooks, Torley Linden, Twosteppin Jewell, tx Oh, urantia jewell, vaguegirl Petty, VeC Merlin, venus petrov, vv33d Beck, vynka dean, zann canto, zeebster colasanti, Zi Ree, Zion Tristan, Zorin Frobozz, Zyzzy Zarf
+  Vielen Dank den folgenden Einwohnern, die uns geholfen haben, dies zur bisher besten Version zu machen: aaron23 decuir, Abra Miles, absolute balderdash, adelle fitzgerald, Aeron Kohime, Aki Shichiroji, Alger Meads, Alissa Sabre, AlwaysIcey Mapholisto, Arawn Spitteler, Aren Mandala, Arianna Wrigglesworth, Bagushii Kohime, Balpien Hammerer, Blinking2342 Blinker, byakuya runo, Capucchy Streeter, Chandra Jun, Coyote Pace, Crusher Soderstrom, Cummere Mayo, cyberrosa Rossini, Dael Ra, danana dodonpa, Darek Deluca, Davec Horsforth, django yifu, draco crane, Dre Dagostino, Ephyu Reino, etan quan, Fenrix Murakami, Fledhyris Proudhon, Fred Wardhani, Frederich Courier, garth fairchang, Gellan Glenelg, Geraldine Giha, GOLAN Eilde, gonzo joubert, Hachiro Yokosuka, Hampton Hax, harleywood guru, Hevenz Vansant, imnotgoing sideways, Jaden Giles, Jeanette Janus, Karl Dorance, keaton Akina, Khashai Steinbeck, KiPSOFT Tuqiri, kirstenlee Cinquetti, Kitty Barnett, Laurent Vesta, Lazure Ryba, Lima Vesperia, Linzi Bingyi, Lisa Lowe, LuDon Ninetails, Mark Rosenbaum, McCabe Maxsted, Michi Lumin, Midi Aeon, ml0rtd kit, Mo Eriksen, Morice Flanagan, Mysterion Aeon, Nad Gough, norgan torok, Pygar Bu, Qie Niangao, rachel corleone, Rado Arado, roberto salubrius, Royer Pessoa, samia bechir, Sasha Nurmi, Sean Heying, Selkit Diller, Shadow Pidgeon, simon kline, Smokie Ember, Soap Clawtooth, Strife Onizuka, Tal Chernov, Talan Hyun, tangletwigs fairymeadow, Tanya Spinotti, Tayra Dagostino, Teebone Aeon, Theremes Langdon, Thraxis Epsilon, tucor Capalini, Vasko Hawker, VenusMari Zapedzki, Vex Streeter, Viktoria Dovgal, Vincent Nacon, Viridian Exonar, Vivienne Schell, WarKirby Magojiro, Wilton Lundquist, Yukinoroh Kamachi, Zyzzy Zarf
  3Dconnexion SDK Copyright (C) 1992-2007 3Dconnexion
  APR Copyright (C) 2000-2004 The Apache Software Foundation
@@ -26,7 +26,7 @@
  Voice-Chat-Audiocoding: Polycom(R) Siren14(TM) (ITU-T Empf. G.722.1 Anhang C)
-  Happiness is a warm puppy. -- Charles M. Schulz
+  What happens to a dream deferred? --Langston Hughes
        </text_editor>
        <text name="you_are_at">
                Sie befinden sich in [POSITION]
diff --git a/linden/indra/newview/skins/default/xui/de/need_to_translate.xml b/linden/indra/newview/skins/default/xui/de/need_to_translate.xml
index 9dfa30b..dcde1bb 100644
--- a/linden/indra/newview/skins/default/xui/de/need_to_translate.xml
+++ b/linden/indra/newview/skins/default/xui/de/need_to_translate.xml
@@ -3557,4 +3557,59 @@ Beschäftigt sich diese Gruppe mit nicht jugendfreien Inhalten?
 <f_old_trans></f_old_trans>
 <f_translation>Ja</f_translation>
 </string>
+<string><a_file>alerts.xml</a_file>
+<b_path>//ChangeSkin/message</b_path>
+<c_attribute></c_attribute>
+<d_old></d_old>
+<e_new>
+      The new skin will appear after you restart [SECOND_LIFE].
+    </e_new>
+<f_old_trans></f_old_trans>
+<f_translation>      Die neue Benutzeroberfläche wird nach einem Neustart von [SECOND_LIFE] angewendet.
+    </f_translation></string><string><a_file>notify.xml</a_file>
+<b_path>//UnableToOpenCommandURL/message</b_path>
+<c_attribute></c_attribute>
+<d_old></d_old>
+<e_new>
+                        The URL you clicked cannot be opened from this web browser.
+                </e_new>
+<f_old_trans></f_old_trans>
+<f_translation>                 Die URL, die Sie angeklickt haben, kann in diesem Web Browser nicht geöffnet werden.
+                </f_translation></string><string><a_file>panel_preferences_skins.xml</a_file>
+<b_path>/Skins panel</b_path>
+<c_attribute>label</c_attribute>
+<d_old></d_old>
+<e_new>Skins</e_new>
+<f_old_trans></f_old_trans>
+<f_translation>Benutzeroberflächen</f_translation></string><string><a_file>panel_preferences_skins.xml</a_file>
+<b_path>/Skins panel/muting_text</b_path>
+<c_attribute></c_attribute>
+<d_old></d_old>
+<e_new>
+                Select a skin (requires restart):
+        </e_new>
+<f_old_trans></f_old_trans>
+<f_translation>
+                Wählen Sie eine Benutzeroberfläche aus (erfordert Neustart):
+        </f_translation></string><string><a_file>panel_preferences_skins.xml</a_file>
+<b_path>/Skins panel/skin_selection/default</b_path>
+<c_attribute></c_attribute>
+<d_old></d_old>
+<e_new>
+      Classic
+    </e_new>
+<f_old_trans></f_old_trans>
+<f_translation>
+      Klassisch
+    </f_translation></string><string><a_file>panel_preferences_skins.xml</a_file>
+<b_path>/Skins panel/skin_selection/silver</b_path>
+<c_attribute></c_attribute>
+<d_old></d_old>
+<e_new>
+      Silver
+    </e_new>
+<f_old_trans></f_old_trans>
+<f_translation>
+      Silber
+    </f_translation></string>
 </strings>
diff --git a/linden/indra/newview/skins/default/xui/de/notify.xml b/linden/indra/newview/skins/default/xui/de/notify.xml
index f22acd9..4218a4a 100644
--- a/linden/indra/newview/skins/default/xui/de/notify.xml
+++ b/linden/indra/newview/skins/default/xui/de/notify.xml
@@ -1048,4 +1048,9 @@ Klicken Sie auf &apos;Akzeptieren&apos;, um dem Chat beizutreten, oder auf &apos
                        Die Region, die Sie betreten haben, verwendet eine andere Simulatorversion. Klicken Sie auf diese Nachricht, um weitere Informationen zu erhalten.
                </message>
        </notify>
+        <notify name="UnableToOpenCommandURL">
+                <message name="message">
+                        Die URL, die Sie angeklickt haben, kann in diesem Web Browser nicht geöffnet werden.
+                </message>
+        </notify>
 </notifications>
diff --git a/linden/indra/newview/skins/default/xui/de/panel_preferences_skins.xml b/linden/indra/newview/skins/default/xui/de/panel_preferences_skins.xml
new file mode 100644
index 0000000..5148c39
--- /dev/null
+++ b/linden/indra/newview/skins/default/xui/de/panel_preferences_skins.xml
@@ -0,0 +1,14 @@
+<?xml version="1.0" encoding="utf-8" standalone="yes" ?>
+<panel label="Oberflächen" name="Skins panel">
+        <text name="muting_text">
+                Wählen Sie eine Benutzeroberfläche aus (erfordert Neustart):
+        </text>
+        <radio_group name="skin_selection">
+                <radio_item name="default">
+                        Klassisch
+                </radio_item>
+                <radio_item name="silver">
+                        Silber
+                </radio_item>
+        </radio_group>
+</panel>
diff --git a/linden/indra/newview/skins/default/xui/en-us/alerts.xml b/linden/indra/newview/skins/default/xui/en-us/alerts.xml
index 89662ea..c7ec62f 100644
--- a/linden/indra/newview/skins/default/xui/en-us/alerts.xml
+++ b/linden/indra/newview/skins/default/xui/en-us/alerts.xml
@@ -887,7 +887,7 @@ Note: This will clear the cache.
        </alert>
  <alert modal="true" name="ChangeSkin">
    <message name="message">
-      New skin will appear after you restart [SECOND_LIFE].
+      The new skin will appear after you restart [SECOND_LIFE].
    </message>
  </alert>
  <alert modal="true" name="GoToAuctionPage">
diff --git a/linden/indra/newview/skins/default/xui/en-us/floater_about.xml b/linden/indra/newview/skins/default/xui/en-us/floater_about.xml
index e5f963a..36e7765 100644
--- a/linden/indra/newview/skins/default/xui/en-us/floater_about.xml
+++ b/linden/indra/newview/skins/default/xui/en-us/floater_about.xml
@@ -7,9 +7,9 @@
             follows="left|top|right|bottom" font="SansSerifSmall" height="168" left="6"
  max_length="65536" mouse_opaque="true" name="credits_editor" width="458"
  word_wrap="true">
-  Second Life is brought to you by Philip, Andrew, Tessa, Cory, Frank, James, Doug, Hunter, Richard, John, Eric, Avi, AaronB, AaronY, Ian, Peter, Mark, Robin, Stephen, Tracy, Ryan, Alberto, Haney, Tanya, JimJ, Dan, Ben, Stephanie, Tim, Evan, Catherine, Colin, Chris, Reuben, Charity, Jeska, James, JonHenry, Kelly, Callum, Char, Daniel, DavidF, Don, Jeff, Lauren, Lee, Michael, Ramzi, Vektor, Steve, TomY, Tess, Kona, Brent, Clarissa, PeterP, Jesse, Annette, Cyn, Blue, Ginsu, Jonathan, Karen, Adam, Nova, Deana, Lizzie, Patsy, DavidK, Isaac, Pathfinder, Monroe, Jill, Benny, Altruima, Rheya, Jennifer, Jack, DaveP, Brad, Mick, Babbage, Elisabeth, Brian, Beth, Data, Ethan, Wendy, Nicole, Sky, Jeffrey, Zero, Coffee, Tesla, Kenny, Makiko, Nigel, Teeple, Lucy, Mia, Dee, Guy, Harry, Liana, Branka, Jimbo, Aura, Vasuda, SarahD, bethanye, Torley, Runitai, MikeS, PaulM, Milo, Hermia, JoeM, Melanie, Rejean, DSmith, SMiller, Susan, Jose, DongYun, Justin, Andrey, Syrah, Donovan, Henrik, Nora, Lexie, AC, Donna, ChrisC, Alex, Leyla, Kyle, Mathew, Devin, Joshua, DanC, Jessica, Harmony, Claudia, Tramel, Glenn, Betsy, Fritz, Jun, Adam, Cassandra, Ken, RyanW, Spike, Tofu, Varas, Andy, Luke, RobLa, Chiyo, JohnZ, Dustin, George, Del, PeterP, Migyeong, Matthew, RMullane, CChampion, JTurbin, JamesC, Viola, Lightfoot, Jacqui, Sturm, Adrian, Buttercup, Alfred, Sunil, Alfred, Noel, Irfan, Jill, Yool, Jane, Yuki, Yoz, Matthew, Arthur, Jennifer, Karl, Brian, Ben, Janine, Christopher, Madhavi, Everett, Anthony, Joon, Jake, sean, Adreanne, Stephany, KellyJo, Jeremy, Pramod, Joshua, Sean, Christopher, Amy, Ceren, Katherine, jon, Sudheendra, James, Stephan, Kari, Kartic, Todd, Thomas, Joki, Rebecca, Belinda, Bert, Roger, Bridie, Kristi, Brian, Maria, John, Aric, Nathanel, Melinda, Darrell, Jennifer, Sandy, Greg, Rob, Brad, Chris, Eric, Palmer, Asi, Katja, Lisa, Minda, Jen, Aaron, Bryan, Mark, Jonathan, Jamie, Laurel, William, Matthew, Steve, David, Remy, James, Tim, Lee, Brian, Ashlei, Sam, Mike, Ethan, Austin, Wanda, Paul, Brian, Rachel, Valentyn, Emma Williams, Autum, Steven, Laley, Charles, Jessica, Sue, Gillian, CG, Kip, Kristen, Shamiran, Blake, Brett, Erica, Kent, Joel, Plexus, Twilight, Joppa, Enus, Kraft, Naveen, Simon, Q, Ronp, Laurap, Ram, KyleJM, Marty, Kend, Daveh, Prospero, Melissa, Nat, Hamilton, Green, Seraph, Ekim, Miz, Jimmy, Kosmo, Rome, Doris, JT, Benoc, Whump, Mango, Trinity, Patch, TJ, Christy, Bao, Joohwan, Kate, Oreh, Angela, Johan, Cheah, Lan, Matias, Brandy, Cogsworth, Aleks,  Mitchell, Space, Einstein, Bambers, Colton, Malbers, Maggie, Umesh, Santosh, Rose, Stash, Rothman, Winnie, Stella, Niall and many others.
+  Second Life is brought to you by Philip, Tessa, Andrew, Cory, Ben, Bunny, Char, Charlie, Colin, Dan, Daniel, Doug, Eric, Hamlet, Haney, Hunter, Ian, Jeff, Jim, John, Lee, Mark, Peter, Phoenix, Richard, Robin, Xenon, Steve, Tanya, Eddie, Frank, Bruce, Aaron, Alice, Bob, Debra, Eileen, Helen, Janet, Louie, Leviathania, Stefan, Ray, Kevin, Tom, Mikeb, MikeT, Burgess, Elena, Tracy, BillTodd, Ryan, Zach, Sarah, Nova, Otakon, Tim, Stephanie, Michael, Evan, Nicolas, Catherine, Rachelle, Dave, Holly, Bub, Kelly, Magellan, Ramzi, Don, Sabin, Jill, Rheya, DanceStar, Jeska, Hungry, Torley, Kona, Callum, Charity, Ventrella, Jack, Uncle, Vektor, Iris, Chris, Nicole, Mick, Reuben, Blue, Babbage, Yedwab, Deana, Lauren, Brent, Pathfinder, Chadrick, Altruima, Jesse, Monroe, David, Tess, Lizzie, Patsy, Pony, Isaac, Lawrence, Cyn, Bo, Gia, Annette, Marius, Tbone, Jonathan, Karen, Ginsu, Yuko, Makiko, Thomas, Harry, Seth, Alexei, Brian, Guy, Runitai, Ethan, Data, Cornelius, Kenny, Swiss, Zero, Natria, Wendy, Stephen, Teeple, Thumper, Lucy, Dee, Mia, Liana, Warren, Branka, Aura, beez, Milo, Hermia, Red, Thrax, Joe, Sally, Magenta, Paul, Jose, Rejean, Henrik, Lexie, Amber, Logan, Xan, Nora, Morpheus, Donovan, Leyla, MichaelFrancis, Beast, Cube, Bucky, Joshua, Stryfe, Harmony, Teresa, Claudia, Walker, Glenn, Fritz, Fordak, June, Cleopetra, Jean, Ivy, Betsy, Roosevelt, Spike, Ken, Which, Tofu, Chiyo, Rob, Zee, dustin, George, Del, Matthew, Cat, Jacqui, Lightfoot, Adrian, Viola, Alfred, Noel, Irfan, Sunil, Yool, Rika, Jane, Xtreme, Frontier, a2, Neo, Siobhan, Yoz, Justin, Elle, Qarl, Benjamin, Isabel, Gulliver, Everett, Christopher, Izzy, Stephany, Garry, Sejong, Sean, Tobin, Iridium, Meta, Anthony, Jeremy, JP, Jake, Maurice, Madhavi, Leopard, Kyle, Joon, Kari, Bert, Belinda, Jon, Kristi, Bridie, Pramod, KJ, Socrates, Maria, Ivan, Aric, Yamasaki, Adreanne, Jay, MitchK, Ceren, Coco, Durl, Jenny, Periapse, Kartic, Storrs, Lotte, Sandy, Colossus, Zen, BigPapi, Brad, Pastrami, Kurz, Mani, Neuro, Jaime, MJ, Rowan, Sgt, Elvis, Gecko, Samuel, Sardonyx, Leo, Bryan, Niko, Soft, Poppy, Rachel, Aki, Angelo, Banzai, Alexa, Sue, CeeLo, Bender, CG, Gillian, Pelle, Nick, Echo, Zara, Christine, Shamiran, Emma, Blake, Keiko, Plexus, Joppa, Sidewinder, Erica, Ashlei, Twilight, Kristen, Brett, Q, Enus, Simon, Bevis, Kraft, Kip, Chandler, Ron, LauraP, Ram, KyleJM, Scouse, Prospero, Melissa, Marty, Nat, Hamilton, Kend, Lordan, Jimmy, Kosmo, Seraph, Green, Ekim, Wiggo, JT, Rome, Doris, Miz, Benoc, Whump, Trinity, Patch, Kate, TJ, Bao, Joohwan, Christy, Sofia, Matias, Cogsworth, Johan, Oreh, Cheah, Angela, Brandy, Mango, Lan, Aleks, Gloria, Heidy, Mitchell, Space, Colton, Bambers, Einstein, Maggie, Malbers, Rose, Winnie, Stella, Milton, Rothman, Niall, Marin, Allison, James, Katie, Dawn, Katt, Kalpana, Judy, Andrea, Ambroff, Infinity, Gail, Rico, Raymond, Yi, William, Christa, M, Teagan, Scout, Molly, Dante, Corr, Dynamike, Usi, Kaylee, Lil, Danica, Sascha, Kelv, Jacob, Nya, Rodney, Brandon, Elsie, Blondin, Grant, Katrin, Nyx, Gabriel, Locklainn, Claire, Devin, Minerva, Monty, Austin, Bradford, Si, Keira, H, Caitlin, Dita, Makai, Jenn and many others.
-  Thank you to the following residents for helping to ensure that this is the best version yet: aaron23 decuir, Abelv Vollmar, Abyssin Otoro, ActingIll Igaly, Adamas Carter, Addy Broome, Adelia Menges, Alexandra Rucker, Alexandrea Fride, Alissa Sabre, Alyx Jonson, Ann Otoole, Anton Fargis, Aradia Dielli, Araina jewell, Arcane Clawtooth, arcangelo vantelli, Are Sperber, Argent Stonecutter, arkady yost, Ashcroft Burnham, Ashen Arida, Auron Forcella, Azadine Umarov, Azildin Furst, Balp Allen, Balpien Hammerer, Barney Boomslang, Barrett Slade, becky pippen, Beeflin Grut, Beer Dailey, Behemoth Greenwood, bigmanu greene, bitova loon, Bonca Chikuwa, Bonnie Bechir, Brandon Catteneo, buttonpusher jones, Carina Raymaker, Ceera Murakami, Celierra Darling, ChatNoir Moonsoo, Cheetah Hammerer, chet neurocam, Cinthya Loveless, Cold Spitteler, Coral Quinnell, Crash Pointe, CrazyTB Oh, Creem Pye, Crom Chaffe, ctrl althouse, dade carver, Dael Ra, dakota schwade, Dale Innis, Damian McLeod, Danger Lytton, danielluh ashton, DanOfWA Flanagan, Davec Horsforth, Davidius Morigi, davie zinner, Day Oh, DBDigital Epsilon, Deany Fall, deBruce Munro, Decaf Coffey, Dedric Mauriac, Deeso Saeed, Dekka Raymaker, dexter eberhart, Dildo Spitz, Dizzy Banjo, djcabello klaar, Dnali Anabuki, Domchi Underwood, Doran Zemlja, Drew Dwi, Duckless Vandyke, Duncan Stenvaag, Dylan Rickenbacker, dzogchen Moody, Dzonatas Sol, Eddy Stryker, Edward Griffith, Edward Pearse, ein duesenburg, Elle Pollack, Elle74 Zaftig, Emileigh Starbrook, Emma Nowhere, ener bing, Erdrick Balbozar, eric domela, Evangeline Biedermann, Excalibur Longstaff, Fake Fitzgerald, Feldspar Millgrove, Feynt Mistral, Fluf Fredriksson, Forbid Utorid, Fortyniner Beck, Francesco Despres, Francisco Koolhoven, Franta Burt, Fury Rosewood, garde Burrel, Garmin Kawaguichi, Gavin Ichigo, Gellan Glenelg, Genie Demina, Gennifer Meredith, Gigs Taggart, Goldie Katsu, Gwyneth Llewelyn, Haravikk Mistral, Harleen Gretzky, Haruki Watanabe, Heather Manatiso, Henri Beauchamp, Honey Fairweather, Hypatia Callisto, Ice Brodie, icktoofay Kamachi, IntLibber Brautigan, Janise Dreamscape, Jay Shinobu, Jenni Ryba, Jeremy Ondricek, JetZep Zabelin, Jims Smythe, Jini Hammerer, Jopy Weber, JustOneMore Loon, Kaluura Boa, Kara Markova, Kevin Susenko, Khyra Ares, Kii Lilliehook, Kitty Barnett, Kris Kuttelwascher, Lanita Wingtips, Laura18 Streeter, Lee Ludd, Lettrius Jewell, Liberty Tesla, LilyAnna Carter, Lindal Kidd, Lisa Lowe, Lisa McConnell, Lola Machin, luca peck, Lupus Clawtooth, M1sha Dallin, Macsima Dagostino, Mana Janus, Mani Canning, Manjusri Binder, marceledward edman, march Korda, marchino villota, Marcus Llewellyn, MartinRJ Fayray, Matthew Dowd, Max Kleiber, mazzy fastback, McCabe Maxsted, Mckailen Kohnke, Meghan Dench, Melvin Starbrook, Mercia Mcmahon, Miakoda Carnell, Michelle2 Zenovka, Michi Lumin, mick parnall, Milla Michinaga, Millie Thompson, miranda Ashby, Mircea Lobo, MIssSara Beck, mouse mimistrobell, Myria Boa, Nanci Barthelmess, Nargus Asturias, Natalya Debevec, Nedrae Messmer, Nexeus Fatale, Niky Zenovka, Nimrod Szondi, Ninane Yoshikawa, Noch Tripsa, nokithecat writer, Nyko Merlin, Onyx Halberd, oryx tempel, Osprey Therian, Pac Hyun, Panagea McMillan, Patrick Ferrentino, PattehPh0x Katsu, ponk bing, Poppy Linden, Prajna Vella, Precious Rhiano, Prokofy Neva, Randall Lovenkraft, Rascal Ratelle, Raydon Writer, Rhaorth Antonelli, Rock Hayek, Ron Crimson, Ron Khondji, Ronald Richez, Rui Clary, Ruud Lathrop, Sakkano Imako, Sam Reinard, Sascha Vandyke, Scrippy Scofield, Sean18 McCarey, Sedona Mills, Sekonda Huet, Seraph Nephilim, Sergei Milos, Shadowquine Maltz, shai khalifa, sheilah flatley, Sheri Underwood, Shuggy Husky, Sierra Janus, Sigma Avro, Simil Miles, simon kline, Simon Nolan, Sindy Tsure, Sparks Keynes, Squirrel Wood, Stahi Columbia, StarSong Bright, Summer Seale, Sunn Thunders, Susan Koltai, Syler Zhora, Synack Fitzgerald, Tayra Dagostino, Tee Cramer, Teravus Ousley, Thomas Shikami, Tia Araw, Tillie Ariantho, Topher Brooks, Torley Linden, Twosteppin Jewell, tx Oh, urantia jewell, vaguegirl Petty, VeC Merlin, venus petrov, vv33d Beck, vynka dean, zann canto, zeebster colasanti, Zi Ree, Zion Tristan, Zorin Frobozz, Zyzzy Zarf
+  Thank you to the following residents for helping to ensure that this is the best version yet: aaron23 decuir, Abra Miles, absolute balderdash, adelle fitzgerald, Aeron Kohime, Aki Shichiroji, Alger Meads, Alissa Sabre, AlwaysIcey Mapholisto, Arawn Spitteler, Aren Mandala, Arianna Wrigglesworth, Bagushii Kohime, Balpien Hammerer, Blinking2342 Blinker, byakuya runo, Capucchy Streeter, Chandra Jun, Coyote Pace, Crusher Soderstrom, Cummere Mayo, cyberrosa Rossini, Dael Ra, danana dodonpa, Darek Deluca, Davec Horsforth, django yifu, draco crane, Dre Dagostino, Ephyu Reino, etan quan, Fenrix Murakami, Fledhyris Proudhon, Fred Wardhani, Frederich Courier, garth fairchang, Gellan Glenelg, Geraldine Giha, GOLAN Eilde, gonzo joubert, Hachiro Yokosuka, Hampton Hax, harleywood guru, Hevenz Vansant, imnotgoing sideways, Jaden Giles, Jeanette Janus, Karl Dorance, keaton Akina, Khashai Steinbeck, KiPSOFT Tuqiri, kirstenlee Cinquetti, Kitty Barnett, Laurent Vesta, Lazure Ryba, Lima Vesperia, Linzi Bingyi, Lisa Lowe, LuDon Ninetails, Mark Rosenbaum, McCabe Maxsted, Michi Lumin, Midi Aeon, ml0rtd kit, Mo Eriksen, Morice Flanagan, Mysterion Aeon, Nad Gough, norgan torok, Pygar Bu, Qie Niangao, rachel corleone, Rado Arado, roberto salubrius, Royer Pessoa, samia bechir, Sasha Nurmi, Sean Heying, Selkit Diller, Shadow Pidgeon, simon kline, Smokie Ember, Soap Clawtooth, Strife Onizuka, Tal Chernov, Talan Hyun, tangletwigs fairymeadow, Tanya Spinotti, Tayra Dagostino, Teebone Aeon, Theremes Langdon, Thraxis Epsilon, tucor Capalini, Vasko Hawker, VenusMari Zapedzki, Vex Streeter, Viktoria Dovgal, Vincent Nacon, Viridian Exonar, Vivienne Schell, WarKirby Magojiro, Wilton Lundquist, Yukinoroh Kamachi, Zyzzy Zarf
  3Dconnexion SDK Copyright (C) 1992-2007 3Dconnexion
  APR Copyright (C) 2000-2004 The Apache Software Foundation
@@ -32,7 +32,7 @@
  Voice chat Audio coding: Polycom(R) Siren14(TM) (ITU-T Rec. G.722.1 Annex C)
-  Happiness is a warm puppy. -- Charles M. Schulz</text_editor>
+  What happens to a dream deferred? --Langston Hughes</text_editor>
        <text_editor bottom_delta="174" embedded_items="false"
             follows="left|top|right|bottom" font="SansSerif" height="238" left="6"
diff --git a/linden/indra/newview/skins/default/xui/en-us/floater_about_land.xml b/linden/indra/newview/skins/default/xui/en-us/floater_about_land.xml
index 262f363..3f6e6b2 100644
--- a/linden/indra/newview/skins/default/xui/en-us/floater_about_land.xml
+++ b/linden/indra/newview/skins/default/xui/en-us/floater_about_land.xml
@@ -454,7 +454,7 @@
                             halign="center" height="16" label="Return objects..."
                             label_selected="Return objects..." left="220" mouse_opaque="true"
                             name="Return objects..." width="164" />
-                        <name_list allow_calling_card_drop="false" background_visible="false" bottom="-329"
+                        <name_list allow_calling_card_drop="false" background_visible="true" bottom="-329"
                             column_padding="0" draw_border="true" draw_heading="true"
                             draw_stripes="true" enabled="true" 
                             follows="left|top|right|bottom" height="117" left="4" mouse_opaque="true"
diff --git a/linden/indra/newview/skins/default/xui/en-us/floater_hud.xml b/linden/indra/newview/skins/default/xui/en-us/floater_hud.xml
index 2372f3e..84d113a 100644
--- a/linden/indra/newview/skins/default/xui/en-us/floater_hud.xml
+++ b/linden/indra/newview/skins/default/xui/en-us/floater_hud.xml
@@ -1,8 +1,11 @@
 <?xml version="1.0" encoding="utf-8" standalone="yes" ?>
 <floater can_close="true" can_drag_on_left="false" can_minimize="false" can_resize="false"
-     height="272" min_height="272" width="342" min_width="342" name="floater_hud"
+     height="292" width="362" name="floater_hud"
     title="Tutorial">
-        <web_browser border_visible="false" left="0" bottom="0" right="-1" top="-24" caret_color="1 1 1 1" follows="top|left|bottom|right"
+<!-- NOTE: Height and width must match values in settings.xml for 
+     FloaterHUDRect because this floater is resized to those values 
+     in LLViewerWindow initialization. JC -->
+        <web_browser border_visible="false" left="1" bottom="1" width="360" height="265" caret_color="1 1 1 1" follows="top|left|bottom|right"
             name="floater_hud_browser"
             start_url="data:text/html,%3Chtml%3E%3Chead%3E%3C/head%3E%3Cbody bgcolor=%22#000000%22 text=%22ffffff%22%3E%3Ch1%3E%3Ctt%3E%0D%0A%0D%0ALoading...%3C/tt%3E%3C/h1%3E%3C/body%3E%3C/html%3E"
        />
diff --git a/linden/indra/newview/skins/default/xui/en-us/floater_im.xml b/linden/indra/newview/skins/default/xui/en-us/floater_im.xml
index 11c839c..e30438b 100644
--- a/linden/indra/newview/skins/default/xui/en-us/floater_im.xml
+++ b/linden/indra/newview/skins/default/xui/en-us/floater_im.xml
@@ -17,7 +17,7 @@
                Click the [BUTTON NAME] button to accept/connect to this voice chat.
        </string>
        <string name="muted_message">
-                [FIRST] [LAST] is muted.
+                You have muted this resident. Sending a message will automatically unmute them.
        </string>
        <string name="generic_request_error">
diff --git a/linden/indra/newview/skins/default/xui/en-us/floater_skin_preview_template.xml b/linden/indra/newview/skins/default/xui/en-us/floater_skin_preview_template.xml
new file mode 100644
index 0000000..a029f19
--- /dev/null
+++ b/linden/indra/newview/skins/default/xui/en-us/floater_skin_preview_template.xml
@@ -0,0 +1,80 @@
+<?xml version="1.0" encoding="utf-8" standalone="yes" ?>
+<multi_floater bottom="256" can_close="true" can_drag_on_left="false" can_minimize="true"
+     can_resize="false" height="148" left="256" name="floater_chatterbox" title="" title_bar="true" width="300" rect_control="ChatterboxRect">
+    <icon image_name="checkerboard_transparency_bg.png" follows="left|right|top|bottom" bottom="0" left="0" height="128" width="300" />
+    <panel width="300" height="28" left="0" bottom="0" background_opaque="true" background_visible="true">
+        <panel bottom="0" filename="panel_bg_toolbar.xml" height="26" left="0" width="300" follows="left|right|top|bottom"/>
+        <button bottom="0" font="SansSerif" height="24"
+            image_selected="btn_chatbar_selected.tga" scale_image="true"
+            image_unselected="btn_chatbar.tga" label="" left="2" name="chat_btn"
+            image_overlay="icn_chatbar.tga" tool_tip="Show Chat Bar. (Enter)"
+            width="50" auto_resize="false" follows="left|right" user_resize="false"/>
+            <icon image_name="spacer24.tga" left_delta="2" width="2" height="2" follows="left|right" auto_resize="false" color="0,0,0,0"/>
+        <flyout_button bottom="0" font="SansSerif" height="24" label="Communicate" left_delta="52"
+           name="communicate_btn" tool_tip="Communicate with your Friends and Groups."
+            list_position="above" auto_resize="false"
+            width="120" follows="left|right" user_resize="false"/>
+        <icon image_name="spacer24.tga" width="2" height="2" follows="left|right" auto_resize="false" color="0,0,0,0"/>
+        <button bottom="0" left_delta="122"
+            font="SansSerif"
+            height="24"
+            label="Fly"
+            image_overlay="icn_toolbar_fly.tga"
+            image_overlay_alignment="left"
+            image_selected="toolbar_btn_selected.tga"
+            image_unselected="toolbar_btn_enabled.tga"
+            toggle="true"
+            auto_resize="false"
+            image_disabled="toolbar_btn_disabled.tga"
+            scale_image="true"
+            label_selected="Stop Flying" left="0" name="fly_btn"
+            tool_tip="Start flying. Use E/C or PgUp/PgDn to fly up and down."
+            width="120"
+            follows="left|right"
+            user_resize="false"/>
+    </panel>
+        <panel name="panel_unfocused_floater" background_opaque="false" background_visible="true" bg_alpha_color="DefaultBackgroundColor" height="100" width="148" left="2" bottom="29" border="true" border_color="FloaterUnfocusBorderColor">
+            <panel background_opaque="false" background_visible="false" bg_alpha_color="0,0,0,0" height="17" width="148" bottom="83" />
+            <text name="titlebar_focused" text_color="LabelDisabledColor" bottom_delta="6" left_delta="15" font="SansSerif">Unfocused</text>
+            <icon image_name="closebox.tga" left_delta="116" bottom="83" width="16" height="16" color="FloaterButtonImageColor"/>
+            <icon image_name="minimize.tga" left_delta="-17" bottom_delta="0" width="16" height="16" color="FloaterButtonImageColor"/>
+            
+        <combo_box name="combo_box_1" label="Combo Box" height="20" width="90" bottom_delta="-22" left="2" />
+        <text_editor type="string" length="1" bg_readonly_color="ChatHistoryBgColor" bg_writeable_color="ChatHistoryBgColor"
+                             bottom="5" embedded_items="false" enabled="false"
+                             follows="left|top|right|bottom" font="SansSerif" height="50" left="5"
+                             max_length="2147483647" mouse_opaque="true" name="Chat History Editor"
+                             text_color="ChatHistoryTextColor"
+                             text_readonly_color="ChatHistoryTextColor" width="140" word_wrap="true">Text</text_editor>
+        </panel>
+        <panel name="panel_focused_floater" background_opaque="true" background_visible="true" height="100" width="148" left="152" bottom="29" border="true">
+            <panel background_opaque="false" background_visible="true" bg_alpha_color="TitleBarFocusColor" height="17" width="148" bottom="83" />
+            <text name="titlebar_focused" text_color="LabelTextColor" bottom_delta="6" left_delta="15" font="SansSerif">Focused</text>
+            <icon image_name="closebox.tga" left_delta="116" bottom="83" width="16" height="16" color="FloaterButtonImageColor" />
+            <icon image_name="minimize.tga" left_delta="-17" bottom_delta="0" width="16" height="16" color="FloaterButtonImageColor"/>
+<icon enabled="false" image_name="tabarea.tga"
+             bg_alpha_color="blue" color="DefaultShadowLight" border="false"
+             bottom="0" follows="left|right|bottom" height="17" left="1" scale_image="true"
+             mouse_opaque="false" name="chatterbox_tab_container" width="148"></icon>
+    <tab_container bottom="0" follows="left|right|top|bottom" height="102" left="0"
+             name="chatterbox_tabs" tab_position="bottom" tab_min_width="40" width="148" >
+        <panel name="test_1" label="Focused">
+            <slider bottom_delta="-36" control_name="SliderTest" follows="left|top|right"
+             height="15" increment="0.05" initial_val="0.5" label="Slider"
+             label_width="36" left="5" max_val="1" min_val="0" name="SliderTestName"
+             show_text="false" volume="true" width="140" />
+            <check_box name="check_box_test_1" label="True" bottom_delta="56" initial_value="true" left="0" />
+        <check_box name="check_box_test_1" label="False" bottom_delta="0" left_delta="50" initial_value="false" />
+            <text_editor type="string" length="1" bg_readonly_color="ChatHistoryBgColor" bg_writeable_color="ChatHistoryBgColor"
+                             bottom="8" embedded_items="false" enabled="false"
+                              font="SansSerif" height="22" left="2"
+                             max_length="2147483647" mouse_opaque="true" name="Chat History Editor" hide_scrollbar="true"
+                             text_color="ChatHistoryTextColor"
+                             text_readonly_color="ChatHistoryTextColor" width="140" word_wrap="true">Chat Text</text_editor>
+        
+        </panel>
+        <panel name="test_2" label="Unfocused" />
+    </tab_container>
+        </panel>
+</multi_floater>
+\ No newline at end of file
diff --git a/linden/indra/newview/skins/default/xui/en-us/floater_snapshot.xml b/linden/indra/newview/skins/default/xui/en-us/floater_snapshot.xml
index 1346f7c..ce19db8 100644
--- a/linden/indra/newview/skins/default/xui/en-us/floater_snapshot.xml
+++ b/linden/indra/newview/skins/default/xui/en-us/floater_snapshot.xml
@@ -142,7 +142,7 @@
             name="keep_open_check" />
        <check_box bottom_delta="-20" follows="left|top" label="Freeze frame (fullscreen preview)"
             left="10" name="freeze_frame_check" />
-        <check_box bottom_delta="-20" follows="left|top" label="Auto-snapshot" left="20"
+        <check_box bottom_delta="-20" follows="left|top" label="Auto-refresh" left="10"
             name="auto_snapshot_check" />
        <string name="unknown">
                unknown
diff --git a/linden/indra/newview/skins/default/xui/en-us/panel_preferences_skins.xml b/linden/indra/newview/skins/default/xui/en-us/panel_preferences_skins.xml
index 7bf4ab2..a3ee65d 100644
--- a/linden/indra/newview/skins/default/xui/en-us/panel_preferences_skins.xml
+++ b/linden/indra/newview/skins/default/xui/en-us/panel_preferences_skins.xml
@@ -11,12 +11,12 @@
  <radio_group bottom="0" draw_border="false" follows="top|left" height="380" left="12"
             name="skin_selection" width="480">
    <radio_item bottom="-20" height="20" left="0" name="default" width="480">
-      Classic
+      Default
    </radio_item>
    <radio_item bottom="-180" height="20" left="0" name="silver" width="480">
      Silver
    </radio_item>
  </radio_group>
-  <button left="130" bottom="-160" width="301" height="129" name="classic_preview" label="" scale_image="true" image_selected="skin_thumbnail_classic.png" image_unselected="skin_thumbnail_classic.png"/>
+  <button left="130" bottom="-160" width="298" height="130" name="classic_preview" label="" scale_image="true" image_selected="skin_thumbnail_default.png" image_unselected="skin_thumbnail_default.png" image_hover_selected="skin_thumbnail_default.png" image_hover_unselected="skin_thumbnail_default.png"/>
-  <button left="130" bottom="-320" width="301" height="129" name="silver_preview" label="" scale_image="true" image_selected="skin_thumbnail_modern.png" image_unselected="skin_thumbnail_modern.png"/>
+  <button left="130" bottom="-320" width="298" height="130" name="silver_preview" label="" scale_image="true" image_selected="skin_thumbnail_silver.png" image_hover_selected="skin_thumbnail_silver.png" image_unselected="skin_thumbnail_silver.png" image_hover_unselected="skin_thumbnail_silver.png"/>
 </panel>
diff --git a/linden/indra/newview/skins/default/xui/es/floater_about.xml b/linden/indra/newview/skins/default/xui/es/floater_about.xml
index c9273dc..2c38899 100644
--- a/linden/indra/newview/skins/default/xui/es/floater_about.xml
+++ b/linden/indra/newview/skins/default/xui/es/floater_about.xml
@@ -1,30 +1,4 @@
 <?xml version="1.0" encoding="utf-8" standalone="yes" ?>
 <floater name="floater_about" title="Sobre Second Life">
-        <text_editor name="credits_editor">
-                Second Life is brought to you by Philip, Andrew, Tessa, Cory, Frank, James, Doug, Hunter, Richard, John, Eric, Avi, AaronB, AaronY, Ian, Peter, Mark, Robin, Stephen, Tracy, Ryan, Alberto, Haney, Tanya, JimJ, Dan, Ben, Stephanie, Tim, Evan, Catherine, Colin, Chris, Reuben, Charity, Jeska, James, JonHenry, Kelly, Callum, Char, Daniel, DavidF, Don, Jeff, Lauren, Lee, Michael, Ramzi, Vektor, Steve, TomY, Tess, Kona, Brent, Clarissa, PeterP, Jesse, Annette, Cyn, Blue, Ginsu, Jonathan, Karen, Adam, Nova, Deana, Lizzie, Patsy, DavidK, Isaac, Pathfinder, Monroe, Jill, Benny, Altruima, Rheya, Jennifer, Jack, DaveP, Brad, Mick, Babbage, Elisabeth, Brian, Beth, Data, Ethan, Wendy, Nicole, Sky, Jeffrey, Zero, Coffee, Tesla, Kenny, Makiko, Nigel, Teeple, Lucy, Mia, Dee, Guy, Harry, Liana, Branka, Jimbo, Aura, Vasuda, SarahD, bethanye, Torley, Runitai, MikeS, PaulM, Milo, Hermia, JoeM, Melanie, Rejean, DSmith, SMiller, Susan, Jose, DongYun, Justin, Andrey, Syrah, Donovan, Henrik, Nora, Lexie, AC, Donna, ChrisC, Alex, Leyla, Kyle, Mathew, Devin, Joshua, DanC, Jessica, Harmony, Claudia, Tramel, Glenn, Betsy, Fritz, Jun, Adam, Cassandra, Ken, RyanW, Spike, Varas, Andy, Luke, RobLa, Chiyo, JohnZ, Dustin, George, Del, PeterP, Migyeong, Matthew, RMullane, CChampion, JTurbin, JamesC, Viola, Lightfoot, Jacqui, Sturm, Adrian, Buttercup, Alfred, Sunil, Alfred, Noel, Irfan, JillS, Yool, Jane and many others.
-Thank you to the following residents for helping to ensure that this is the best version yet: Atte Aderdeen, Alise Altman, Doomby Arrow, Rox Arten, Jesse Barnett, Smiley Barry, SuezanneC Baskerville, Glitch Braess, Dorian Caldwell, JuiceBox132 Castro, Aden Christensen, Fremont Cunningham, Zirnitra Demar, Errafel Eccleston, Cory Edo, Kitto Flora, Ashrilyn Hayashida, Elektra Hesse, Friar Jeffries, Samuel Jordan, DeLisa Junot, Howie Lament, Candide LeMay, Michi Lumin, Ikani Mahana, SignpostMarv Martin, Ksathra Mason, Console Mission, Haravikk Mistral, Usagi Musashi, Lex Neva, Jamma Newt, Blaze Nielsen, Destiny Niles, Tateru Nino, Harald Nomad, Nerk Noonan, Stumbelina Ophelia, Fledhyris Proudhon, Londyn Reatequi, Zi Ree, Hank Rucker, BamBam Sachertorte, kai Sachertorte, Sean Sao, Funk Schnook, Magnum Serpentine, Nekosune Smails, Rhyph Somme, Al Sonic, Oz Spade, Wesley Spengler, Steve Steed, Gearsawe Stonecutter, Dirk Talamasca, Dolmere Talamasca, John Taylor, Raymond Tuxing, Churchill Tweak, Huns Valen, windozer Vargas, Sabby Whiplash, Raven Wombat, Beatfox Xevious, Yiffy Yaffle, Alpha Zaius, Hewee Zetkin, Jai Zucker and many others.
-APR Copyright (C) 2000-2004 The Apache Software Foundation
-Cg Copyright (C) 2002, NVIDIA Corporationa.
-cURL Copyright (C) 1996-2002, Daniel Stenberg, (daniel@haxx.se)
-expat Copyright (C) 1998, 1999, 2000 Thai Open Source Software Center Ltd.
-FreeType Copyright (C) 1996-2002, The FreeType Project (www.freetype.org).
-GL Copyright (C) 1999-2004 Brian Paul.
-Havok.com(TM) Copyright (C) 1999-2001, Telekinesys Research Limited.
-jpeg2000 Copyright (C) 2001, David Taubman, The University of New South Wales (UNSW)
-jpeglib Copyright (C) 1991-1998, Thomas G. Lane.
-ogg/vorbis Copyright (C) 2001, Xiphophorus
-OpenSSL Copyright (C) 1998-2002 The OpenSSL Project.
-SDL Copyright (C) 1997, 1998, 1999, 2000, 2001, 2002 Sam Lantinga
-SSLeay Copyright (C) 1995-1998 Eric Young (eay@cryptsoft.com)
-xmlrpc-epi Copyright (C) 2000 Epinions, Inc.
-zlib Copyright (C) 1995-2002 Jean-loup Gailly and Mark Adler.
-All rights reserved.  See licenses.txt for details.
-Don&apos;t hassle the hoff.
-        </text_editor>
 </floater>
diff --git a/linden/indra/newview/skins/default/xui/fr/floater_about.xml b/linden/indra/newview/skins/default/xui/fr/floater_about.xml
index 2c8ab77..883551c 100644
--- a/linden/indra/newview/skins/default/xui/fr/floater_about.xml
+++ b/linden/indra/newview/skins/default/xui/fr/floater_about.xml
@@ -1,30 +1,4 @@
 <?xml version="1.0" encoding="utf-8" standalone="yes" ?>
 <floater name="floater_about" title="A propos de Second Life">
-        <text_editor name="credits_editor">
-                Second Life is brought to you by Philip, Andrew, Tessa, Cory, Frank, James, Doug, Hunter, Richard, John, Eric, Avi, AaronB, AaronY, Ian, Peter, Mark, Robin, Stephen, Tracy, Ryan, Alberto, Haney, Tanya, JimJ, Dan, Ben, Stephanie, Tim, Evan, Catherine, Colin, Chris, Reuben, Charity, Jeska, James, JonHenry, Kelly, Callum, Char, Daniel, DavidF, Don, Jeff, Lauren, Lee, Michael, Ramzi, Vektor, Steve, TomY, Tess, Kona, Brent, Clarissa, PeterP, Jesse, Annette, Cyn, Blue, Ginsu, Jonathan, Karen, Adam, Nova, Deana, Lizzie, Patsy, DavidK, Isaac, Pathfinder, Monroe, Jill, Benny, Altruima, Rheya, Jennifer, Jack, DaveP, Brad, Mick, Babbage, Elisabeth, Brian, Beth, Data, Ethan, Wendy, Nicole, Sky, Jeffrey, Zero, Coffee, Tesla, Kenny, Makiko, Nigel, Teeple, Lucy, Mia, Dee, Guy, Harry, Liana, Branka, Jimbo, Aura, Vasuda, SarahD, bethanye, Torley, Runitai, MikeS, PaulM, Milo, Hermia, JoeM, Melanie, Rejean, DSmith, SMiller, Susan, Jose, DongYun, Justin, Andrey, Syrah, Donovan, Henrik, Nora, Lexie, AC, Donna, ChrisC, Alex, Leyla, Kyle, Mathew, Devin, Joshua, DanC, Jessica, Harmony, Claudia, Tramel, Glenn, Betsy, Fritz, Jun, Adam, Cassandra, Ken, RyanW and many others.
-Thank you to the following residents for helping to ensure that this is the best version yet: Kyrah Abattoir, Icesis Anansi, Clifton Antonelli, Nargus Asturias, Justizin Austinmer, Drake Bacon, Bitzer Balderdash, McWheelie Baldwin, SuezanneC Baskerville, Sweetheart Baskerville, Logan Bauer, Malarthi Behemoth, phoenix Behemoth, Eva Bellambi, Samgame Bertrand, Woody Blair, Tin Bling, Bibi Book, Barney Boomslang, Eric Boyer, Chromal Brodsky, Kerian Bunin, Lara Bunin, BigRick Byrd, Jillian Callahan, Hypatia Callisto, Frans Charming, nathalie Christensen, Francis Chung, pizzaguy Clutterbuck, Evo Commons, Entity Cosmo, Grazel Cosmo, Tiger Crossing, Fremont Cunningham, Jaki Daligdig, Sugar Darling, Todd David, Norman Desmoulins, Gxeremio Dimsum, Happy Dimsum, Kim Dingo, Roy Domela, Cory Edo, Delu Elytis, DBDigital Epsilon, Leeza Everett, Garth FairChang, Snowflake Fairymeadow, Khamon Fate, lex Fitzcarraldo, Kitto Flora, Angel Fluffy, CrystalShard Foo, Raudf Fox, Govindira Galatea, Rizpah Galatea, Tre Giles, Gattz Gilman, Kex Godel, Armandi Goodliffe, Tsu Goodliffe, Nickolas Goodman, Damen Gorilla, Nytemyst Grace, Mhaijik Guillaume, Gleeb Gupte, Ebonfire Harbinger, Bethanee Heaney, Jenny Hicks, Sandling Honey, Victoria Jacques, Adso Krogstad, Travis Lambert, simon Lameth, Duffy Langdon, Aaron Levy, Jade Lily, Gwyneth Llewelyn, Lola Lollipop, Michi Lumin, KaiLastOfTheBrunnenG Macdonald, Jesse Malthus, Herry Maltz, Seth Mandelbrot, Raavi Mann, Shirley Marquez, Dnate Mars, Ima Mechanique, Hawk Mendicant, Mercury Metropolitan, Haravikk Mistral, Trent Mondrian, Nexus Nash, Seraph Nephilim, Lewis Nerd, Aurael Neurocam, Lex Neva, Prokofy Neva, Seagel Neville, Kate Nicholas, Didde Nielsen, Richard Noonan, crevan Nori, Maczter Oddfellow, vanler Odets, Fat Ogre, Hamncheese Omlet, Strife Onizuka, Panthar Orlowski, Jessica Ornitz, Ron Overdrive, OmniCron Overlord, Dargon Pacer, Kar Parks, Eloise Pasteur, Caliandris Pendragon, Julianna Pennyfeather, Iron Perth, Shawk Pertwee, Mera Pixel, Elle Pollack, Phoenix Psaltery, Hank Ramos, Jon Ree, Tam Ree, Zi Ree, Jon Rolland, BamBam Sachertorte, kai Sachertorte, Mily Sartre, ice Semple, Desmond Shang, DigiKatt Shaw, Felix Sholokhov, Rhyph Somme, Rain Soothsayer, Oz Spade, squeekachu Spearmann, Wesley Spengler, Belaya Statosky, eltee Statosky, Khashai Steinbeck, Draco Steinhardt, Hope Stilman, Ashen Stygian, Seifert Surface, Gigs Taggart, Dolmere Talamasca, JayJay Talamasca, Becky Tardis, Fenris Tardis, Cubey Terra, Osprey Therian, Millie Thompson, John Toonie, Charlene Trudeau, Lyr Tuppakaka, Indy Turner, Luthien Unsung, Random Unsung, Huns Valen, Valdemar Virgo, Gordon Wendt, Mike Westerburg, Wayfinder Wishbringer, Lee Wormser, Aimee Xia, nimrod Yaffle, Yiffy Yaffle, Elle74 Zaftig and many others.
-APR Copyright (C) 2000-2004 The Apache Software Foundation
-Cg Copyright (C) 2002, NVIDIA Corporationa.
-cURL Copyright (C) 1996-2002, Daniel Stenberg, (daniel@haxx.se)
-expat Copyright (C) 1998, 1999, 2000 Thai Open Source Software Center Ltd.
-FreeType Copyright (C) 1996-2002, The FreeType Project (www.freetype.org).
-GL Copyright (C) 1999-2004 Brian Paul.
-Havok.com(TM) Copyright (C) 1999-2001, Telekinesys Research Limited.
-jpeg2000 Copyright (C) 2001, David Taubman, The University of New South Wales (UNSW)
-jpeglib Copyright (C) 1991-1998, Thomas G. Lane.
-ogg/vorbis Copyright (C) 2001, Xiphophorus
-OpenSSL Copyright (C) 1998-2002 The OpenSSL Project.
-SDL Copyright (C) 1997, 1998, 1999, 2000, 2001, 2002 Sam Lantinga
-SSLeay Copyright (C) 1995-1998 Eric Young (eay@cryptsoft.com)
-xmlrpc-epi Copyright (C) 2000 Epinions, Inc.
-zlib Copyright (C) 1995-2002 Jean-loup Gailly and Mark Adler.
-All rights reserved.  See licenses.txt for details.
-It&apos;s not a glitch, it&apos;s a feature.
-        </text_editor>
 </floater>
diff --git a/linden/indra/newview/skins/default/xui/ja/alerts.xml b/linden/indra/newview/skins/default/xui/ja/alerts.xml
index f010bc3..6cc6379 100644
--- a/linden/indra/newview/skins/default/xui/ja/alerts.xml
+++ b/linden/indra/newview/skins/default/xui/ja/alerts.xml
@@ -737,6 +737,11 @@ Studio exhibitのウェブ・ページで確認してください。
                        キャンセル
                </option>
        </alert>
+        <alert name="ChangeSkin">
+                <message name="message">
+                        新しいスキンは[SECOND_LIFE]を再起動すると現れます
+                </message>
+        </alert>
        <alert name="UnsupportedGLRequirements">
                <message name="message">
                        Second Life の使用に必要なハードウェアの環境が満たされていないようです。 Second Life ではマルチテクスチャーに対応したOpenGLグラフィック・カードが必要です。 この場合、グラフィック・カードの最新ドライバがインストールされていること、およびオペレーティング・システムにサービス・パックと修正プログラムが適用されていることをご確認ください。
diff --git a/linden/indra/newview/skins/default/xui/ja/floater_about.xml b/linden/indra/newview/skins/default/xui/ja/floater_about.xml
index 75983b5..57faea0 100644
--- a/linden/indra/newview/skins/default/xui/ja/floater_about.xml
+++ b/linden/indra/newview/skins/default/xui/ja/floater_about.xml
@@ -1,9 +1,9 @@
 <?xml version="1.0" encoding="utf-8" standalone="yes" ?>
 <floater name="floater_about" title="Second Lifeについて">
        <text_editor name="credits_editor">
-                Second Life は、Philip、Andrew、Tessa、Cory、Frank、James、Doug、Hunter、Richard、John、Eric、Avi、AaronB、AaronY、Ian、Peter、Mark、Robin、Stephen、Tracy、Ryan、Alberto、Haney、Tanya、JimJ、Dan、Ben、Stephanie、Tim、Evan、Catherine、Colin、Chris、Reuben、Charity、Jeska、James、JonHenry、Kelly、Callum、Char、Daniel、DavidF、Don、Jeff、Lauren、Lee、Michael、Ramzi、Vektor、Steve、TomY、Tess、Kona、Brent、Clarissa、PeterP、Jesse、Annette、Cyn、Blue、Ginsu、Jonathan、Karen、Adam、Nova、Deana、Lizzie、Patsy、DavidK、Isaac、Pathfinder、Monroe、Jill、Benny、Altruima、Rheya、Jennifer、Jack、DaveP、Brad、Mick、Babbage、Elisabeth、Brian、Beth、Data、Ethan、Wendy、Nicole、Sky、Jeffrey、Zero、Coffee、Tesla、Kenny、Makiko、Nigel、Teeple、Lucy、Mia、Dee、Guy、Harry、Liana、Branka、Jimbo、Aura、Vasuda、SarahD、bethanye、Torley、Runitai、MikeS、PaulM、Milo、Hermia、JoeM、Melanie、Rejean、DSmith、SMiller、Susan、Jose、DongYun、Justin、Andrey、Syrah、Donovan、Henrik、Nora、Lexie、AC、Donna、ChrisC、Alex、Leyla、Kyle、Mathew、Devin、Joshua、DanC、Jessica、Harmony、Claudia、Tramel、Glenn、Betsy、Fritz、Jun、Adam、Cassandra、Ken、RyanW、Spike、Tofu、Varas、Andy、Luke、RobLa、Chiyo、JohnZ、Dustin、George、Del、PeterP、Migyeong、Matthew、RMullane、CChampion、JTurbin、JamesC、Viola、Lightfoot、Jacqui、Sturm、Adrian、Buttercup、Alfred、Sunil、Alfred、Noel、Irfan、Jill、Yool、Jane、Yuki、Yoz、Matthew、Arthur、Jennifer、Karl、Brian、Ben、Janine、Christopher、Madhavi、Everett、Anthony、Joon、Jake、sean、Adreanne、Stephany、KellyJo、Jeremy、Pramod、Joshua、Sean、Christopher、Amy、Ceren、Katherine、jon、Sudheendra、James、Stephan、Kari、Kartic、Todd、Thomas、Joki、Rebecca、Belinda、Bert、Roger、Bridie、Kristi、Brian、Maria、John、Aric、Nathanel、Melinda、Darrell、Jennifer、Sandy、Greg、Rob、Brad、Chris、Eric、Palmer、Asi、Katja、Lisa、Minda、Jen、Aaron、Bryan、Mark、Jonathan、Jamie、Laurel、William、Matthew、Steve、David、Remy、James、Tim、Lee、Brian、Ashlei、Sam、Mike、Ethan、Austin、Wanda、Paul、Brian、Rachel、Valentyn、Emma Williams、Autum、Steven、Laley、Charles、Jessica、Sue、Gillian、CG、Kip、Kristen、Shamiran、Blake、Brett、Erica、Kent、Joel、Plexus、Twilight、Joppa、Enus、Kraft、Naveen、Simon、Q、Ronp、Laurap、Ram、KyleJM、Marty、Kend、Daveh、Prospero、Melissa、Nat、Hamilton、Green、Seraph、Ekim、Miz、Jimmy、Kosmo、Rome、Doris、JT、Benoc、Whump、Mango、Trinity、Patch、TJ、Christy、Bao、Joohwan、Kate、Oreh、Angela、Johan、Cheah、Lan、Matias、Brandy、Cogsworth、Aleks、 Mitchell、Space、Einstein、Bambers、Colton、Malbers、Maggie、Umesh、Santosh、Rose、Stash、Rothman、Winnie、Stella、Niall と、その他多数の人達によって作成されました。
+                Second Life は、 Philip、 Tessa、 Andrew、 Cory、 Ben、 Bunny、 Char、 Charlie、 Colin、 Dan、 Daniel、 Doug、 Eric、 Hamlet、 Haney、 Hunter、 Ian、 Jeff、 Jim、 John、 Lee、 Mark、 Peter、 Phoenix、 Richard、 Robin、 Xenon、 Steve、 Tanya、 Eddie、 Frank、 Bruce、 Aaron、 Alice、 Bob、 Debra、 Eileen、 Helen、 Janet、 Louie、 Leviathania、 Stefan、 Ray、 Kevin、 Tom、 Mikeb、 MikeT、 Burgess、 Elena、 Tracy、 BillTodd、 Ryan、 Zach、 Sarah、 Nova、 Otakon、 Tim、 Stephanie、 Michael、 Evan、 Nicolas、 Catherine、 Rachelle、 Dave、 Holly、 Bub、 Kelly、 Magellan、 Ramzi、 Don、 Sabin、 Jill、 Rheya、 DanceStar、 Jeska、 Hungry、 Torley、 Kona、 Callum、 Charity、 Ventrella、 Jack、 Uncle、 Vektor、 Iris、 Chris、 Nicole、 Mick、 Reuben、 Blue、 Babbage、 Yedwab、 Deana、 Lauren、 Brent、 Pathfinder、 Chadrick、 Altruima、 Jesse、 Monroe、 David、 Tess、 Lizzie、 Patsy、 Pony、 Isaac、 Lawrence、 Cyn、 Bo、 Gia、 Annette、 Marius、 Tbone、 Jonathan、 Karen、 Ginsu、 Yuko、 Makiko、 Thomas、 Harry、 Seth、 Alexei、 Brian、 Guy、 Runitai、 Ethan、 Data、 Cornelius、 Kenny、 Swiss、 Zero、 Natria、 Wendy、 Stephen、 Teeple、 Thumper、 Lucy、 Dee、 Mia、 Liana、 Warren、 Branka、 Aura、 beez、 Milo、 Hermia、 Red、 Thrax、 Joe、 Sally、 Magenta、 Paul、 Jose、 Rejean、 Henrik、 Lexie、 Amber、 Logan、 Xan、 Nora、 Morpheus、 Donovan、 Leyla、 MichaelFrancis、 Beast、 Cube、 Bucky、 Joshua、 Stryfe、 Harmony、 Teresa、 Claudia、 Walker、 Glenn、 Fritz、 Fordak、 June、 Cleopetra、 Jean、 Ivy、 Betsy、 Roosevelt、 Spike、 Ken、 Which、 Tofu、 Chiyo、 Rob、 Zee、 dustin、 George、 Del、 Matthew、 Cat、 Jacqui、 Lightfoot、 Adrian、 Viola、 Alfred、 Noel、 Irfan、 Sunil、 Yool、 Rika、 Jane、 Xtreme、 Frontier、 a2、 Neo、 Siobhan、 Yoz、 Justin、 Elle、 Qarl、 Benjamin、 Isabel、 Gulliver、 Everett、 Christopher、 Izzy、 Stephany、 Garry、 Sejong、 Sean、 Tobin、 Iridium、 Meta、 Anthony、 Jeremy、 JP、 Jake、 Maurice、 Madhavi、 Leopard、 Kyle、 Joon、 Kari、 Bert、 Belinda、 Jon、 Kristi、 Bridie、 Pramod、 KJ、 Socrates、 Maria、 Ivan、 Aric、 Yamasaki、 Adreanne、 Jay、 MitchK、 Ceren、 Coco、 Durl、 Jenny、 Periapse、 Kartic、 Storrs、 Lotte、 Sandy、 Colossus、 Zen、 BigPapi、 Brad、 Pastrami、 Kurz、 Mani、 Neuro、 Jaime、 MJ、 Rowan、 Sgt、 Elvis、 Gecko、 Samuel、 Sardonyx、 Leo、 Bryan、 Niko、 Soft、 Poppy、 Rachel、 Aki、 Angelo、 Banzai、 Alexa、 Sue、 CeeLo、 Bender、 CG、 Gillian、 Pelle、 Nick、 Echo、 Zara、 Christine、 Shamiran、 Emma、 Blake、 Keiko、 Plexus、 Joppa、 Sidewinder、 Erica、 Ashlei、 Twilight、 Kristen、 Brett、 Q、 Enus、 Simon、 Bevis、 Kraft、 Kip、 Chandler、 Ron、 LauraP、 Ram、 KyleJM、 Scouse、 Prospero、 Melissa、 Marty、 Nat、 Hamilton、 Kend、 Lordan、 Jimmy、 Kosmo、 Seraph、 Green、 Ekim、 Wiggo、 JT、 Rome、 Doris、 Miz、 Benoc、 Whump、 Trinity、 Patch、 Kate、 TJ、 Bao、 Joohwan、 Christy、 Sofia、 Matias、 Cogsworth、 Johan、 Oreh、 Cheah、 Angela、 Brandy、 Mango、 Lan、 Aleks、 Gloria、 Heidy、 Mitchell、 Space、 Colton、 Bambers、 Einstein、 Maggie、 Malbers、 Rose、 Winnie、 Stella、 Milton、 Rothman、 Niall、 Marin、 Allison、 James、 Katie、 Dawn、 Katt、 Kalpana、 Judy、 Andrea、 Ambroff、 Infinity、 Gail、 Rico、 Raymond、 Yi、 William、 Christa、 M、 Teagan、 Scout、 Molly、 Dante、 Corr、 Dynamike、 Usi、 Kaylee、 Lil、 Danica、 Sascha、 Kelv、 Jacob、 Nya、 Rodney、 Brandon、 Elsie、 Blondin、 Grant、 Katrin、 Nyx、 Gabriel、 Locklainn、 Claire、 Devin、 Minerva、 Monty、 Austin、 Bradford、 Si、 Keira、 H、 Caitlin、 Dita、 Makai、 Jenn と、その他多数の人達によって作成されました。
-このバージョンをこれまでで最高のものになるようご協力をいただいた以下の住人の皆様に深く感謝いたします。aaron23 decuir、Abelv Vollmar、Abyssin Otoro、ActingIll Igaly、Adamas Carter、Addy Broome、Adelia Menges、Alexandra Rucker、Alexandrea Fride、Alissa Sabre、Alyx Jonson、Ann Otoole、Anton Fargis、Aradia Dielli、Araina jewell、Arcane Clawtooth、arcangelo vantelli、Are Sperber、Argent Stonecutter、arkady yost、Ashcroft Burnham、Ashen Arida、Auron Forcella、Azadine Umarov、Azildin Furst、Balp Allen、Balpien Hammerer、Barney Boomslang、Barrett Slade、becky pippen、Beeflin Grut、Beer Dailey、Behemoth Greenwood、bigmanu greene、bitova loon、Bonca Chikuwa、Bonnie Bechir、Brandon Catteneo、buttonpusher jones、Carina Raymaker、Ceera Murakami、Celierra Darling、ChatNoir Moonsoo、Cheetah Hammerer、chet neurocam、Cinthya Loveless、Cold Spitteler、Coral Quinnell、Crash Pointe、CrazyTB Oh、Creem Pye、Crom Chaffe、ctrl althouse、dade carver、Dael Ra、dakota schwade、Dale Innis、Damian McLeod、Danger Lytton、danielluh ashton、DanOfWA Flanagan、Davec Horsforth、Davidius Morigi、davie zinner、Day Oh、DBDigital Epsilon、Deany Fall、deBruce Munro、Decaf Coffey、Dedric Mauriac、Deeso Saeed、Dekka Raymaker、dexter eberhart、Dildo Spitz、Dizzy Banjo、djcabello klaar、Dnali Anabuki、Domchi Underwood、Doran Zemlja、Drew Dwi、Duckless Vandyke、Duncan Stenvaag、Dylan Rickenbacker、dzogchen Moody、Dzonatas Sol、Eddy Stryker、Edward Griffith、Edward Pearse、ein duesenburg、Elle Pollack、Elle74 Zaftig、Emileigh Starbrook、Emma Nowhere、ener bing、Erdrick Balbozar、eric domela、Evangeline Biedermann、Excalibur Longstaff、Fake Fitzgerald、Feldspar Millgrove、Feynt Mistral、Fluf Fredriksson、Forbid Utorid、Fortyniner Beck、Francesco Despres、Francisco Koolhoven、Franta Burt、Fury Rosewood、garde Burrel、Garmin Kawaguichi、Gavin Ichigo、Gellan Glenelg、Genie Demina、Gennifer Meredith、Gigs Taggart、Goldie Katsu、Gwyneth Llewelyn、Haravikk Mistral、Harleen Gretzky、Haruki Watanabe、Heather Manatiso、Henri Beauchamp、Honey Fairweather、Hypatia Callisto、Ice Brodie、icktoofay Kamachi、IntLibber Brautigan、Janise Dreamscape、Jay Shinobu、Jenni Ryba、Jeremy Ondricek、JetZep Zabelin、Jims Smythe、Jini Hammerer、Jopy Weber、JustOneMore Loon、Kaluura Boa、Kara Markova、Kevin Susenko、Khyra Ares、Kii Lilliehook、Kitty Barnett、Kris Kuttelwascher、Lanita Wingtips、Laura18 Streeter、Lee Ludd、Lettrius Jewell、Liberty Tesla、LilyAnna Carter、Lindal Kidd、Lisa Lowe、Lisa McConnell、Lola Machin、luca peck、Lupus Clawtooth、M1sha Dallin、Macsima Dagostino、Mana Janus、Mani Canning、Manjusri Binder、marceledward edman、march Korda、marchino villota、Marcus Llewellyn、MartinRJ Fayray、Matthew Dowd、Max Kleiber、mazzy fastback、McCabe Maxsted、Mckailen Kohnke、Meghan Dench、Melvin Starbrook、Mercia Mcmahon、Miakoda Carnell、Michelle2 Zenovka、Michi Lumin、mick parnall、Milla Michinaga、Millie Thompson、miranda Ashby、Mircea Lobo、MIssSara Beck、mouse mimistrobell、Myria Boa、Nanci Barthelmess、Nargus Asturias、Natalya Debevec、Nedrae Messmer、Nexeus Fatale、Niky Zenovka、Nimrod Szondi、Ninane Yoshikawa、Noch Tripsa、nokithecat writer、Nyko Merlin、Onyx Halberd、oryx tempel、Osprey Therian、Pac Hyun、Panagea McMillan、Patrick Ferrentino、PattehPh0x Katsu、ponk bing、Poppy Linden、Prajna Vella、Precious Rhiano、Prokofy Neva、Randall Lovenkraft、Rascal Ratelle、Raydon Writer、Rhaorth Antonelli、Rock Hayek、Ron Crimson、Ron Khondji、Ronald Richez、Rui Clary、Ruud Lathrop、Sakkano Imako、Sam Reinard、Sascha Vandyke、Scrippy Scofield、Sean18 McCarey、Sedona Mills、Sekonda Huet、Seraph Nephilim、Sergei Milos、Shadowquine Maltz、shai khalifa、sheilah flatley、Sheri Underwood、Shuggy Husky、Sierra Janus、Sigma Avro、Simil Miles、simon kline、Simon Nolan、Sindy Tsure、Sparks Keynes、Squirrel Wood、Stahi Columbia、StarSong Bright、Summer Seale、Sunn Thunders、Susan Koltai、Syler Zhora、Synack Fitzgerald、Tayra Dagostino、Tee Cramer、Teravus Ousley、Thomas Shikami、Tia Araw、Tillie Ariantho、Topher Brooks、Torley Linden、Twosteppin Jewell、tx Oh、urantia jewell、vaguegirl Petty、VeC Merlin、venus petrov、vv33d Beck、vynka dean、zann canto、zeebster colasanti、Zi Ree、Zion Tristan、Zorin Frobozz、Zyzzy Zarf
+このバージョンをこれまでで最高のものになるようご協力をいただいた以下の住人の皆様に深く感謝いたします。aaron23 decuir、 Abra Miles、 absolute balderdash、 adelle fitzgerald、 Aeron Kohime、 Aki Shichiroji、 Alger Meads、 Alissa Sabre、 AlwaysIcey Mapholisto、 Arawn Spitteler、 Aren Mandala、 Arianna Wrigglesworth、 Bagushii Kohime、 Balpien Hammerer、 Blinking2342 Blinker、 byakuya runo、 Capucchy Streeter、 Chandra Jun、 Coyote Pace、 Crusher Soderstrom、 Cummere Mayo、 cyberrosa Rossini、 Dael Ra、 danana dodonpa、 Darek Deluca、 Davec Horsforth、 django yifu、 draco crane、 Dre Dagostino、 Ephyu Reino、 etan quan、 Fenrix Murakami、 Fledhyris Proudhon、 Fred Wardhani、 Frederich Courier、 garth fairchang、 Gellan Glenelg、 Geraldine Giha、 GOLAN Eilde、 gonzo joubert、 Hachiro Yokosuka、 Hampton Hax、 harleywood guru、 Hevenz Vansant、 imnotgoing sideways、 Jaden Giles、 Jeanette Janus、 Karl Dorance、 keaton Akina、 Khashai Steinbeck、 KiPSOFT Tuqiri、 kirstenlee Cinquetti、 Kitty Barnett、 Laurent Vesta、 Lazure Ryba、 Lima Vesperia、 Linzi Bingyi、 Lisa Lowe、 LuDon Ninetails、 Mark Rosenbaum、 McCabe Maxsted、 Michi Lumin、 Midi Aeon、 ml0rtd kit、 Mo Eriksen、 Morice Flanagan、 Mysterion Aeon、 Nad Gough、 norgan torok、 Pygar Bu、 Qie Niangao、 rachel corleone、 Rado Arado、 roberto salubrius、 Royer Pessoa、 samia bechir、 Sasha Nurmi、 Sean Heying、 Selkit Diller、 Shadow Pidgeon、 simon kline、 Smokie Ember、 Soap Clawtooth、 Strife Onizuka、 Tal Chernov、 Talan Hyun、 tangletwigs fairymeadow、 Tanya Spinotti、 Tayra Dagostino、 Teebone Aeon、 Theremes Langdon、 Thraxis Epsilon、 tucor Capalini、 Vasko Hawker、 VenusMari Zapedzki、 Vex Streeter、 Viktoria Dovgal、 Vincent Nacon、 Viridian Exonar、 Vivienne Schell、 WarKirby Magojiro、 Wilton Lundquist、 Yukinoroh Kamachi、 Zyzzy Zarf
 3Dconnexion SDK Copyright (C) 1992-2007 3Dconnexion
 APR Copyright (C) 2000-2004 The Apache Software Foundation
@@ -26,7 +26,7 @@ zlib Copyright (C) 1995-2002 Jean-loup Gailly and Mark Adler.
 Voice chat Audio coding:Polycom(R) Siren14(TM) (ITU-T Rec.G.722.1 Annex C)
-Happiness is a warm puppy. (しあわせはあったかい子犬)-- チャールズ・M・シュルツ
+しあわせはあったかい子犬-- チャールズ・M・シュルツ
        </text_editor>
        <text name="you_are_at">
                [POSITION]中
diff --git a/linden/indra/newview/skins/default/xui/ja/floater_joystick.xml b/linden/indra/newview/skins/default/xui/ja/floater_joystick.xml
index baef61c..b71cffa 100644
--- a/linden/indra/newview/skins/default/xui/ja/floater_joystick.xml
+++ b/linden/indra/newview/skins/default/xui/ja/floater_joystick.xml
@@ -1,126 +1,120 @@
 <?xml version="1.0" encoding="utf-8" standalone="yes" ?>
 <floater name="Joystick" title="ジョイスティックの設定">
+        <check_box name="enable_joystick" width="120" >
+                ジョイスティックを使う：
+        </check_box>
+        <text name="joystick_type" left="180" width="320"></text>
        <spinner label="X軸マッピング" name="JoystickAxis1" />
        <spinner label="Y軸マッピング" name="JoystickAxis2" />
        <spinner label="Z軸マッピング" name="JoystickAxis0" />
-        <spinner label="ピッチ・マッピング" name="JoystickAxis4" label_width="110" left="10" width="150"/>
+        <spinner label="ピッチ・マッピング" label_width="110" left="10"
+             name="JoystickAxis4" width="150" />
        <spinner label="ヨー・マッピング" name="JoystickAxis5" />
-        <spinner label="ロール・マッピング" name="JoystickAxis3" label_width="110" left="350" width="150"/>
+        <spinner label="ロール・マッピング" label_width="110" left="350"
-        <spinner label="ズーム・マッピング" name="JoystickAxis6" label_width="110" left="10" width="150"/>
+             name="JoystickAxis3" width="150" />
+        <spinner label="ズーム・マッピング" label_width="110" left="10"
+             name="JoystickAxis6" width="150" />
        <check_box label="直接ズーム" name="ZoomDirect" />
        <check_box label="3Dカーソル" name="Cursor3D" />
        <check_box label="自動レベル" name="AutoLeveling" />
        <text name="Control Modes:">
-                制御モード:
+                制御モード：
-        </text>
+        </text>
-        <check_box left="131" name="JoystickAvatarEnabled">アバター</check_box>
+        <check_box left="131" name="JoystickAvatarEnabled">
-        <check_box left="201" name="JoystickBuildEnabled">造る</check_box>
+                アバター
-        <check_box left="271" name="JoystickFlycamEnabled">フライ・カメラ</check_box>
+        </check_box>
-        <text name="XScale" left="5" width="120">
+        <check_box left="201" name="JoystickBuildEnabled">
+                造る
+        </check_box>
+        <check_box left="271" name="JoystickFlycamEnabled">
+                フライ・カメラ
+        </check_box>
+        <text left="5" name="XScale" width="120">
                Xスケール
        </text>
-        <spinner left="135" width="50" name="AvatarAxisScale1" />
+        <spinner left="135" name="AvatarAxisScale1" width="50" />
-        <spinner left="205" width="50" name="BuildAxisScale1" />
+        <spinner left="205" name="BuildAxisScale1" width="50" />
-        <spinner left="275" width="50" name="FlycamAxisScale1" />
+        <spinner left="275" name="FlycamAxisScale1" width="50" />
+        <text left="5" name="YScale" width="120">
-        <text name="YScale" left="5" width="120">
                Yスケール
        </text>
-        <spinner left="135" width="50" name="AvatarAxisScale2" />
+        <spinner left="135" name="AvatarAxisScale2" width="50" />
-        <spinner left="205" width="50" name="BuildAxisScale2" />
+        <spinner left="205" name="BuildAxisScale2" width="50" />
-        <spinner left="275" width="50" name="FlycamAxisScale2" />
+        <spinner left="275" name="FlycamAxisScale2" width="50" />
+        <text left="5" name="ZScale" width="120">
-        <text name="ZScale" left="5" width="120">
                Zスケール
        </text>
-        <spinner left="135" width="50" name="AvatarAxisScale0" />
+        <spinner left="135" name="AvatarAxisScale0" width="50" />
-        <spinner left="205" width="50" name="BuildAxisScale0" />
+        <spinner left="205" name="BuildAxisScale0" width="50" />
-        <spinner left="275" width="50" name="FlycamAxisScale0" />
+        <spinner left="275" name="FlycamAxisScale0" width="50" />
+        <text left="5" name="PitchScale" width="120">
-        <text name="PitchScale" left="5" width="120">
                ピッチ・スケール
        </text>
-        <spinner left="135" width="50" name="AvatarAxisScale4" />
+        <spinner left="135" name="AvatarAxisScale4" width="50" />
-        <spinner left="205" width="50" name="BuildAxisScale4" />
+        <spinner left="205" name="BuildAxisScale4" width="50" />
-        <spinner left="275" width="50" name="FlycamAxisScale4" />
+        <spinner left="275" name="FlycamAxisScale4" width="50" />
+        <text left="5" name="YawScale" width="120">
-        <text name="YawScale" left="5" width="120">
                ヨー・スケール
        </text>
-        <spinner left="135" width="50" name="AvatarAxisScale5" />
+        <spinner left="135" name="AvatarAxisScale5" width="50" />
-        <spinner left="205" width="50" name="BuildAxisScale5" />
+        <spinner left="205" name="BuildAxisScale5" width="50" />
-        <spinner left="275" width="50" name="FlycamAxisScale5" />
+        <spinner left="275" name="FlycamAxisScale5" width="50" />
+        <text left="5" name="RollScale" width="120">
-        <text name="RollScale" left="5" width="120">
                ロール・スケール
        </text>
-        <spinner left="205" width="50" name="BuildAxisScale3" />
+        <spinner left="205" name="BuildAxisScale3" width="50" />
-        <spinner left="275" width="50" name="FlycamAxisScale3" />
+        <spinner left="275" name="FlycamAxisScale3" width="50" />
+        <text left="5" name="XDeadZone" width="120">
-        <text name="XDeadZone" left="5" width="120">
                Xデッド・ゾーン
        </text>
-                <spinner left="135" width="50" name="AvatarAxisDeadZone1" />
+        <spinner left="135" name="AvatarAxisDeadZone1" width="50" />
-                <spinner left="205" width="50" name="BuildAxisDeadZone1" />
+        <spinner left="205" name="BuildAxisDeadZone1" width="50" />
-                <spinner left="275" width="50" name="FlycamAxisDeadZone1"/>
+        <spinner left="275" name="FlycamAxisDeadZone1" width="50" />
+        <text left="5" name="YDeadZone" width="120">
-        <text name="YDeadZone" left="5" width="120">
                Yデッド・ゾーン
        </text>
-                <spinner left="135" width="50" name="AvatarAxisDeadZone2"/>
+        <spinner left="135" name="AvatarAxisDeadZone2" width="50" />
-                <spinner left="205" width="50" name="BuildAxisDeadZone2"/>
+        <spinner left="205" name="BuildAxisDeadZone2" width="50" />
-                <spinner left="275" width="50" name="FlycamAxisDeadZone2" />
+        <spinner left="275" name="FlycamAxisDeadZone2" width="50" />
+        <text left="5" name="ZDeadZone" width="120">
-        <text name="ZDeadZone" left="5" width="120">
                Zデッド・ゾーン
        </text>
-                <spinner left="135" width="50" name="AvatarAxisDeadZone0" />
+        <spinner left="135" name="AvatarAxisDeadZone0" width="50" />
-                <spinner left="205" width="50" name="BuildAxisDeadZone0" />
+        <spinner left="205" name="BuildAxisDeadZone0" width="50" />
-                <spinner left="275" width="50" name="FlycamAxisDeadZone0" />
+        <spinner left="275" name="FlycamAxisDeadZone0" width="50" />
+        <text left="0" name="PitchDeadZone" width="135">
-        <text name="PitchDeadZone" left="0" width="135">
                ピッチ・デッド・ゾーン
        </text>
-                <spinner left="135" width="50" name="AvatarAxisDeadZone4"/>
+        <spinner left="135" name="AvatarAxisDeadZone4" width="50" />
-                <spinner left="205" width="50" name="BuildAxisDeadZone4"/>
+        <spinner left="205" name="BuildAxisDeadZone4" width="50" />
-                <spinner left="275" width="50" name="FlycamAxisDeadZone4"/>
+        <spinner left="275" name="FlycamAxisDeadZone4" width="50" />
+        <text left="5" name="YawDeadZone" width="120">
-        <text name="YawDeadZone" left="5" width="120">
                ヨー・デッド・ゾーン
        </text>
-                <spinner left="135" width="50" name="AvatarAxisDeadZone5" />
+        <spinner left="135" name="AvatarAxisDeadZone5" width="50" />
-                <spinner left="205" width="50" name="BuildAxisDeadZone5" />
+        <spinner left="205" name="BuildAxisDeadZone5" width="50" />
-                <spinner left="275" width="50" name="FlycamAxisDeadZone5" />
+        <spinner left="275" name="FlycamAxisDeadZone5" width="50" />
+        <text left="0" name="RollDeadZone" width="135">
-        <text name="RollDeadZone" left="0" width="135">
                ロール・デッド・ゾーン
        </text>
-        <spinner left="205" width="50" name="BuildAxisDeadZone3" />
+        <spinner left="205" name="BuildAxisDeadZone3" width="50" />
-        <spinner left="275" width="50" name="FlycamAxisDeadZone3" />
+        <spinner left="275" name="FlycamAxisDeadZone3" width="50" />
        <text name="Feathering">
                羽毛
        </text>
-        <slider left="126" width="67" name="AvatarFeathering" />
+        <slider left="126" name="AvatarFeathering" width="67" />
-        <slider left="196" width="67" name="BuildFeathering" />
+        <slider left="196" name="BuildFeathering" width="67" />
-        <slider left="266" width="67" name="FlycamFeathering" />
+        <slider left="266" name="FlycamFeathering" width="67" />
-        <text name="ZoomScale2" left="0" width="140">
+        <text left="0" name="ZoomScale2" width="140">
                ズーム・スケール
        </text>
-        <spinner left="275" width="50" name="FlycamAxisScale6" />
+        <spinner left="275" name="FlycamAxisScale6" width="50" />
-        <text name="ZoomDeadZone" left="0" width="140">
+        <text left="0" name="ZoomDeadZone" width="140">
                ズーム・デッド・ゾーン
        </text>
-        <spinner left="275" width="50" name="FlycamAxisDeadZone6" />
+        <spinner left="275" name="FlycamAxisDeadZone6" width="50" />
-        <button label="SpaceNavigatorのデフォルト設定" name="SpaceNavigatorDefaults" width="210" left="330"/>
+        <button label="SpaceNavigatorのデフォルト設定" left="330"
-<!-- Reverted the translation of the Joystick Monitor axes due to monospace font that cannot support UTF8 (see VWR-6608)
+             name="SpaceNavigatorDefaults" width="210" />
-        <string name="JoystickMonitor">
-                ジョイスティック・モニター
-        </string>
-        <string name="Axis">
-                軸 [NUM]
-        </string>
-->
        <string name="NoDevice">
                デバイスは検出されませんでした
        </string>
diff --git a/linden/indra/newview/skins/default/xui/ja/need_to_translate.xml b/linden/indra/newview/skins/default/xui/ja/need_to_translate.xml
index 893906b..f8c0cbe 100644
--- a/linden/indra/newview/skins/default/xui/ja/need_to_translate.xml
+++ b/linden/indra/newview/skins/default/xui/ja/need_to_translate.xml
@@ -3549,4 +3549,77 @@ Does this group contain Mature content?
 <f_old_trans></f_old_trans>
 <f_translation>頷く</f_translation>
 </string>
+<string><a_file>alerts.xml</a_file>
+<b_path>//ChangeSkin/message</b_path>
+<c_attribute></c_attribute>
+<d_old></d_old>
+<e_new>
+      The new skin will appear after you restart [SECOND_LIFE].
+    </e_new>
+<f_old_trans></f_old_trans>
+<f_translation>
+      新しいスキンは[SECOND_LIFE]を再起動すると現れます
+    </f_translation></string><string><a_file>floater_joystick.xml</a_file>
+<b_path>/Joystick/enable_joystick</b_path>
+<c_attribute></c_attribute>
+<d_old></d_old>
+<e_new>Enable Joystick:</e_new>
+<f_old_trans></f_old_trans>
+<f_translation>ジョイスティックを使う：</f_translation></string><string><a_file>notify.xml</a_file>
+<b_path>//UnableToOpenCommandURL/message</b_path>
+<c_attribute></c_attribute>
+<d_old></d_old>
+<e_new>
+                        The URL you clicked cannot be opened from this web browser.
+                </e_new>
+<f_old_trans></f_old_trans>
+<f_translation>
+                        クリックしたURLはこのウェブブラウザでは開けません
+                </f_translation></string><string><a_file>panel_preferences_skins.xml</a_file>
+<b_path>/Skins panel</b_path>
+<c_attribute>label</c_attribute>
+<d_old></d_old>
+<e_new>Skins</e_new>
+<f_old_trans></f_old_trans>
+<f_translation>スキン</f_translation></string><string><a_file>panel_preferences_skins.xml</a_file>
+<b_path>/Skins panel/muting_text</b_path>
+<c_attribute></c_attribute>
+<d_old></d_old>
+<e_new>
+                Select a skin (requires restart):
+        </e_new>
+<f_old_trans></f_old_trans>
+<f_translation>
+                スキンを選択（要アプリの再起動）：
+        </f_translation></string><string><a_file>panel_preferences_skins.xml</a_file>
+<b_path>/Skins panel/skin_selection/default</b_path>
+<c_attribute></c_attribute>
+<d_old></d_old>
+<e_new>
+      Classic
+    </e_new>
+<f_old_trans></f_old_trans>
+<f_translation>
+      クラシック
+    </f_translation></string><string><a_file>panel_preferences_skins.xml</a_file>
+<b_path>/Skins panel/skin_selection/silver</b_path>
+<c_attribute></c_attribute>
+<d_old></d_old>
+<e_new>
+      Silver
+    </e_new>
+<f_old_trans></f_old_trans>
+<f_translation>
+      シルバー
+    </f_translation></string><string><a_file>panel_speaker_controls.xml</a_file>
+<b_path>/active_speakers_panel/panels/moderator_controls/moderator_allow_voice</b_path>
+<c_attribute></c_attribute>
+<d_old></d_old>
+<e_new>
+                                Allow voice chat
+                        </e_new>
+<f_old_trans></f_old_trans>
+<f_translation>
+                                ボイスチャットを許可
+                        </f_translation></string>
 </strings>
diff --git a/linden/indra/newview/skins/default/xui/ja/notify.xml b/linden/indra/newview/skins/default/xui/ja/notify.xml
index 1a10704..97a56cc 100644
--- a/linden/indra/newview/skins/default/xui/ja/notify.xml
+++ b/linden/indra/newview/skins/default/xui/ja/notify.xml
@@ -1046,4 +1046,9 @@ Mキーを押して移行します。
                        入力した地域は異なるシミュレーターのバージョンで実行されています。 詳細についてはこのメッセージをクリックしてください。
                </message>
        </notify>
+        <notify name="UnableToOpenCommandURL">
+                <message name="message">
+                        クリックしたURLはこのウェブブラウザでは開けません
+                </message>
+        </notify>
 </notifications>
diff --git a/linden/indra/newview/skins/default/xui/ja/panel_preferences_skins.xml b/linden/indra/newview/skins/default/xui/ja/panel_preferences_skins.xml
new file mode 100644
index 0000000..5742cc6
--- /dev/null
+++ b/linden/indra/newview/skins/default/xui/ja/panel_preferences_skins.xml
@@ -0,0 +1,14 @@
+<?xml version="1.0" encoding="utf-8" standalone="yes" ?>
+<panel label="スキン" name="Skins panel">
+        <text name="muting_text">
+                スキンを選択（要アプリの再起動）：
+        </text>
+        <radio_group name="skin_selection">
+                <radio_item name="default">
+                        クラシック
+                </radio_item>
+                <radio_item name="silver">
+                        シルバー
+                </radio_item>
+        </radio_group>
+</panel>
diff --git a/linden/indra/newview/skins/default/xui/ja/panel_speaker_controls.xml b/linden/indra/newview/skins/default/xui/ja/panel_speaker_controls.xml
index b82aace..37b5c72 100644
--- a/linden/indra/newview/skins/default/xui/ja/panel_speaker_controls.xml
+++ b/linden/indra/newview/skins/default/xui/ja/panel_speaker_controls.xml
@@ -14,7 +14,7 @@
                                </combo_item>
                        </combo_box>
                </layout_panel>
-                <layout_panel name="moderate_chat_panel"  font="SansSerifSmall">
+                <layout_panel font="SansSerifSmall" name="moderate_chat_panel">
                        <scroll_list name="speakers_list">
                                <column label="名前" name="speaker_name" />
                        </scroll_list>
@@ -31,7 +31,9 @@
                        <text name="moderator_controls_label">
                                モデレータ・コントロール:
                        </text>
-                        <check_box name="moderator_allow_voice" />
+                        <check_box name="moderator_allow_voice">
+                                ボイスチャットを許可
+                        </check_box>
                        <check_box name="moderator_allow_text">
                                テキストによるチャットを許可
                        </check_box>
diff --git a/linden/indra/newview/skins/default/xui/ko/alerts.xml b/linden/indra/newview/skins/default/xui/ko/alerts.xml
index 914648c..9ad1c5c 100644
--- a/linden/indra/newview/skins/default/xui/ko/alerts.xml
+++ b/linden/indra/newview/skins/default/xui/ko/alerts.xml
@@ -736,6 +736,11 @@ L$0로 판매하는 경우, 팔 사람을 선택하십시오.
                        취소
                </option>
        </alert>
+        <alert name="ChangeSkin">
+                <message name="message">
+                        새로운 스킨은 [SECOND_LIFE]를 재시동후 적용 됩니다.
+                </message>
+        </alert>
        <alert name="UnsupportedGLRequirements">
                <message name="message">
                        세컨드라이프를 실행하는 데 필요한 하드웨어 요구 사항이 충족되지 않았습니다. 세컨드라이프를 이용하려면 멀티텍스처를 지원하는 OpenGL 그래픽 카드가 필요합니다. 적절한 그래픽 카드가 있는 경우 해당 그래픽 카드에 대한 최신 드라이버와 운영 체제에 맞는 서비스 팩과 패치가 설치되어 있는지 확인하십시오.
diff --git a/linden/indra/newview/skins/default/xui/ko/floater_about.xml b/linden/indra/newview/skins/default/xui/ko/floater_about.xml
index 19f3a27..987a1f9 100644
--- a/linden/indra/newview/skins/default/xui/ko/floater_about.xml
+++ b/linden/indra/newview/skins/default/xui/ko/floater_about.xml
@@ -1,9 +1,9 @@
 <?xml version="1.0" encoding="utf-8" standalone="yes" ?>
 <floater name="floater_about" title="세컨드라이프 정보">
        <text_editor name="credits_editor">
-                Second Life 제작자들: Philip, Andrew, Tessa, Cory, Frank, James, Doug, Hunter, Richard, John, Eric, Avi, AaronB, AaronY, Ian, Peter, Mark, Robin, Stephen, Tracy, Ryan, Alberto, Haney, Tanya, JimJ, Dan, Ben, Stephanie, Tim, Evan, Catherine, Colin, Chris, Reuben, Charity, Jeska, James, JonHenry, Kelly, Callum, Char, Daniel, DavidF, Don, Jeff, Lauren, Lee, Michael, Ramzi, Vektor, Steve, TomY, Tess, Kona, Brent, Clarissa, PeterP, Jesse, Annette, Cyn, Blue, Ginsu, Jonathan, Karen, Adam, Nova, Deana, Lizzie, Patsy, DavidK, Isaac, Pathfinder, Monroe, Jill, Benny, Altruima, Rheya, Jennifer, Jack, DaveP, Brad, Mick, Babbage, Elisabeth, Brian, Beth, Data, Ethan, Wendy, Nicole, Sky, Jeffrey, Zero, Coffee, Tesla, Kenny, Makiko, Nigel, Teeple, Lucy, Mia, Dee, Guy, Harry, Liana, Branka, Jimbo, Aura, Vasuda, SarahD, bethanye, Torley, Runitai, MikeS, PaulM, Milo, Hermia, JoeM, Melanie, Rejean, DSmith, SMiller, Susan, Jose, DongYun, Justin, Andrey, Syrah, Donovan, Henrik, Nora, Lexie, AC, Donna, ChrisC, Alex, Leyla, Kyle, Mathew, Devin, Joshua, DanC, Jessica, Harmony, Claudia, Tramel, Glenn, Betsy, Fritz, Jun, Adam, Cassandra, Ken, RyanW, Spike, Tofu, Varas, Andy, Luke, RobLa, Chiyo, JohnZ, Dustin, George, Del, PeterP, Migyeong, Matthew, RMullane, CChampion, JTurbin, JamesC, Viola, Lightfoot, Jacqui, Sturm, Adrian, Buttercup, Alfred, Sunil, Alfred, Noel, Irfan, Jill, Yool, Jane, Yuki, Yoz, Matthew, Arthur, Jennifer, Karl, Brian, Ben, Janine, Christopher, Madhavi, Everett, Anthony, Joon, Jake, sean, Adreanne, Stephany, KellyJo, Jeremy, Pramod, Joshua, Sean, Christopher, Amy, Ceren, Katherine, jon, Sudheendra, James, Stephan, Kari, Kartic, Todd, Thomas, Joki, Rebecca, Belinda, Bert, Roger, Bridie, Kristi, Brian, Maria, John, Aric, Nathanel, Melinda, Darrell, Jennifer, Sandy, Greg, Rob, Brad, Chris, Eric, Palmer, Asi, Katja, Lisa, Minda, Jen, Aaron, Bryan, Mark, Jonathan, Jamie, Laurel, William, Matthew, Steve, David, Remy, James, Tim, Lee, Brian, Ashlei, Sam, Mike, Ethan, Austin, Wanda, Paul, Brian, Rachel, Valentyn, Emma Williams, Autum, Steven, Laley, Charles, Jessica, Sue, Gillian, CG, Kip, Kristen, Shamiran, Blake, Brett, Erica, Kent, Joel, Plexus, Twilight, Joppa, Enus, Kraft, Naveen, Simon, Q, Ronp, Laurap, Ram, KyleJM, Marty, Kend, Daveh, Prospero, Melissa, Nat, Hamilton, Green, Seraph, Ekim, Miz, Jimmy, Kosmo, Rome, Doris, JT, Benoc, Whump, Mango, Trinity, Patch, TJ, Christy, Bao, Joohwan, Kate, Oreh, Angela, Johan, Cheah, Lan, Matias, Brandy, Cogsworth, Aleks,  Mitchell, Space, Einstein, Bambers, Colton, Malbers, Maggie, Umesh, Santosh, Rose, Stash, Rothman, Winnie, Stella, Niall, 그 외에 많은 분들이 수고해 주셨습니다.
+                Second Life 제작자들: Philip, Tessa, Andrew, Cory, Ben, Bunny, Char, Charlie, Colin, Dan, Daniel, Doug, Eric, Hamlet, Haney, Hunter, Ian, Jeff, Jim, John, Lee, Mark, Peter, Phoenix, Richard, Robin, Xenon, Steve, Tanya, Eddie, Frank, Bruce, Aaron, Alice, Bob, Debra, Eileen, Helen, Janet, Louie, Leviathania, Stefan, Ray, Kevin, Tom, Mikeb, MikeT, Burgess, Elena, Tracy, BillTodd, Ryan, Zach, Sarah, Nova, Otakon, Tim, Stephanie, Michael, Evan, Nicolas, Catherine, Rachelle, Dave, Holly, Bub, Kelly, Magellan, Ramzi, Don, Sabin, Jill, Rheya, DanceStar, Jeska, Hungry, Torley, Kona, Callum, Charity, Ventrella, Jack, Uncle, Vektor, Iris, Chris, Nicole, Mick, Reuben, Blue, Babbage, Yedwab, Deana, Lauren, Brent, Pathfinder, Chadrick, Altruima, Jesse, Monroe, David, Tess, Lizzie, Patsy, Pony, Isaac, Lawrence, Cyn, Bo, Gia, Annette, Marius, Tbone, Jonathan, Karen, Ginsu, Yuko, Makiko, Thomas, Harry, Seth, Alexei, Brian, Guy, Runitai, Ethan, Data, Cornelius, Kenny, Swiss, Zero, Natria, Wendy, Stephen, Teeple, Thumper, Lucy, Dee, Mia, Liana, Warren, Branka, Aura, beez, Milo, Hermia, Red, Thrax, Joe, Sally, Magenta, Paul, Jose, Rejean, Henrik, Lexie, Amber, Logan, Xan, Nora, Morpheus, Donovan, Leyla, MichaelFrancis, Beast, Cube, Bucky, Joshua, Stryfe, Harmony, Teresa, Claudia, Walker, Glenn, Fritz, Fordak, June, Cleopetra, Jean, Ivy, Betsy, Roosevelt, Spike, Ken, Which, Tofu, Chiyo, Rob, Zee, dustin, George, Del, Matthew, Cat, Jacqui, Lightfoot, Adrian, Viola, Alfred, Noel, Irfan, Sunil, Yool, Rika, Jane, Xtreme, Frontier, a2, Neo, Siobhan, Yoz, Justin, Elle, Qarl, Benjamin, Isabel, Gulliver, Everett, Christopher, Izzy, Stephany, Garry, Sejong, Sean, Tobin, Iridium, Meta, Anthony, Jeremy, JP, Jake, Maurice, Madhavi, Leopard, Kyle, Joon, Kari, Bert, Belinda, Jon, Kristi, Bridie, Pramod, KJ, Socrates, Maria, Ivan, Aric, Yamasaki, Adreanne, Jay, MitchK, Ceren, Coco, Durl, Jenny, Periapse, Kartic, Storrs, Lotte, Sandy, Colossus, Zen, BigPapi, Brad, Pastrami, Kurz, Mani, Neuro, Jaime, MJ, Rowan, Sgt, Elvis, Gecko, Samuel, Sardonyx, Leo, Bryan, Niko, Soft, Poppy, Rachel, Aki, Angelo, Banzai, Alexa, Sue, CeeLo, Bender, CG, Gillian, Pelle, Nick, Echo, Zara, Christine, Shamiran, Emma, Blake, Keiko, Plexus, Joppa, Sidewinder, Erica, Ashlei, Twilight, Kristen, Brett, Q, Enus, Simon, Bevis, Kraft, Kip, Chandler, Ron, LauraP, Ram, KyleJM, Scouse, Prospero, Melissa, Marty, Nat, Hamilton, Kend, Lordan, Jimmy, Kosmo, Seraph, Green, Ekim, Wiggo, JT, Rome, Doris, Miz, Benoc, Whump, Trinity, Patch, Kate, TJ, Bao, Joohwan, Christy, Sofia, Matias, Cogsworth, Johan, Oreh, Cheah, Angela, Brandy, Mango, Lan, Aleks, Gloria, Heidy, Mitchell, Space, Colton, Bambers, Einstein, Maggie, Malbers, Rose, Winnie, Stella, Milton, Rothman, Niall, Marin, Allison, James, Katie, Dawn, Katt, Kalpana, Judy, Andrea, Ambroff, Infinity, Gail, Rico, Raymond, Yi, William, Christa, M, Teagan, Scout, Molly, Dante, Corr, Dynamike, Usi, Kaylee, Lil, Danica, Sascha, Kelv, Jacob, Nya, Rodney, Brandon, Elsie, Blondin, Grant, Katrin, Nyx, Gabriel, Locklainn, Claire, Devin, Minerva, Monty, Austin, Bradford, Si, Keira, H, Caitlin, Dita, Makai, Jenn, 그 외에 많은 분들이 수고해 주셨습니다.
-  현재 버전이 최상의 버전이 될 수 있도록 도와주신 게이머 여러분께 감사드립니다: aaron23 decuir, Abelv Vollmar, Abyssin Otoro, ActingIll Igaly, Adamas Carter, Addy Broome, Adelia Menges, Alexandra Rucker, Alexandrea Fride, Alissa Sabre, Alyx Jonson, Ann Otoole, Anton Fargis, Aradia Dielli, Araina jewell, Arcane Clawtooth, arcangelo vantelli, Are Sperber, Argent Stonecutter, arkady yost, Ashcroft Burnham, Ashen Arida, Auron Forcella, Azadine Umarov, Azildin Furst, Balp Allen, Balpien Hammerer, Barney Boomslang, Barrett Slade, becky pippen, Beeflin Grut, Beer Dailey, Behemoth Greenwood, bigmanu greene, bitova loon, Bonca Chikuwa, Bonnie Bechir, Brandon Catteneo, buttonpusher jones, Carina Raymaker, Ceera Murakami, Celierra Darling, ChatNoir Moonsoo, Cheetah Hammerer, chet neurocam, Cinthya Loveless, Cold Spitteler, Coral Quinnell, Crash Pointe, CrazyTB Oh, Creem Pye, Crom Chaffe, ctrl althouse, dade carver, Dael Ra, dakota schwade, Dale Innis, Damian McLeod, Danger Lytton, danielluh ashton, DanOfWA Flanagan, Davec Horsforth, Davidius Morigi, davie zinner, Day Oh, DBDigital Epsilon, Deany Fall, deBruce Munro, Decaf Coffey, Dedric Mauriac, Deeso Saeed, Dekka Raymaker, dexter eberhart, Dildo Spitz, Dizzy Banjo, djcabello klaar, Dnali Anabuki, Domchi Underwood, Doran Zemlja, Drew Dwi, Duckless Vandyke, Duncan Stenvaag, Dylan Rickenbacker, dzogchen Moody, Dzonatas Sol, Eddy Stryker, Edward Griffith, Edward Pearse, ein duesenburg, Elle Pollack, Elle74 Zaftig, Emileigh Starbrook, Emma Nowhere, ener bing, Erdrick Balbozar, eric domela, Evangeline Biedermann, Excalibur Longstaff, Fake Fitzgerald, Feldspar Millgrove, Feynt Mistral, Fluf Fredriksson, Forbid Utorid, Fortyniner Beck, Francesco Despres, Francisco Koolhoven, Franta Burt, Fury Rosewood, garde Burrel, Garmin Kawaguichi, Gavin Ichigo, Gellan Glenelg, Genie Demina, Gennifer Meredith, Gigs Taggart, Goldie Katsu, Gwyneth Llewelyn, Haravikk Mistral, Harleen Gretzky, Haruki Watanabe, Heather Manatiso, Henri Beauchamp, Honey Fairweather, Hypatia Callisto, Ice Brodie, icktoofay Kamachi, IntLibber Brautigan, Janise Dreamscape, Jay Shinobu, Jenni Ryba, Jeremy Ondricek, JetZep Zabelin, Jims Smythe, Jini Hammerer, Jopy Weber, JustOneMore Loon, Kaluura Boa, Kara Markova, Kevin Susenko, Khyra Ares, Kii Lilliehook, Kitty Barnett, Kris Kuttelwascher, Lanita Wingtips, Laura18 Streeter, Lee Ludd, Lettrius Jewell, Liberty Tesla, LilyAnna Carter, Lindal Kidd, Lisa Lowe, Lisa McConnell, Lola Machin, luca peck, Lupus Clawtooth, M1sha Dallin, Macsima Dagostino, Mana Janus, Mani Canning, Manjusri Binder, marceledward edman, march Korda, marchino villota, Marcus Llewellyn, MartinRJ Fayray, Matthew Dowd, Max Kleiber, mazzy fastback, McCabe Maxsted, Mckailen Kohnke, Meghan Dench, Melvin Starbrook, Mercia Mcmahon, Miakoda Carnell, Michelle2 Zenovka, Michi Lumin, mick parnall, Milla Michinaga, Millie Thompson, miranda Ashby, Mircea Lobo, MIssSara Beck, mouse mimistrobell, Myria Boa, Nanci Barthelmess, Nargus Asturias, Natalya Debevec, Nedrae Messmer, Nexeus Fatale, Niky Zenovka, Nimrod Szondi, Ninane Yoshikawa, Noch Tripsa, nokithecat writer, Nyko Merlin, Onyx Halberd, oryx tempel, Osprey Therian, Pac Hyun, Panagea McMillan, Patrick Ferrentino, PattehPh0x Katsu, ponk bing, Poppy Linden, Prajna Vella, Precious Rhiano, Prokofy Neva, Randall Lovenkraft, Rascal Ratelle, Raydon Writer, Rhaorth Antonelli, Rock Hayek, Ron Crimson, Ron Khondji, Ronald Richez, Rui Clary, Ruud Lathrop, Sakkano Imako, Sam Reinard, Sascha Vandyke, Scrippy Scofield, Sean18 McCarey, Sedona Mills, Sekonda Huet, Seraph Nephilim, Sergei Milos, Shadowquine Maltz, shai khalifa, sheilah flatley, Sheri Underwood, Shuggy Husky, Sierra Janus, Sigma Avro, Simil Miles, simon kline, Simon Nolan, Sindy Tsure, Sparks Keynes, Squirrel Wood, Stahi Columbia, StarSong Bright, Summer Seale, Sunn Thunders, Susan Koltai, Syler Zhora, Synack Fitzgerald, Tayra Dagostino, Tee Cramer, Teravus Ousley, Thomas Shikami, Tia Araw, Tillie Ariantho, Topher Brooks, Torley Linden, Twosteppin Jewell, tx Oh, urantia jewell, vaguegirl Petty, VeC Merlin, venus petrov, vv33d Beck, vynka dean, zann canto, zeebster colasanti, Zi Ree, Zion Tristan, Zorin Frobozz, Zyzzy Zarf
+  현재 버전이 최상의 버전이 될 수 있도록 도와주신 게이머 여러분께 감사드립니다: aaron23 decuir, Abra Miles, absolute balderdash, adelle fitzgerald, Aeron Kohime, Aki Shichiroji, Alger Meads, Alissa Sabre, AlwaysIcey Mapholisto, Arawn Spitteler, Aren Mandala, Arianna Wrigglesworth, Bagushii Kohime, Balpien Hammerer, Blinking2342 Blinker, byakuya runo, Capucchy Streeter, Chandra Jun, Coyote Pace, Crusher Soderstrom, Cummere Mayo, cyberrosa Rossini, Dael Ra, danana dodonpa, Darek Deluca, Davec Horsforth, django yifu, draco crane, Dre Dagostino, Ephyu Reino, etan quan, Fenrix Murakami, Fledhyris Proudhon, Fred Wardhani, Frederich Courier, garth fairchang, Gellan Glenelg, Geraldine Giha, GOLAN Eilde, gonzo joubert, Hachiro Yokosuka, Hampton Hax, harleywood guru, Hevenz Vansant, imnotgoing sideways, Jaden Giles, Jeanette Janus, Karl Dorance, keaton Akina, Khashai Steinbeck, KiPSOFT Tuqiri, kirstenlee Cinquetti, Kitty Barnett, Laurent Vesta, Lazure Ryba, Lima Vesperia, Linzi Bingyi, Lisa Lowe, LuDon Ninetails, Mark Rosenbaum, McCabe Maxsted, Michi Lumin, Midi Aeon, ml0rtd kit, Mo Eriksen, Morice Flanagan, Mysterion Aeon, Nad Gough, norgan torok, Pygar Bu, Qie Niangao, rachel corleone, Rado Arado, roberto salubrius, Royer Pessoa, samia bechir, Sasha Nurmi, Sean Heying, Selkit Diller, Shadow Pidgeon, simon kline, Smokie Ember, Soap Clawtooth, Strife Onizuka, Tal Chernov, Talan Hyun, tangletwigs fairymeadow, Tanya Spinotti, Tayra Dagostino, Teebone Aeon, Theremes Langdon, Thraxis Epsilon, tucor Capalini, Vasko Hawker, VenusMari Zapedzki, Vex Streeter, Viktoria Dovgal, Vincent Nacon, Viridian Exonar, Vivienne Schell, WarKirby Magojiro, Wilton Lundquist, Yukinoroh Kamachi, Zyzzy Zarf
  3Dconnexion SDK Copyright (C) 1992-2007 3Dconnexion
  APR Copyright (C) 2000-2004 The Apache Software Foundation
diff --git a/linden/indra/newview/skins/default/xui/ko/floater_joystick.xml b/linden/indra/newview/skins/default/xui/ko/floater_joystick.xml
index dd0fe30..25e532d 100644
--- a/linden/indra/newview/skins/default/xui/ko/floater_joystick.xml
+++ b/linden/indra/newview/skins/default/xui/ko/floater_joystick.xml
@@ -1,5 +1,8 @@
 <?xml version="1.0" encoding="utf-8" standalone="yes" ?>
 <floater name="Joystick" title="조이스틱 설정">
+        <check_box name="enable_joystick">
+                죠이스틱 활성:
+        </check_box>
        <spinner label="X축 매핑" name="JoystickAxis1" />
        <spinner label="Y축 매핑" name="JoystickAxis2" />
        <spinner label="Z축 매핑" name="JoystickAxis0" />
@@ -13,9 +16,15 @@
        <text name="Control Modes:">
                조절 모드:
        </text>
-        <check_box name="JoystickAvatarEnabled">아바타</check_box>
+        <check_box name="JoystickAvatarEnabled">
-        <check_box name="JoystickBuildEnabled">만들기</check_box>
+                아바타
-        <check_box name="JoystickFlycamEnabled">플라이캠</check_box>
+        </check_box>
+        <check_box name="JoystickBuildEnabled">
+                만들기
+        </check_box>
+        <check_box name="JoystickFlycamEnabled">
+                플라이캠
+        </check_box>
        <text name="XScale">
                X 크기
        </text>
@@ -58,18 +67,10 @@
        <text name="ZoomScale2">
                확대/축소 크기
        </text>
-        <text name="ZoomDeadZone" width="140" left="0" >
+        <text left="0" name="ZoomDeadZone" width="140">
                확대/축소 사각지대
        </text>
        <button label="SpaceNavigator 기본값" name="SpaceNavigatorDefaults" />
-<!-- Reverted the translation of the Joystick Monitor axes due to monospace font that cannot support UTF8 (see VWR-6608)
-        <string name="JoystickMonitor">
-                조이스틱 검사
-        </string>
-        <string name="Axis">
-                축 [NUM]
-        </string>
-->
        <string name="NoDevice">
                검색된 장치가 없습니다.
        </string>
diff --git a/linden/indra/newview/skins/default/xui/ko/need_to_translate.xml b/linden/indra/newview/skins/default/xui/ko/need_to_translate.xml
index a541bf2..b2c37db 100644
--- a/linden/indra/newview/skins/default/xui/ko/need_to_translate.xml
+++ b/linden/indra/newview/skins/default/xui/ko/need_to_translate.xml
@@ -3669,4 +3669,67 @@ Does this group contain Mature content?
 <f_old_trans></f_old_trans>
 <f_translation>동의</f_translation>
 </string>
+<string><a_file>alerts.xml</a_file>
+<b_path>//ChangeSkin/message</b_path>
+<c_attribute></c_attribute>
+<d_old></d_old>
+<e_new>
+      The new skin will appear after you restart [SECOND_LIFE].
+    </e_new>
+<f_old_trans></f_old_trans>
+<f_translation>
+      새로운 스킨은 [SECOND_LIFE]를 재시동후 적용 됩니다.
+    </f_translation></string><string><a_file>floater_joystick.xml</a_file>
+<b_path>/Joystick/enable_joystick</b_path>
+<c_attribute></c_attribute>
+<d_old></d_old>
+<e_new>Enable Joystick:</e_new>
+<f_old_trans></f_old_trans>
+<f_translation>죠이스틱 활성:</f_translation></string><string><a_file>notify.xml</a_file>
+<b_path>//UnableToOpenCommandURL/message</b_path>
+<c_attribute></c_attribute>
+<d_old></d_old>
+<e_new>
+                        The URL you clicked cannot be opened from this web browser.
+                </e_new>
+<f_old_trans></f_old_trans>
+<f_translation>
+                        본 URL은 현재의 웹브라우져에서 볼 수 없습니다.
+                </f_translation></string><string><a_file>panel_preferences_skins.xml</a_file>
+<b_path>/Skins panel</b_path>
+<c_attribute>label</c_attribute>
+<d_old></d_old>
+<e_new>Skins</e_new>
+<f_old_trans></f_old_trans>
+<f_translation>스킨</f_translation></string><string><a_file>panel_preferences_skins.xml</a_file>
+<b_path>/Skins panel/muting_text</b_path>
+<c_attribute></c_attribute>
+<d_old></d_old>
+<e_new>
+                Select a skin (requires restart):
+        </e_new>
+<f_old_trans></f_old_trans>
+<f_translation>
+                스킨 선택(재시동 필요):
+        </f_translation></string><string><a_file>panel_preferences_skins.xml</a_file>
+<b_path>/Skins panel/skin_selection/default</b_path>
+<c_attribute></c_attribute>
+<d_old></d_old>
+<e_new>
+      Classic
+    </e_new>
+<f_old_trans></f_old_trans>
+<f_translation>
+      클래식
+    </f_translation></string><string><a_file>panel_preferences_skins.xml</a_file>
+<b_path>/Skins panel/skin_selection/silver</b_path>
+<c_attribute></c_attribute>
+<d_old></d_old>
+<e_new>
+      Silver
+    </e_new>
+<f_old_trans></f_old_trans>
+<f_translation>
+      실버
+    </f_translation></string>
 </strings>
diff --git a/linden/indra/newview/skins/default/xui/ko/notify.xml b/linden/indra/newview/skins/default/xui/ko/notify.xml
index 3f92fb1..f96627c 100644
--- a/linden/indra/newview/skins/default/xui/ko/notify.xml
+++ b/linden/indra/newview/skins/default/xui/ko/notify.xml
@@ -1048,4 +1048,9 @@ sculpted prim은 그 형태를 지정하는 특별한 텍스처를 요구합니�
                        이동한 지역이 다른 시뮬레이터 버전으로 실행 중입니다. 자세한 내용을 보려면 이 메시지를 클릭하십시오.
                </message>
        </notify>
+        <notify name="UnableToOpenCommandURL">
+                <message name="message">
+                        본 URL은 현재의 웹브라우져에서 볼 수 없습니다.
+                </message>
+        </notify>
 </notifications>
diff --git a/linden/indra/newview/skins/default/xui/ko/panel_preferences_skins.xml b/linden/indra/newview/skins/default/xui/ko/panel_preferences_skins.xml
new file mode 100644
index 0000000..6df8dac
--- /dev/null
+++ b/linden/indra/newview/skins/default/xui/ko/panel_preferences_skins.xml
@@ -0,0 +1,14 @@
+<?xml version="1.0" encoding="utf-8" standalone="yes" ?>
+<panel label="스킨" name="Skins panel">
+        <text name="muting_text">
+                스킨 선택(재시동 필요):
+        </text>
+        <radio_group name="skin_selection">
+                <radio_item name="default">
+                        클래식
+                </radio_item>
+                <radio_item name="silver">
+                        실버
+                </radio_item>
+        </radio_group>
+</panel>
diff --git a/linden/indra/newview/skins/default/xui/pt/floater_about.xml b/linden/indra/newview/skins/default/xui/pt/floater_about.xml
index 5aaff2e..e78a5a5 100644
--- a/linden/indra/newview/skins/default/xui/pt/floater_about.xml
+++ b/linden/indra/newview/skins/default/xui/pt/floater_about.xml
@@ -1,31 +1,4 @@
 <?xml version="1.0" encoding="utf-8" standalone="yes" ?>
 <floater name="floater_about" title="Sobre o Second Life">
-        <text_editor name="credits_editor">
-  Second Life is brought to you by Philip, Andrew, Tessa, Cory, Frank, James, Doug, Hunter, Richard, John, Eric, Avi, AaronB, AaronY, Ian, Peter, Mark, Robin, Stephen, Tracy, Ryan, Alberto, Haney, Tanya, JimJ, Dan, Ben, Stephanie, Tim, Evan, Catherine, Colin, Chris, Reuben, Charity, Jeska, James, JonHenry, Kelly, Callum, Char, Daniel, DavidF, Don, Jeff, Lauren, Lee, Michael, Ramzi, Vektor, Steve, TomY, Tess, Kona, Brent, Clarissa, PeterP, Jesse, Annette, Cyn, Blue, Ginsu, Jonathan, Karen, Adam, Nova, Deana, Lizzie, Patsy, DavidK, Isaac, Pathfinder, Monroe, Jill, Benny, Altruima, Rheya, Jennifer, Jack, DaveP, Brad, Mick, Babbage, Elisabeth, Brian, Beth, Data, Ethan, Wendy, Nicole, Sky, Jeffrey, Zero, Coffee, Tesla, Kenny, Makiko, Nigel, Teeple, Lucy, Mia, Dee, Guy, Harry, Liana, Branka, Jimbo, Aura, Vasuda, SarahD, bethanye, Torley, Runitai, MikeS, PaulM, Milo, Hermia, JoeM, Melanie, Rejean, DSmith, SMiller, Susan, Jose, DongYun, Justin, Andrey, Syrah, Donovan, Henrik, Nora, Lexie, AC, Donna, ChrisC, Alex, Leyla, Kyle, Mathew, Devin, Joshua, DanC, Jessica, Harmony, Claudia, Tramel, Glenn, Betsy, Fritz, Jun, Adam, Cassandra, Ken, RyanW, Spike, Tofu, Varas, Andy, Luke, RobLa, Chiyo, JohnZ, Dustin, George, Del, PeterP, Migyeong, Matthew, RMullane, CChampion, JTurbin, JamesC, Viola, Lightfoot, Jacqui, Sturm, Adrian, Buttercup, Alfred, Sunil, Alfred, Noel, Irfan, Jill, Yool, Jane, Yuki, Yoz, Matthew, Arthur, Jennifer, Karl, Brian, Ben, Janine, Christopher, Madhavi, Everett, Anthony, Joon, Jake, sean, Adreanne, Stephany, KellyJo, Jeremy, Pramod, Joshua, Sean, Christopher, Amy, Ceren, Katherine, jon, Sudheendra, James, Stephan, Kari, Kartic, Todd, Thomas, Joki, Rebecca, Belinda, Bert, Roger, Bridie, Kristi, Brian, Maria, John, Aric, Nathanel, Melinda, Darrell, Jennifer, Sandy, Greg, Rob, Brad, Chris, Eric, Palmer, Asi, Katja, Lisa, Minda, Jen, Aaron, Bryan, Mark, Jonathan, Jamie, Laurel, William, Matthew, Steve, David, Remy, James, Tim, Lee, Brian, Ashlei, Sam, Mike, Ethan, Austin, Wanda, Paul, Brian, Rachel, Valentyn, Emma Williams, Autum, Steven, Laley, Charles, Jessica, Sue, Gillian, CG, Kip, Kristen, Shamiran, Blake, Brett, Erica, Kent, Joel, Plexus, Twilight, Joppa, Enus, Kraft, Naveen, Simon, Q, Ronp, Laurap, Ram, KyleJM, Marty, Kend, Daveh, Prospero, Melissa, Nat, Hamilton, Green, Seraph, Ekim, Miz, Jimmy, Kosmo, Rome, Doris, JT, Benoc, Whump, Mango, Trinity, Patch, TJ, Christy, Bao, Joohwan, Kate, Oreh, Angela, Johan, Cheah, Lan, Matias, Brandy, Cogsworth, Aleks,  Mitchell, Space, Einstein, Bambers, Colton, Malbers, Maggie, Umesh, Santosh, Rose, Stash, Rothman, Winnie, Stella, Niall and many others.
-  Thank you to the following residents for helping to ensure that this is the best version yet: aaron23 decuir, Abelv Vollmar, Abyssin Otoro, ActingIll Igaly, Adamas Carter, Addy Broome, Adelia Menges, Alexandra Rucker, Alexandrea Fride, Alissa Sabre, Alyx Jonson, Ann Otoole, Anton Fargis, Aradia Dielli, Araina jewell, Arcane Clawtooth, arcangelo vantelli, Are Sperber, Argent Stonecutter, arkady yost, Ashcroft Burnham, Ashen Arida, Auron Forcella, Azadine Umarov, Azildin Furst, Balp Allen, Balpien Hammerer, Barney Boomslang, Barrett Slade, becky pippen, Beeflin Grut, Beer Dailey, Behemoth Greenwood, bigmanu greene, bitova loon, Bonca Chikuwa, Bonnie Bechir, Brandon Catteneo, buttonpusher jones, Carina Raymaker, Ceera Murakami, Celierra Darling, ChatNoir Moonsoo, Cheetah Hammerer, chet neurocam, Cinthya Loveless, Cold Spitteler, Coral Quinnell, Crash Pointe, CrazyTB Oh, Creem Pye, Crom Chaffe, ctrl althouse, dade carver, Dael Ra, dakota schwade, Dale Innis, Damian McLeod, Danger Lytton, danielluh ashton, DanOfWA Flanagan, Davec Horsforth, Davidius Morigi, davie zinner, Day Oh, DBDigital Epsilon, Deany Fall, deBruce Munro, Decaf Coffey, Dedric Mauriac, Deeso Saeed, Dekka Raymaker, dexter eberhart, Dildo Spitz, Dizzy Banjo, djcabello klaar, Dnali Anabuki, Domchi Underwood, Doran Zemlja, Drew Dwi, Duckless Vandyke, Duncan Stenvaag, Dylan Rickenbacker, dzogchen Moody, Dzonatas Sol, Eddy Stryker, Edward Griffith, Edward Pearse, ein duesenburg, Elle Pollack, Elle74 Zaftig, Emileigh Starbrook, Emma Nowhere, ener bing, Erdrick Balbozar, eric domela, Evangeline Biedermann, Excalibur Longstaff, Fake Fitzgerald, Feldspar Millgrove, Feynt Mistral, Fluf Fredriksson, Forbid Utorid, Fortyniner Beck, Francesco Despres, Francisco Koolhoven, Franta Burt, Fury Rosewood, garde Burrel, Garmin Kawaguichi, Gavin Ichigo, Gellan Glenelg, Genie Demina, Gennifer Meredith, Gigs Taggart, Goldie Katsu, Gwyneth Llewelyn, Haravikk Mistral, Harleen Gretzky, Haruki Watanabe, Heather Manatiso, Henri Beauchamp, Honey Fairweather, Hypatia Callisto, Ice Brodie, icktoofay Kamachi, IntLibber Brautigan, Janise Dreamscape, Jay Shinobu, Jenni Ryba, Jeremy Ondricek, JetZep Zabelin, Jims Smythe, Jini Hammerer, Jopy Weber, JustOneMore Loon, Kaluura Boa, Kara Markova, Kevin Susenko, Khyra Ares, Kii Lilliehook, Kitty Barnett, Kris Kuttelwascher, Lanita Wingtips, Laura18 Streeter, Lee Ludd, Lettrius Jewell, Liberty Tesla, LilyAnna Carter, Lindal Kidd, Lisa Lowe, Lisa McConnell, Lola Machin, luca peck, Lupus Clawtooth, M1sha Dallin, Macsima Dagostino, Mana Janus, Mani Canning, Manjusri Binder, marceledward edman, march Korda, marchino villota, Marcus Llewellyn, MartinRJ Fayray, Matthew Dowd, Max Kleiber, mazzy fastback, McCabe Maxsted, Mckailen Kohnke, Meghan Dench, Melvin Starbrook, Mercia Mcmahon, Miakoda Carnell, Michelle2 Zenovka, Michi Lumin, mick parnall, Milla Michinaga, Millie Thompson, miranda Ashby, Mircea Lobo, MIssSara Beck, mouse mimistrobell, Myria Boa, Nanci Barthelmess, Nargus Asturias, Natalya Debevec, Nedrae Messmer, Nexeus Fatale, Niky Zenovka, Nimrod Szondi, Ninane Yoshikawa, Noch Tripsa, nokithecat writer, Nyko Merlin, Onyx Halberd, oryx tempel, Osprey Therian, Pac Hyun, Panagea McMillan, Patrick Ferrentino, PattehPh0x Katsu, ponk bing, Poppy Linden, Prajna Vella, Precious Rhiano, Prokofy Neva, Randall Lovenkraft, Rascal Ratelle, Raydon Writer, Rhaorth Antonelli, Rock Hayek, Ron Crimson, Ron Khondji, Ronald Richez, Rui Clary, Ruud Lathrop, Sakkano Imako, Sam Reinard, Sascha Vandyke, Scrippy Scofield, Sean18 McCarey, Sedona Mills, Sekonda Huet, Seraph Nephilim, Sergei Milos, Shadowquine Maltz, shai khalifa, sheilah flatley, Sheri Underwood, Shuggy Husky, Sierra Janus, Sigma Avro, Simil Miles, simon kline, Simon Nolan, Sindy Tsure, Sparks Keynes, Squirrel Wood, Stahi Columbia, StarSong Bright, Summer Seale, Sunn Thunders, Susan Koltai, Syler Zhora, Synack Fitzgerald, Tayra Dagostino, Tee Cramer, Teravus Ousley, Thomas Shikami, Tia Araw, Tillie Ariantho, Topher Brooks, Torley Linden, Twosteppin Jewell, tx Oh, urantia jewell, vaguegirl Petty, VeC Merlin, venus petrov, vv33d Beck, vynka dean, zann canto, zeebster colasanti, Zi Ree, Zion Tristan, Zorin Frobozz, Zyzzy Zarf
-  3Dconnexion SDK Copyright (C) 1992-2007 3Dconnexion
-  APR Copyright (C) 2000-2004 The Apache Software Foundation
-  cURL Copyright (C) 1996-2002, Daniel Stenberg, (daniel@haxx.se)
-  expat Copyright (C) 1998, 1999, 2000 Thai Open Source Software Center Ltd.
-  FreeType Copyright (C) 1996-2002, The FreeType Project (www.freetype.org).
-  GL Copyright (C) 1999-2004 Brian Paul.
-  Havok.com(TM) Copyright (C) 1999-2001, Telekinesys Research Limited.
-  jpeg2000 Copyright (C) 2001, David Taubman, The University of New South Wales (UNSW)
-  jpeglib Copyright (C) 1991-1998, Thomas G. Lane.
-  ogg/vorbis Copyright (C) 2001, Xiphophorus
-  OpenSSL Copyright (C) 1998-2002 The OpenSSL Project.
-  SDL Copyright (C) 1997, 1998, 1999, 2000, 2001, 2002 Sam Lantinga
-  SSLeay Copyright (C) 1995-1998 Eric Young (eay@cryptsoft.com)
-  xmlrpc-epi Copyright (C) 2000 Epinions, Inc.
-  zlib Copyright (C) 1995-2002 Jean-loup Gailly and Mark Adler.
-  All rights reserved.  See licenses.txt for details.
-  Voice chat Audio coding: Polycom(R) Siren14(TM) (ITU-T Rec. G.722.1 Annex C)
-  Happiness is a warm puppy. -- Charles M. Schulz
-        </text_editor>
 </floater>
diff --git a/linden/indra/newview/skins/default/xui/pt/floater_buy_land.xml b/linden/indra/newview/skins/default/xui/pt/floater_buy_land.xml
index d724d35..30d7193 100644
--- a/linden/indra/newview/skins/default/xui/pt/floater_buy_land.xml
+++ b/linden/indra/newview/skins/default/xui/pt/floater_buy_land.xml
@@ -81,7 +81,8 @@
                Aumente sua taxa de locação de lote para US$ 40/mês.
        </text>
        <text name="land_use_reason">
-                Você possui 1,309 metros quadrados de terra. Este lote tem 512 metros quadrados.
+                Você possui 1,309 metros quadrados de terra.
+Este lote tem 512 metros quadrados.
        </text>
        <text name="purchase_action">
                Pagar ao Residente Joe L$4000 pelo lote
@@ -124,7 +125,8 @@
                Nenhum lote selecionado.
        </text>
        <text name="multiple_parcels_selected">
-                Vários lotes diferentes selecionados. Tente selecionar uma área menor.
+                Vários lotes diferentes selecionados. 
+Tente selecionar uma área menor.
        </text>
        <text name="no_permission">
                Você não tem permissão para comprar um lote para seu grupo ativo.
@@ -145,10 +147,13 @@
                A área selecionada não é um lote público.
        </text>
        <text name="not_owned_by_you">
-                O lote possuído por outro proprietário está selecionado. Tente uma área menor.
+                O lote possuído por outro proprietário está selecionado.
+Tente uma área menor.
        </text>
        <text name="processing">
-                Processando sua compra... (Isso pode levar um minuto)
+                Processando sua compra...
+ 
+(Isso pode levar um minuto.)
        </text>
        <text name="fetching_error">
                Houve um erro ao buscar informações sobre compra de lotes.
@@ -196,13 +201,15 @@
                Este lote é promocional, e será cobrado como [AMOUNT] metros quadrados.
        </text>
        <text name="meters_supports_object">
-                [AMOUNT] metros quadrados suporta [AMOUNT2] objetos
+                [AMOUNT] metros quadrados
+suporta [AMOUNT2] objetos
        </text>
        <text name="sold_with_objects">
                vendido com objetos
        </text>
        <text name="insufficient_land_credits">
-                O grupo [GROUP] precisará de fundos suficientes de terras contribuídas para cobrir este lote antes da aquisição se completar.
+                O grupo [GROUP] precisará de fundos suficientes de terras
+contribuídas para cobrir este lote antes da aquisição se completar.
        </text>
        <text name="have_enough_lindens">
                Você tem L$ [AMOUNT], o qual é suficiente para comprar este lote.
diff --git a/linden/indra/newview/skins/default/xui/zh/floater_about.xml b/linden/indra/newview/skins/default/xui/zh/floater_about.xml
index a53e82f..24bef29 100644
--- a/linden/indra/newview/skins/default/xui/zh/floater_about.xml
+++ b/linden/indra/newview/skins/default/xui/zh/floater_about.xml
@@ -1,28 +1,30 @@
 <?xml version="1.0" encoding="utf-8" standalone="yes" ?>
 <floater name="floater_about" title="关于第二人生">
        <text_editor name="credits_editor">
-                第二人生的推出应感谢以下人物的贡献： Philip, Andrew, Tessa, Cory, Frank, James, Doug, Hunter, Richard, John, Eric, Avi, AaronB, AaronY, Ian, Peter, Mark, Robin, Stephen, Tracy, Ryan, Alberto, Haney, Tanya, JimJ, Dan, Ben, Stephanie, Tim, Evan, Catherine, Colin, Chris, Reuben, Charity, Jeska, James, JonHenry, Kelly, Callum, Char, Daniel, DavidF, Don, Jeff, Lauren, Lee, Michael, Ramzi, Vektor, Steve, TomY, Tess, Kona, Brent, Clarissa, PeterP, Jesse, Annette, Cyn, Blue, Ginsu, Jonathan, Karen, Adam, Nova, Deana, Lizzie, Patsy, DavidK, Isaac, Pathfinder, Monroe, Jill, Benny, Altruima, Rheya, Jennifer, Jack, DaveP, Brad, Mick, Babbage, Elisabeth, Brian, Beth, Data, Ethan, Wendy, Nicole, Sky, Jeffrey, Zero, Coffee, Tesla, Kenny, Makiko, Nigel, Teeple, Lucy, Mia, Dee, Guy, Harry, Liana, Branka, Jimbo, Aura, Vasuda, SarahD, bethanye, Torley, Runitai, MikeS, PaulM, Milo, Hermia, JoeM, Melanie, Rejean, DSmith, SMiller, Susan, Jose, DongYun, Justin, Andrey, Syrah, Donovan, Henrik, Nora, Lexie, AC, Donna, ChrisC, Alex, Leyla, Kyle, Mathew, Devin, Joshua, DanC, Jessica, Harmony, Claudia, Tramel, Glenn, Betsy, Fritz, Jun, Adam, Cassandra, Ken, RyanW and many others.
+                第二人生的推出应感谢以下人物的贡献： Philip, Tessa, Andrew, Cory, Ben, Bunny, Char, Charlie, Colin, Dan, Daniel, Doug, Eric, Hamlet, Haney, Hunter, Ian, Jeff, Jim, John, Lee, Mark, Peter, Phoenix, Richard, Robin, Xenon, Steve, Tanya, Eddie, Frank, Bruce, Aaron, Alice, Bob, Debra, Eileen, Helen, Janet, Louie, Leviathania, Stefan, Ray, Kevin, Tom, Mikeb, MikeT, Burgess, Elena, Tracy, BillTodd, Ryan, Zach, Sarah, Nova, Otakon, Tim, Stephanie, Michael, Evan, Nicolas, Catherine, Rachelle, Dave, Holly, Bub, Kelly, Magellan, Ramzi, Don, Sabin, Jill, Rheya, DanceStar, Jeska, Hungry, Torley, Kona, Callum, Charity, Ventrella, Jack, Uncle, Vektor, Iris, Chris, Nicole, Mick, Reuben, Blue, Babbage, Yedwab, Deana, Lauren, Brent, Pathfinder, Chadrick, Altruima, Jesse, Monroe, David, Tess, Lizzie, Patsy, Pony, Isaac, Lawrence, Cyn, Bo, Gia, Annette, Marius, Tbone, Jonathan, Karen, Ginsu, Yuko, Makiko, Thomas, Harry, Seth, Alexei, Brian, Guy, Runitai, Ethan, Data, Cornelius, Kenny, Swiss, Zero, Natria, Wendy, Stephen, Teeple, Thumper, Lucy, Dee, Mia, Liana, Warren, Branka, Aura, beez, Milo, Hermia, Red, Thrax, Joe, Sally, Magenta, Paul, Jose, Rejean, Henrik, Lexie, Amber, Logan, Xan, Nora, Morpheus, Donovan, Leyla, MichaelFrancis, Beast, Cube, Bucky, Joshua, Stryfe, Harmony, Teresa, Claudia, Walker, Glenn, Fritz, Fordak, June, Cleopetra, Jean, Ivy, Betsy, Roosevelt, Spike, Ken, Which, Tofu, Chiyo, Rob, Zee, dustin, George, Del, Matthew, Cat, Jacqui, Lightfoot, Adrian, Viola, Alfred, Noel, Irfan, Sunil, Yool, Rika, Jane, Xtreme, Frontier, a2, Neo, Siobhan, Yoz, Justin, Elle, Qarl, Benjamin, Isabel, Gulliver, Everett, Christopher, Izzy, Stephany, Garry, Sejong, Sean, Tobin, Iridium, Meta, Anthony, Jeremy, JP, Jake, Maurice, Madhavi, Leopard, Kyle, Joon, Kari, Bert, Belinda, Jon, Kristi, Bridie, Pramod, KJ, Socrates, Maria, Ivan, Aric, Yamasaki, Adreanne, Jay, MitchK, Ceren, Coco, Durl, Jenny, Periapse, Kartic, Storrs, Lotte, Sandy, Colossus, Zen, BigPapi, Brad, Pastrami, Kurz, Mani, Neuro, Jaime, MJ, Rowan, Sgt, Elvis, Gecko, Samuel, Sardonyx, Leo, Bryan, Niko, Soft, Poppy, Rachel, Aki, Angelo, Banzai, Alexa, Sue, CeeLo, Bender, CG, Gillian, Pelle, Nick, Echo, Zara, Christine, Shamiran, Emma, Blake, Keiko, Plexus, Joppa, Sidewinder, Erica, Ashlei, Twilight, Kristen, Brett, Q, Enus, Simon, Bevis, Kraft, Kip, Chandler, Ron, LauraP, Ram, KyleJM, Scouse, Prospero, Melissa, Marty, Nat, Hamilton, Kend, Lordan, Jimmy, Kosmo, Seraph, Green, Ekim, Wiggo, JT, Rome, Doris, Miz, Benoc, Whump, Trinity, Patch, Kate, TJ, Bao, Joohwan, Christy, Sofia, Matias, Cogsworth, Johan, Oreh, Cheah, Angela, Brandy, Mango, Lan, Aleks, Gloria, Heidy, Mitchell, Space, Colton, Bambers, Einstein, Maggie, Malbers, Rose, Winnie, Stella, Milton, Rothman, Niall, Marin, Allison, James, Katie, Dawn, Katt, Kalpana, Judy, Andrea, Ambroff, Infinity, Gail, Rico, Raymond, Yi, William, Christa, M, Teagan, Scout, Molly, Dante, Corr, Dynamike, Usi, Kaylee, Lil, Danica, Sascha, Kelv, Jacob, Nya, Rodney, Brandon, Elsie, Blondin, Grant, Katrin, Nyx, Gabriel, Locklainn, Claire, Devin, Minerva, Monty, Austin, Bradford, Si, Keira, H, Caitlin, Dita, Makai, Jenn and many others.
-感谢以下居民，他们的帮助保证了这次第二人生的版本是有史以来最出色的: Kyrah Abattoir, Icesis Anansi, Clifton Antonelli, Nargus Asturias, Justizin Austinmer, Drake Bacon, Bitzer Balderdash, McWheelie Baldwin, SuezanneC Baskerville, Sweetheart Baskerville, Logan Bauer, Malarthi Behemoth, phoenix Behemoth, Eva Bellambi, Samgame Bertrand, Woody Blair, Tin Bling, Bibi Book, Barney Boomslang, Eric Boyer, Chromal Brodsky, Kerian Bunin, Lara Bunin, BigRick Byrd, Jillian Callahan, Hypatia Callisto, Frans Charming, nathalie Christensen, Francis Chung, pizzaguy Clutterbuck, Evo Commons, Entity Cosmo, Grazel Cosmo, Tiger Crossing, Fremont Cunningham, Jaki Daligdig, Sugar Darling, Todd David, Norman Desmoulins, Gxeremio Dimsum, Happy Dimsum, Kim Dingo, Roy Domela, Cory Edo, Delu Elytis, DBDigital Epsilon, Leeza Everett, Garth FairChang, Snowflake Fairymeadow, Khamon Fate, lex Fitzcarraldo, Kitto Flora, Angel Fluffy, CrystalShard Foo, Raudf Fox, Govindira Galatea, Rizpah Galatea, Tre Giles, Gattz Gilman, Kex Godel, Armandi Goodliffe, Tsu Goodliffe, Nickolas Goodman, Damen Gorilla, Nytemyst Grace, Mhaijik Guillaume, Gleeb Gupte, Ebonfire Harbinger, Bethanee Heaney, Jenny Hicks, Sandling Honey, Victoria Jacques, Adso Krogstad, Travis Lambert, simon Lameth, Duffy Langdon, Aaron Levy, Jade Lily, Gwyneth Llewelyn, Lola Lollipop, Michi Lumin, KaiLastOfTheBrunnenG Macdonald, Jesse Malthus, Herry Maltz, Seth Mandelbrot, Raavi Mann, Shirley Marquez, Dnate Mars, Ima Mechanique, Hawk Mendicant, Mercury Metropolitan, Haravikk Mistral, Trent Mondrian, Nexus Nash, Seraph Nephilim, Lewis Nerd, Aurael Neurocam, Lex Neva, Prokofy Neva, Seagel Neville, Kate Nicholas, Didde Nielsen, Richard Noonan, crevan Nori, Maczter Oddfellow, vanler Odets, Fat Ogre, Hamncheese Omlet, Strife Onizuka, Panthar Orlowski, Jessica Ornitz, Ron Overdrive, OmniCron Overlord, Dargon Pacer, Kar Parks, Eloise Pasteur, Caliandris Pendragon, Julianna Pennyfeather, Iron Perth, Shawk Pertwee, Mera Pixel, Elle Pollack, Phoenix Psaltery, Hank Ramos, Jon Ree, Tam Ree, Zi Ree, Jon Rolland, BamBam Sachertorte, kai Sachertorte, Mily Sartre, ice Semple, Desmond Shang, DigiKatt Shaw, Felix Sholokhov, Rhyph Somme, Rain Soothsayer, Oz Spade, squeekachu Spearmann, Wesley Spengler, Belaya Statosky, eltee Statosky, Khashai Steinbeck, Draco Steinhardt, Hope Stilman, Ashen Stygian, Seifert Surface, Gigs Taggart, Dolmere Talamasca, JayJay Talamasca, Becky Tardis, Fenris Tardis, Cubey Terra, Osprey Therian, Millie Thompson, John Toonie, Charlene Trudeau, Lyr Tuppakaka, Indy Turner, Luthien Unsung, Random Unsung, Huns Valen, Valdemar Virgo, Gordon Wendt, Mike Westerburg, Wayfinder Wishbringer, Lee Wormser, Aimee Xia, nimrod Yaffle, Yiffy Yaffle, Elle74 Zaftig and many others.
+感谢以下居民，他们的帮助保证了这次第二人生的版本是有史以来最出色的: aaron23 decuir, Abra Miles, absolute balderdash, adelle fitzgerald, Aeron Kohime, Aki Shichiroji, Alger Meads, Alissa Sabre, AlwaysIcey Mapholisto, Arawn Spitteler, Aren Mandala, Arianna Wrigglesworth, Bagushii Kohime, Balpien Hammerer, Blinking2342 Blinker, byakuya runo, Capucchy Streeter, Chandra Jun, Coyote Pace, Crusher Soderstrom, Cummere Mayo, cyberrosa Rossini, Dael Ra, danana dodonpa, Darek Deluca, Davec Horsforth, django yifu, draco crane, Dre Dagostino, Ephyu Reino, etan quan, Fenrix Murakami, Fledhyris Proudhon, Fred Wardhani, Frederich Courier, garth fairchang, Gellan Glenelg, Geraldine Giha, GOLAN Eilde, gonzo joubert, Hachiro Yokosuka, Hampton Hax, harleywood guru, Hevenz Vansant, imnotgoing sideways, Jaden Giles, Jeanette Janus, Karl Dorance, keaton Akina, Khashai Steinbeck, KiPSOFT Tuqiri, kirstenlee Cinquetti, Kitty Barnett, Laurent Vesta, Lazure Ryba, Lima Vesperia, Linzi Bingyi, Lisa Lowe, LuDon Ninetails, Mark Rosenbaum, McCabe Maxsted, Michi Lumin, Midi Aeon, ml0rtd kit, Mo Eriksen, Morice Flanagan, Mysterion Aeon, Nad Gough, norgan torok, Pygar Bu, Qie Niangao, rachel corleone, Rado Arado, roberto salubrius, Royer Pessoa, samia bechir, Sasha Nurmi, Sean Heying, Selkit Diller, Shadow Pidgeon, simon kline, Smokie Ember, Soap Clawtooth, Strife Onizuka, Tal Chernov, Talan Hyun, tangletwigs fairymeadow, Tanya Spinotti, Tayra Dagostino, Teebone Aeon, Theremes Langdon, Thraxis Epsilon, tucor Capalini, Vasko Hawker, VenusMari Zapedzki, Vex Streeter, Viktoria Dovgal, Vincent Nacon, Viridian Exonar, Vivienne Schell, WarKirby Magojiro, Wilton Lundquist, Yukinoroh Kamachi, Zyzzy Zarf
-APR Copyright (C) 2000-2004 The Apache Software Foundation
+  3Dconnexion SDK Copyright (C) 1992-2007 3Dconnexion
-Cg Copyright (C) 2002, NVIDIA Corporationa.
+  APR Copyright (C) 2000-2004 The Apache Software Foundation
-cURL Copyright (C) 1996-2002, Daniel Stenberg, (daniel@haxx.se)
+  cURL Copyright (C) 1996-2002, Daniel Stenberg, (daniel@haxx.se)
-expat Copyright (C) 1998, 1999, 2000 Thai Open Source Software Center Ltd.
+  expat Copyright (C) 1998, 1999, 2000 Thai Open Source Software Center Ltd.
-FreeType Copyright (C) 1996-2002, The FreeType Project (www.freetype.org).
+  FreeType Copyright (C) 1996-2002, The FreeType Project (www.freetype.org).
-GL Copyright (C) 1999-2004 Brian Paul.
+  GL Copyright (C) 1999-2004 Brian Paul.
-Havok.com(TM) Copyright (C) 1999-2001, Telekinesys Research Limited.
+  Havok.com(TM) Copyright (C) 1999-2001, Telekinesys Research Limited.
-jpeg2000 Copyright (C) 2001, David Taubman, The University of New South Wales (UNSW)
+  jpeg2000 Copyright (C) 2001, David Taubman, The University of New South Wales (UNSW)
-jpeglib Copyright (C) 1991-1998, Thomas G. Lane.
+  jpeglib Copyright (C) 1991-1998, Thomas G. Lane.
-ogg/vorbis Copyright (C) 2001, Xiphophorus
+  ogg/vorbis Copyright (C) 2001, Xiphophorus
-OpenSSL Copyright (C) 1998-2002 The OpenSSL Project.
+  OpenSSL Copyright (C) 1998-2002 The OpenSSL Project.
-SDL Copyright (C) 1997, 1998, 1999, 2000, 2001, 2002 Sam Lantinga
+  SDL Copyright (C) 1997, 1998, 1999, 2000, 2001, 2002 Sam Lantinga
-SSLeay Copyright (C) 1995-1998 Eric Young (eay@cryptsoft.com)
+  SSLeay Copyright (C) 1995-1998 Eric Young (eay@cryptsoft.com)
-xmlrpc-epi Copyright (C) 2000 Epinions, Inc.
+  xmlrpc-epi Copyright (C) 2000 Epinions, Inc.
-zlib Copyright (C) 1995-2002 Jean-loup Gailly and Mark Adler.
+  zlib Copyright (C) 1995-2002 Jean-loup Gailly and Mark Adler.
-All rights reserved.  查看licenses.txt获取细节.
+  All rights reserved.  查看licenses.txt获取细节.
+  Voice chat Audio coding: Polycom(R) Siren14(TM) (ITU-T Rec. G.722.1 Annex C)
 这不是一次故障，而是一个特性.
author	Jacek Antonelli	2008-08-15 23:46:01 -0500
committer	Jacek Antonelli	2008-08-15 23:46:01 -0500
commit	ae88605f72ef43be7b619b8c1c11a508ebae5057 (patch)
tree	f27474fe2d1186124211e2a5b2ad31927a3ab5bc /linden
parent	Second Life viewer sources 1.20.13 (diff)
download	meta-impy-ae88605f72ef43be7b619b8c1c11a508ebae5057.zip meta-impy-ae88605f72ef43be7b619b8c1c11a508ebae5057.tar.gz meta-impy-ae88605f72ef43be7b619b8c1c11a508ebae5057.tar.bz2 meta-impy-ae88605f72ef43be7b619b8c1c11a508ebae5057.tar.xz