Second Life viewer sources 1.17.0.12

332 files changed, 11879 insertions, 5972 deletions

diff --git a/linden/doc/contributions.txt b/linden/doc/contributions.txt
index dbb18f2..72e79f3 100644
--- a/linden/doc/contributions.txt
+++ b/linden/doc/contributions.txt
@@ -5,11 +5,12 @@ received from them.  To see more about these contributions, visit
 http://jira.secondlife.com/ and enter the issue identifier.
 
 Alissa Sabre - VWR-81, VWR-83, VWR-414, VWR-415
+Blakar Ogre - VWR-881
 blino Nakamura - VWR-17
 bushing Spatula - VWR-424
-Drewan Keats - VWR-28
+Drewan Keats - VWR-28, VWR-412
 Dylan Haskell - VWR-72
-Dzonatas Sol - VWR-198
+Dzonatas Sol - VWR-198, VWR-878
 Eddy Stryker - VWR-15, VWR-23
 Gigs Taggart - VWR-71, VWR-326
 Ginko Bayliss - VWR-4
@@ -19,11 +20,14 @@ Jacek Antonelli - VWR-165, VWR-188
 Joghert LeSabre - VWR-64
 Kage Pixel - VWR-11
 Kunnis Basiat - VWR-82
+Nicholaz Beresford - VWR-793, VWR-794, VWR-802, VWR-803, VWR-804, VWR-805, VWR-808, VWR-809, VWR-810, VWR-823, VWR-869, VWR-870, VWR-871, VWR-908, VWR-966
 Paul Churchill - VWR-20
 Paula Innis - VWR-30
 Peekay Semyorka - VWR-7, VWR-19, VWR-49
 SignpostMarv Martin - VWR-154, VWR-155
+Simon Nolan - VWR-409
 SpacedOut Frye - VWR-57, VWR-94, VWR-121, VWR-123
 Strife Onizuka - SVC-9, VWR-74, VWR-85, VWR-148
+Zi Ree - VWR-671, VWR-682
 Zipherius Turas - VWR-76, VWR-77
 
diff --git a/linden/indra/SConstruct b/linden/indra/SConstruct
index cbf2029..39b50bc 100644
--- a/linden/indra/SConstruct
+++ b/linden/indra/SConstruct
@@ -1,4 +1,4 @@
-#################################################
+################################################# -*- python -*-
 #
 #  SConstruct makefile for Second Life viewer
 #  and servers.
@@ -19,6 +19,7 @@
 import os
 import sys
 import glob
+import re
 
 platform = sys.platform
 if platform == 'linux2':
@@ -28,18 +29,49 @@ if platform == 'linux2':
 # GET VERSION        #
 ######################
 
-pipe = os.popen('grep LL_VERSION_MAJOR llcommon/llversion.h | sed \'s/.*=//; s/[^0-9]*//g\'')
-version_major = pipe.read().rstrip('\n')
-pipe.close()
-pipe = os.popen('grep LL_VERSION_MINOR llcommon/llversion.h | sed \'s/.*=//; s/[^0-9]*//g\'')
-version_minor = pipe.read().rstrip('\n')
-pipe.close()
-pipe = os.popen('grep LL_VERSION_PATCH llcommon/llversion.h | sed \'s/.*=//; s/[^0-9]*//g\'')
-version_patch = pipe.read().rstrip('\n')
-pipe.close()
-pipe = os.popen('grep LL_VERSION_BUILD llcommon/llversion.h | sed \'s/.*=//; s/[^0-9]*//g\'')
-version_build = pipe.read().rstrip('\n')
-pipe.close()
+def grep(filestr,searchstr):
+    try:
+        f = open( filestr, 'r' )
+    except IOError:
+        print "No such file " + filestr
+        sys.exit(2)
+    r = re.compile( searchstr )
+    for line in f.read().split('\n'):
+        if ( r.search(line) ):
+            f.close()
+            return line
+    f.close()
+    return None
+
+def get_version(llver):
+    re_vernum = re.compile("[0-9]+")
+    rstr = grep('llcommon/llversion.h', "LL_VERSION_" + llver)
+    if rstr == None:
+        print "No version information in llversion.h"
+        sys.exit(2)
+    version = re_vernum.findall( rstr )[1]
+    return version
+
+version_major = get_version("MAJOR")
+version_minor = get_version("MINOR")
+version_patch = get_version("PATCH")
+version_build = get_version("BUILD")
+
+version = version_major + '.' + version_minor + '.' + version_patch + '.' + version_build
+
+
+###############
+# SYSTEM INFO #
+###############
+
+# Debian Sarge has a broken glibc that leads to build failures on
+# *non*-Sarge systems (because of prebuilt static libraries built on
+# Sarge).
+
+try:
+    debian_sarge = open('/etc/debian_version').read().strip() == '3.1'
+except:
+    debian_sarge = False
 
 #########################
 # COMMAND LINE OPTIONS  #
@@ -90,7 +122,7 @@ for build_target in targets:
 
     system_str = arch + '-' + platform
 
-    print 'Building ' + build_target + ' ' + version_major + '.' + version_minor + '.' + version_patch + '.' + version_build + ' on ' + system_str + ' (' + buildtype + ')'
+    print 'Building ' + build_target + ' ' + version + ' on ' + system_str + ' (' + buildtype + ')'
 
     system_lib_dir = '../libraries/' + system_str 
     if build_target == 'client':
@@ -161,11 +193,15 @@ for build_target in targets:
 
     if build_target == 'server':
         # Server flags
-        flags += '-march=pentiumpro -D_GNU_SOURCE -ftemplate-depth-60 -DLL_MESA_HEADLESS=1 -DLL_MESA=1 '
-        try:
-            server_cppflags = os.environ['SERVER_CPPFLAGS']
-        except:
-            server_cppflags = ''
+        flags += '-D_GNU_SOURCE -ftemplate-depth-60 -DLL_MESA_HEADLESS=1 -DLL_MESA=1 '
+        if arch == 'i686':
+            flags += '-march=pentiumpro '
+        if debian_sarge:
+            def_server_cppflags = ''
+        else:
+            def_server_cppflags = '-DCTYPE_WORKAROUND'
+        server_cppflags = os.environ.get('SERVER_CPPFLAGS',
+                                         def_server_cppflags)
         flags += server_cppflags + ' '
     else:
         # Viewer flags
@@ -243,9 +279,15 @@ for build_target in targets:
     if enable_distcc:
         compiler = 'distcc ' + gcc_bin
 
+    lib_path = [lib_dir] + [system_lib_dir]
+
+    mysql_lib_dir = '/usr/lib/mysql4/mysql'
+    if os.path.isdir(mysql_lib_dir):
+        lib_path.append(mysql_lib_dir)
+
     base_env = Environment(CXX = compiler,
             CPPPATH = include_dirs,
-            LIBPATH = [lib_dir] + [system_lib_dir],
+            LIBPATH = lib_path,
             LINKFLAGS = system_link_flags + '--no-keep-memory --reduce-memory-overheads ' )
 
     ### Environments for various build types ###
@@ -418,8 +460,10 @@ for build_target in targets:
 
         external_libs = client_external_libs + common_external_libs + [ 'freetype', 'jpeg', 'SDL', 'GL', 'GLU', 'ogg', 'vorbisenc', 'vorbisfile', 'vorbis', 'db-4.2', 'openjpeg' ]
 
-        if arch != 'x86_64' and arch != 'x86_64cross' and enable_fmod:
-            external_libs += [ 'fmod-3.75' ]
+        if arch != 'x86_64' and arch != 'x86_64cross':
+            if enable_fmod:
+                external_libs += [ 'fmod-3.75' ]
+            external_libs += ['tcmalloc', 'stacktrace']
 
         external_libs.remove('cares')
 
diff --git a/linden/indra/indra_complete/indra_complete.sln b/linden/indra/indra_complete/indra_complete.sln
index 5c5c0ca..80bb436 100644
--- a/linden/indra/indra_complete/indra_complete.sln
+++ b/linden/indra/indra_complete/indra_complete.sln
@@ -69,7 +69,6 @@ Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "newview", "..\newview\newvi
                 {E87FD9BE-BE42-4EA3-BF4D-D992223046D9} = {E87FD9BE-BE42-4EA3-BF4D-D992223046D9}
                 {4C8D64D5-649F-481E-96BE-EF1E82A77ACB} = {4C8D64D5-649F-481E-96BE-EF1E82A77ACB}
                 {5EA5DDF0-C7E1-4F49-BEF5-9246A4656B2E} = {5EA5DDF0-C7E1-4F49-BEF5-9246A4656B2E}
-                {648685F3-8760-4CC5-BB2B-CAF9DECC25A4} = {648685F3-8760-4CC5-BB2B-CAF9DECC25A4}
                 {D37774F4-253D-4760-BF64-372A943224A1} = {D37774F4-253D-4760-BF64-372A943224A1}
         EndProjectSection
 EndProject
diff --git a/linden/indra/lib/python/indra/llmanifest.py b/linden/indra/lib/python/indra/llmanifest.py
index c49e39a..e295cd7 100644
--- a/linden/indra/lib/python/indra/llmanifest.py
+++ b/linden/indra/lib/python/indra/llmanifest.py
@@ -85,6 +85,7 @@ def get_default_version(srctree):
             build = re.search("LL_VERSION_BUILD\s=\s([0-9]+)", contents).group(1)
             return major, minor, patch, build
 
+DEFAULT_CHANNEL = 'Second Life Release'
 
 ARGUMENTS=[
     dict(name='actions',
@@ -113,6 +114,9 @@ ARGUMENTS=[
         though it's not strictly a grid, 'firstlook' is also an acceptable
         value for this parameter.""",
          default=""),
+    dict(name='channel',
+         description="""The channel to use for updates.""",
+         default=DEFAULT_CHANNEL),
     dict(name='installer_name',
          description=""" The name of the file that the installer should be
         packaged up into. Only used on Linux at the moment.""",
@@ -224,6 +228,11 @@ class LLManifest(object):
         self.src_prefix = [srctree]
         self.dst_prefix = [dsttree]
         self.created_paths = []
+        
+    def default_grid(self):
+        return self.args.get('grid', None) == ''
+    def default_channel(self):
+        return self.args.get('channel', None) == DEFAULT_CHANNEL
 
     def construct(self):
         """ Meant to be overriden by LLManifest implementors with code that
diff --git a/linden/indra/llaudio/llaudiodecodemgr.cpp b/linden/indra/llaudio/llaudiodecodemgr.cpp
index 0dbc64f..ffd115a 100644
--- a/linden/indra/llaudio/llaudiodecodemgr.cpp
+++ b/linden/indra/llaudio/llaudiodecodemgr.cpp
@@ -73,7 +73,6 @@ public:
         };
         
         LLVorbisDecodeState(const LLUUID &uuid, const LLString &out_filename);
-        virtual ~LLVorbisDecodeState();
 
         BOOL initDecode();
         BOOL decodeSection(); // Return TRUE if done.
@@ -85,7 +84,10 @@ public:
         BOOL isValid() const                            { return mValid; }
         BOOL isDone() const                                     { return mDone; }
         const LLUUID &getUUID() const           { return mUUID; }
+
 protected:
+        virtual ~LLVorbisDecodeState();
+
         BOOL mValid;
         BOOL mDone;
         LLAtomicS32 mBytesRead;
diff --git a/linden/indra/llcharacter/llcharacter.cpp b/linden/indra/llcharacter/llcharacter.cpp
index 90a3cc6..29872f7 100644
--- a/linden/indra/llcharacter/llcharacter.cpp
+++ b/linden/indra/llcharacter/llcharacter.cpp
@@ -190,6 +190,15 @@ void LLCharacter::updateMotion(BOOL force_update)
 
 
 //-----------------------------------------------------------------------------
+// deactivateAllMotions()
+//-----------------------------------------------------------------------------
+void LLCharacter::deactivateAllMotions()
+{
+        mMotionController.deactivateAllMotions();
+}
+
+
+//-----------------------------------------------------------------------------
 // flushAllMotions()
 //-----------------------------------------------------------------------------
 void LLCharacter::flushAllMotions()
diff --git a/linden/indra/llcharacter/llcharacter.h b/linden/indra/llcharacter/llcharacter.h
index 90824aa..666beb2 100644
--- a/linden/indra/llcharacter/llcharacter.h
+++ b/linden/indra/llcharacter/llcharacter.h
@@ -170,6 +170,9 @@ public:
         // no cached references to character joint data.  This is 
         // useful if a character wants to rebuild it's skeleton.
         virtual void flushAllMotions();
+        
+        // Flush only wipes active animations. 
+        virtual void deactivateAllMotions();
 
         // dumps information for debugging
         virtual void dumpCharacter( LLJoint *joint = NULL );
diff --git a/linden/indra/llcharacter/llheadrotmotion.cpp b/linden/indra/llcharacter/llheadrotmotion.cpp
index be0b55d..cfab048 100644
--- a/linden/indra/llcharacter/llheadrotmotion.cpp
+++ b/linden/indra/llcharacter/llheadrotmotion.cpp
@@ -431,6 +431,7 @@ BOOL LLEyeMotion::onUpdate(F32 time, U8* joint_mask)
                 LLVector3               up;
 
                 eye_look_at = *targetPos;
+                has_eye_target = TRUE;
                 F32 lookAtDistance = eye_look_at.normVec();
 
                 left.setVec(skyward % eye_look_at);
diff --git a/linden/indra/llcharacter/llmotioncontroller.cpp b/linden/indra/llcharacter/llmotioncontroller.cpp
index 5545841..e2453c9 100644
--- a/linden/indra/llcharacter/llmotioncontroller.cpp
+++ b/linden/indra/llcharacter/llmotioncontroller.cpp
@@ -546,7 +546,6 @@ void LLMotionController::updateMotionsByType(LLMotion::LLMotionBlendType anim_ty
                         {
                                 if (motionp->isStopped() && mTime > motionp->getStopTime() + motionp->getEaseOutDuration())
                                 {
-                                        posep->setWeight(0.f);
                                         deactivateMotion(motionp);
                                 }
                                 continue;
@@ -573,7 +572,6 @@ void LLMotionController::updateMotionsByType(LLMotion::LLMotionBlendType anim_ty
                         }
                         else
                         {
-                                posep->setWeight(0.f);
                                 deactivateMotion(motionp);
                                 continue;
                         }
@@ -824,6 +822,7 @@ BOOL LLMotionController::activateMotion(LLMotion *motion, F32 time)
 //-----------------------------------------------------------------------------
 BOOL LLMotionController::deactivateMotion(LLMotion *motion)
 {
+        motion->getPose()->setWeight(0.f);
         motion->deactivate();
         mActiveMotions.remove(motion);
 
@@ -855,6 +854,23 @@ LLMotion *LLMotionController::findMotion(const LLUUID& id)
         return mAllMotions[id];
 }
 
+//-----------------------------------------------------------------------------
+// deactivateAllMotions()
+//-----------------------------------------------------------------------------
+void LLMotionController::deactivateAllMotions()
+{
+        //They must all die, precious.
+        for (std::map<LLUUID, LLMotion*>::iterator iter = mAllMotions.begin();
+                 iter != mAllMotions.end(); iter++)
+        {
+                LLMotion* motionp = iter->second;
+                if (motionp) motionp->deactivate();
+        }
+
+        // delete all motion instances
+        deleteAllMotions();
+}
+
 
 //-----------------------------------------------------------------------------
 // flushAllMotions()
diff --git a/linden/indra/llcharacter/llmotioncontroller.h b/linden/indra/llcharacter/llmotioncontroller.h
index e4c7b3f..94149da 100644
--- a/linden/indra/llcharacter/llmotioncontroller.h
+++ b/linden/indra/llcharacter/llmotioncontroller.h
@@ -158,6 +158,9 @@ public:
         // releases all motion instances
         void flushAllMotions();
 
+        //Flush is a liar.
+        void deactivateAllMotions();    
+
         // pause and continue all motions
         void pause();
         void unpause();
diff --git a/linden/indra/llcommon/files.lst b/linden/indra/llcommon/files.lst
index 6a48752..0474cbb 100644
--- a/linden/indra/llcommon/files.lst
+++ b/linden/indra/llcommon/files.lst
@@ -18,6 +18,7 @@ llcommon/llliveappconfig.cpp
 llcommon/lllivefile.cpp
 llcommon/llmemory.cpp
 llcommon/llmemorystream.cpp
+llcommon/llmetrics.cpp
 llcommon/llmortician.cpp
 llcommon/llprocessor.cpp
 llcommon/llqueuedthread.cpp
diff --git a/linden/indra/llcommon/llcommon.vcproj b/linden/indra/llcommon/llcommon.vcproj
index ca91e18..399dae3 100644
--- a/linden/indra/llcommon/llcommon.vcproj
+++ b/linden/indra/llcommon/llcommon.vcproj
@@ -215,6 +215,9 @@
                                 RelativePath=".\llmemorystream.cpp">
                         </File>
                         <File
+                                RelativePath=".\llmetrics.cpp">
+                        </File>
+                        <File
                                 RelativePath=".\llmortician.cpp">
                         </File>
                         <File
@@ -433,6 +436,9 @@
                                 RelativePath=".\llmemtype.h">
                         </File>
                         <File
+                                RelativePath=".\llmetrics.h">
+                        </File>
+                        <File
                                 RelativePath=".\llmortician.h">
                         </File>
                         <File
diff --git a/linden/indra/llcommon/llerror.cpp b/linden/indra/llcommon/llerror.cpp
index 9bcb415..714a265 100644
--- a/linden/indra/llcommon/llerror.cpp
+++ b/linden/indra/llcommon/llerror.cpp
@@ -40,6 +40,7 @@ extern apr_thread_mutex_t *gLogMutexp;
 #include "lllivefile.h"
 #include "llsd.h"
 #include "llsdserialize.h"
+#include "llstl.h"
 
 #include <algorithm>
 #include <cctype>
@@ -397,6 +398,12 @@ namespace LLError
                                 shouldLogCallCounter(0)
                         { }
                 
+                ~Settings()
+                {
+                        for_each(recorders.begin(), recorders.end(),
+                                         DeletePointer());
+                }
+                
                 static Settings*& getPtr();
         };
         
diff --git a/linden/indra/llcommon/llevent.h b/linden/indra/llcommon/llevent.h
index 18b0596..cab8817 100644
--- a/linden/indra/llcommon/llevent.h
+++ b/linden/indra/llcommon/llevent.h
@@ -88,12 +88,12 @@ public:
 class LLSimpleListener : public LLEventListener
 {
 public:
-        virtual ~LLSimpleListener();
         void clearDispatchers();
         virtual bool handleAttach(LLEventDispatcher *dispatcher);
         virtual bool handleDetach(LLEventDispatcher *dispatcher);
 
 protected:
+        ~LLSimpleListener();
         std::vector<LLEventDispatcher *> mDispatchers;
 };
 
diff --git a/linden/indra/llcommon/llframetimer.cpp b/linden/indra/llcommon/llframetimer.cpp
index 5ae4a6b..2b53e8c 100644
--- a/linden/indra/llcommon/llframetimer.cpp
+++ b/linden/indra/llcommon/llframetimer.cpp
@@ -70,6 +70,12 @@ void LLFrameTimer::reset()
         mExpiry = sFrameTime;
 }
 
+void LLFrameTimer::resetWithExpiry(F32 expiration)
+{
+        reset();
+        setTimerExpirySec(expiration);
+}
+
 // Don't combine pause/unpause with start/stop
 // Useage:
 //  LLFrameTime foo; // starts automatically
diff --git a/linden/indra/llcommon/llframetimer.h b/linden/indra/llcommon/llframetimer.h
index 0366e09..de550e2 100644
--- a/linden/indra/llcommon/llframetimer.h
+++ b/linden/indra/llcommon/llframetimer.h
@@ -75,6 +75,7 @@ public:
         void start();
         void stop();
         void reset();
+        void resetWithExpiry(F32 expiration);
         void pause();
         void unpause();
         void setTimerExpirySec(F32 expiration);
diff --git a/linden/indra/llcommon/llmetrics.cpp b/linden/indra/llcommon/llmetrics.cpp
new file mode 100644
index 0000000..583f840
--- /dev/null
+++ b/linden/indra/llcommon/llmetrics.cpp
@@ -0,0 +1,165 @@
+/** 
+ * @file llmetrics.cpp
+ * @author Kelly
+ * @date 2007-05-25
+ * @brief Metrics accumulation and associated functions
+ *
+ * Copyright (c) 2007-2007, Linden Research, Inc.
+ * 
+ * Second Life Viewer Source Code
+ * The source code in this file ("Source Code") is provided by Linden Lab
+ * to you under the terms of the GNU General Public License, version 2.0
+ * ("GPL"), unless you have obtained a separate licensing agreement
+ * ("Other License"), formally executed by you and Linden Lab.  Terms of
+ * the GPL can be found in doc/GPL-license.txt in this distribution, or
+ * online at http://secondlife.com/developers/opensource/gplv2
+ * 
+ * There are special exceptions to the terms and conditions of the GPL as
+ * it is applied to this Source Code. View the full text of the exception
+ * in the file doc/FLOSS-exception.txt in this software distribution, or
+ * online at http://secondlife.com/developers/opensource/flossexception
+ * 
+ * By copying, modifying or distributing this software, you acknowledge
+ * that you have read and understood your obligations described above,
+ * and agree to abide by those obligations.
+ * 
+ * ALL LINDEN LAB SOURCE CODE IS PROVIDED "AS IS." LINDEN LAB MAKES NO
+ * WARRANTIES, EXPRESS, IMPLIED OR OTHERWISE, REGARDING ITS ACCURACY,
+ * COMPLETENESS OR PERFORMANCE.
+ */
+
+#include "linden_common.h"
+#include "llmetrics.h"
+
+#include "llsd.h"
+#include "llsdserialize.h"
+#include "llframetimer.h"
+
+class LLMetricsImpl
+{
+public:
+        LLMetricsImpl() { }
+        ~LLMetricsImpl();
+
+        void recordEvent(const std::string& location, const std::string& mesg, bool success);
+        void printTotals(LLSD metadata);
+        void recordEventDetails(const std::string& location, 
+                                                                        const std::string& mesg, 
+                                                                        bool success, 
+                                                                        LLSD stats);
+private:
+        LLFrameTimer mLastPrintTimer;
+        LLSD mMetricsMap;
+};
+
+LLMetricsImpl::~LLMetricsImpl()
+{
+}
+
+void LLMetricsImpl::recordEventDetails(const std::string& location, 
+                                                                        const std::string& mesg, 
+                                                                        bool success, 
+                                                                        LLSD stats)
+{
+        recordEvent(location,mesg,success);
+
+        LLSD metrics = LLSD::emptyMap();
+        metrics["location"] = location;
+        metrics["stats"]  = stats;
+        
+        llinfos << "LLMETRICS: " << LLSDOStreamer<LLSDNotationFormatter>(metrics) << llendl; 
+}
+
+// Store this:
+// [ {'location_1':{'mesg_1':{'success':i10, 'fail':i0},
+//                                      'mesg_2':{'success':i10, 'fail':i0}},
+//   {'location_2',{'mesg_3':{'success':i10, 'fail':i0}} ]
+void LLMetricsImpl::recordEvent(const std::string& location, const std::string& mesg, bool success)
+{
+        LLSD& stats = mMetricsMap[location][mesg];
+        if (success)
+        {
+                stats["success"] = stats["success"].asInteger() + 1;
+        }
+        else
+        {
+                stats["fail"] = stats["fail"].asInteger() + 1;
+        }
+}
+
+// Print this:
+// { 'meta':
+//              { 'elapsed_time':r3600.000 }
+//   'stats':
+//              [ {'location':'location_1', 'mesg':'mesg_1', 'success':i10, 'fail':i0},
+//                {'location':'location_1', 'mesg':'mesg_2', 'success':i10, 'fail':i0},
+//                {'location':'location_2', 'mesg':'mesg_3', 'success':i10, 'fail':i0} ] }
+void LLMetricsImpl::printTotals(LLSD metadata)
+{
+        F32 elapsed_time = mLastPrintTimer.getElapsedTimeAndResetF32();
+        metadata["elapsed_time"] = elapsed_time;
+
+        LLSD out_sd = LLSD::emptyMap();
+        out_sd["meta"] = metadata;
+                
+        LLSD stats = LLSD::emptyArray();
+
+        LLSD::map_const_iterator loc_it = mMetricsMap.beginMap();
+        LLSD::map_const_iterator loc_end = mMetricsMap.endMap();
+        for ( ; loc_it != loc_end; ++loc_it)
+        {
+                const std::string& location = (*loc_it).first;
+                
+                const LLSD& loc_map = (*loc_it).second;
+                LLSD::map_const_iterator mesg_it = loc_map.beginMap();
+                LLSD::map_const_iterator mesg_end = loc_map.endMap();
+                for ( ; mesg_it != mesg_end; ++mesg_it)
+                {
+                        const std::string& mesg = (*mesg_it).first;
+                        const LLSD& mesg_map = (*mesg_it).second;
+
+                        LLSD entry = LLSD::emptyMap();
+                        entry["location"] = location;
+                        entry["mesg"] = mesg;
+                        entry["success"] = mesg_map["success"];
+                        entry["fail"] = mesg_map["fail"];
+                
+                        stats.append(entry);
+                }
+        }
+
+        out_sd["stats"] = stats;
+
+        llinfos << "LLMETRICS: AGGREGATE: " << LLSDOStreamer<LLSDNotationFormatter>(out_sd) << llendl;
+}
+
+LLMetrics::LLMetrics()
+{
+        mImpl = new LLMetricsImpl();
+}
+
+LLMetrics::~LLMetrics()
+{
+        delete mImpl;
+        mImpl = NULL;
+}
+
+void LLMetrics::recordEvent(const std::string& location, const std::string& mesg, bool success)
+{
+        if (mImpl) mImpl->recordEvent(location,mesg,success);
+}
+
+void LLMetrics::printTotals(LLSD meta)
+{
+        if (mImpl) mImpl->printTotals(meta);
+}
+
+
+void LLMetrics::recordEventDetails(const std::string& location, 
+                                                                        const std::string& mesg, 
+                                                                        bool success, 
+                                                                        LLSD stats)
+{
+        if (mImpl) mImpl->recordEventDetails(location,mesg,success,stats);
+}
+
diff --git a/linden/indra/llcommon/llmetrics.h b/linden/indra/llcommon/llmetrics.h
new file mode 100644
index 0000000..2c216c3
--- /dev/null
+++ b/linden/indra/llcommon/llmetrics.h
@@ -0,0 +1,62 @@
+/**
+ * @file llmetrics.h
+ * @author Kelly
+ * @date 2007-05-25
+ * @brief Declaration of metrics accumulation and associated functions
+ *
+ * Copyright (c) 2007-2007, Linden Research, Inc.
+ * 
+ * Second Life Viewer Source Code
+ * The source code in this file ("Source Code") is provided by Linden Lab
+ * to you under the terms of the GNU General Public License, version 2.0
+ * ("GPL"), unless you have obtained a separate licensing agreement
+ * ("Other License"), formally executed by you and Linden Lab.  Terms of
+ * the GPL can be found in doc/GPL-license.txt in this distribution, or
+ * online at http://secondlife.com/developers/opensource/gplv2
+ * 
+ * There are special exceptions to the terms and conditions of the GPL as
+ * it is applied to this Source Code. View the full text of the exception
+ * in the file doc/FLOSS-exception.txt in this software distribution, or
+ * online at http://secondlife.com/developers/opensource/flossexception
+ * 
+ * By copying, modifying or distributing this software, you acknowledge
+ * that you have read and understood your obligations described above,
+ * and agree to abide by those obligations.
+ * 
+ * ALL LINDEN LAB SOURCE CODE IS PROVIDED "AS IS." LINDEN LAB MAKES NO
+ * WARRANTIES, EXPRESS, IMPLIED OR OTHERWISE, REGARDING ITS ACCURACY,
+ * COMPLETENESS OR PERFORMANCE.
+ */
+
+#ifndef LL_LLMETRICS_H
+#define LL_LLMETRICS_H
+
+class LLMetricsImpl;
+class LLSD;
+
+class LLMetrics
+{
+public:
+        LLMetrics();
+        virtual ~LLMetrics();
+
+        // Adds this event to aggregate totals and records details to syslog (llinfos)
+        virtual void recordEventDetails(const std::string& location, 
+                                                const std::string& mesg, 
+                                                bool success, 
+                                                LLSD stats);
+
+        // Adds this event to aggregate totals
+        virtual void recordEvent(const std::string& location, const std::string& mesg, bool success);
+
+        // Prints aggregate totals and resets the counts.
+        virtual void printTotals(LLSD meta);
+
+
+private:
+        
+        LLMetricsImpl* mImpl;
+};
+
+#endif
+
diff --git a/linden/indra/llcommon/llprocessor.cpp b/linden/indra/llcommon/llprocessor.cpp
index d269e35..40dc00c 100644
--- a/linden/indra/llcommon/llprocessor.cpp
+++ b/linden/indra/llcommon/llprocessor.cpp
@@ -277,7 +277,7 @@ bool CProcessor::AnalyzeIntelProcessor()
 
         // Only override the brand if we have it in the lookup table.  We should
         // already have a string here from GetCPUInfo().  JC
-        if (CPUInfo.uiBrandID < sizeof(INTEL_BRAND))
+        if (CPUInfo.uiBrandID < (sizeof(INTEL_BRAND)/sizeof(INTEL_BRAND[0])))
         {
                 strcpy(CPUInfo.strBrandID, INTEL_BRAND[CPUInfo.uiBrandID]);
 
diff --git a/linden/indra/llcommon/llsdutil.cpp b/linden/indra/llcommon/llsdutil.cpp
index d30afc7..85718ba 100644
--- a/linden/indra/llcommon/llsdutil.cpp
+++ b/linden/indra/llcommon/llsdutil.cpp
@@ -285,3 +285,16 @@ char* ll_print_sd(const LLSD& sd)
         buffer[bufferSize - 1] = '\0';
         return buffer;
 }
+
+char* ll_pretty_print_sd(const LLSD& sd)
+{
+        const U32 bufferSize = 10 * 1024;
+        static char buffer[bufferSize];
+        std::ostringstream stream;
+        //stream.rdbuf()->pubsetbuf(buffer, bufferSize);
+        stream << LLSDOStreamer<LLSDXMLFormatter>(sd, LLSDFormatter::OPTIONS_PRETTY);
+        stream << std::ends;
+        strncpy(buffer, stream.str().c_str(), bufferSize);
+        buffer[bufferSize - 1] = '\0';
+        return buffer;
+}
\ No newline at end of file
diff --git a/linden/indra/llcommon/llsdutil.h b/linden/indra/llcommon/llsdutil.h
index 6344c50..38a7b83 100644
--- a/linden/indra/llcommon/llsdutil.h
+++ b/linden/indra/llcommon/llsdutil.h
@@ -85,4 +85,7 @@ LLSD ll_binary_from_string(const LLSD& sd);
 // Serializes sd to static buffer and returns pointer, useful for gdb debugging.
 char* ll_print_sd(const LLSD& sd);
 
+// Serializes sd to static buffer and returns pointer, using "pretty printing" mode.
+char* ll_pretty_print_sd(const LLSD& sd);
+
 #endif // LL_LLSDUTIL_H
diff --git a/linden/indra/llcommon/llthread.h b/linden/indra/llcommon/llthread.h
index adb04a5..c863322 100644
--- a/linden/indra/llcommon/llthread.h
+++ b/linden/indra/llcommon/llthread.h
@@ -239,8 +239,9 @@ private:
 // Pure virtual class
 class LLResponder : public LLThreadSafeRefCount
 {
-public:
+protected:
         virtual ~LLResponder();
+public:
         virtual void completed(bool success) = 0;
 };
 
diff --git a/linden/indra/llcommon/llversion.h b/linden/indra/llcommon/llversion.h
index f2ea20d..57b1512 100644
--- a/linden/indra/llcommon/llversion.h
+++ b/linden/indra/llcommon/llversion.h
@@ -30,8 +30,8 @@
 #define LL_LLVERSION_H
 
 const S32 LL_VERSION_MAJOR = 1;
-const S32 LL_VERSION_MINOR = 16;
+const S32 LL_VERSION_MINOR = 17;
 const S32 LL_VERSION_PATCH = 0;
-const S32 LL_VERSION_BUILD = 5;
+const S32 LL_VERSION_BUILD = 12;
 
 #endif
diff --git a/linden/indra/llimage/llimageworker.cpp b/linden/indra/llimage/llimageworker.cpp
index c28f80c..c59eac2 100644
--- a/linden/indra/llimage/llimageworker.cpp
+++ b/linden/indra/llimage/llimageworker.cpp
@@ -50,7 +50,9 @@ void LLImageWorker::cleanupClass()
 
 //----------------------------------------------------------------------------
 
-LLImageWorker::LLImageWorker(LLImageFormatted* image, U32 priority, S32 discard, LLResponder* responder)
+LLImageWorker::LLImageWorker(LLImageFormatted* image, U32 priority,
+                                                         S32 discard,
+                                                         LLPointer<LLResponder> responder)
         : LLWorkerClass(sWorkerThread, "Image"),
           mFormattedImage(image),
           mDecodedType(-1),
diff --git a/linden/indra/llimage/llimageworker.h b/linden/indra/llimage/llimageworker.h
index 8026cbb..a84918d 100644
--- a/linden/indra/llimage/llimageworker.h
+++ b/linden/indra/llimage/llimageworker.h
@@ -41,7 +41,8 @@ public:
 
         // LLWorkerThread
 public:
-        LLImageWorker(LLImageFormatted* image, U32 priority, S32 discard, LLResponder* responder = NULL);
+        LLImageWorker(LLImageFormatted* image, U32 priority, S32 discard,
+                                  LLPointer<LLResponder> responder);
         ~LLImageWorker();
 
         // called from WORKER THREAD, returns TRUE if done
diff --git a/linden/indra/llinventory/llnotecard.cpp b/linden/indra/llinventory/llnotecard.cpp
index 47dd690..86eb5b2 100644
--- a/linden/indra/llinventory/llnotecard.cpp
+++ b/linden/indra/llinventory/llnotecard.cpp
@@ -104,12 +104,6 @@ bool LLNotecard::importEmbeddedItemsStream(std::istream& str)
                         goto import_file_failed;
                 }
 
-                if( (index < 0) )
-                {
-                        llwarns << "Invalid LLEmbeddedItems file format: invalid ext char index: " << index << llendl;
-                        goto import_file_failed;
-                }
-
                 str >> std::ws >> "inv_item\t0\n";
                 if(str.fail())
                 {
diff --git a/linden/indra/llinventory/llparcel.cpp b/linden/indra/llinventory/llparcel.cpp
index 5b2052f..990e77d 100644
--- a/linden/indra/llinventory/llparcel.cpp
+++ b/linden/indra/llinventory/llparcel.cpp
@@ -316,6 +316,11 @@ void LLParcel::setLocalID(S32 local_id)
         mLocalID = local_id;
 }
 
+void LLParcel::setAllParcelFlags(U32 flags)
+{
+        mParcelFlags = flags;
+}
+
 void LLParcel::setParcelFlag(U32 flag, BOOL b)
 {
         if (b)
@@ -712,6 +717,16 @@ BOOL LLParcel::importStream(std::istream& input_stream)
                         LLString::convertToU32(value, setting);
                         setParcelFlag(PF_ALLOW_GROUP_SCRIPTS, setting);
                 }
+                else if ("allow_voice_chat" == keyword)
+                {
+                        LLString::convertToU32(value, setting);
+                        setParcelFlag(PF_ALLOW_VOICE_CHAT, setting);
+                }
+                else if ("use_estate_voice_chan" == keyword)
+                {
+                        LLString::convertToU32(value, setting);
+                        setParcelFlag(PF_USE_ESTATE_VOICE_CHAN, setting);
+                }
                 else if ("allow_scripts" == keyword)
                 {
                         LLString::convertToU32(value, setting);
@@ -1104,6 +1119,8 @@ BOOL LLParcel::exportStream(std::ostream& output_stream)
         output_stream << "\t\t sound_local         " << (getSoundLocal() ? 1 : 0)  << "\n";
         output_stream << "\t\t allow_scripts    " << (getAllowOtherScripts()  ? 1 : 0)  << "\n";
         output_stream << "\t\t allow_group_scripts    " << (getAllowGroupScripts()  ? 1 : 0)  << "\n";
+        output_stream << "\t\t allow_voice_chat    " << (getVoiceEnabled() ? 1 : 0) << "\n";
+        output_stream << "\t\t use_estate_voice_chan   " << (getVoiceUseEstateChannel() ? 1 : 0) << "\n";
         output_stream << "\t\t for_sale         " << (getForSale()       ? 1 : 0)  << "\n";
         output_stream << "\t\t sell_w_objects   " << (getSellWithObjects()      ? 1 : 0)  << "\n";
         output_stream << "\t\t draw_distance    " << mDrawDistance  << "\n";
diff --git a/linden/indra/llinventory/llparcel.h b/linden/indra/llinventory/llparcel.h
index 3144eb9..371b802 100644
--- a/linden/indra/llinventory/llparcel.h
+++ b/linden/indra/llinventory/llparcel.h
@@ -167,21 +167,39 @@ public:
 
         // CREATORS
         LLParcel();
-        LLParcel(       const LLUUID &owner_id,
-                                BOOL modify, BOOL terraform, BOOL damage,
-                                time_t claim_date, S32 claim_price, S32 rent_price, S32 area, S32 sim_object_limit, F32 parcel_object_bonus,
-                                BOOL is_group_owned = FALSE);
+        LLParcel(
+                const LLUUID &owner_id,
+                BOOL modify,
+                BOOL terraform,
+                BOOL damage,
+                time_t claim_date,
+                S32 claim_price,
+                S32 rent_price,
+                S32 area,
+                S32 sim_object_limit,
+                F32 parcel_object_bonus,
+                BOOL is_group_owned = FALSE);
         virtual ~LLParcel();
 
-        void    init(   const LLUUID &owner_id,
-                                        BOOL modify, BOOL terraform, BOOL damage,
-                                        time_t claim_date, S32 claim_price, S32 rent_price,
-                                        S32 area, S32 sim_object_limit, F32 parcel_object_bonus, BOOL is_group_owned = FALSE);
+        void init(
+                const LLUUID &owner_id,
+                BOOL modify,
+                BOOL terraform,
+                BOOL damage,
+                time_t claim_date,
+                S32 claim_price,
+                S32 rent_price,
+                S32 area,
+                S32 sim_object_limit,
+                F32 parcel_object_bonus,
+                BOOL is_group_owned = FALSE);
 
         // TODO: make an actual copy constructor for this
-        void    overrideParcelFlags(U32 flags);
+        void overrideParcelFlags(U32 flags);
         // if you specify an agent id here, the group id will be zeroed
-        void    overrideOwner(const LLUUID& owner_id, BOOL is_group_owned = FALSE);
+        void overrideOwner(
+                const LLUUID& owner_id,
+                BOOL is_group_owned = FALSE);
         void overrideSaleTimerExpires(F32 secs_left) { mSaleTimerExpires.setTimerExpirySec(secs_left); }
 
         // MANIPULATORS
@@ -211,7 +229,7 @@ public:
 
         void setAuctionID(U32 auction_id) { mAuctionID = auction_id;}
 
-        void    setAllParcelFlags(U32 flags) { mParcelFlags = flags; }
+        void    setAllParcelFlags(U32 flags);
         void    setParcelFlag(U32 flag, BOOL b);
 
         void    setArea(S32 area, S32 sim_object_limit);
@@ -410,6 +428,10 @@ public:
                                         { return (mParcelFlags & PF_FOR_SALE) ? TRUE : FALSE; }
         BOOL    getSoundLocal() const
                                         { return (mParcelFlags & PF_SOUND_LOCAL) ? TRUE : FALSE; }
+        BOOL    getVoiceEnabled() const
+                                        { return (mParcelFlags & PF_ALLOW_VOICE_CHAT) ? TRUE : FALSE; }
+        BOOL    getVoiceUseEstateChannel() const
+                                        { return (mParcelFlags & PF_USE_ESTATE_VOICE_CHAN) ? TRUE : FALSE; }
         BOOL    getAllowPublish() const
                                         { return (mParcelFlags & PF_ALLOW_PUBLISH) ? TRUE : FALSE; }
         BOOL    getMaturePublish() const
diff --git a/linden/indra/llinventory/llparcelflags.h b/linden/indra/llinventory/llparcelflags.h
index 17d9151..38d49fe 100644
--- a/linden/indra/llinventory/llparcelflags.h
+++ b/linden/indra/llinventory/llparcelflags.h
@@ -61,7 +61,8 @@ const U32 PF_ALLOW_GROUP_SCRIPTS		= 1 << 25;	// Allow scripts owned by group
 const U32 PF_CREATE_GROUP_OBJECTS               = 1 << 26;      // Allow object creation by group members or objects
 const U32 PF_ALLOW_ALL_OBJECT_ENTRY             = 1 << 27;      // Allow all objects to enter a parcel
 const U32 PF_ALLOW_GROUP_OBJECT_ENTRY   = 1 << 28;      // Only allow group (and owner) objects to enter the parcel
-
+const U32 PF_ALLOW_VOICE_CHAT                   = 1 << 29;      // Allow residents to use voice chat on this parcel
+const U32 PF_USE_ESTATE_VOICE_CHAN      = 1 << 30;
 
 const U32 PF_RESERVED                   = 1 << 31;
 
@@ -83,7 +84,9 @@ const U32 PF_DEFAULT =  PF_ALLOW_FLY
                                                 | PF_CREATE_GROUP_OBJECTS
                                                 | PF_USE_BAN_LIST
                                                 | PF_ALLOW_ALL_OBJECT_ENTRY
-                                                | PF_ALLOW_GROUP_OBJECT_ENTRY;
+                                                | PF_ALLOW_GROUP_OBJECT_ENTRY
+                        | PF_ALLOW_VOICE_CHAT
+                        | PF_USE_ESTATE_VOICE_CHAN;
 
 // Access list flags
 const U32 AL_ACCESS  = (1 << 0);
diff --git a/linden/indra/llinventory/llsaleinfo.cpp b/linden/indra/llinventory/llsaleinfo.cpp
index 9364529..debb092 100644
--- a/linden/indra/llinventory/llsaleinfo.cpp
+++ b/linden/indra/llinventory/llsaleinfo.cpp
@@ -175,7 +175,7 @@ BOOL LLSaleInfo::importFile(FILE* fp, BOOL& has_perm_mask, U32& perm_mask)
                         buffer,
                         " %254s %254s",
                         keyword, valuestr);
-                if(!keyword)
+                if(!keyword[0])
                 {
                         continue;
                 }
@@ -231,7 +231,7 @@ BOOL LLSaleInfo::importLegacyStream(std::istream& input_stream, BOOL& has_perm_m
                         buffer,
                         " %254s %254s",
                         keyword, valuestr);
-                if(!keyword)
+                if(!keyword[0])
                 {
                         continue;
                 }
diff --git a/linden/indra/llinventory/lluserrelations.h b/linden/indra/llinventory/lluserrelations.h
index 430dc43..3895533 100644
--- a/linden/indra/llinventory/lluserrelations.h
+++ b/linden/indra/llinventory/lluserrelations.h
@@ -38,7 +38,7 @@
  * @class LLRelationship
  *
  * This class represents a relationship between two agents, where the
- * related agent is stored and the other agent is the relationship is
+ * related agent is stored and the other agent in the relationship is
  * implicit by container ownership.
  * This is merely a cache of this information used by the sim 
  * and viewer.
diff --git a/linden/indra/llmath/lloctree.h b/linden/indra/llmath/lloctree.h
index 81b9d8c..004b0a2 100644
--- a/linden/indra/llmath/lloctree.h
+++ b/linden/indra/llmath/lloctree.h
@@ -57,7 +57,6 @@ public:
         typedef LLTreeListener<T> BaseType;
         typedef LLOctreeNode<T> oct_node;
 
-        virtual ~LLOctreeListener() { };
         virtual void handleChildAddition(const oct_node* parent, oct_node* child) = 0;
         virtual void handleChildRemoval(const oct_node* parent, const oct_node* child) = 0;
 };
diff --git a/linden/indra/llmath/lltreenode.h b/linden/indra/llmath/lltreenode.h
index a42a156..a47795d 100644
--- a/linden/indra/llmath/lltreenode.h
+++ b/linden/indra/llmath/lltreenode.h
@@ -57,7 +57,6 @@ template <class T>
 class LLTreeListener: public LLRefCount
 {
 public:
-        virtual ~LLTreeListener() { };
         virtual void handleInsertion(const LLTreeNode<T>* node, T* data) = 0;
         virtual void handleRemoval(const LLTreeNode<T>* node, T* data) = 0;
         virtual void handleDestruction(const LLTreeNode<T>* node) = 0;
diff --git a/linden/indra/llmath/llvolume.cpp b/linden/indra/llmath/llvolume.cpp
index fb745b8..327f1bf 100644
--- a/linden/indra/llmath/llvolume.cpp
+++ b/linden/indra/llmath/llvolume.cpp
@@ -1829,13 +1829,16 @@ void LLVolume::sculpt(U16 sculpt_width, U16 sculpt_height, S8 sculpt_components,
                                 U32 x = (U32) ((F32)s/(sizeS-1) * (F32) sculpt_width);
                                 U32 y = (U32) ((F32)t/(sizeT-1) * (F32) sculpt_height);
 
-                                if (y == sculpt_height)  // clamp to bottom row
+                                if (y == sculpt_height)  // stitch bottom
+                                {
                                         y = sculpt_height - 1;
+                                        x = sculpt_width / 2;
+                                }
 
                                 if (x == sculpt_width)   // stitch sides
                                         x = 0;
 
-                                if ((y == 0) || (y == sculpt_height-1))  // stitch top and bottom
+                                if (y == 0)  // stitch top
                                         x = sculpt_width / 2;
 
                                 U32 index = (x + y * sculpt_width) * sculpt_components;
@@ -1847,63 +1850,69 @@ void LLVolume::sculpt(U16 sculpt_width, U16 sculpt_height, S8 sculpt_components,
 
                                 last_index = index;
                         }
+                if ((F32)vertex_change / sizeS / sizeT < 0.05) // less than 5%
+                        data_is_empty = TRUE;
         }
 
-        
-        if ((F32)vertex_change / sizeS / sizeT < 0.05) // less than 5%
-                data_is_empty = TRUE;
-        
-        
         //generate vertex positions
-        // Run along the path.
-        S32 s = 0, t = 0;
-        S32 line = 0;
-        while (s < sizeS)
+        if (data_is_empty) // if empty, make a sphere
         {
-                t = 0;
-                // Run along the profile.
-                while (t < sizeT)
-                {
-                        S32 i = t + line;
-                        Point& pt = mMesh[i];
-
-                        U32 x = (U32) ((F32)t/(sizeT-1) * (F32) sculpt_width);
-                        U32 y = (U32) ((F32)s/(sizeS-1) * (F32) sculpt_height);
+                S32 line = 0;
 
-                        if (y == sculpt_height)  // clamp to bottom row
-                                y = sculpt_height - 1;
-
-                        if (x == sculpt_width)   // stitch sides
-                                x = 0;
+                for (S32 s = 0; s < sizeS; s++)
+                {
+                        for (S32 t = 0; t < sizeT; t++)
+                        {
+                                S32 i = t + line;
+                                Point& pt = mMesh[i];
 
-                        if ((y == 0) || (y == sculpt_height-1))  // stitch top and bottom
-                                x = sculpt_width / 2;
                         
-
-                        if (data_is_empty) // if empty, make a sphere
-                        {
                                 F32 u = (F32)s/(sizeS-1);
                                 F32 v = (F32)t/(sizeT-1);
 
                                 const F32 RADIUS = (F32) 0.3;
-                                
+                                        
                                 pt.mPos.mV[0] = (F32)(sin(F_PI * v) * cos(2.0 * F_PI * u) * RADIUS);
                                 pt.mPos.mV[1] = (F32)(sin(F_PI * v) * sin(2.0 * F_PI * u) * RADIUS);
                                 pt.mPos.mV[2] = (F32)(cos(F_PI * v) * RADIUS);
+
                         }
-                        
-                        else
+                        line += sizeT;
+                }
+        }
+        else
+        {
+                S32 line = 0;
+                for (S32 s = 0; s < sizeS; s++)
+                {
+                        // Run along the profile.
+                        for (S32 t = 0; t < sizeT; t++)
                         {
+                                S32 i = t + line;
+                                Point& pt = mMesh[i];
+
+                                U32 x = (U32) ((F32)t/(sizeT-1) * (F32) sculpt_width);
+                                U32 y = (U32) ((F32)s/(sizeS-1) * (F32) sculpt_height);
+
+                                if (y == sculpt_height)  // stitch bottom row
+                                {
+                                        y = sculpt_height - 1;
+                                        x = sculpt_width / 2;
+                                }
+
+                                if (x == sculpt_width)   // stitch sides
+                                        x = 0;
+
+                                if (y == 0)  // stitch top row
+                                        x = sculpt_width / 2;
+                        
                                 U32 index = (x + y * sculpt_width) * sculpt_components;
                                 pt.mPos.mV[0] = sculpt_data[index  ] / 256.f - 0.5f;
                                 pt.mPos.mV[1] = sculpt_data[index+1] / 256.f - 0.5f;
                                 pt.mPos.mV[2] = sculpt_data[index+2] / 256.f - 0.5f;
                         }
-
-                        t++;
+                        line += sizeT;
                 }
-                line += sizeT;
-                s++;
         }
 
         for (S32 i = 0; i < (S32)mProfilep->mFaces.size(); i++)
diff --git a/linden/indra/llmath/llvolume.h b/linden/indra/llmath/llvolume.h
index a3e89ab..6ac07f5 100644
--- a/linden/indra/llmath/llvolume.h
+++ b/linden/indra/llmath/llvolume.h
@@ -635,12 +635,14 @@ protected:
 class LLProfile
 {
 public:
-        LLProfile(const LLProfileParams &params) : mParams(params)
+        LLProfile(const LLProfileParams &params)
+                : mParams(params),
+                  mOpen(FALSE),
+                  mConcave(FALSE),
+                  mDirty(TRUE),
+                  mTotalOut(0),
+                  mTotal(2)
         {
-                mTotal    = 2;
-                mTotalOut = 0;
-                mDirty    = TRUE;
-                mConcave = FALSE;
         }
 
         ~LLProfile();
@@ -710,11 +712,13 @@ public:
         };
 
 public:
-        LLPath(const LLPathParams &params) : mParams(params)
+        LLPath(const LLPathParams &params)
+                : mParams(params),
+                  mOpen(FALSE),
+                  mTotal(0),
+                  mDirty(TRUE),
+                  mStep(1)
         {
-                mOpen      = FALSE;
-                mDirty     = TRUE;
-                mStep      = 1;
         }
 
         virtual ~LLPath();
diff --git a/linden/indra/llmessage/llbuffer.h b/linden/indra/llmessage/llbuffer.h
index badbc9f..63f7bea 100644
--- a/linden/indra/llmessage/llbuffer.h
+++ b/linden/indra/llmessage/llbuffer.h
@@ -39,6 +39,7 @@
  */
 
 #include <list>
+#include <vector>
 
 /** 
  * @class LLChannelDescriptors
diff --git a/linden/indra/llmessage/llcachename.cpp b/linden/indra/llmessage/llcachename.cpp
index 3df4b82..2a21b5a 100644
--- a/linden/indra/llmessage/llcachename.cpp
+++ b/linden/indra/llmessage/llcachename.cpp
@@ -643,6 +643,12 @@ void LLCacheName::dumpStats()
                         << llendl;
 }
 
+//static 
+LLString LLCacheName::getDefaultName()
+{
+        return LLString(CN_WAITING);
+}
+
 void LLCacheName::Impl::processPendingAsks()
 {
         sendRequest(_PREHASH_UUIDNameRequest, mAskNameQueue);
diff --git a/linden/indra/llmessage/llcachename.h b/linden/indra/llmessage/llcachename.h
index 7d606e6..d1a5cfe 100644
--- a/linden/indra/llmessage/llcachename.h
+++ b/linden/indra/llmessage/llcachename.h
@@ -101,6 +101,8 @@ public:
         void dump();            // Dumps the contents of the cache
         void dumpStats();       // Dumps the sizes of the cache and associated queues.
 
+        static LLString getDefaultName();
+
 private:
         class Impl;
         Impl& impl;
diff --git a/linden/indra/llmessage/llcurl.cpp b/linden/indra/llmessage/llcurl.cpp
index 9d883a7..5eaaab0 100644
--- a/linden/indra/llmessage/llcurl.cpp
+++ b/linden/indra/llmessage/llcurl.cpp
@@ -342,6 +342,12 @@ namespace
                 }
                 return sMainMulti;
         }
+
+        void freeMulti()
+        {
+                delete sMainMulti;
+                sMainMulti = NULL;
+        }
 }
 
 void
@@ -362,3 +368,8 @@ LLCurl::process()
         mainMulti()->process();
 }
 
+void LLCurl::cleanup()
+{
+        freeMulti();
+        curl_global_cleanup();
+}
diff --git a/linden/indra/llmessage/llcurl.h b/linden/indra/llmessage/llcurl.h
index e188c38..2d7d5d8 100644
--- a/linden/indra/llmessage/llcurl.h
+++ b/linden/indra/llmessage/llcurl.h
@@ -128,6 +128,7 @@ public:
         static void getByteRange(const std::string& url, S32 offset, S32 length, ResponderPtr responder);
         
         static void process();
+        static void cleanup();
 };
 
 namespace boost
diff --git a/linden/indra/llmessage/llhttpclient.cpp b/linden/indra/llmessage/llhttpclient.cpp
index 8cb8344..a1f8e29 100644
--- a/linden/indra/llmessage/llhttpclient.cpp
+++ b/linden/indra/llmessage/llhttpclient.cpp
@@ -70,6 +70,29 @@ void LLHTTPClient::Responder::result(const LLSD& content)
 {
 }
 
+// virtual 
+void LLHTTPClient::Responder::completedRaw(U32 status, const std::string& reason, const LLChannelDescriptors& channels,
+                                                                const LLIOPipe::buffer_ptr_t& buffer)
+{
+        LLBufferStream istr(channels, buffer.get());
+        LLSD content;
+
+        if (200 <= status && status < 300)
+        {
+                LLSDSerialize::fromXML(content, istr);
+/*
+                const S32 parseError = -1;
+                if(LLSDSerialize::fromXML(content, istr) == parseError)
+                {
+                        mStatus = 498;
+                        mReason = "Client Parse Error";
+                }
+*/
+        }
+        
+        completed(status, reason, content);
+}
+
 // virtual
 void LLHTTPClient::Responder::completed(U32 status, const std::string& reason, const LLSD& content)
 {
@@ -108,25 +131,9 @@ namespace
                 virtual void complete(const LLChannelDescriptors& channels,
                                                                 const buffer_ptr_t& buffer)
                 {
-                        LLBufferStream istr(channels, buffer.get());
-                        LLSD content;
-
-                        if (200 <= mStatus && mStatus < 300)
-                        {
-                                LLSDSerialize::fromXML(content, istr);
-/*
-                                const S32 parseError = -1;
-                                if(LLSDSerialize::fromXML(content, istr) == parseError)
-                                {
-                                        mStatus = 498;
-                                        mReason = "Client Parse Error";
-                                }
-*/
-                        }
-
                         if (mResponder.get())
                         {
-                                mResponder->completed(mStatus, mReason, content);
+                                mResponder->completedRaw(mStatus, mReason, channels, buffer);
                         }
                 }
 
@@ -243,15 +250,18 @@ namespace
         LLPumpIO* theClientPump = NULL;
 }
 
-static void request(const std::string& url, LLURLRequest::ERequestAction method,
-        Injector* body_injector, LLHTTPClient::ResponderPtr responder, const F32 timeout=HTTP_REQUEST_EXPIRY_SECS)
+static void request(
+        const std::string& url,
+        LLURLRequest::ERequestAction method,
+        Injector* body_injector,
+        LLHTTPClient::ResponderPtr responder,
+        const F32 timeout=HTTP_REQUEST_EXPIRY_SECS)
 {
         if (!LLHTTPClient::hasPump())
         {
                 responder->completed(U32_MAX, "No pump", LLSD());
                 return;
         }
-
         LLPumpIO::chain_t chain;
 
         LLURLRequest *req = new LLURLRequest(method, url);
@@ -262,7 +272,8 @@ static void request(const std::string& url, LLURLRequest::ERequestAction method,
         }
         req->setCallback(new LLHTTPClientURLAdaptor(responder));
 
-        if (method == LLURLRequest::HTTP_POST  &&  gMessageSystem) {
+        if (method == LLURLRequest::HTTP_POST  &&  gMessageSystem)
+        {
                 req->addHeader(llformat("X-SecondLife-UDP-Listen-Port: %d",
                                                                 gMessageSystem->mPort).c_str());
         }
diff --git a/linden/indra/llmessage/llhttpclient.h b/linden/indra/llmessage/llhttpclient.h
index c2dfb5d..88f8cbb 100644
--- a/linden/indra/llmessage/llhttpclient.h
+++ b/linden/indra/llmessage/llhttpclient.h
@@ -38,6 +38,8 @@
 #include <boost/intrusive_ptr.hpp>
 
 #include "llassettype.h"
+#include "llbuffer.h"
+#include "lliopipe.h"
 
 extern const F32 HTTP_REQUEST_EXPIRY_SECS;
 
@@ -58,7 +60,11 @@ public:
                 virtual void error(U32 status, const std::string& reason);      // called with bad status codes
                 
                 virtual void result(const LLSD& content);
-                        
+                
+                // Override point for clients that may want to use this class when the response is some other format besides LLSD
+                virtual void completedRaw(U32 status, const std::string& reason, const LLChannelDescriptors& channels,
+                                                                const LLIOPipe::buffer_ptr_t& buffer);
+
                 virtual void completed(U32 status, const std::string& reason, const LLSD& content);
                         /**< The default implemetnation calls
                                 either:
diff --git a/linden/indra/llmessage/llhttpnode.h b/linden/indra/llmessage/llhttpnode.h
index ae64a63..db82296 100644
--- a/linden/indra/llmessage/llhttpnode.h
+++ b/linden/indra/llmessage/llhttpnode.h
@@ -88,9 +88,10 @@ public:
 
                 class Response : public LLRefCount
                 {
-                public:
+                protected:
                         virtual ~Response();
 
+                public:
                         virtual void result(const LLSD&) = 0;
                         virtual void status(S32 code, const std::string& message) = 0;
 
@@ -225,7 +226,6 @@ class LLSimpleResponse : public LLHTTPNode::Response
 {
 public:
         static LLPointer<LLSimpleResponse> create();
-        ~LLSimpleResponse();
         
         void result(const LLSD& result);
         void status(S32 code, const std::string& message);
@@ -235,6 +235,9 @@ public:
         S32 mCode;
         std::string mMessage;
 
+protected:
+        ~LLSimpleResponse();
+
 private:
         LLSimpleResponse() {;} // Must be accessed through LLPointer.
 };
diff --git a/linden/indra/llmessage/llinstantmessage.cpp b/linden/indra/llmessage/llinstantmessage.cpp
index 0ba7629..0a3a1e6 100644
--- a/linden/indra/llmessage/llinstantmessage.cpp
+++ b/linden/indra/llmessage/llinstantmessage.cpp
@@ -328,18 +328,46 @@ LLSD im_info_to_llsd(LLPointer<LLIMInfo> im_info)
         param_message["parent_estate_id"] = (S32)im_info->mParentEstateID;
         param_message["region_id"] = im_info->mRegionID;
         param_message["position"] = ll_sd_from_vector3(im_info->mPosition);
-        if (im_info->mData) param_message["data"] = im_info->mData;
+        param_message["data"] = im_info->mData;
+        param_message["source"]= im_info->mSource;
+        param_message["ttl"] = im_info->mTTL;
+
         LLSD param_agent;
         param_agent["agent_id"] = im_info->mFromID;
 
         LLSD params;
-        params.append(param_version);
-        params.append(param_message);
-        params.append(param_agent);
+        params["version_params"] = param_version;
+        params["message_params"] = param_message;
+        params["agent_params"] = param_agent;
 
         return params;
 }
 
+LLPointer<LLIMInfo> llsd_to_im_info(const LLSD& im_info_sd)
+{
+        LLSD param_message = im_info_sd["message_params"];
+        LLSD param_agent = im_info_sd["agent_params"];
+
+        LLPointer<LLIMInfo> im_info = new LLIMInfo(
+                param_message["from_id"].asUUID(),
+                param_message["from_group"].asBoolean(),
+                param_message["to_id"].asUUID(),
+                (EInstantMessage) param_message["type"].asInteger(),
+                param_message["from_name"].asString(),
+                param_message["message"].asString(),
+                param_message["id"].asUUID(),
+                (U32) param_message["parent_estate_id"].asInteger(),
+                im_info->mRegionID = param_message["region_id"].asUUID(),
+                ll_vector3_from_sd(param_message["position"]),
+                param_message["data"],
+                (U8) param_message["offline"].asInteger(),
+                (U32) param_message["timestamp"].asInteger(),
+                (EIMSource)param_message["source"].asInteger(),
+                param_message["ttl"].asInteger());
+
+        return im_info;
+}
+
 LLPointer<LLIMInfo> LLIMInfo::clone()
 {
         return new LLIMInfo(
diff --git a/linden/indra/llmessage/llinstantmessage.h b/linden/indra/llmessage/llinstantmessage.h
index 0b2de19..45db037 100644
--- a/linden/indra/llmessage/llinstantmessage.h
+++ b/linden/indra/llmessage/llinstantmessage.h
@@ -94,13 +94,10 @@ enum EInstantMessage
         // communicate with each other.
         //
 
-        // Add users to a session.
-        IM_SESSION_ADD = 13,
+        // Invite users to a session.
+        IM_SESSION_INVITE = 13,
 
-        // IM sent automatically on call for help, 
-        // sets up a way for each Helper reached to teleport to the
-        // helpee
-        IM_SESSION_911_SEND = 14,
+        IM_SESSION_P2P_INVITE = 14,
 
         // start a session with your gruop
         IM_SESSION_GROUP_START = 15,
@@ -112,7 +109,7 @@ enum EInstantMessage
         IM_SESSION_SEND = 17,
 
         // leave a session
-        IM_SESSION_DROP = 18,
+        IM_SESSION_LEAVE = 18,
 
         // an instant message from an object - for differentiation on the
         // viewer, since you can't IM an object yet.
@@ -141,14 +138,6 @@ enum EInstantMessage
         // bucket.
         IM_GOTO_URL = 28,
 
-        // IM for help from the GAURDIAN_ANGELS
-        // Binary bucket contains the name of the session.
-        IM_SESSION_911_START = 29,
-
-        // IM for requesting to teleport to the creator
-        // of a livehelp session (assuming they are verified first)
-        IM_TELEPORT_911 = 30,
-
         // a message generated by a script which we don't want to
         // be sent through e-mail.  Similar to IM_FROM_TASK, but
         // it is shown as an alert on the viewer.
@@ -288,6 +277,7 @@ public:
         S32 mTTL;
 };
 
+LLPointer<LLIMInfo> llsd_to_im_info(const LLSD& im_info_sd);
 LLSD im_info_to_llsd(LLPointer<LLIMInfo> im_info);
 
 void pack_instant_message(
diff --git a/linden/indra/llmessage/llmessageconfig.cpp b/linden/indra/llmessage/llmessageconfig.cpp
index a0566ea..687896b 100644
--- a/linden/indra/llmessage/llmessageconfig.cpp
+++ b/linden/indra/llmessage/llmessageconfig.cpp
@@ -112,9 +112,10 @@ void LLMessageConfigFile::loadServerDefaults(const LLSD& data)
 
 void LLMessageConfigFile::loadMessages(const LLSD& data)
 {
-        mMessages = data["messages"];
+        LLPointer<LLSDXMLFormatter> formatter = new LLSDXMLFormatter;
         std::ostringstream out;
-        LLSDXMLFormatter *formatter = new LLSDXMLFormatter;
+
+        mMessages = data["messages"];
         formatter->format(mMessages, out);
         lldebugs << "loading ... " << out.str()
                         << " LLMessageConfigFile::loadMessages loaded "
diff --git a/linden/indra/llmessage/llregionflags.h b/linden/indra/llmessage/llregionflags.h
index fb9bf5b..8702277 100644
--- a/linden/indra/llmessage/llregionflags.h
+++ b/linden/indra/llmessage/llregionflags.h
@@ -56,7 +56,7 @@ const U32 REGION_FLAGS_BLOCK_LAND_RESELL		= (1 << 7);
 
 // All content wiped once per night
 const U32 REGION_FLAGS_SANDBOX                                  = (1 << 8);
-
+const U32 REGION_FLAGS_NULL_LAYER                               = (1 << 9);
 const U32 REGION_FLAGS_SKIP_AGENT_ACTION                = (1 << 10);
 const U32 REGION_FLAGS_SKIP_UPDATE_INTEREST_LIST= (1 << 11);
 const U32 REGION_FLAGS_SKIP_COLLISIONS                  = (1 << 12); // Pin all non agent rigid bodies
@@ -88,11 +88,14 @@ const U32 REGION_FLAGS_ALLOW_PARCEL_CHANGES		= (1 << 26);
 
 const U32 REGION_FLAGS_ABUSE_EMAIL_TO_ESTATE_OWNER = (1 << 27);
 
-const U32 REGION_FLAGS_NULL_LAYER                               = (1 << 9);
+const U32 REGION_FLAGS_ALLOW_VOICE = (1 << 28);
+
 
 const U32 REGION_FLAGS_DEFAULT = REGION_FLAGS_ALLOW_LANDMARK |
                                                                  REGION_FLAGS_ALLOW_SET_HOME |
-                                                                 REGION_FLAGS_ALLOW_PARCEL_CHANGES;
+                                 REGION_FLAGS_ALLOW_PARCEL_CHANGES |
+                                 REGION_FLAGS_ALLOW_VOICE;
+
 
 const U32 REGION_FLAGS_PRELUDE_SET = REGION_FLAGS_RESET_HOME_ON_TELEPORT;
 const U32 REGION_FLAGS_PRELUDE_UNSET = REGION_FLAGS_ALLOW_LANDMARK 
diff --git a/linden/indra/llmessage/message.cpp b/linden/indra/llmessage/message.cpp
index 29f232c..ab41cca 100644
--- a/linden/indra/llmessage/message.cpp
+++ b/linden/indra/llmessage/message.cpp
@@ -1344,12 +1344,17 @@ LLMessageSystem::~LLMessageSystem()
                 end_net();
         }
         
-        delete mMessageReader;
+        delete mTemplateMessageReader;
+        mTemplateMessageReader = NULL;
         mMessageReader = NULL;
 
-        delete mMessageBuilder;
+        delete mTemplateMessageBuilder;
+        mTemplateMessageBuilder = NULL;
         mMessageBuilder = NULL;
 
+        delete mLLSDMessageReader;
+        mLLSDMessageReader = NULL;
+
         delete mPollInfop;
         mPollInfop = NULL;
 
@@ -2942,17 +2947,19 @@ static LLHTTPNode& messageRootNode()
 }
 
 //static
-void LLMessageSystem::dispatch(const std::string& msg_name,
-                                                                const LLSD& message)
+void LLMessageSystem::dispatch(
+        const std::string& msg_name,
+        const LLSD& message)
 {
         LLPointer<LLSimpleResponse>     responsep =     LLSimpleResponse::create();
         dispatch(msg_name, message, responsep);
 }
 
 //static
-void LLMessageSystem::dispatch(const std::string& msg_name,
-                                                                const LLSD& message,
-                                                           LLHTTPNode::ResponsePtr responsep)
+void LLMessageSystem::dispatch(
+        const std::string& msg_name,
+        const LLSD& message,
+        LLHTTPNode::ResponsePtr responsep)
 {
         if (msg_name.empty())
         {
diff --git a/linden/indra/llrender/llvertexbuffer.cpp b/linden/indra/llrender/llvertexbuffer.cpp
index b94f593..45d706f 100644
--- a/linden/indra/llrender/llvertexbuffer.cpp
+++ b/linden/indra/llrender/llvertexbuffer.cpp
@@ -1,3 +1,31 @@
+/** 
+ * @file llvertexbuffer.cpp
+ * @brief LLVertexBuffer implementation
+ *
+ * Copyright (c) 2003-2007, Linden Research, Inc.
+ * 
+ * Second Life Viewer Source Code
+ * The source code in this file ("Source Code") is provided by Linden Lab
+ * to you under the terms of the GNU General Public License, version 2.0
+ * ("GPL"), unless you have obtained a separate licensing agreement
+ * ("Other License"), formally executed by you and Linden Lab.  Terms of
+ * the GPL can be found in doc/GPL-license.txt in this distribution, or
+ * online at http://secondlife.com/developers/opensource/gplv2
+ * 
+ * There are special exceptions to the terms and conditions of the GPL as
+ * it is applied to this Source Code. View the full text of the exception
+ * in the file doc/FLOSS-exception.txt in this software distribution, or
+ * online at http://secondlife.com/developers/opensource/flossexception
+ * 
+ * By copying, modifying or distributing this software, you acknowledge
+ * that you have read and understood your obligations described above,
+ * and agree to abide by those obligations.
+ * 
+ * ALL LINDEN LAB SOURCE CODE IS PROVIDED "AS IS." LINDEN LAB MAKES NO
+ * WARRANTIES, EXPRESS, IMPLIED OR OTHERWISE, REGARDING ITS ACCURACY,
+ * COMPLETENESS OR PERFORMANCE.
+ */
+
 #include "linden_common.h"
 
 #include "llvertexbuffer.h"
diff --git a/linden/indra/llrender/llvertexbuffer.h b/linden/indra/llrender/llvertexbuffer.h
index b221d35..62c6124 100644
--- a/linden/indra/llrender/llvertexbuffer.h
+++ b/linden/indra/llrender/llvertexbuffer.h
@@ -1,3 +1,31 @@
+/** 
+ * @file llvertexbuffer.h
+ * @brief LLVertexBuffer wrapper for OpengGL vertex buffer objects
+ *
+ * Copyright (c) 2003-2007, Linden Research, Inc.
+ * 
+ * Second Life Viewer Source Code
+ * The source code in this file ("Source Code") is provided by Linden Lab
+ * to you under the terms of the GNU General Public License, version 2.0
+ * ("GPL"), unless you have obtained a separate licensing agreement
+ * ("Other License"), formally executed by you and Linden Lab.  Terms of
+ * the GPL can be found in doc/GPL-license.txt in this distribution, or
+ * online at http://secondlife.com/developers/opensource/gplv2
+ * 
+ * There are special exceptions to the terms and conditions of the GPL as
+ * it is applied to this Source Code. View the full text of the exception
+ * in the file doc/FLOSS-exception.txt in this software distribution, or
+ * online at http://secondlife.com/developers/opensource/flossexception
+ * 
+ * By copying, modifying or distributing this software, you acknowledge
+ * that you have read and understood your obligations described above,
+ * and agree to abide by those obligations.
+ * 
+ * ALL LINDEN LAB SOURCE CODE IS PROVIDED "AS IS." LINDEN LAB MAKES NO
+ * WARRANTIES, EXPRESS, IMPLIED OR OTHERWISE, REGARDING ITS ACCURACY,
+ * COMPLETENESS OR PERFORMANCE.
+ */
+
 #ifndef LL_LLVERTEXBUFFER_H
 #define LL_LLVERTEXBUFFER_H
 
diff --git a/linden/indra/llui/llalertdialog.cpp b/linden/indra/llui/llalertdialog.cpp
index 547efae..8950fcd 100644
--- a/linden/indra/llui/llalertdialog.cpp
+++ b/linden/indra/llui/llalertdialog.cpp
@@ -783,10 +783,11 @@ bool LLAlertDialog::parseAlerts(const LLString& xml_filename, LLControlGroup* se
                                 // label=
                                 LLString name;
                                 child->getAttributeString("name", name);
-                                if (name.empty())
-                                {
-                                        name = alert_name;
-                                }
+                                
+                                //always set to alert_name for the sake of i18n
+                                //if (name.empty())
+                                name = alert_name;
+                                
                                 if (xml_template)
                                 {
                                         xml_template->mIgnorable = LLAlertDialog::IGNORE_USE_DEFAULT;
diff --git a/linden/indra/llui/llbutton.cpp b/linden/indra/llui/llbutton.cpp
index 1d44537..de8b82e 100644
--- a/linden/indra/llui/llbutton.cpp
+++ b/linden/indra/llui/llbutton.cpp
@@ -615,6 +615,56 @@ void LLButton::draw()
                         gl_rect_2d(0, mRect.getHeight(), mRect.getWidth(), 0, LLColor4::pink1, FALSE);
                 }
 
+                // draw overlay image
+                if (mImageOverlay.notNull())
+                {
+                        const S32 IMG_PAD = 4;
+                        // get max width and height (discard level 0)
+                        S32 overlay_width = mImageOverlay->getWidth(0);
+                        S32 overlay_height = mImageOverlay->getHeight(0);
+
+                        F32 scale_factor = llmin((F32)mRect.getWidth() / (F32)overlay_width, (F32)mRect.getHeight() / (F32)overlay_height, 1.f);
+                        overlay_width = llround((F32)overlay_width * scale_factor);
+                        overlay_height = llround((F32)overlay_height * scale_factor);
+
+                        S32 center_x = getLocalRect().getCenterX();
+                        S32 center_y = getLocalRect().getCenterY();
+
+                        switch(mImageOverlayAlignment)
+                        {
+                        case LLFontGL::LEFT:
+                                gl_draw_scaled_image(
+                                        IMG_PAD, 
+                                        center_y - (overlay_height / 2), 
+                                        overlay_width, 
+                                        overlay_height, 
+                                        mImageOverlay,
+                                        LLColor4::white);
+                                break;
+                        case LLFontGL::HCENTER:
+                                gl_draw_scaled_image(
+                                        center_x - (overlay_width / 2), 
+                                        center_y - (overlay_height / 2), 
+                                        overlay_width, 
+                                        overlay_height, 
+                                        mImageOverlay,
+                                        LLColor4::white);
+                                break;
+                        case LLFontGL::RIGHT:
+                                gl_draw_scaled_image(
+                                        mRect.getWidth() - IMG_PAD - overlay_width, 
+                                        center_y - (overlay_height / 2), 
+                                        overlay_width, 
+                                        overlay_height, 
+                                        mImageOverlay,
+                                        LLColor4::white);
+                                break;
+                        default:
+                                // draw nothing
+                                break;
+                        }
+                }
+
                 // Draw label
                 if( !label.empty() )
                 {
@@ -826,6 +876,21 @@ void LLButton::setHoverImages( const LLString& image_name, const LLString& selec
         setImageHoverSelected(selected_name);
 }
 
+void LLButton::setImageOverlay(const LLString &image_name, LLFontGL::HAlign alignment)
+{
+        if (image_name.empty())
+        {
+                mImageOverlay = NULL;
+        }
+        else
+        {
+                LLUUID overlay_image_id = LLUI::findAssetUUIDByName(image_name);
+                mImageOverlay = LLUI::sImageProvider->getUIImageByID(overlay_image_id);
+                mImageOverlayAlignment = alignment;
+        }
+}
+
+
 void LLButton::onMouseCaptureLost()
 {
         mMouseDownTimer.stop();
@@ -998,6 +1063,18 @@ LLView* LLButton::fromXML(LLXMLNodePtr node, LLView *parent, LLUICtrlFactory *fa
         LLString        image_disabled;
         if (node->hasAttribute("image_disabled")) node->getAttributeString("image_disabled",image_disabled);
 
+        LLString        image_overlay;
+        node->getAttributeString("image_overlay", image_overlay);
+
+        LLFontGL::HAlign image_overlay_alignment = LLFontGL::HCENTER;
+        LLString image_overlay_alignment_string;
+        if (node->hasAttribute("image_overlay_alignment"))
+        {
+                node->getAttributeString("image_overlay_alignment", image_overlay_alignment_string);
+                image_overlay_alignment = LLFontGL::hAlignFromName(image_overlay_alignment_string);
+        }
+
+
         LLButton *button = new LLButton(name, 
                         LLRect(),
                         image_unselected,
@@ -1020,6 +1097,7 @@ LLView* LLButton::fromXML(LLXMLNodePtr node, LLView *parent, LLUICtrlFactory *fa
         
         if(image_disabled != LLString::null) button->setImageDisabled(image_disabled);
         
+        if(image_overlay != LLString::null) button->setImageOverlay(image_overlay, image_overlay_alignment);
 
         if (node->hasAttribute("halign"))
         {
diff --git a/linden/indra/llui/llbutton.h b/linden/indra/llui/llbutton.h
index 44e8776..6e11779 100644
--- a/linden/indra/llui/llbutton.h
+++ b/linden/indra/llui/llbutton.h
@@ -142,6 +142,10 @@ public:
 
         void                    setDisabledSelectedLabelColor( const LLColor4& c )      { mDisabledSelectedLabelColor = c; }
 
+        void                    setImageOverlay(const LLString &image_name, LLFontGL::HAlign alignment = LLFontGL::HCENTER);
+        LLPointer<LLImageGL> getImageOverlay() { return mImageOverlay; }
+        
+
         virtual void    setValue(const LLSD& value );
         virtual LLSD    getValue() const;
 
@@ -202,6 +206,9 @@ protected:
         F32                             mHeldDownDelay;         // seconds, after which held-down callbacks get called
         S32                             mHeldDownFrameDelay;    // frames, after which held-down callbacks get called
 
+        LLPointer<LLImageGL>    mImageOverlay;
+        LLFontGL::HAlign                mImageOverlayAlignment;
+
         LLPointer<LLImageGL>    mImageUnselected;
         LLUIString                              mUnselectedLabel;
         LLColor4                                mUnselectedLabelColor;
diff --git a/linden/indra/llui/llfloater.cpp b/linden/indra/llui/llfloater.cpp
index df44a58..6ab182f 100644
--- a/linden/indra/llui/llfloater.cpp
+++ b/linden/indra/llui/llfloater.cpp
@@ -575,17 +575,20 @@ void LLFloater::close(bool app_quitting)
                 cleanupHandles();
                 gFocusMgr.clearLastFocusForGroup(this);
 
-                // Do this early, so UI controls will commit before the
-                // window is taken down.
-                releaseFocus();
-
-                // give focus to dependee floater if it exists, and we had focus first
-                if (isDependent())
+                if (hasFocus())
                 {
-                        LLFloater* dependee = LLFloater::getFloaterByHandle(mDependeeHandle);
-                        if (dependee && !dependee->isDead())
+                        // Do this early, so UI controls will commit before the
+                        // window is taken down.
+                        releaseFocus();
+
+                        // give focus to dependee floater if it exists, and we had focus first
+                        if (isDependent())
                         {
-                                dependee->setFocus(TRUE);
+                                LLFloater* dependee = LLFloater::getFloaterByHandle(mDependeeHandle);
+                                if (dependee && !dependee->isDead())
+                                {
+                                        dependee->setFocus(TRUE);
+                                }
                         }
                 }
 
@@ -1170,6 +1173,28 @@ BOOL LLFloater::getEditModeEnabled()
         return sEditModeEnabled;
 }
 
+//static 
+void LLFloater::show(LLFloater* floaterp)
+{
+        if (floaterp) floaterp->open();
+}
+
+//static 
+void LLFloater::hide(LLFloater* floaterp)
+{
+        if (floaterp) floaterp->close();
+}
+
+//static
+BOOL LLFloater::visible(LLFloater* floaterp)
+{
+        if (floaterp) 
+        {
+                return floaterp->isInVisibleChain();
+        }
+        return FALSE;
+}
+
 // static
 void LLFloater::onClickMinimize(void *userdata)
 {
@@ -2372,7 +2397,7 @@ void LLFloaterView::popVisibleAll(const skip_list_t& skip_list)
 LLMultiFloater::LLMultiFloater() :
         mTabContainer(NULL),
         mTabPos(LLTabContainerCommon::TOP),
-        mAutoResize(FALSE)
+        mAutoResize(TRUE)
 {
 
 }
@@ -2380,7 +2405,7 @@ LLMultiFloater::LLMultiFloater() :
 LLMultiFloater::LLMultiFloater(LLTabContainerCommon::TabPosition tab_pos) :
         mTabContainer(NULL),
         mTabPos(tab_pos),
-        mAutoResize(FALSE)
+        mAutoResize(TRUE)
 {
 
 }
@@ -2594,15 +2619,12 @@ void LLMultiFloater::addFloater(LLFloater* floaterp, BOOL select_added_floater,
         floaterp->setCanResize(FALSE);
         floaterp->setCanDrag(FALSE);
 
-        S32 new_width = llmax(mRect.getWidth(), floaterp->getRect().getWidth()); 
-        S32 new_height = llmax(mRect.getHeight(), floaterp->getRect().getHeight() + LLFLOATER_HEADER_SIZE + TABCNTR_HEADER_HEIGHT); 
-
-        reshape(new_width, new_height);
-
         //add the panel, add it to proper maps
         mTabContainer->addTabPanel(floaterp, floaterp->getTitle(), FALSE, onTabSelected, this, 0, FALSE, insertion_point);
         mFloaterDataMap[floaterp->getHandle()] = floater_data;
 
+        resizeToContents();
+
         if ( select_added_floater )
         {
                 mTabContainer->selectLastTab();
@@ -2676,10 +2698,7 @@ void LLMultiFloater::removeFloater(LLFloater* floaterp)
         floaterp->setBackgroundVisible(TRUE);
         floaterp->setHost(NULL);
 
-        if (mAutoResize)
-        {
-                resizeToContents();
-        }
+        resizeToContents();
 
         tabOpen((LLFloater*)mTabContainer->getCurrentPanel(), false);
 }
@@ -2729,7 +2748,8 @@ BOOL LLMultiFloater::handleKeyHere(KEY key, MASK mask, BOOL called_from_parent)
                 if (key == 'W')
                 {
                         LLFloater* floater = getActiveFloater();
-                        if (floater && floater->canClose())
+                        // is user closeable and is system closeable
+                        if (floater && floater->canClose() && floater->isCloseable())
                         {
                                 floater->close();
                         }
@@ -2848,10 +2868,17 @@ void LLMultiFloater::resizeToContents()
 
         S32 cur_height = mRect.getHeight();
 
-        reshape(new_width, new_height);
+        if (mAutoResize)
+        {
+                reshape(new_width, new_height);
+        }
+        else
+        {
+                reshape(llmax(new_min_width, mRect.getWidth()), llmax(new_min_height, mRect.getHeight()));
+        }
 
         // make sure upper left corner doesn't move
-        translate(0, cur_height - new_height);
+        translate(0, cur_height - mRect.getHeight());
 
         // Try to keep whole view onscreen, don't allow partial offscreen.
         gFloaterView->adjustToFitScreen(this, FALSE);
diff --git a/linden/indra/llui/llfloater.h b/linden/indra/llui/llfloater.h
index cd45762..8b610e3 100644
--- a/linden/indra/llui/llfloater.h
+++ b/linden/indra/llui/llfloater.h
@@ -212,6 +212,10 @@ public:
         static BOOL             getEditModeEnabled();
         static LLMultiFloater*          getFloaterHost() {return sHostp; }
 
+        static void             show(LLFloater* floaterp);
+        static void             hide(LLFloater* floaterp);
+        static BOOL             visible(LLFloater* floaterp);
+
         static LLFloater* getFloaterByHandle(LLViewHandle handle);
 
 protected:
@@ -279,7 +283,6 @@ protected:
         std::vector<LLView*> mMinimizedHiddenChildren;
 };
 
-
 /////////////////////////////////////////////////////////////
 // LLFloaterView
 // Parent of all floating panels
@@ -354,8 +357,8 @@ public:
         LLMultiFloater();
         LLMultiFloater(LLTabContainerCommon::TabPosition tab_pos);
         LLMultiFloater(const LLString& name);
-        LLMultiFloater(const LLString& name, const LLRect& rect, LLTabContainer::TabPosition tab_pos = LLTabContainer::TOP, BOOL auto_resize = FALSE);
-        LLMultiFloater(const LLString& name, const LLString& rect_control, LLTabContainer::TabPosition tab_pos = LLTabContainer::TOP, BOOL auto_resize = FALSE);
+        LLMultiFloater(const LLString& name, const LLRect& rect, LLTabContainer::TabPosition tab_pos = LLTabContainer::TOP, BOOL auto_resize = TRUE);
+        LLMultiFloater(const LLString& name, const LLString& rect_control, LLTabContainer::TabPosition tab_pos = LLTabContainer::TOP, BOOL auto_resize = TRUE);
         virtual ~LLMultiFloater();
 
         virtual BOOL postBuild();
@@ -416,3 +419,4 @@ extern LLFloaterView* gFloaterView;
 
 #endif  // LL_FLOATER_H
 
+
diff --git a/linden/indra/llui/lllineeditor.cpp b/linden/indra/llui/lllineeditor.cpp
index a2cd9af..44616b9 100644
--- a/linden/indra/llui/lllineeditor.cpp
+++ b/linden/indra/llui/lllineeditor.cpp
@@ -157,6 +157,14 @@ LLLineEditor::LLLineEditor(const LLString& name, const LLRect& rect,
 {
         llassert( max_length_bytes > 0 );
 
+        // line history support:
+        // - initialize line history list
+        mLineHistory.insert( mLineHistory.end(), "" );
+        // - disable line history by default
+        mHaveHistory = FALSE;
+        // - reset current history line pointer
+        mCurrentHistoryLine = 0;
+
         if (font)
         {
                 mGLFont = font;
@@ -229,10 +237,33 @@ void LLLineEditor::onFocusLost()
 
 void LLLineEditor::onCommit()
 {
+        // put current line into the line history
+        updateHistory();
+
         LLUICtrl::onCommit();
         selectAll();
 }
 
+// line history support
+void LLLineEditor::updateHistory()
+{
+        // On history enabled line editors, remember committed line and
+        // reset current history line number.
+        // Be sure only to remember lines that are not empty and that are
+        // different from the last on the list.
+        if( mHaveHistory && mText.length() && ( mLineHistory.empty() || getText() != mLineHistory.back() ) )
+        {
+                // discard possible empty line at the end of the history
+                // inserted by setText()
+                if( !mLineHistory.back().length() )
+                {
+                        mLineHistory.pop_back();
+                }
+                mLineHistory.insert( mLineHistory.end(), getText() );
+                mCurrentHistoryLine = mLineHistory.size() - 1;
+        }
+}
+
 void LLLineEditor::reshape(S32 width, S32 height, BOOL called_from_parent)
 {
         LLUICtrl::reshape(width, height, called_from_parent );
@@ -240,6 +271,10 @@ void LLLineEditor::reshape(S32 width, S32 height, BOOL called_from_parent)
         mMaxHPixels = mRect.getWidth() - 2 * (mBorderThickness + UI_LINEEDITOR_H_PAD) + 1 - mBorderRight;
 }
 
+void LLLineEditor::setEnableLineHistory( BOOL enabled )
+{
+        mHaveHistory = enabled;
+}
 
 void LLLineEditor::setEnabled(BOOL enabled)
 {
@@ -300,6 +335,13 @@ void LLLineEditor::setText(const LLString &new_text)
                 deselect();
         }
         setCursor(llmin((S32)mText.length(), getCursor()));
+
+        // Newly set text goes always in the last line of history.
+        // Possible empty strings (as with chat line) will be deleted later.
+        mLineHistory.insert( mLineHistory.end(), new_text );
+        // Set current history line to end of history.
+        mCurrentHistoryLine = mLineHistory.size() - 1;
+
         mPrevText = mText;
 }
 
@@ -1086,6 +1128,45 @@ BOOL LLLineEditor::handleSpecialKey(KEY key, MASK mask)
                 }
                 break;
 
+        // handle ctrl-uparrow if we have a history enabled line editor.
+        case KEY_UP:
+                if( mHaveHistory && ( MASK_CONTROL & mask ) )
+                {
+                        if( mCurrentHistoryLine > 0 )
+                        {
+                                mText.assign( mLineHistory[ --mCurrentHistoryLine ] );
+                                setCursor(llmin((S32)mText.length(), getCursor()));
+                        }
+                        else
+                        {
+                                reportBadKeystroke();
+                        }
+                        handled = TRUE;
+                }
+                break;
+
+        // handle ctrl-downarrow if we have a history enabled line editor
+        case KEY_DOWN:
+                if( mHaveHistory  && ( MASK_CONTROL & mask ) )
+                {
+                        if( !mLineHistory.empty() && mCurrentHistoryLine < mLineHistory.size() - 1 )
+                        {
+                                mText.assign( mLineHistory[ ++mCurrentHistoryLine ] );
+                                setCursor(llmin((S32)mText.length(), getCursor()));
+                        }
+                        else
+                        {
+                                reportBadKeystroke();
+                        }
+                        handled = TRUE;
+                }
+                break;
+
+        case KEY_RETURN:
+                // store sent line in history
+                updateHistory();
+                break;
+
         case KEY_ESCAPE:
             if (mRevertOnEsc && mText.getString() != mPrevText)
                 {
diff --git a/linden/indra/llui/lllineeditor.h b/linden/indra/llui/lllineeditor.h
index 65c75ab..e715737 100644
--- a/linden/indra/llui/lllineeditor.h
+++ b/linden/indra/llui/lllineeditor.h
@@ -36,6 +36,7 @@
 //              Clipboard (cut, copy, and paste)
 //              Horizontal scrolling to allow strings longer than widget size allows 
 //              Pre-validation (limit which keys can be used)
+//              Optional line history so previous entries can be recalled by CTRL UP/DOWN
 
 
 #ifndef LL_LLLINEEDITOR_H
@@ -206,6 +207,10 @@ public:
 
         static BOOL             postvalidateFloat(const LLString &str);
 
+        // line history support:
+        void                    setEnableLineHistory( BOOL enabled ); // switches line history on or off 
+        void                    updateHistory(); // stores current line in history
+
 protected:
         void                    removeChar();
         void                    addChar(const llwchar c);
@@ -224,6 +229,11 @@ protected:
         LLString                mPrevText;                              // Saved string for 'ESC' revert
         LLUIString              mLabel;                                 // text label that is visible when no user text provided
 
+        // line history support:
+        BOOL            mHaveHistory;                           // flag for enabled line history
+        std::vector<LLString> mLineHistory;             // line history storage
+        U32                     mCurrentHistoryLine;            // currently browsed history line
+
         LLViewBorder* mBorder;
         const LLFontGL* mGLFont;
         S32                     mMaxLengthChars;                        // Max number of characters
diff --git a/linden/indra/llui/llmemberlistener.h b/linden/indra/llui/llmemberlistener.h
index 92e7278..bc67519 100644
--- a/linden/indra/llui/llmemberlistener.h
+++ b/linden/indra/llui/llmemberlistener.h
@@ -37,7 +37,6 @@ class LLMemberListener : public LLSimpleListener
 {
 public:
         LLMemberListener() : mPtr(NULL), mRegisteredName("") { }
-        ~LLMemberListener() { }
 
         void registerListener(T *pointer, const LLString& register_name)
         {
diff --git a/linden/indra/llui/llpanel.cpp b/linden/indra/llui/llpanel.cpp
index f0b5b25..dfa3f8a 100644
--- a/linden/indra/llui/llpanel.cpp
+++ b/linden/indra/llui/llpanel.cpp
@@ -589,7 +589,7 @@ LLView* LLPanel::fromXML(LLXMLNodePtr node, LLView* parentp, LLUICtrlFactory *fa
         return panelp;
 }
 
-void LLPanel::initPanelXML(LLXMLNodePtr node, LLView *parent, LLUICtrlFactory *factory)
+BOOL LLPanel::initPanelXML(LLXMLNodePtr node, LLView *parent, LLUICtrlFactory *factory)
 {
         LLString name("panel");
         node->getAttributeString("name", name);
@@ -605,12 +605,23 @@ void LLPanel::initPanelXML(LLXMLNodePtr node, LLView *parent, LLUICtrlFactory *f
 
         LLString xml_filename;
         node->getAttributeString("filename", xml_filename);
+
+        BOOL didPost;
+
         if (!xml_filename.empty())
         {
-                factory->buildPanel(this, xml_filename, NULL);
+                didPost = factory->buildPanel(this, xml_filename, NULL);
+        } else {
+                didPost = FALSE;
         }
         
-        postBuild();
+        if (!didPost)
+        {
+                postBuild();
+                didPost = TRUE;
+        }
+
+        return didPost;
 }
 
 void LLPanel::setPanelParameters(LLXMLNodePtr node, LLView* parentp)
diff --git a/linden/indra/llui/llpanel.h b/linden/indra/llui/llpanel.h
index 9da942e..fea3eee 100644
--- a/linden/indra/llui/llpanel.h
+++ b/linden/indra/llui/llpanel.h
@@ -135,7 +135,7 @@ public:
 
         virtual LLXMLNodePtr getXML(bool save_children = true) const;
         static LLView* fromXML(LLXMLNodePtr node, LLView *parent, LLUICtrlFactory *factory);
-        void initPanelXML(LLXMLNodePtr node, LLView *parent, LLUICtrlFactory *factory);
+        BOOL initPanelXML(LLXMLNodePtr node, LLView *parent, LLUICtrlFactory *factory);
         void setPanelParameters(LLXMLNodePtr node, LLView *parentp);
 
         // ** Wrappers for setting child properties by name ** -TomY
diff --git a/linden/indra/llui/llscrolllistctrl.cpp b/linden/indra/llui/llscrolllistctrl.cpp
index 22987dc..fd98bd5 100644
--- a/linden/indra/llui/llscrolllistctrl.cpp
+++ b/linden/indra/llui/llscrolllistctrl.cpp
@@ -99,7 +99,7 @@ protected:
 // LLScrollListIcon
 //
 LLScrollListIcon::LLScrollListIcon(LLImageGL* icon, S32 width, LLUUID image_id) :
-mIcon(icon), mImageUUID(image_id.asString())
+mIcon(icon), mColor(LLColor4::white), mImageUUID(image_id.asString())
 {
         if (width)
         {
@@ -115,6 +115,16 @@ LLScrollListIcon::~LLScrollListIcon()
 {
 }
 
+void LLScrollListIcon::setColor(const LLColor4& color)
+{
+        mColor = color;
+}
+
+void LLScrollListIcon::drawToWidth(S32 width, const LLColor4& color, const LLColor4& highlight_color) const     
+{
+        gl_draw_image(0, 0, mIcon, mColor); 
+}
+
 //
 // LLScrollListCheck
 //
@@ -208,6 +218,15 @@ LLScrollListText::~LLScrollListText()
         delete mColor;
 }
 
+void LLScrollListText::setColor(const LLColor4& color)
+{
+        if (!mColor)
+        {
+                mColor = new LLColor4();
+        }
+        *mColor = color;
+}
+
 void LLScrollListText::setText(const LLString& text)
 {
         mText = text;
@@ -2809,6 +2828,8 @@ LLScrollListItem* LLScrollListCtrl::addElement(const LLSD& value, EAddPosition p
                 LLString fontname = (*itor)["font"].asString();
                 LLString fontstyle = (*itor)["font-style"].asString();
                 LLString type = (*itor)["type"].asString();
+                BOOL has_color = (*itor).has("color");
+                LLColor4 color = ((*itor)["color"]);
 
                 const LLFontGL *font = gResMgr->getRes(fontname);
                 if (!font)
@@ -2821,21 +2842,41 @@ LLScrollListItem* LLScrollListCtrl::addElement(const LLSD& value, EAddPosition p
                 {
                         LLUUID image_id = value.asUUID();
                         LLImageGL* icon = LLUI::sImageProvider->getUIImageByID(image_id);
-                        new_item->setColumn(index, new LLScrollListIcon(icon, width, image_id));
+                        LLScrollListIcon* cell = new LLScrollListIcon(icon, width, image_id);
+                        if (has_color)
+                        {
+                                cell->setColor(color);
+                        }
+                        new_item->setColumn(index, cell);
                 }
                 else if (type == "checkbox")
                 {
                         LLCheckBoxCtrl* ctrl = new LLCheckBoxCtrl(value.asString(),
                                                                                                                 LLRect(0, 0, width, width), "label");
-                        new_item->setColumn(index, new LLScrollListCheck(ctrl,width));
+                        LLScrollListCheck* cell = new LLScrollListCheck(ctrl,width);
+                        if (has_color)
+                        {
+                                cell->setColor(color);
+                        }
+                        new_item->setColumn(index, cell);
                 }
                 else if (type == "separator")
                 {
-                        new_item->setColumn(index, new LLScrollListSeparator(width));
+                        LLScrollListSeparator* cell = new LLScrollListSeparator(width);
+                        if (has_color)
+                        {
+                                cell->setColor(color);
+                        }
+                        new_item->setColumn(index, cell);
                 }
                 else
                 {
-                        new_item->setColumn(index, new LLScrollListText(value.asString(), font, width, font_style, font_alignment));
+                        LLScrollListText* cell = new LLScrollListText(value.asString(), font, width, font_style, font_alignment);
+                        if (has_color)
+                        {
+                                cell->setColor(color);
+                        }
+                        new_item->setColumn(index, cell);
                         if (columnp->mHeader && !value.asString().empty())
                         {
                                 columnp->mHeader->setHasResizableElement(TRUE);
diff --git a/linden/indra/llui/llscrolllistctrl.h b/linden/indra/llui/llscrolllistctrl.h
index eed07b8..429985b 100644
--- a/linden/indra/llui/llscrolllistctrl.h
+++ b/linden/indra/llui/llscrolllistctrl.h
@@ -63,6 +63,7 @@ public:
         virtual void                    setWidth(S32 width) = 0;
         virtual void                    highlightText(S32 offset, S32 num_chars) {}
         virtual BOOL                    isText() = 0;
+        virtual void                    setColor(const LLColor4&) = 0;
 
         virtual BOOL    handleClick() { return FALSE; }
         virtual void    setEnabled(BOOL enable) { }
@@ -77,6 +78,7 @@ public:
         virtual S32                             getWidth() const {return mWidth;}
         virtual S32                             getHeight() const { return 5; };
         virtual void                    setWidth(S32 width) {mWidth = width; }
+        virtual void                    setColor(const LLColor4&) {};
         virtual BOOL                    isText() { return FALSE; }
 
 protected:
@@ -97,6 +99,7 @@ public:
         virtual const BOOL                      getVisible() const  { return mVisible; }
         virtual void    highlightText(S32 offset, S32 num_chars) {mHighlightOffset = offset; mHighlightCount = num_chars;}
         void                    setText(const LLString& text);
+        virtual void    setColor(const LLColor4&);
         virtual BOOL    isText() { return TRUE; }
 
 private:
@@ -120,18 +123,20 @@ class LLScrollListIcon : public LLScrollListCell
 public:
         LLScrollListIcon( LLImageGL* icon, S32 width = 0, LLUUID image_id = LLUUID::null);
         /*virtual*/ ~LLScrollListIcon();
-        virtual void    drawToWidth(S32 width, const LLColor4& color, const LLColor4& highlight_color) const    { gl_draw_image(0, 0, mIcon); }
+        virtual void    drawToWidth(S32 width, const LLColor4& color, const LLColor4& highlight_color) const;
         virtual S32             getWidth() const                        { return mWidth; }
         virtual S32             getHeight() const                       { return mIcon->getHeight(); }
         virtual const LLString& getText() const { return mImageUUID; }
         virtual const LLString& getTextLower() const { return mImageUUID; }
         virtual void    setWidth(S32 width)                     { mWidth = width; }
+        virtual void    setColor(const LLColor4&);
         virtual BOOL    isText() { return FALSE; }
 
 private:
         LLPointer<LLImageGL> mIcon;
         LLString mImageUUID;
         S32 mWidth;
+        LLColor4 mColor;
 };
 
 class LLScrollListCheck : public LLScrollListCell
@@ -146,6 +151,7 @@ public:
 
         virtual BOOL    handleClick();
         virtual void    setEnabled(BOOL enable)         { if (mCheckBox) mCheckBox->setEnabled(enable); }
+        virtual void    setColor(const LLColor4& color) {};
 
         LLCheckBoxCtrl* getCheckBox()                           { return mCheckBox; }
         virtual BOOL    isText() { return FALSE; }
diff --git a/linden/indra/llui/lltabcontainer.cpp b/linden/indra/llui/lltabcontainer.cpp
index 61cfde4..44940ae 100644
--- a/linden/indra/llui/lltabcontainer.cpp
+++ b/linden/indra/llui/lltabcontainer.cpp
@@ -77,7 +77,8 @@ LLTabContainerCommon::LLTabContainerCommon(
         mCallbackUserdata( callback_userdata ),
         mTitleBox(NULL),
         mTopBorderHeight(LLPANEL_BORDER_WIDTH),
-        mTabPosition(pos)
+        mTabPosition(pos),
+        mLockedTabCount(0)
 { 
         setMouseOpaque(FALSE);
 }
@@ -142,6 +143,13 @@ void LLTabContainerCommon::addPlaceholder(LLPanel* child, const LLString& label)
         addTabPanel(child, label, FALSE, NULL, NULL, 0, TRUE);
 }
 
+void LLTabContainerCommon::lockTabs()
+{
+        // count current tabs and ensure no new tabs get
+        // inserted between them
+        mLockedTabCount = getTabCount();
+}
+
 void LLTabContainerCommon::removeTabPanel(LLPanel* child)
 {
         BOOL has_focus = gFocusMgr.childHasKeyboardFocus(this);
@@ -164,6 +172,10 @@ void LLTabContainerCommon::removeTabPanel(LLPanel* child)
                         break;
                 }
         }
+
+        // make sure we don't have more locked tabs than we have tabs
+        mLockedTabCount = llmin(getTabCount(), mLockedTabCount);
+
         if (mCurrentTabIdx >= (S32)mTabList.size())
         {
                 mCurrentTabIdx = mTabList.size()-1;
@@ -526,6 +538,15 @@ void LLTabContainerCommon::setTabPanelFlashing(LLPanel* child, BOOL state )
         }
 }
 
+void LLTabContainerCommon::setTabImage(LLPanel* child, std::string img_name)
+{
+        LLTabTuple* tuple = getTabByPanel(child);
+        if( tuple )
+        {
+                tuple->mButton->setImageOverlay(img_name, LLFontGL::RIGHT);
+        }
+}
+
 void LLTabContainerCommon::setTitle(const LLString& title)
 {
         if (mTitleBox)
@@ -687,12 +708,12 @@ void LLTabContainerCommon::insertTuple(LLTabTuple * tuple, eInsertionPoint inser
         {
         case START:
                 // insert the new tab in the front of the list
-                mTabList.insert(mTabList.begin(), tuple);
+                mTabList.insert(mTabList.begin() + mLockedTabCount, tuple);
                 break;
         case RIGHT_OF_CURRENT:
-                // insert the new tab after the current tab
+                // insert the new tab after the current tab (but not before mLockedTabCount)
                 {
-                tuple_list_t::iterator current_iter = mTabList.begin() + mCurrentTabIdx + 1;
+                tuple_list_t::iterator current_iter = mTabList.begin() + llmax(mLockedTabCount, mCurrentTabIdx + 1);
                 mTabList.insert(current_iter, tuple);
                 }
                 break;
@@ -1249,6 +1270,7 @@ void LLTabContainer::draw()
                 for(tuple_list_t::iterator iter = mTabList.begin(); iter != mTabList.end(); ++iter)
                 {
                         LLTabTuple* tuple = *iter;
+
                         tuple->mButton->translate( left - tuple->mButton->getRect().mLeft, 0 );
                         left += tuple->mButton->getRect().getWidth();
 
@@ -1596,3 +1618,27 @@ BOOL LLTabContainer::handleDragAndDrop(S32 x, S32 y, MASK mask,	BOOL drop,	EDrag
 
         return LLView::handleDragAndDrop(x,     y, mask, drop, type, cargo_data,  accept, tooltip);
 }
+
+void LLTabContainer::setTabImage(LLPanel* child, std::string image_name)
+{
+        LLTabTuple* tuple = getTabByPanel(child);
+        if( tuple )
+        {
+                tuple->mButton->setImageOverlay(image_name, LLFontGL::RIGHT);
+
+                const LLFontGL* fontp = gResMgr->getRes( LLFONT_SANSSERIF_SMALL );
+                // remove current width from total tab strip width
+                mTotalTabWidth -= tuple->mButton->getRect().getWidth();
+
+                S32 image_overlay_width = tuple->mButton->getImageOverlay().notNull() ? 
+                        tuple->mButton->getImageOverlay()->getWidth(0) :
+                        0;
+                tuple->mButton->reshape(llclamp(fontp->getWidth(tuple->mButton->getLabelSelected()) + TAB_PADDING + image_overlay_width, mMinTabWidth, mMaxTabWidth), 
+                                                                tuple->mButton->getRect().getHeight());
+                // add back in button width to total tab strip width
+                mTotalTabWidth += tuple->mButton->getRect().getWidth();
+
+                // tabs have changed size, might need to scroll to see current tab
+                updateMaxScrollPos();
+        }
+}
\ No newline at end of file
diff --git a/linden/indra/llui/lltabcontainer.h b/linden/indra/llui/lltabcontainer.h
index 5fe6bc5..7d501d2 100644
--- a/linden/indra/llui/lltabcontainer.h
+++ b/linden/indra/llui/lltabcontainer.h
@@ -87,7 +87,8 @@ public:
                                                          BOOL placeholder = FALSE,
                                                          eInsertionPoint insertion_point = END) = 0;
         virtual void            addPlaceholder(LLPanel* child, const LLString& label);
-        
+        virtual void            lockTabs();
+
         virtual void            enableTabButton(S32 which, BOOL enable);
 
         virtual void removeTabPanel( LLPanel* child );
@@ -113,6 +114,7 @@ public:
 
         BOOL        getTabPanelFlashing(LLPanel* child);
         void            setTabPanelFlashing(LLPanel* child, BOOL state);
+        virtual void setTabImage(LLPanel* child, std::string img_name);
         void            setTitle( const LLString& title );
         const LLString getPanelTitle(S32 index);
         
@@ -180,6 +182,7 @@ protected:
 
         S32                                                             mTopBorderHeight;
         TabPosition                                     mTabPosition;
+        S32                                                             mLockedTabCount;
 
 protected:
         void            scrollPrev();
@@ -221,7 +224,7 @@ public:
         /*virtual*/ void removeTabPanel( LLPanel* child );
 
         /*virtual*/ void                setPanelTitle(S32 index, const LLString& title);
-
+        /*virtual*/ void                setTabImage(LLPanel* child, std::string img_name);
         /*virtual*/ void                setRightTabBtnOffset( S32 offset );
          
         /*virtual*/ void                setMinTabWidth(S32 width);
diff --git a/linden/indra/llui/lltexteditor.cpp b/linden/indra/llui/lltexteditor.cpp
index ba991c2..80205d3 100644
--- a/linden/indra/llui/lltexteditor.cpp
+++ b/linden/indra/llui/lltexteditor.cpp
@@ -309,6 +309,9 @@ LLTextEditor::LLTextEditor(
 {
         mSourceID.generate();
 
+        // reset desired x cursor position
+        mDesiredXPixel = -1;
+
         if (font)
         {
                 mGLFont = font;
@@ -348,7 +351,7 @@ LLTextEditor::LLTextEditor(
         mBorder = new LLViewBorder( "text ed border", LLRect(0, mRect.getHeight(), mRect.getWidth(), 0), LLViewBorder::BEVEL_IN, LLViewBorder::STYLE_LINE, UI_TEXTEDITOR_BORDER );
         addChild( mBorder );
 
-        setText(default_text);
+        appendText(default_text, FALSE, FALSE);
         
         mParseHTML=FALSE;
         mHTML="";
@@ -914,6 +917,8 @@ void LLTextEditor::setCursorPos(S32 offset)
 {
         mCursorPos = llclamp(offset, 0, (S32)getLength());
         updateScrollFromCursor();
+        // reset desired x cursor position
+        mDesiredXPixel = -1;
 }
 
 
@@ -2645,7 +2650,8 @@ void LLTextEditor::drawSelectionBackground()
                 {
                         LLGLSNoTexture no_texture;
                         const LLColor4& color = mReadOnly ? mReadOnlyBgColor : mWriteableBgColor;
-                        glColor3f( 1.f - color.mV[0], 1.f - color.mV[1], 1.f - color.mV[2] );
+                        F32 alpha = hasFocus() ? 1.f : 0.5f;
+                        glColor4f( 1.f - color.mV[0], 1.f - color.mV[1], 1.f - color.mV[2], alpha );
 
                         if( selection_left_y == selection_right_y )
                         {
@@ -3098,6 +3104,9 @@ void LLTextEditor::changePage( S32 delta )
         S32 line, offset;
         getLineAndOffset( mCursorPos, &line, &offset );
 
+        // get desired x position to remember previous position
+        S32 desired_x_pixel = mDesiredXPixel;
+
         // allow one line overlap
         S32 page_size = mScrollbar->getPageSize() - 1;
         if( delta == -1 )
@@ -3112,6 +3121,10 @@ void LLTextEditor::changePage( S32 delta )
                 setCursorPos(getPos( line + page_size, offset ));
                 mScrollbar->setDocPos( mScrollbar->getDocPos() + page_size );
         }
+
+        // put desired position into remember-buffer after setCursorPos()
+        mDesiredXPixel = desired_x_pixel;
+
         if (mOnScrollEndCallback && mOnScrollEndData && (mScrollbar->getDocPos() == mScrollbar->getDocPosMax()))
         {
                 mOnScrollEndCallback(mOnScrollEndData);
@@ -3127,9 +3140,13 @@ void LLTextEditor::changeLine( S32 delta )
 
         S32  line_start = getLineStart(line);
 
-        S32 desired_x_pixel;
-        
-        desired_x_pixel = mGLFont->getWidth(mWText.c_str(), line_start, offset, mAllowEmbeddedItems );
+        // set desired x position to remembered previous position
+        S32 desired_x_pixel = mDesiredXPixel;
+        // if remembered position was reset (thus -1), calculate new one here
+        if( desired_x_pixel == -1 )
+        {
+                desired_x_pixel = mGLFont->getWidth(mWText.c_str(), line_start, offset, mAllowEmbeddedItems );
+        }
 
         S32 new_line = 0;
         if( (delta < 0) && (line > 0 ) )
@@ -3165,6 +3182,9 @@ void LLTextEditor::changeLine( S32 delta )
                                                                                           mAllowEmbeddedItems);
 
         setCursorPos (getPos( new_line, new_offset ));
+
+        // put desired position into remember-buffer after setCursorPos()
+        mDesiredXPixel = desired_x_pixel;
         unbindEmbeddedChars( mGLFont );
 }
 
@@ -3358,6 +3378,14 @@ void LLTextEditor::appendColoredText(const LLString &new_text,
         style.setVisible(true);
         style.setColor(color);
         style.setFontName(font_name);
+        appendStyledText(new_text, allow_undo, prepend_newline, &style);
+}
+
+void LLTextEditor::appendStyledText(const LLString &new_text, 
+                                                                         bool allow_undo, 
+                                                                         bool prepend_newline,
+                                                                         const LLStyle* style)
+{
         if(mParseHTML)
         {
 
@@ -3368,10 +3396,13 @@ void LLTextEditor::appendColoredText(const LLString &new_text,
                         LLStyle html;
                         html.setVisible(true);
                         html.setColor(mLinkColor);
-                        html.setFontName(font_name);
+                        if (style)
+                        {
+                                html.setFontName(style->getFontString());
+                        }
                         html.mUnderline = TRUE;
 
-                        if (start > 0) appendText(text.substr(0,start),allow_undo, prepend_newline, &style);
+                        if (start > 0) appendText(text.substr(0,start),allow_undo, prepend_newline, style);
                         html.setLinkHREF(text.substr(start,end-start));
                         appendText(text.substr(start, end-start),allow_undo, prepend_newline, &html);
                         if (end < (S32)text.length()) 
@@ -3384,22 +3415,14 @@ void LLTextEditor::appendColoredText(const LLString &new_text,
                                 break;
                         }
                 }
-                if (end < (S32)text.length()) appendText(text,allow_undo, prepend_newline, &style);             
+                if (end < (S32)text.length()) appendText(text,allow_undo, prepend_newline, style);      
         }
         else
         {
-                appendText(new_text, allow_undo, prepend_newline, &style);
+                appendText(new_text, allow_undo, prepend_newline, style);
         }
 }
 
-void LLTextEditor::appendStyledText(const LLString &new_text, 
-                                                                         bool allow_undo, 
-                                                                         bool prepend_newline,
-                                                                         const LLStyle &style)
-{
-        appendText(new_text, allow_undo, prepend_newline, &style);
-}
-
 // Appends new text to end of document
 void LLTextEditor::appendText(const LLString &new_text, bool allow_undo, bool prepend_newline,
                                                           const LLStyle* segment_style)
diff --git a/linden/indra/llui/lltexteditor.h b/linden/indra/llui/lltexteditor.h
index 32375be..ebe8ac3 100644
--- a/linden/indra/llui/lltexteditor.h
+++ b/linden/indra/llui/lltexteditor.h
@@ -159,7 +159,7 @@ public:
         // if styled text starts a line, you need to prepend a newline.
         void                    appendStyledText(const LLString &new_text, bool allow_undo, 
                                                                          bool prepend_newline,
-                                                                         const LLStyle &style);
+                                                                         const LLStyle* style);
 
         // Removes text from the end of document
         // Does not change highlight or cursor position.
@@ -359,6 +359,7 @@ protected:
         undo_stack_t    mUndoStack;
 
         S32                             mCursorPos;                             // I-beam is just after the mCursorPos-th character.
+        S32                             mDesiredXPixel;                 // X pixel position where the user wants the cursor to be
         LLRect                  mTextRect;                              // The rect in which text is drawn.  Excludes borders.
         // List of offsets and segment index of the start of each line.  Always has at least one node (0).
         struct line_info
diff --git a/linden/indra/llui/llui.h b/linden/indra/llui/llui.h
index 6b8a86a..3085bd9 100644
--- a/linden/indra/llui/llui.h
+++ b/linden/indra/llui/llui.h
@@ -275,4 +275,95 @@ typedef enum e_widget_type
         WIDGET_TYPE_COUNT
 } EWidgetType;
 
+// Manages generation of UI elements by LLSD, such that there is
+// only one instance per uniquely identified LLSD parameter
+// Class T is the instance type being managed, and INSTANCE_ADDAPTOR
+// wraps an instance of the class with handlers for show/hide semantics, etc.
+template <class T, class INSTANCE_ADAPTOR = T>
+class LLUIInstanceMgr
+{
+public:
+        LLUIInstanceMgr()
+        {
+        }
+
+        virtual ~LLUIInstanceMgr() 
+        { 
+        }
+
+        // default show and hide methods
+        static T* showInstance(const LLSD& seed) 
+        { 
+                T* instance = INSTANCE_ADAPTOR::getInstance(seed); 
+                INSTANCE_ADAPTOR::show(instance);
+                return instance;
+        }
+
+        static void hideInstance(const LLSD& seed) 
+        { 
+                T* instance = INSTANCE_ADAPTOR::getInstance(seed); 
+                INSTANCE_ADAPTOR::hide(instance);
+        }
+
+        static void toggleInstance(const LLSD& seed)
+        {
+                if (!INSTANCE_ADAPTOR::instanceVisible(seed))
+                {
+                        INSTANCE_ADAPTOR::showInstance(seed);
+                }
+                else
+                {
+                        INSTANCE_ADAPTOR::hideInstance(seed);
+                }
+        }
+
+        static BOOL instanceVisible(const LLSD& seed)
+        {
+                T* instance = INSTANCE_ADAPTOR::findInstance(seed);
+                return instance != NULL && INSTANCE_ADAPTOR::visible(instance);
+        }
+
+        static T* getInstance(const LLSD& seed) 
+        {
+                T* instance = INSTANCE_ADAPTOR::findInstance(seed);
+                if (instance == NULL)
+                {
+                        instance = INSTANCE_ADAPTOR::createInstance(seed);
+                }
+                return instance;
+        }
+};
+
+// Creates a UI singleton by ignoring the identifying parameter
+// and always generating the same instance via the LLUIInstanceMgr interface.
+// Note that since UI elements can be destroyed by their hierarchy, this singleton
+// pattern uses a static pointer to an instance that will be re-created as needed.
+template <class T, class INSTANCE_ADAPTOR = T>
+class LLUISingleton: public LLUIInstanceMgr<T, INSTANCE_ADAPTOR>
+{
+public:
+        // default constructor assumes T is derived from LLUISingleton (a true singleton)
+        LLUISingleton() : LLUIInstanceMgr<T, INSTANCE_ADAPTOR>() { sInstance = (T*)this; }
+        ~LLUISingleton() { sInstance = NULL; }
+
+        static T* findInstance(const LLSD& seed)
+        {
+                return sInstance;
+        }
+
+        static T* createInstance(const LLSD& seed)
+        {
+                if (sInstance == NULL)
+                {
+                        sInstance = new T(seed);
+                }
+                return sInstance;
+        }
+
+protected:
+        static T*       sInstance;
+};
+
+template <class T, class U> T* LLUISingleton<T,U>::sInstance = NULL;
+
 #endif
diff --git a/linden/indra/llui/lluictrlfactory.cpp b/linden/indra/llui/lluictrlfactory.cpp
index 475ef2e..79f7313 100644
--- a/linden/indra/llui/lluictrlfactory.cpp
+++ b/linden/indra/llui/lluictrlfactory.cpp
@@ -370,21 +370,22 @@ S32 LLUICtrlFactory::saveToXML(LLView* viewp, const LLString& filename)
 //-----------------------------------------------------------------------------
 // buildPanel()
 //-----------------------------------------------------------------------------
-void LLUICtrlFactory::buildPanel(LLPanel* panelp, const LLString &filename,
+BOOL LLUICtrlFactory::buildPanel(LLPanel* panelp, const LLString &filename,
                                                                         const LLCallbackMap::map_t* factory_map)
 {
+        BOOL didPost = FALSE;
         LLXMLNodePtr root;
 
         if (!LLUICtrlFactory::getLayeredXMLNode(filename, root))
         {
-                return;
+                return didPost;
         }
 
         // root must be called panel
         if( !root->hasName("panel" ) )
         {
                 llwarns << "Root node should be named panel in : " << filename << llendl;
-                return;
+                return didPost;
         }
 
         if (factory_map)
@@ -392,7 +393,7 @@ void LLUICtrlFactory::buildPanel(LLPanel* panelp, const LLString &filename,
                 mFactoryStack.push_front(factory_map);
         }
 
-        panelp->initPanelXML(root, NULL, this);
+        didPost = panelp->initPanelXML(root, NULL, this);
         
         if (LLUI::sShowXUINames)
         {
@@ -406,6 +407,8 @@ void LLUICtrlFactory::buildPanel(LLPanel* panelp, const LLString &filename,
         {
                 mFactoryStack.pop_front();
         }
+
+        return didPost;
 }
 
 //-----------------------------------------------------------------------------
diff --git a/linden/indra/llui/lluictrlfactory.h b/linden/indra/llui/lluictrlfactory.h
index 18b0ba9..eaae754 100644
--- a/linden/indra/llui/lluictrlfactory.h
+++ b/linden/indra/llui/lluictrlfactory.h
@@ -80,8 +80,8 @@ public:
         void buildFloater(LLFloater* floaterp, const LLString &filename, 
                                                 const LLCallbackMap::map_t* factory_map = NULL, BOOL open = TRUE);
 
-        void buildPanel(LLPanel* panelp, const LLString &filename,
-                                                const LLCallbackMap::map_t* factory_map = NULL);
+        BOOL buildPanel(LLPanel* panelp, const LLString &filename,
+                                        const LLCallbackMap::map_t* factory_map = NULL);
 
         LLMenuGL *buildMenu(const LLString &filename, LLView* parentp);
 
diff --git a/linden/indra/llui/llview.cpp b/linden/indra/llui/llview.cpp
index d150e10..22d426a 100644
--- a/linden/indra/llui/llview.cpp
+++ b/linden/indra/llui/llview.cpp
@@ -194,8 +194,10 @@ LLView::~LLView()
         for (itor = mDispatchList.begin(); itor != mDispatchList.end(); ++itor)
         {
                 (*itor).second->clearDispatchers();
-                delete (*itor).second;
         }
+
+        std::for_each(mFloaterControls.begin(), mFloaterControls.end(),
+                                  DeletePairedPointer());
 }
 
 // virtual
@@ -367,22 +369,25 @@ void LLView::addChildAtEnd(LLView* child, S32 tab_group)
 }
 
 // remove the specified child from the view, and set it's parent to NULL.
-void LLView::removeChild( LLView* child )
+void LLView::removeChild(LLView* child, BOOL deleteIt)
 {
         if (child->mParentView == this) 
         {
                 mChildList.remove( child );
                 child->mParentView = NULL;
+                if (child->isCtrl())
+                {
+                        removeCtrl((LLUICtrl*)child);
+                }
+                if (deleteIt)
+                {
+                        delete child;
+                }
         }
         else
         {
                 llerrs << "LLView::removeChild called with non-child" << llendl;
         }
-
-        if (child->isCtrl())
-        {
-                removeCtrl((LLUICtrl*)child);
-        }
 }
 
 void LLView::addCtrlAtEnd(LLUICtrl* ctrl, S32 tab_group)
@@ -2507,7 +2512,6 @@ void LLView::deregisterEventListener(LLString name)
         dispatch_list_t::iterator itor = mDispatchList.find(name);
         if (itor != mDispatchList.end())
         {
-                delete itor->second;
                 mDispatchList.erase(itor);
         }
 }
diff --git a/linden/indra/llui/llview.h b/linden/indra/llui/llview.h
index cb9a35c..c7664eb 100644
--- a/linden/indra/llui/llview.h
+++ b/linden/indra/llui/llview.h
@@ -241,7 +241,7 @@ public:
         void            addChild(LLView* view, S32 tab_group = 0);
         void            addChildAtEnd(LLView* view,  S32 tab_group = 0);
         // remove the specified child from the view, and set it's parent to NULL.
-        void            removeChild( LLView* view );
+        void            removeChild(LLView* view, BOOL deleteIt = FALSE);
 
         virtual void    addCtrl( LLUICtrl* ctrl, S32 tab_group);
         virtual void    addCtrlAtEnd( LLUICtrl* ctrl, S32 tab_group);
@@ -484,7 +484,7 @@ protected:
         LLView* childrenHandleRightMouseDown(S32 x, S32 y, MASK mask);
         LLView* childrenHandleRightMouseUp(S32 x, S32 y, MASK mask);
 
-        typedef std::map<LLString, LLSimpleListener*> dispatch_list_t;
+        typedef std::map<LLString, LLPointer<LLSimpleListener> > dispatch_list_t;
         dispatch_list_t mDispatchList;
 
 protected:
diff --git a/linden/indra/llvfs/lllfsthread.h b/linden/indra/llvfs/lllfsthread.h
index 48c5a5c..25b4c6b 100644
--- a/linden/indra/llvfs/lllfsthread.h
+++ b/linden/indra/llvfs/lllfsthread.h
@@ -58,8 +58,9 @@ public:
 
         class Responder : public LLThreadSafeRefCount
         {
+        protected:
+                ~Responder();
         public:
-                virtual ~Responder();
                 virtual void completed(S32 bytes) = 0;
         };
 
diff --git a/linden/indra/llwindow/llwindow.cpp b/linden/indra/llwindow/llwindow.cpp
index 134e606..cad1dc4 100644
--- a/linden/indra/llwindow/llwindow.cpp
+++ b/linden/indra/llwindow/llwindow.cpp
@@ -125,6 +125,16 @@ BOOL LLWindowCallbacks::handleRightMouseUp(LLWindow *window, const LLCoordGL pos
         return FALSE;
 }
 
+BOOL LLWindowCallbacks::handleMiddleMouseDown(LLWindow *window, const LLCoordGL pos, MASK mask)
+{
+        return FALSE;
+}
+
+BOOL LLWindowCallbacks::handleMiddleMouseUp(LLWindow *window, const LLCoordGL pos, MASK mask)
+{
+        return FALSE;
+}
+
 BOOL LLWindowCallbacks::handleActivate(LLWindow *window, BOOL activated)
 {
         return FALSE;
diff --git a/linden/indra/llwindow/llwindow.h b/linden/indra/llwindow/llwindow.h
index a52aff6..2bb49e9 100644
--- a/linden/indra/llwindow/llwindow.h
+++ b/linden/indra/llwindow/llwindow.h
@@ -96,6 +96,8 @@ public:
         virtual void handleQuit(LLWindow *window);
         virtual BOOL handleRightMouseDown(LLWindow *window,  LLCoordGL pos, MASK mask);
         virtual BOOL handleRightMouseUp(LLWindow *window,  LLCoordGL pos, MASK mask);
+        virtual BOOL handleMiddleMouseDown(LLWindow *window,  LLCoordGL pos, MASK mask);
+        virtual BOOL handleMiddleMouseUp(LLWindow *window,  LLCoordGL pos, MASK mask);
         virtual BOOL handleActivate(LLWindow *window, BOOL activated);
         virtual void handleMouseMove(LLWindow *window,  LLCoordGL pos, MASK mask);
         virtual void handleScrollWheel(LLWindow *window,  S32 clicks);
diff --git a/linden/indra/llwindow/llwindowmacosx.cpp b/linden/indra/llwindow/llwindowmacosx.cpp
index b2a1ccf..0c5d6ed 100644
--- a/linden/indra/llwindow/llwindowmacosx.cpp
+++ b/linden/indra/llwindow/llwindowmacosx.cpp
@@ -2177,6 +2177,10 @@ OSStatus LLWindowMacOSX::eventHandler (EventHandlerCallRef myHandler, EventRef e
                                         case kEventMouseButtonSecondary:
                                                 mCallbacks->handleRightMouseDown(this, outCoords, mask);
                                                 break;
+                                        
+                                        case kEventMouseButtonTertiary:
+                                                mCallbacks->handleMiddleMouseDown(this, outCoords, mask);
+                                                break;
                                         }
                                         result = noErr;
                                         break;
@@ -2199,6 +2203,10 @@ OSStatus LLWindowMacOSX::eventHandler (EventHandlerCallRef myHandler, EventRef e
                                         case kEventMouseButtonSecondary:
                                                 mCallbacks->handleRightMouseUp(this, outCoords, mask);
                                                 break;
+
+                                        case kEventMouseButtonTertiary:
+                                                mCallbacks->handleMiddleMouseUp(this, outCoords, mask);
+                                                break;
                                         }
                                         result = noErr;
                                         break;
@@ -2231,7 +2239,13 @@ OSStatus LLWindowMacOSX::eventHandler (EventHandlerCallRef myHandler, EventRef e
 
         case kEventClassWindow:
                 switch(evtKind)
-                {
+                {               
+                case kEventWindowActivated:
+                        mCallbacks->handleFocus(this);
+                        break;
+                case kEventWindowDeactivated:
+                        mCallbacks->handleFocusLost(this);
+                        break;
                 case kEventWindowBoundsChanging:
                         {
                                 Rect currentBounds;
diff --git a/linden/indra/llwindow/llwindowmesaheadless.h b/linden/indra/llwindow/llwindowmesaheadless.h
index 599db72..f0ad50e 100644
--- a/linden/indra/llwindow/llwindowmesaheadless.h
+++ b/linden/indra/llwindow/llwindowmesaheadless.h
@@ -32,6 +32,7 @@
 #if LL_MESA_HEADLESS
 
 #include "llwindow.h"
+#include "GL/glu.h"
 #include "GL/osmesa.h"
 
 class LLWindowMesaHeadless : public LLWindow
diff --git a/linden/indra/llwindow/llwindowsdl.cpp b/linden/indra/llwindow/llwindowsdl.cpp
index f7b4071..a1cdeb3 100644
--- a/linden/indra/llwindow/llwindowsdl.cpp
+++ b/linden/indra/llwindow/llwindowsdl.cpp
@@ -296,9 +296,9 @@ static SDL_Surface *Load_BMP_Resource(const char *basename)
 #if LL_X11
 // This is an XFree86/XOrg-specific hack for detecting the amount of Video RAM
 // on this machine.  It works by searching /var/log/var/log/Xorg.?.log or
-// /var/log/XFree86.?.log for a ': VideoRAM: (%d+) kB' regex, where '?' is
-// the X11 display number derived from $DISPLAY
-static int x11_detect_VRAM_kb_fp(FILE *fp)
+// /var/log/XFree86.?.log for a ': (VideoRAM|Memory): (%d+) kB' regex, where
+// '?' is the X11 display number derived from $DISPLAY
+static int x11_detect_VRAM_kb_fp(FILE *fp, const char *prefix_str)
 {
         const int line_buf_size = 1000;
         char line_buf[line_buf_size];
@@ -310,7 +310,7 @@ static int x11_detect_VRAM_kb_fp(FILE *fp)
                 // favourite regex implementation - libboost_regex - is
                 // quite a heavy and troublesome dependency for the client, so
                 // it seems a shame to introduce it for such a simple task.
-                const char part1_template[] = ": VideoRAM: ";
+                const char *part1_template = prefix_str;
                 const char part2_template[] = " kB";
                 char *part1 = strstr(line_buf, part1_template);
                 if (part1) // found start of matching line
@@ -325,7 +325,6 @@ static int x11_detect_VRAM_kb_fp(FILE *fp)
                                 int rtn = 0;
                                 for (; part1 < part2; ++part1)
                                 {
-                                        //lldebugs << "kB" << *part1 << llendl;
                                         if (*part1 < '0' || *part1 > '9')
                                         {
                                                 // unexpected char, abort parse
@@ -345,6 +344,7 @@ static int x11_detect_VRAM_kb_fp(FILE *fp)
         }
         return 0; // 'could not detect'
 }
+
 static int x11_detect_VRAM_kb()
 {
         std::string x_log_location("/var/log/");
@@ -363,7 +363,7 @@ static int x11_detect_VRAM_kb()
         // *TODO: we could be smarter and see which of Xorg/XFree86 has the
         // freshest time-stamp.
 
-        // Try XOrg log first
+        // Try Xorg log first
         fname = x_log_location;
         fname += "Xorg.";
         fname += ('0' + display_num);
@@ -371,12 +371,25 @@ static int x11_detect_VRAM_kb()
         fp = fopen(fname.c_str(), "r");
         if (fp)
         {
-                rtn = x11_detect_VRAM_kb_fp(fp);
+                llinfos << "Looking in " << fname
+                        << " for VRAM info..." << llendl;
+                rtn = x11_detect_VRAM_kb_fp(fp, ": VideoRAM: ");
                 fclose(fp);
+                if (0 == rtn)
+                {
+                        fp = fopen(fname.c_str(), "r");
+                        if (fp)
+                        {
+                                rtn = x11_detect_VRAM_kb_fp(fp, ": Memory: ");
+                                fclose(fp);
+                        }
+                }
         }
-        // Try old XFree86 log otherwise
-        if (rtn == 0)
+        else
         {
+                llinfos << "Could not open " << fname
+                        << " - skipped." << llendl;     
+                // Try old XFree86 log otherwise
                 fname = x_log_location;
                 fname += "XFree86.";
                 fname += ('0' + display_num);
@@ -384,8 +397,24 @@ static int x11_detect_VRAM_kb()
                 fp = fopen(fname.c_str(), "r");
                 if (fp)
                 {
-                        rtn = x11_detect_VRAM_kb_fp(fp);
+                        llinfos << "Looking in " << fname
+                                << " for VRAM info..." << llendl;
+                        rtn = x11_detect_VRAM_kb_fp(fp, ": VideoRAM: ");
                         fclose(fp);
+                        if (0 == rtn)
+                        {
+                                fp = fopen(fname.c_str(), "r");
+                                if (fp)
+                                {
+                                        rtn = x11_detect_VRAM_kb_fp(fp, ": Memory: ");
+                                        fclose(fp);
+                                }
+                        }
+                }
+                else
+                {
+                        llinfos << "Could not open " << fname
+                                << " - skipped." << llendl;
                 }
         }
         return rtn;
@@ -2023,7 +2052,9 @@ void LLWindowSDL::gatherInput()
                 }
 
                 else if (event.button.button == SDL_BUTTON_MIDDLE)  // middle
-                                    ;  // Middle mouse isn't handled right now in Second Life ... mCallbacks->handleMiddleMouseDown(this, openGlCoord, mask);
+                                {
+                                    mCallbacks->handleMiddleMouseDown(this, openGlCoord, mask);
+                                }
                 else if (event.button.button == 4)  // mousewheel up...thanks to X11 for making SDL consider these "buttons".
                                         mCallbacks->handleScrollWheel(this, -1);
                 else if (event.button.button == 5)  // mousewheel down...thanks to X11 for making SDL consider these "buttons".
@@ -2044,8 +2075,9 @@ void LLWindowSDL::gatherInput()
                 else if (event.button.button == SDL_BUTTON_RIGHT)  // right ... yes, it's 3, not 2, in SDL...
                                     mCallbacks->handleRightMouseUp(this, openGlCoord, mask);
                 else if (event.button.button == SDL_BUTTON_MIDDLE)  // middle
-                                    ;  // UNUSED IN SECOND LIFE RIGHT NOW mCallbacks->handleMiddleMouseUp(this, openGlCoord, mask);
-
+                                {
+                                        mCallbacks->handleMiddleMouseUp(this, openGlCoord, mask);
+                                }
                 // don't handle mousewheel here...
 
                 break;
diff --git a/linden/indra/llwindow/llwindowwin32.cpp b/linden/indra/llwindow/llwindowwin32.cpp
index 3c2e730..2cd1353 100644
--- a/linden/indra/llwindow/llwindowwin32.cpp
+++ b/linden/indra/llwindow/llwindowwin32.cpp
@@ -2072,7 +2072,54 @@ LRESULT CALLBACK LLWindowWin32::mainWindowProc(HWND h_wnd, UINT u_msg, WPARAM w_
                         break;
 
                 case WM_MBUTTONDOWN:
-                        // Handle middle button click
+//              case WM_MBUTTONDBLCLK:
+                        {
+                                // Because we move the cursor position in tllviewerhe app, we need to query
+                                // to find out where the cursor at the time the event is handled.
+                                // If we don't do this, many clicks could get buffered up, and if the
+                                // first click changes the cursor position, all subsequent clicks
+                                // will occur at the wrong location.  JC
+                                LLCoordWindow cursor_coord_window;
+                                if (window_imp->mMousePositionModified)
+                                {
+                                        window_imp->getCursorPosition(&cursor_coord_window);
+                                        window_imp->convertCoords(cursor_coord_window, &gl_coord);
+                                }
+                                else
+                                {
+                                        window_imp->convertCoords(window_coord, &gl_coord);
+                                }
+                                MASK mask = gKeyboard->currentMask(TRUE);
+                                if (window_imp->mCallbacks->handleMiddleMouseDown(window_imp, gl_coord, mask))
+                                {
+                                        return 0;
+                                }
+                        }
+                        break;
+
+                case WM_MBUTTONUP:
+                        {
+                                // Because we move the cursor position in tllviewerhe app, we need to query
+                                // to find out where the cursor at the time the event is handled.
+                                // If we don't do this, many clicks could get buffered up, and if the
+                                // first click changes the cursor position, all subsequent clicks
+                                // will occur at the wrong location.  JC
+                                LLCoordWindow cursor_coord_window;
+                                if (window_imp->mMousePositionModified)
+                                {
+                                        window_imp->getCursorPosition(&cursor_coord_window);
+                                        window_imp->convertCoords(cursor_coord_window, &gl_coord);
+                                }
+                                else
+                                {
+                                        window_imp->convertCoords(window_coord, &gl_coord);
+                                }
+                                MASK mask = gKeyboard->currentMask(TRUE);
+                                if (window_imp->mCallbacks->handleMiddleMouseUp(window_imp, gl_coord, mask))
+                                {
+                                        return 0;
+                                }
+                        }
                         break;
 
                 case WM_MOUSEWHEEL:
diff --git a/linden/indra/llxml/llxmlnode.cpp b/linden/indra/llxml/llxmlnode.cpp
index b83555a..26906a4 100644
--- a/linden/indra/llxml/llxmlnode.cpp
+++ b/linden/indra/llxml/llxmlnode.cpp
@@ -637,6 +637,66 @@ bool LLXMLNode::parseBuffer(
         return true;
 }
 
+// static
+bool LLXMLNode::parseStream(
+        std::istream& str,
+        LLXMLNodePtr& node, 
+        LLXMLNode* defaults)
+{
+        // Init
+        XML_Parser my_parser = XML_ParserCreate(NULL);
+        XML_SetElementHandler(my_parser, StartXMLNode, EndXMLNode);
+        XML_SetCharacterDataHandler(my_parser, XMLData);
+
+        // Create a root node
+        LLXMLNode *file_node_ptr = new LLXMLNode("XML", FALSE);
+        LLXMLNodePtr file_node = file_node_ptr;
+
+        file_node->mParser = &my_parser;
+
+        XML_SetUserData(my_parser, (void *)file_node_ptr);
+
+        const int BUFSIZE = 1024; 
+        U8* buffer = new U8[BUFSIZE];
+
+        while(str.good())
+        {
+                str.read((char*)buffer, BUFSIZE);
+                int count = str.gcount();
+                
+                if (XML_Parse(my_parser, (const char *)buffer, count, !str.good()) != XML_STATUS_OK)
+                {
+                        llwarns << "Error parsing xml error code: "
+                                        << XML_ErrorString(XML_GetErrorCode(my_parser))
+                                        << " on lne " << XML_GetCurrentLineNumber(my_parser)
+                                        << llendl;
+                        break;
+                }
+        }
+        
+        delete [] buffer;
+
+        // Deinit
+        XML_ParserFree(my_parser);
+
+        if (!file_node->mChildren || file_node->mChildren->map.size() != 1)
+        {
+                llwarns << "Parse failure - wrong number of top-level nodes xml."
+                                << llendl;
+                node = new LLXMLNode();
+                return false;
+        }
+
+        LLXMLNode *return_node = file_node->mChildren->map.begin()->second;
+
+        return_node->setDefault(defaults);
+        return_node->updateDefault();
+
+        node = return_node;
+        return true;
+}
+
+
 BOOL LLXMLNode::isFullyDefault()
 {
         if (mDefault.isNull())
diff --git a/linden/indra/llxml/llxmlnode.h b/linden/indra/llxml/llxmlnode.h
index e876739..f95a53b 100644
--- a/linden/indra/llxml/llxmlnode.h
+++ b/linden/indra/llxml/llxmlnode.h
@@ -94,7 +94,7 @@ public:
         };
 
 protected:
-        virtual ~LLXMLNode();
+        ~LLXMLNode();
 
 public:
         LLXMLNode();
@@ -117,6 +117,10 @@ public:
                 U32 length,
                 LLXMLNodePtr& node, 
                 LLXMLNode* defaults);
+        static bool parseStream(
+                std::istream& str,
+                LLXMLNodePtr& node, 
+                LLXMLNode* defaults);
         static bool updateNode(
         LLXMLNodePtr& node,
         LLXMLNodePtr& update_node);
diff --git a/linden/indra/lscript/lscript_compile/indra.l b/linden/indra/lscript/lscript_compile/indra.l
index 7c9b3aa..6b4e67d 100644
--- a/linden/indra/lscript/lscript_compile/indra.l
+++ b/linden/indra/lscript/lscript_compile/indra.l
@@ -758,15 +758,8 @@ void comment()
 {
         char c;
 
-#if LL_DARWIN
         while ((c = yyinput()) != '\n' && c != 0 && c != EOF)
                 ;
-#else
-        while ((c = yyinput()) != '\n' && c != 0)
-                ;
-#endif          
-
-
 }
 
 void count()
diff --git a/linden/indra/mac_updater/mac_updater.cpp b/linden/indra/mac_updater/mac_updater.cpp
index 58819a2..a30f024 100644
--- a/linden/indra/mac_updater/mac_updater.cpp
+++ b/linden/indra/mac_updater/mac_updater.cpp
@@ -537,8 +537,7 @@ bool isDirWritable(FSRef &dir)
 
 static void utf8str_to_HFSUniStr255(HFSUniStr255 *dest, const char* src)
 {
-        LLWString               wstr = utf8str_to_wstring(src);
-        llutf16string   utf16str = wstring_to_utf16str(wstr);
+        llutf16string   utf16str = utf8str_to_utf16str(src);
 
         dest->length = utf16str.size();
         if(dest->length > 255)
@@ -550,6 +549,13 @@ static void utf8str_to_HFSUniStr255(HFSUniStr255 *dest, const char* src)
         memcpy(dest->unicode, utf16str.data(), sizeof(UniChar)* dest->length);          /* Flawfinder: ignore */
 }
 
+static std::string HFSUniStr255_to_utf8str(const HFSUniStr255* src)
+{
+        llutf16string string16((U16*)&(src->unicode), src->length);
+        std::string result = utf16str_to_utf8str(string16);
+        return result;
+}
+
 int restoreObject(const char* aside, const char* target, const char* path, const char* object)
 {
         char source[PATH_MAX];          /* Flawfinder: ignore */
@@ -598,6 +604,123 @@ void filterFile(const char* filename)
         system(temp);           /* Flawfinder: ignore */
 }
 
+static bool isFSRefViewerBundle(FSRef *targetRef)
+{
+        bool result = false;
+        CFURLRef targetURL = NULL;
+        CFBundleRef targetBundle = NULL;
+        CFStringRef targetBundleID = NULL;
+        
+        targetURL = CFURLCreateFromFSRef(NULL, targetRef);
+
+        if(targetURL == NULL)
+        {
+                llinfos << "Error creating target URL." << llendl;
+        }
+        else
+        {
+                targetBundle = CFBundleCreate(NULL, targetURL);
+        }
+        
+        if(targetBundle == NULL)
+        {
+                llinfos << "Failed to create target bundle." << llendl;
+        }
+        else
+        {
+                targetBundleID = CFBundleGetIdentifier(targetBundle);
+        }
+        
+        if(targetBundleID == NULL)
+        {
+                llinfos << "Couldn't retrieve target bundle ID." << llendl;
+        }
+        else
+        {
+                if(CFStringCompare(targetBundleID, CFSTR("com.secondlife.indra.viewer"), 0) == kCFCompareEqualTo)
+                {
+                        // This is the bundle we're looking for.
+                        result = true;
+                }
+                else
+                {
+                        llinfos << "Target bundle ID mismatch." << llendl;
+                }
+        }
+        
+        // Don't release targetBundleID -- since we don't retain it, it's released when targetBundle is released.
+        if(targetURL != NULL)
+                CFRelease(targetURL);
+        if(targetBundle != NULL)
+                CFRelease(targetBundle);
+        
+        return result;
+}
+
+// Search through the directory specified by 'parent' for an item that appears to be a Second Life viewer.
+static OSErr findAppBundleOnDiskImage(FSRef *parent, FSRef *app)
+{
+        FSIterator              iterator;
+        bool                    found = false;
+
+        OSErr err = FSOpenIterator( parent, kFSIterateFlat, &iterator );
+        if(!err)
+        {
+                do
+                {
+                        ItemCount actualObjects = 0;
+                        Boolean containerChanged = false;
+                        FSCatalogInfo info;
+                        FSRef ref;
+                        HFSUniStr255 unicodeName;
+                        err = FSGetCatalogInfoBulk( 
+                                        iterator, 
+                                        1, 
+                                        &actualObjects, 
+                                        &containerChanged,
+                                        kFSCatInfoNodeFlags, 
+                                        &info, 
+                                        &ref,
+                                        NULL, 
+                                        &unicodeName );
+                        
+                        if(actualObjects == 0)
+                                break;
+                                
+                        if(!err)
+                        {
+                                // Call succeeded and not done with the iteration.
+                                std::string name = HFSUniStr255_to_utf8str(&unicodeName);
+
+                                llinfos << "Considering \"" << name << "\"" << llendl;
+
+                                if(info.nodeFlags & kFSNodeIsDirectoryMask)
+                                {
+                                        // This is a directory.  See if it's a .app
+                                        if(name.find(".app") != std::string::npos)
+                                        {
+                                                // Looks promising.  Check to see if it has the right bundle identifier.
+                                                if(isFSRefViewerBundle(&ref))
+                                                {
+                                                        // This is the one.  Return it.
+                                                        *app = ref;
+                                                        found = true;
+                                                }
+                                        }
+                                }
+                        }
+                }
+                while(!err && !found);
+                
+                FSCloseIterator(iterator);
+        }
+        
+        if(!err && !found)
+                err = fnfErr;
+                
+        return err;
+}
+
 void *updatethreadproc(void*)
 {
         char tempDir[PATH_MAX] = "";            /* Flawfinder: ignore */
@@ -670,57 +793,15 @@ void *updatethreadproc(void*)
                         // Sanity check: make sure the target is a bundle with the right identifier
                         if(err == noErr)
                         {
-                                CFURLRef targetURL = NULL;
-                                CFBundleRef targetBundle = NULL;
-                                CFStringRef targetBundleID = NULL;
-                                
                                 // Assume the worst...
                                 err = -1;
-                                
-                                targetURL = CFURLCreateFromFSRef(NULL, &targetRef);
 
-                                if(targetURL == NULL)
-                                {
-                                        llinfos << "Error creating target URL." << llendl;
-                                }
-                                else
+                                if(isFSRefViewerBundle(&targetRef))
                                 {
-                                        targetBundle = CFBundleCreate(NULL, targetURL);
-                                }
-                                
-                                if(targetBundle == NULL)
-                                {
-                                        llinfos << "Failed to create target bundle." << llendl;
-                                }
-                                else
-                                {
-                                        targetBundleID = CFBundleGetIdentifier(targetBundle);
-                                }
-                                
-                                if(targetBundleID == NULL)
-                                {
-                                        llinfos << "Couldn't retrieve target bundle ID." << llendl;
-                                }
-                                else
-                                {
-                                        if(CFStringCompare(targetBundleID, CFSTR("com.secondlife.indra.viewer"), 0) == kCFCompareEqualTo)
-                                        {
-                                                // This is the bundle we're looking for.
-                                                err = noErr;
-                                                replacingTarget = true;
-                                        }
-                                        else
-                                        {
-                                                llinfos << "Target bundle ID mismatch." << llendl;
-                                        }
+                                        // This is the bundle we're looking for.
+                                        err = noErr;
+                                        replacingTarget = true;
                                 }
-                                
-                                // Don't release targetBundleID -- since we don't retain it, it's released when targetBundle is released.
-                                if(targetURL != NULL)
-                                        CFRelease(targetURL);
-                                if(targetBundle != NULL)
-                                        CFRelease(targetBundle);
-                                
                         }
                         
                         // Make sure the target's parent directory is writable.
@@ -943,13 +1024,24 @@ void *updatethreadproc(void*)
                 
                 // Get an FSRef to the new application on the disk image
                 FSRef sourceRef;
-                snprintf(temp, sizeof(temp), "%s/mnt/Second Life.app", tempDir);                
+                FSRef mountRef;
+                snprintf(temp, sizeof(temp), "%s/mnt", tempDir);                
 
-                llinfos << "Source application is: " << temp << llendl;
+                llinfos << "Disk image mount point is: " << temp << llendl;
 
-                err = FSPathMakeRef((UInt8 *)temp, &sourceRef, NULL);
+                err = FSPathMakeRef((UInt8 *)temp, &mountRef, NULL);
                 if(err != noErr)
+                {
+                        llinfos << "Couldn't make FSRef to disk image mount point." << llendl;
                         throw 0;
+                }
+
+                err = findAppBundleOnDiskImage(&mountRef, &sourceRef);
+                if(err != noErr)
+                {
+                        llinfos << "Couldn't find application bundle on mounted disk image." << llendl;
+                        throw 0;
+                }
                 
                 FSRef asideRef;
                 char aside[MAX_PATH];           /* Flawfinder: ignore */
diff --git a/linden/indra/newview/English.lproj/InfoPlist.strings b/linden/indra/newview/English.lproj/InfoPlist.strings
index 8fae01f..9df6a82 100644
--- a/linden/indra/newview/English.lproj/InfoPlist.strings
+++ b/linden/indra/newview/English.lproj/InfoPlist.strings
@@ -1,5 +1,5 @@
 /* Localized versions of Info.plist keys */
 
 CFBundleName = "Second Life";
-CFBundleShortVersionString = "Second Life version 1.16.0.5";
-CFBundleGetInfoString = "Second Life version 1.16.0.5, Copyright 2004-2007 Linden Research, Inc.";
+CFBundleShortVersionString = "Second Life version 1.17.0.12";
+CFBundleGetInfoString = "Second Life version 1.17.0.12, Copyright 2004-2007 Linden Research, Inc.";
diff --git a/linden/indra/newview/Info-SecondLife.plist b/linden/indra/newview/Info-SecondLife.plist
index 764b152..a02f664 100644
--- a/linden/indra/newview/Info-SecondLife.plist
+++ b/linden/indra/newview/Info-SecondLife.plist
@@ -32,7 +32,7 @@
                 </dict>
         </array>
         <key>CFBundleVersion</key>
-        <string>1.16.0.5</string>
+        <string>1.17.0.12</string>
         <key>CSResourcesFileMapped</key>
         <true/>
 </dict>
diff --git a/linden/indra/newview/installers/windows/installer_template.nsi b/linden/indra/newview/installers/windows/installer_template.nsi
index 8ab7c4f..1b5226c 100644
--- a/linden/indra/newview/installers/windows/installer_template.nsi
+++ b/linden/indra/newview/installers/windows/installer_template.nsi
@@ -1,63 +1,70 @@
-;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;

-;;; @file viewer_manifest.py

-;;; @author James Cook, Don Kjer

-;;; @brief NSIS script for creating a Windows installer.

-;;;  This file has variables expanded by viewer_manifest.py 

-;;;  to produce the complete nsi script file.

-;;; For info, see http://www.nullsoft.com/free/nsis/

-;;; NSIS 2.02 or higher required

-;;;

-;;; Copyright (c) 2006-$CurrentYear$, Linden Research, Inc.

-;;; $License$

-;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;

-

-;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;

-;;; Compiler flags

-;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;

-

+;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;

+;; secondlife setup.nsi

+;; Copyright 2004-2007, Linden Research, Inc.

+;; For info, see http://www.nullsoft.com/free/nsis/

+;;

+;; NSIS 2.22 or higher required

+;; Author: James Cook, Don Kjer, Callum Prentice

+;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;

+

+;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;

 ;;; Detect NSIS compiler version

 !define "NSIS${NSIS_VERSION}"

 !ifdef "NSISv2.02" | "NSISv2.03" | "NSISv2.04" | "NSISv2.05" | "NSISv2.06"

-    ;;; before 2.07 defaulted lzma to solid (whole file)

+    ;; before 2.07 defaulted lzma to solid (whole file)

     SetCompressor lzma

 !else

-    ;;; after 2.07 required /solid for whole file compression

+    ;; after 2.07 required /solid for whole file compression

     SetCompressor /solid lzma

 !endif

 

+;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;

+;; Compiler flags

+;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;

 SetOverwrite on                         ; overwrite files

 SetCompress auto                        ; compress iff saves space

-SetDatablockOptimize off                ; only saves us 0.1%, not worth it

-XPStyle on                              ; add an XP manifest to the installer

+SetDatablockOptimize off        ; only saves us 0.1%, not worth it

+XPStyle on                  ; add an XP manifest to the installer

 

-;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;

+;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;

 ;;; Project flags

-;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;

+;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;

 

 %%VERSION%%

 

-;;; Tweak for different servers/builds (this placeholder is replaced by viewer_manifest.py)

+;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;

+;; - language files - one for each language (or flavor thereof)

+;; (these files are in the same place as the nsi template but the python script generates a new nsi file in the 

+;; application directory so we have to add a path to these include files)

+;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;

+#!include "installers\windows\lang_de.nsi"

+!include "installers\windows\lang_en-us.nsi"

+#!include "installers\windows\lang_ja.nsi"

+!include "installers\windows\lang_ko.nsi"

+

+;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;

+;; Tweak for different servers/builds (this placeholder is replaced by viewer_manifest.py)

 %%GRID_VARS%%

 

 Name ${INSTNAME}

 

-SubCaption 0 " Setup"                   ; override "license agreement" text

+SubCaption 0 $(LicenseSubTitleSetup)    ; override "license agreement" text

 

-BrandingText " "                                ; bottom of window text

-Icon res\install_icon.ico               ; our custom icon

+BrandingText " "                                                ; bottom of window text

+Icon res\install_icon.ico                               ; our custom icon

 UninstallIcon res\uninstall_icon.ico    ; our custom icon

-WindowIcon on                                   ; show our icon in left corner

-BGGradient off                                  ; no big background window

-CRCCheck on                                             ; make sure CRC is OK

+WindowIcon on                                                   ; show our icon in left corner

+BGGradient off                                                  ; no big background window

+CRCCheck on                                                             ; make sure CRC is OK

 InstProgressFlags smooth colored                ; new colored smooth look

-ShowInstDetails nevershow               ; no details, no "show" button

-SetOverwrite on                                 ; stomp files by default

-AutoCloseWindow true                    ; after all files install, close window

+ShowInstDetails nevershow                               ; no details, no "show" button

+SetOverwrite on                                                 ; stomp files by default

+AutoCloseWindow true                                    ; after all files install, close window

 

 !ifdef UPDATE

-LicenseText "This package will update Second Life to version ${VERSION_LONG}." "Next >"

+LicenseText $(LicenseDescUpdate) $(LicenseDescNext)

 !else

-LicenseText "This package will install Second Life on your computer." "Next >"

+LicenseText $(LicenseDescSetup) $(LicenseDescNext)

 !endif

 

 LicenseData "releasenotes.txt"

@@ -65,30 +72,30 @@ LicenseData "releasenotes.txt"
 InstallDir "$PROGRAMFILES\${INSTNAME}"

 InstallDirRegKey HKEY_LOCAL_MACHINE "SOFTWARE\Linden Research, Inc.\${INSTNAME}" ""

 !ifdef UPDATE

-DirText "Installation Directory" "Select the Second Life directory to update:"

+DirText $(DirectoryChooseTitle) $(DirectoryChooseUpdate)

 !else

-DirText "Installation Directory" "Select the directory to install Second Life in:"

+DirText $(DirectoryChooseTitle) $(DirectoryChooseSetup)

 !endif

 

-;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;

+;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;

 ;;; Variables

-;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;

+;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;

 Var INSTPROG

 Var INSTEXE

 Var INSTFLAGS

+Var LANGFLAGS

 Var INSTSHORTCUT

 

-;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;

+;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;

 ;;; Sections

-;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;

-

+;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;

 Section ""                                              ; (default section)

 

 SetShellVarContext all                  ; install for all users (if you change this, change it in the uninstall as well)

 

-

 ; Start with some default values.

 StrCpy $INSTFLAGS "${INSTFLAGS}"

+StrCpy $INSTFLAGS "$INSTFLAGS $LANGFLAGS"

 StrCpy $INSTPROG "${INSTNAME}"

 StrCpy $INSTEXE "${INSTEXE}"

 StrCpy $INSTSHORTCUT "${SHORTCUT}"

@@ -103,21 +110,22 @@ Call CheckIfAlreadyCurrent		; Make sure that we haven't already installed this v
 Call CloseSecondLife                    ; Make sure we're not running

 Call RemoveNSIS                                 ; Check for old NSIS install to remove

 

+;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;

 ;;; Don't remove cache files during a regular install, removing the inventory cache on upgrades results in lots of damage to the servers.

 ;Call RemoveCacheFiles                  ; Installing over removes potentially corrupted

                                                                 ; VFS and cache files.

 

-

-;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;

+;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;

 ;;; Files

-;;;

-;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;

+;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;

 ;; This placeholder is replaced by the complete list of all the files in the installer, by viewer_manifest.py

 %%INSTALL_FILES%%

 

+;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;

 ; If this is a silent update, we don't need to re-create these shortcuts or registry entries.

 IfSilent POST_INSTALL

 

+;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;

 ; Shortcuts in start menu

 CreateDirectory "$SMPROGRAMS\$INSTSHORTCUT"

 SetOutPath "$INSTDIR"

@@ -146,6 +154,7 @@ CreateShortCut	"$SMPROGRAMS\$INSTSHORTCUT\SL Scripting Language Help.lnk" \
 CreateShortCut  "$SMPROGRAMS\$INSTSHORTCUT\Uninstall $INSTSHORTCUT.lnk" \

                                 '"$INSTDIR\uninst.exe"' '/P="$INSTPROG"'

 

+;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;

 ; Other shortcuts

 SetOutPath "$INSTDIR"

 CreateShortCut "$DESKTOP\$INSTSHORTCUT.lnk" "$INSTDIR\$INSTEXE" "$INSTFLAGS"

@@ -164,6 +173,7 @@ CreateShortCut "$INSTDIR\$INSTSHORTCUT Museum Spanish.lnk" "$INSTDIR\$INSTEXE" "
 

 !endif

 

+;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;

 ; Write registry

 WriteRegStr HKEY_LOCAL_MACHINE "SOFTWARE\Linden Research, Inc.\$INSTPROG" "" "$INSTDIR"

 WriteRegStr HKEY_LOCAL_MACHINE "SOFTWARE\Linden Research, Inc.\$INSTPROG" "Version" "${VERSION_LONG}"

@@ -173,6 +183,7 @@ WriteRegStr HKEY_LOCAL_MACHINE "SOFTWARE\Linden Research, Inc.\$INSTPROG" "Exe"
 WriteRegStr HKEY_LOCAL_MACHINE "Software\Microsoft\Windows\CurrentVersion\Uninstall\$INSTPROG" "DisplayName" "$INSTPROG (remove only)"

 WriteRegStr HKEY_LOCAL_MACHINE "Software\Microsoft\Windows\CurrentVersion\Uninstall\$INSTPROG" "UninstallString" '"$INSTDIR\uninst.exe" /P="$INSTPROG"'

 

+;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;

 ; Write URL registry info

 WriteRegStr HKEY_CLASSES_ROOT "${URLNAME}" "(default)" "URL:Second Life"

 WriteRegStr HKEY_CLASSES_ROOT "${URLNAME}" "URL Protocol" ""

@@ -192,10 +203,10 @@ WriteUninstaller "$INSTDIR\uninst.exe"
 ; end of default section

 SectionEnd

 

-;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;

+;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;

 ; PostInstallExe

 ; This just runs any post installation scripts.

-;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;

+;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;

 Function PostInstallExe

 push $0

   ReadRegStr $0 HKEY_LOCAL_MACHINE "SOFTWARE\Linden Research, Inc.\$INSTPROG" "PostInstallExe"

@@ -204,11 +215,10 @@ push $0
 pop $0

 FunctionEnd

 

-

-;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;

+;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;

 ; CheckStartupParameters

 ; Sets INSTFLAGS, INSTPROG, and INSTEXE.

-;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;

+;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;

 Function CheckStartupParams

 push $0

 push $R0

@@ -237,7 +247,7 @@ push $R0
   Goto FINISHED

 

 ABORT:

-  MessageBox MB_OK "Could not find the program '$INSTPROG'. Silent update failed."

+  MessageBox MB_OK $(CheckStartupParamsMB)

   Quit

 

 FINISHED:

@@ -246,6 +256,9 @@ pop $R0
 pop $0

 FunctionEnd

 

+;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;

+;;

+;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;

 Function un.CheckStartupParams

 push $0

 push $R0

@@ -274,7 +287,7 @@ push $R0
   Goto FINISHED

 

 ABORT:

-  MessageBox MB_OK "Could not find the program '$INSTPROG'. Silent update failed."

+  MessageBox MB_OK $(CheckStartupParamsMB)

   Quit

 

 FINISHED:

@@ -283,26 +296,26 @@ pop $R0
 pop $0

 FunctionEnd

 

-;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;

+;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;

 ;;; After install completes, offer readme file

-;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;

+;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;

 Function .onInstSuccess

         MessageBox MB_YESNO \

-        "Start Second Life now?" /SD IDYES IDNO NoReadme

+        $(InstSuccesssQuestion) /SD IDYES IDNO NoReadme

                 ; Assumes SetOutPath $INSTDIR

                 Exec '"$INSTDIR\$INSTEXE" $INSTFLAGS'

         NoReadme:

 FunctionEnd

 

-;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;

+;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;

 ; Remove old NSIS version. Modifies no variables.

 ; Does NOT delete the LindenWorld directory, or any

 ; user files in that directory.

-;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;

+;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;

 Function RemoveNSIS

   Push $0

   ; Grab the installation directory of the old version

-  DetailPrint "Checking for old version..."

+  DetailPrint $(RemoveOldNSISVersion)

   ReadRegStr $0 HKEY_LOCAL_MACHINE "SOFTWARE\Linden Research, Inc.\$INSTPROG" ""

 

   ; If key doesn't exist, skip uninstall

@@ -323,9 +336,9 @@ Function RemoveNSIS
   Pop $0

 FunctionEnd

 

-;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;

+;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;

 ; Make sure we're not on Windows 98 / ME

-;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;

+;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;

 Function CheckWindowsVersion

         DetailPrint "Checking Windows version..."

         Call GetWindowsVersion

@@ -339,46 +352,49 @@ Function CheckWindowsVersion
         StrCmp $R0 "NT" win_ver_bad

         Return

 win_ver_bad:

-        MessageBox MB_YESNO 'Second Life only supports Windows XP, Windows 2000, and Mac OS X.$\n$\nAttempting to install on Windows $R0 can result in crashes and data loss.$\n$\nInstall anyway?' IDNO win_ver_abort

+        MessageBox MB_YESNO $(CheckWindowsVersionMB) IDNO win_ver_abort

         Return

 win_ver_abort:

         Quit

 FunctionEnd

 

-;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;

+;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;

 ; Make sure the user can install/uninstall

-;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;

+;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;

 Function CheckIfAdministrator

-                DetailPrint "Checking for permission to install..."

+                DetailPrint $(CheckAdministratorInstDP)

          UserInfo::GetAccountType

          Pop $R0

          StrCmp $R0 "Admin" is_admin

-         MessageBox MB_OK 'You appear to be using a "limited" account.$\nYou must be an "administrator" to install Second Life.'

+         MessageBox MB_OK $(CheckAdministratorInstMB)

          Quit

 is_admin:

          Return

 FunctionEnd

 

+;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;

+;;

+;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;

 Function un.CheckIfAdministrator

-                DetailPrint "Checking for permission to uninstall..."

+                DetailPrint $(CheckAdministratorUnInstDP)

          UserInfo::GetAccountType

          Pop $R0

          StrCmp $R0 "Admin" is_admin

-         MessageBox MB_OK 'You appear to be using a "limited" account.$\nYou must be an "administrator" to uninstall Second Life.'

+         MessageBox MB_OK $(CheckAdministratorUnInstMB)

          Quit

 is_admin:

          Return

 FunctionEnd

 

-;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;

+;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;

 ; Checks to see if the current version has already been installed (according to the registry).

 ; If it has, allow user to bail out of install process.

-;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;

+;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;

 Function CheckIfAlreadyCurrent

   Push $0

         ReadRegStr $0 HKEY_LOCAL_MACHINE "SOFTWARE\Linden Research, Inc.\$INSTPROG" "Version"

     StrCmp $0 ${VERSION_LONG} 0 DONE

-        MessageBox MB_OKCANCEL "It appears that Second Life ${VERSION_LONG} is already installed.$\n$\nWould you like to install it again?" /SD IDOK IDOK DONE

+        MessageBox MB_OKCANCEL $(CheckIfCurrentMB) /SD IDOK IDOK DONE

     Quit

 

   DONE:

@@ -386,22 +402,21 @@ Function CheckIfAlreadyCurrent
     Return

 FunctionEnd

         

-

-;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;

+;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;

 ; Close the program, if running. Modifies no variables.

 ; Allows user to bail out of install process.

-;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;

+;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;

 Function CloseSecondLife

   Push $0

   FindWindow $0 "Second Life" ""

   IntCmp $0 0 DONE

-  MessageBox MB_OKCANCEL "Second Life can't be installed while it is already running.$\n$\nFinish what you're doing then select OK to close Second Life and continue.$\nSelect CANCEL to cancel installation." IDOK CLOSE IDCANCEL CANCEL_INSTALL

+  MessageBox MB_OKCANCEL $(CloseSecondLifeInstMB) IDOK CLOSE IDCANCEL CANCEL_INSTALL

 

   CANCEL_INSTALL:

     Quit

 

   CLOSE:

-    DetailPrint "Waiting for Second Life to shut down..."

+    DetailPrint $(CloseSecondLifeInstDP)

     SendMessage $0 16 0 0

 

   LOOP:

@@ -416,59 +431,59 @@ Function CloseSecondLife
 FunctionEnd

 

 

-;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;

+;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;

 ; Delete files in Documents and Settings\<user>\SecondLife\cache

 ; Delete files in Documents and Settings\All Users\SecondLife\cache

-;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;

-Function RemoveCacheFiles

-

-; Delete files in Documents and Settings\<user>\SecondLife

-Push $0

-Push $1

-Push $2

-  DetailPrint "Deleting cache files in Documents and Settings folder"

-

-  StrCpy $0 0 ; Index number used to iterate via EnumRegKey

-

-  LOOP:

-    EnumRegKey $1 HKEY_LOCAL_MACHINE "SOFTWARE\Microsoft\Windows NT\CurrentVersion\ProfileList" $0

-    StrCmp $1 "" DONE               ; no more users

-

-    ReadRegStr $2 HKEY_LOCAL_MACHINE "SOFTWARE\Microsoft\Windows NT\CurrentVersion\ProfileList\$1" "ProfileImagePath" 

-    StrCmp $2 "" CONTINUE 0         ; "ProfileImagePath" value is missing

-

-    ; Required since ProfileImagePath is of type REG_EXPAND_SZ

-    ExpandEnvStrings $2 $2

-

-        ; When explicitly uninstalling, everything goes away

-    RMDir /r "$2\Application Data\SecondLife\cache"

-

-  CONTINUE:

-    IntOp $0 $0 + 1

-    Goto LOOP

-  DONE:

-Pop $2

-Pop $1

-Pop $0

-

-; Delete files in Documents and Settings\All Users\SecondLife

-Push $0

-  ReadRegStr $0 HKEY_LOCAL_MACHINE "SOFTWARE\Microsoft\Windows\CurrentVersion\Explorer\Shell Folders" "Common AppData"

-  StrCmp $0 "" +2

-  RMDir /r "$0\SecondLife\cache"

-Pop $0

-

-; Delete filse in C:\Windows\Application Data\SecondLife

-; If the user is running on a pre-NT system, Application Data lives here instead of

-; in Documents and Settings.

-RMDir /r "$WINDIR\Application Data\SecondLife\cache"

-

-FunctionEnd

+;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;

+;Function RemoveCacheFiles

+;

+;; Delete files in Documents and Settings\<user>\SecondLife

+;Push $0

+;Push $1

+;Push $2

+;  DetailPrint $(RemoveCacheFilesDP)

+;

+;  StrCpy $0 0 ; Index number used to iterate via EnumRegKey

+;

+;  LOOP:

+;    EnumRegKey $1 HKEY_LOCAL_MACHINE "SOFTWARE\Microsoft\Windows NT\CurrentVersion\ProfileList" $0

+;    StrCmp $1 "" DONE               ; no more users

+;

+;    ReadRegStr $2 HKEY_LOCAL_MACHINE "SOFTWARE\Microsoft\Windows NT\CurrentVersion\ProfileList\$1" "ProfileImagePath" 

+;    StrCmp $2 "" CONTINUE 0         ; "ProfileImagePath" value is missing

+;

+;    ; Required since ProfileImagePath is of type REG_EXPAND_SZ

+;    ExpandEnvStrings $2 $2

+;

+;       ; When explicitly uninstalling, everything goes away

+;    RMDir /r "$2\Application Data\SecondLife\cache"

+;

+;  CONTINUE:

+;    IntOp $0 $0 + 1

+;    Goto LOOP

+;  DONE:

+;Pop $2

+;Pop $1

+;Pop $0

+;

+;; Delete files in Documents and Settings\All Users\SecondLife

+;Push $0

+;  ReadRegStr $0 HKEY_LOCAL_MACHINE "SOFTWARE\Microsoft\Windows\CurrentVersion\Explorer\Shell Folders" "Common AppData"

+;  StrCmp $0 "" +2

+;  RMDir /r "$0\SecondLife\cache"

+;Pop $0

+;

+;; Delete filse in C:\Windows\Application Data\SecondLife

+;; If the user is running on a pre-NT system, Application Data lives here instead of

+;; in Documents and Settings.

+;RMDir /r "$WINDIR\Application Data\SecondLife\cache"

+;

+;FunctionEnd

 

-;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;

+;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;

 ; Delete files in Documents and Settings\<user>\SecondLife

 ; Delete files in Documents and Settings\All Users\SecondLife

-;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;

+;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;

 Function un.DocumentsAndSettingsFolder

 

 ; Delete files in Documents and Settings\<user>\SecondLife

@@ -522,21 +537,21 @@ RMDir /r "$WINDIR\Application Data\SecondLife"
 

 FunctionEnd

 

-;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;

+;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;

 ; Close the program, if running. Modifies no variables.

 ; Allows user to bail out of uninstall process.

-;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;

+;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;

 Function un.CloseSecondLife

   Push $0

   FindWindow $0 "Second Life" ""

   IntCmp $0 0 DONE

-  MessageBox MB_OKCANCEL "Second Life can't be uninstalled while it is already running.$\n$\nFinish what you're doing then select OK to close Second Life and continue.$\nSelect CANCEL to cancel installation." IDOK CLOSE IDCANCEL CANCEL_UNINSTALL

+  MessageBox MB_OKCANCEL $(CloseSecondLifeUnInstMB) IDOK CLOSE IDCANCEL CANCEL_UNINSTALL

 

   CANCEL_UNINSTALL:

     Quit

 

   CLOSE:

-    DetailPrint "Waiting for Second Life to shut down..."

+    DetailPrint $(CloseSecondLifeUnInstDP)

     SendMessage $0 16 0 0

 

   LOOP:

@@ -550,7 +565,7 @@ Function un.CloseSecondLife
     Return

 FunctionEnd

 

-;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;

+;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;

 ;;; Delete the installed files

 ;;; This deletes the uninstall executable, but it works 

 ;;; because it is copied to temp directory before running

@@ -558,7 +573,7 @@ FunctionEnd
 ;;; Note:  You must list all files here, because we only

 ;;; want to delete our files, not things users left in the

 ;;; application directories.

-;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;

+;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;

 Function un.ProgramFiles

 

 ;; Remove mozilla file first so recursive directory deletion doesn't get hung up

@@ -597,26 +612,26 @@ RMDir "$INSTDIR"
 IfFileExists "$INSTDIR" FOLDERFOUND NOFOLDER

 

 FOLDERFOUND:

-  MessageBox MB_YESNO "There are still files in your SecondLife program directory.$\n$\nThese are possibly files you created or moved to:$\n$INSTDIR$\n$\nDo you want to remove them?" IDNO NOFOLDER

+  MessageBox MB_YESNO $(DeleteProgramFilesMB) IDNO NOFOLDER

   RMDir /r "$INSTDIR"

 

 NOFOLDER:

 

 FunctionEnd

 

-;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;

+;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;

 ;;; Uninstall settings

-;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;

-UninstallText "This will uninstall Second Life ${VERSION_LONG} from your system."

+;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;

+UninstallText $(UninstallTextMsg)

 ShowUninstDetails show

 

-;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;

+;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;

 ;;; Uninstall section

-;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;

+;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;

 Section Uninstall

 

 ; Start with some default values.

-StrCpy $INSTFLAGS "${INSTFLAGS}"

+StrCpy $INSTFLAGS ""

 StrCpy $INSTPROG "${INSTNAME}"

 StrCpy $INSTEXE "${INSTEXE}"

 StrCpy $INSTSHORTCUT "${SHORTCUT}"

@@ -629,9 +644,10 @@ SetShellVarContext all
 ; Make sure we're not running

 Call un.CloseSecondLife

 

-; Clean up registry keys

+; Clean up registry keys (these should all be !defines somewhere)

 DeleteRegKey HKEY_LOCAL_MACHINE "SOFTWARE\Linden Research, Inc.\$INSTPROG"

 DeleteRegKey HKEY_LOCAL_MACHINE "SOFTWARE\Microsoft\Windows\CurrentVersion\Uninstall\$INSTPROG"

+DeleteRegKey HKEY_LOCAL_MACHINE "Software\Linden Research, Inc.\Installer Language" 

 

 ; Clean up shortcuts

 Delete "$SMPROGRAMS\$INSTSHORTCUT\*.*"

@@ -652,7 +668,7 @@ Call un.ProgramFiles
 

 SectionEnd                              ; end of uninstall section

 

-;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;

+;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;

 ; (From the NSIS wiki, DK)

 ; GetParameterValue

 ;

@@ -667,7 +683,7 @@ SectionEnd 				; end of uninstall section
 ; or:

 ; foo.exe /S "/L=1033" /D="C:\Program Files\Foo"

 ; gpv "/L=" "1033"

-;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;

+;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;

 

  !macro GetParameterValue SWITCH DEFAULT

    Push $0

@@ -770,7 +786,7 @@ Function un.GetProgramName
   !insertmacro GetParameterValue "/P=" "SecondLife"

 FunctionEnd

 

-;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;

+;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;

 ; (From the NSIS documentation, JC)

 ; GetWindowsVersion

 ;

@@ -787,8 +803,7 @@ FunctionEnd
 ;   Call GetWindowsVersion

 ;   Pop $R0

 ;   ; at this point $R0 is "NT 4.0" or whatnot

-;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;

- 

+;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;

 Function GetWindowsVersion

  

    Push $R0

@@ -860,3 +875,61 @@ Function GetWindowsVersion
    Exch $R0

  

 FunctionEnd

+

+;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;

+;;  Note: to add new languages, add a language file include to the list 

+;;  at the top of this file, add an entry to the menu and then add an 

+;;  entry to the language ID selector below

+;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;

+Function .onInit

+

+        ; read the language from registry (ok if not there) and set langauge menu

+        ReadRegStr $0 HKEY_LOCAL_MACHINE "SOFTWARE\Linden Research, Inc.\${INSTNAME}" "InstallerLanguage"

+        StrCpy $LANGUAGE $0

+

+        Push ""

+        Push ${LANG_ENGLISH}

+        Push English

+#       Push ${LANG_GERMAN}

+#       Push German

+#       Push ${LANG_JAPANESE}

+#       Push Japanese

+        Push ${LANG_KOREAN}

+        Push Korean

+        Push A ; A means auto count languages for the auto count to work the first empty push (Push "") must remain

+        LangDLL::LangDialog "Installer Language" "Please select the language of the installer"

+        Pop $LANGUAGE

+        StrCmp $LANGUAGE "cancel" 0 +2

+                Abort

+

+        ; save language in registry             

+        WriteRegStr HKEY_LOCAL_MACHINE "SOFTWARE\Linden Research, Inc.\${INSTNAME}" "InstallerLanguage" $LANGUAGE

+        

+        ; generate language ID that will be used as a command line arg  

+        StrCmp $LANGUAGE "1042" 0 +3

+        StrCpy $LANGFLAGS " -set SystemLanguage ko"

+        Goto EndOfFunc

+#       StrCmp $LANGUAGE "1041" 0 +3

+#       StrCpy $LANGFLAGS " -set SystemLanguage ja"

+#       Goto EndOfFunc

+#       StrCmp $LANGUAGE "1031" 0 +3

+#       StrCpy $LANGFLAGS " -set SystemLanguage de"

+#       Goto EndOfFunc

+        StrCmp $LANGUAGE "1033" 0 +3

+        StrCpy $LANGFLAGS " -set SystemLanguage en-us"

+        Goto EndOfFunc

+        

+        EndOfFunc:

+

+FunctionEnd

+

+;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;

+Function un.onInit

+

+        ; read language from registry and set for ininstaller

+        ReadRegStr $0 HKEY_LOCAL_MACHINE "SOFTWARE\Linden Research, Inc.\${INSTNAME}" "InstallerLanguage"

+        StrCpy $LANGUAGE $0

+

+FunctionEnd

+

+;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;; EOF  ;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
\ No newline at end of file
diff --git a/linden/indra/newview/installers/windows/installer_template_multilang.nsi b/linden/indra/newview/installers/windows/installer_template_multilang.nsi
deleted file mode 100644
index b722a0f..0000000
--- a/linden/indra/newview/installers/windows/installer_template_multilang.nsi
+++ /dev/null
@@ -1,938 +0,0 @@
-;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;

-;; secondlife setup.nsi

-;; Copyright 2004-2007, Linden Research, Inc.

-;; For info, see http://www.nullsoft.com/free/nsis/

-;;

-;; NSIS 2.22 or higher required

-;; Author: James Cook, Don Kjer, Callum Prentice

-;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;

-

-;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;

-;;; Detect NSIS compiler version

-!define "NSIS${NSIS_VERSION}"

-!ifdef "NSISv2.02" | "NSISv2.03" | "NSISv2.04" | "NSISv2.05" | "NSISv2.06"

-    ;; before 2.07 defaulted lzma to solid (whole file)

-    SetCompressor lzma

-!else

-    ;; after 2.07 required /solid for whole file compression

-    SetCompressor /solid lzma

-!endif

-

-;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;

-;; Compiler flags

-;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;

-SetOverwrite on                         ; overwrite files

-SetCompress auto                        ; compress iff saves space

-SetDatablockOptimize off        ; only saves us 0.1%, not worth it

-XPStyle on                  ; add an XP manifest to the installer

-

-;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;

-;;; Project flags

-;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;

-

-%%VERSION%%

-

-;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;

-;; - language files - one for each language (or flavor thereof)

-;; (these files are in the same place as the nsi template but the python script generates a new nsi file in the 

-;; application directory so we have to add a path to these include files)

-;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;

-!include "installers\windows\lang_de.nsi"

-!include "installers\windows\lang_en-us.nsi"

-!include "installers\windows\lang_ja.nsi"

-!include "installers\windows\lang_ko.nsi"

-

-;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;

-;; Tweak for different servers/builds (this placeholder is replaced by viewer_manifest.py)

-%%GRID_VARS%%

-

-Name ${INSTNAME}

-

-SubCaption 0 $(LicenseSubTitleSetup)    ; override "license agreement" text

-

-BrandingText " "                                                ; bottom of window text

-Icon res\install_icon.ico                               ; our custom icon

-UninstallIcon res\uninstall_icon.ico    ; our custom icon

-WindowIcon on                                                   ; show our icon in left corner

-BGGradient off                                                  ; no big background window

-CRCCheck on                                                             ; make sure CRC is OK

-InstProgressFlags smooth colored                ; new colored smooth look

-ShowInstDetails nevershow                               ; no details, no "show" button

-SetOverwrite on                                                 ; stomp files by default

-AutoCloseWindow true                                    ; after all files install, close window

-

-!ifdef UPDATE

-LicenseText $(LicenseDescUpdate) $(LicenseDescNext)

-!else

-LicenseText $(LicenseDescSetup) $(LicenseDescNext)

-!endif

-

-LicenseData "releasenotes.txt"

-

-InstallDir "$PROGRAMFILES\${INSTNAME}"

-InstallDirRegKey HKEY_LOCAL_MACHINE "SOFTWARE\Linden Research, Inc.\${INSTNAME}" ""

-!ifdef UPDATE

-DirText $(DirectoryChooseTitle) $(DirectoryChooseUpdate)

-!else

-DirText $(DirectoryChooseTitle) $(DirectoryChooseSetup)

-!endif

-

-;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;

-;;; Variables

-;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;

-Var INSTPROG

-Var INSTEXE

-Var INSTFLAGS

-Var LANGFLAGS

-Var INSTSHORTCUT

-

-;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;

-;;; Sections

-;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;

-Section ""                                              ; (default section)

-

-SetShellVarContext all                  ; install for all users (if you change this, change it in the uninstall as well)

-

-; Start with some default values.

-StrCpy $INSTFLAGS "${INSTFLAGS}"

-StrCpy $INSTFLAGS "$INSTFLAGS $LANGFLAGS"

-StrCpy $INSTPROG "${INSTNAME}"

-StrCpy $INSTEXE "${INSTEXE}"

-StrCpy $INSTSHORTCUT "${SHORTCUT}"

-

-IfSilent +2

-Goto NOT_SILENT

-  Call CheckStartupParams                 ; Figure out where, what and how to install.

-NOT_SILENT:

-Call CheckWindowsVersion                ; warn if on Windows 98/ME

-Call CheckIfAdministrator               ; Make sure the user can install/uninstall

-Call CheckIfAlreadyCurrent              ; Make sure that we haven't already installed this version

-Call CloseSecondLife                    ; Make sure we're not running

-Call RemoveNSIS                                 ; Check for old NSIS install to remove

-

-;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;

-;;; Don't remove cache files during a regular install, removing the inventory cache on upgrades results in lots of damage to the servers.

-;Call RemoveCacheFiles                  ; Installing over removes potentially corrupted

-                                                                ; VFS and cache files.

-

-;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;

-;;; Files

-;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;

-;; This placeholder is replaced by the complete list of all the files in the installer, by viewer_manifest.py

-%%INSTALL_FILES%%

-

-;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;

-; If this is a silent update, we don't need to re-create these shortcuts or registry entries.

-IfSilent POST_INSTALL

-

-;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;

-; Shortcuts in start menu

-CreateDirectory "$SMPROGRAMS\$INSTSHORTCUT"

-SetOutPath "$INSTDIR"

-CreateShortCut  "$SMPROGRAMS\$INSTSHORTCUT\$INSTSHORTCUT.lnk" \

-                                "$INSTDIR\$INSTEXE" "$INSTFLAGS"

-

-!ifdef MUSEUM

-CreateShortCut  "$SMPROGRAMS\$INSTSHORTCUT\$INSTSHORTCUT Museum.lnk" \

-

-                                "$INSTDIR\$INSTEXE" "$INSTFLAGS -simple"

-CreateShortCut  "$SMPROGRAMS\$INSTSHORTCUT\$INSTSHORTCUT Museum Spanish.lnk" \

-

-                                "$INSTDIR\$INSTEXE" "$INSTFLAGS -simple -spanish"

-!endif

-

-WriteINIStr             "$SMPROGRAMS\$INSTSHORTCUT\SL Create Trial Account.url" \

-                                "InternetShortcut" "URL" \

-                                "http://www.secondlife.com/registration/"

-WriteINIStr             "$SMPROGRAMS\$INSTSHORTCUT\SL Your Account.url" \

-                                "InternetShortcut" "URL" \

-                                "http://www.secondlife.com/account/"

-CreateShortCut  "$SMPROGRAMS\$INSTSHORTCUT\SL Release Notes.lnk" \

-                                "$INSTDIR\releasenotes.txt"

-CreateShortCut  "$SMPROGRAMS\$INSTSHORTCUT\SL Scripting Language Help.lnk" \

-                                "$INSTDIR\lsl_guide.html"

-CreateShortCut  "$SMPROGRAMS\$INSTSHORTCUT\Uninstall $INSTSHORTCUT.lnk" \

-                                '"$INSTDIR\uninst.exe"' '/P="$INSTPROG"'

-

-;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;

-; Other shortcuts

-SetOutPath "$INSTDIR"

-CreateShortCut "$DESKTOP\$INSTSHORTCUT.lnk" "$INSTDIR\$INSTEXE" "$INSTFLAGS"

-CreateShortCut "$INSTDIR\$INSTSHORTCUT.lnk" "$INSTDIR\$INSTEXE" "$INSTFLAGS"

-CreateShortCut "$INSTDIR\Uninstall $INSTSHORTCUT.lnk" \

-                                '"$INSTDIR\uninst.exe"' '/P="$INSTPROG"'

-

-!ifdef MUSEUM

-CreateShortCut "$DESKTOP\$INSTSHORTCUT Museum.lnk" "$INSTDIR\$INSTEXE" "$INSTFLAGS -simple"

-

-CreateShortCut "$DESKTOP\$INSTSHORTCUT Museum Spanish.lnk" "$INSTDIR\$INSTEXE" "$INSTFLAGS -simple -spanish"

-

-CreateShortCut "$INSTDIR\$INSTSHORTCUT Museum.lnk" "$INSTDIR\$INSTEXE" "$INSTFLAGS -simple"

-

-CreateShortCut "$INSTDIR\$INSTSHORTCUT Museum Spanish.lnk" "$INSTDIR\$INSTEXE" "$INSTFLAGS -simple -spanish"

-

-!endif

-

-;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;

-; Write registry

-WriteRegStr HKEY_LOCAL_MACHINE "SOFTWARE\Linden Research, Inc.\$INSTPROG" "" "$INSTDIR"

-WriteRegStr HKEY_LOCAL_MACHINE "SOFTWARE\Linden Research, Inc.\$INSTPROG" "Version" "${VERSION_LONG}"

-WriteRegStr HKEY_LOCAL_MACHINE "SOFTWARE\Linden Research, Inc.\$INSTPROG" "Flags" "$INSTFLAGS"

-WriteRegStr HKEY_LOCAL_MACHINE "SOFTWARE\Linden Research, Inc.\$INSTPROG" "Shortcut" "$INSTSHORTCUT"

-WriteRegStr HKEY_LOCAL_MACHINE "SOFTWARE\Linden Research, Inc.\$INSTPROG" "Exe" "$INSTEXE"

-WriteRegStr HKEY_LOCAL_MACHINE "Software\Microsoft\Windows\CurrentVersion\Uninstall\$INSTPROG" "DisplayName" "$INSTPROG (remove only)"

-WriteRegStr HKEY_LOCAL_MACHINE "Software\Microsoft\Windows\CurrentVersion\Uninstall\$INSTPROG" "UninstallString" '"$INSTDIR\uninst.exe" /P="$INSTPROG"'

-

-;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;

-; Write URL registry info

-WriteRegStr HKEY_CLASSES_ROOT "${URLNAME}" "(default)" "URL:Second Life"

-WriteRegStr HKEY_CLASSES_ROOT "${URLNAME}" "URL Protocol" ""

-WriteRegStr HKEY_CLASSES_ROOT "${URLNAME}\DefaultIcon" "" '"$INSTDIR\$INSTEXE"'

-WriteRegExpandStr HKEY_CLASSES_ROOT "${URLNAME}\shell\open\command" "" '"$INSTDIR\$INSTEXE" $INSTFLAGS -url "%1"'

-

-Goto WRITE_UNINST

-

-POST_INSTALL:

-; Run a post-executable script if necessary.

-Call PostInstallExe

-

-WRITE_UNINST:

-; write out uninstaller

-WriteUninstaller "$INSTDIR\uninst.exe"

-

-; end of default section

-SectionEnd

-

-;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;

-; PostInstallExe

-; This just runs any post installation scripts.

-;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;

-Function PostInstallExe

-push $0

-  ReadRegStr $0 HKEY_LOCAL_MACHINE "SOFTWARE\Linden Research, Inc.\$INSTPROG" "PostInstallExe"

-  ;MessageBox MB_OK '$0'

-  ExecWait '$0'

-pop $0

-FunctionEnd

-

-;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;

-; CheckStartupParameters

-; Sets INSTFLAGS, INSTPROG, and INSTEXE.

-;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;

-Function CheckStartupParams

-push $0

-push $R0

-

-  ; Look for a registry entry with info about where to update.

-  Call GetProgramName

-  pop $R0

-  StrCpy $INSTPROG "$R0"

-  StrCpy $INSTEXE "$R0.exe"

-

-  ReadRegStr $0 HKEY_LOCAL_MACHINE "SOFTWARE\Linden Research, Inc.\$INSTPROG" ""

-  ; If key doesn't exist, skip install

-  IfErrors ABORT

-  StrCpy $INSTDIR "$0"

-

-  ; We now have a directory to install to.  Get the startup parameters and shortcut as well.

-  ReadRegStr $0 HKEY_LOCAL_MACHINE "SOFTWARE\Linden Research, Inc.\$INSTPROG" "Flags"

-  IfErrors +2

-  StrCpy $INSTFLAGS "$0"

-  ReadRegStr $0 HKEY_LOCAL_MACHINE "SOFTWARE\Linden Research, Inc.\$INSTPROG" "Shortcut"

-  IfErrors +2

-  StrCpy $INSTSHORTCUT "$0"

-  ReadRegStr $0 HKEY_LOCAL_MACHINE "SOFTWARE\Linden Research, Inc.\$INSTPROG" "Exe"

-  IfErrors +2

-  StrCpy $INSTEXE "$0"

-  Goto FINISHED

-

-ABORT:

-  MessageBox MB_OK $(CheckStartupParamsMB)

-  Quit

-

-FINISHED:

-  ;MessageBox MB_OK "INSTPROG: $INSTPROG, INSTEXE: $INSTEXE, INSTFLAGS: $INSTFLAGS"

-pop $R0

-pop $0

-FunctionEnd

-

-;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;

-;;

-;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;

-Function un.CheckStartupParams

-push $0

-push $R0

-

-  ; Look for a registry entry with info about where to update.

-  Call un.GetProgramName

-  pop $R0

-  StrCpy $INSTPROG "$R0"

-  StrCpy $INSTEXE "$R0.exe"

-

-  ReadRegStr $0 HKEY_LOCAL_MACHINE "SOFTWARE\Linden Research, Inc.\$INSTPROG" ""

-  ; If key doesn't exist, skip install

-  IfErrors ABORT

-  StrCpy $INSTDIR "$0"

-

-  ; We now have a directory to install to.  Get the startup parameters and shortcut as well.

-  ReadRegStr $0 HKEY_LOCAL_MACHINE "SOFTWARE\Linden Research, Inc.\$INSTPROG" "Flags"

-  IfErrors +2

-  StrCpy $INSTFLAGS "$0"

-  ReadRegStr $0 HKEY_LOCAL_MACHINE "SOFTWARE\Linden Research, Inc.\$INSTPROG" "Shortcut"

-  IfErrors +2

-  StrCpy $INSTSHORTCUT "$0"

-  ReadRegStr $0 HKEY_LOCAL_MACHINE "SOFTWARE\Linden Research, Inc.\$INSTPROG" "Exe"

-  IfErrors +2

-  StrCpy $INSTEXE "$0"

-  Goto FINISHED

-

-ABORT:

-  MessageBox MB_OK $(CheckStartupParamsMB)

-  Quit

-

-FINISHED:

-  ;MessageBox MB_OK "INSTPROG: $INSTPROG, INSTEXE: $INSTEXE, INSTFLAGS: $INSTFLAGS"

-pop $R0

-pop $0

-FunctionEnd

-

-;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;

-;;; After install completes, offer readme file

-;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;

-Function .onInstSuccess

-        MessageBox MB_YESNO \

-        $(InstSuccesssQuestion) /SD IDYES IDNO NoReadme

-                ; Assumes SetOutPath $INSTDIR

-                Exec '"$INSTDIR\$INSTEXE" $INSTFLAGS'

-        NoReadme:

-FunctionEnd

-

-;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;

-; Remove old NSIS version. Modifies no variables.

-; Does NOT delete the LindenWorld directory, or any

-; user files in that directory.

-;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;

-Function RemoveNSIS

-  Push $0

-  ; Grab the installation directory of the old version

-  DetailPrint $(RemoveOldNSISVersion)

-  ReadRegStr $0 HKEY_LOCAL_MACHINE "SOFTWARE\Linden Research, Inc.\$INSTPROG" ""

-

-  ; If key doesn't exist, skip uninstall

-  IfErrors NO_NSIS

-

-  ; Clean up legacy beta shortcuts

-  Delete "$SMPROGRAMS\Second Life Beta.lnk"

-  Delete "$DESKTOP\Second Life Beta.lnk"

-  Delete "$SMPROGRAMS\Second Life.lnk"

-  

-  ; Clean up old newview.exe file

-  Delete "$INSTDIR\newview.exe"

-

-  ; Intentionally don't delete the stuff in

-  ; Documents and Settings, so we keep the user's settings

-

-  NO_NSIS:

-  Pop $0

-FunctionEnd

-

-;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;

-; Make sure we're not on Windows 98 / ME

-;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;

-Function CheckWindowsVersion

-        DetailPrint "Checking Windows version..."

-        Call GetWindowsVersion

-        Pop $R0

-        ; Just get first two characters, ignore 4.0 part of "NT 4.0"

-        StrCpy $R0 $R0 2

-        ; Blacklist certain OS versions

-        StrCmp $R0 "95" win_ver_bad

-        StrCmp $R0 "98" win_ver_bad

-        StrCmp $R0 "ME" win_ver_bad

-        StrCmp $R0 "NT" win_ver_bad

-        Return

-win_ver_bad:

-        MessageBox MB_YESNO $(CheckWindowsVersionMB) IDNO win_ver_abort

-        Return

-win_ver_abort:

-        Quit

-FunctionEnd

-

-;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;

-; Make sure the user can install/uninstall

-;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;

-Function CheckIfAdministrator

-                DetailPrint $(CheckAdministratorInstDP)

-         UserInfo::GetAccountType

-         Pop $R0

-         StrCmp $R0 "Admin" is_admin

-         MessageBox MB_OK $(CheckAdministratorInstMB)

-         Quit

-is_admin:

-         Return

-FunctionEnd

-

-;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;

-;;

-;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;

-Function un.CheckIfAdministrator

-                DetailPrint $(CheckAdministratorUnInstDP)

-         UserInfo::GetAccountType

-         Pop $R0

-         StrCmp $R0 "Admin" is_admin

-         MessageBox MB_OK $(CheckAdministratorUnInstMB)

-         Quit

-is_admin:

-         Return

-FunctionEnd

-

-;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;

-; Checks to see if the current version has already been installed (according to the registry).

-; If it has, allow user to bail out of install process.

-;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;

-Function CheckIfAlreadyCurrent

-  Push $0

-        ReadRegStr $0 HKEY_LOCAL_MACHINE "SOFTWARE\Linden Research, Inc.\$INSTPROG" "Version"

-    StrCmp $0 ${VERSION_LONG} 0 DONE

-        MessageBox MB_OKCANCEL $(CheckIfCurrentMB) /SD IDOK IDOK DONE

-    Quit

-

-  DONE:

-    Pop $0

-    Return

-FunctionEnd

-        

-;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;

-; Close the program, if running. Modifies no variables.

-; Allows user to bail out of install process.

-;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;

-Function CloseSecondLife

-  Push $0

-  FindWindow $0 "Second Life" ""

-  IntCmp $0 0 DONE

-  MessageBox MB_OKCANCEL $(CloseSecondLifeInstMB) IDOK CLOSE IDCANCEL CANCEL_INSTALL

-

-  CANCEL_INSTALL:

-    Quit

-

-  CLOSE:

-    DetailPrint $(CloseSecondLifeInstDP)

-    SendMessage $0 16 0 0

-

-  LOOP:

-          FindWindow $0 "Second Life" ""

-          IntCmp $0 0 DONE

-          Sleep 500

-          Goto LOOP

-

-  DONE:

-    Pop $0

-    Return

-FunctionEnd

-

-

-;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;

-; Delete files in Documents and Settings\<user>\SecondLife\cache

-; Delete files in Documents and Settings\All Users\SecondLife\cache

-;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;

-;Function RemoveCacheFiles

-;

-;; Delete files in Documents and Settings\<user>\SecondLife

-;Push $0

-;Push $1

-;Push $2

-;  DetailPrint $(RemoveCacheFilesDP)

-;

-;  StrCpy $0 0 ; Index number used to iterate via EnumRegKey

-;

-;  LOOP:

-;    EnumRegKey $1 HKEY_LOCAL_MACHINE "SOFTWARE\Microsoft\Windows NT\CurrentVersion\ProfileList" $0

-;    StrCmp $1 "" DONE               ; no more users

-;

-;    ReadRegStr $2 HKEY_LOCAL_MACHINE "SOFTWARE\Microsoft\Windows NT\CurrentVersion\ProfileList\$1" "ProfileImagePath" 

-;    StrCmp $2 "" CONTINUE 0         ; "ProfileImagePath" value is missing

-;

-;    ; Required since ProfileImagePath is of type REG_EXPAND_SZ

-;    ExpandEnvStrings $2 $2

-;

-;       ; When explicitly uninstalling, everything goes away

-;    RMDir /r "$2\Application Data\SecondLife\cache"

-;

-;  CONTINUE:

-;    IntOp $0 $0 + 1

-;    Goto LOOP

-;  DONE:

-;Pop $2

-;Pop $1

-;Pop $0

-;

-;; Delete files in Documents and Settings\All Users\SecondLife

-;Push $0

-;  ReadRegStr $0 HKEY_LOCAL_MACHINE "SOFTWARE\Microsoft\Windows\CurrentVersion\Explorer\Shell Folders" "Common AppData"

-;  StrCmp $0 "" +2

-;  RMDir /r "$0\SecondLife\cache"

-;Pop $0

-;

-;; Delete filse in C:\Windows\Application Data\SecondLife

-;; If the user is running on a pre-NT system, Application Data lives here instead of

-;; in Documents and Settings.

-;RMDir /r "$WINDIR\Application Data\SecondLife\cache"

-;

-;FunctionEnd

-

-;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;

-; Delete files in Documents and Settings\<user>\SecondLife

-; Delete files in Documents and Settings\All Users\SecondLife

-;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;

-;Function un.DocumentsAndSettingsFolder

-;

-;; Delete files in Documents and Settings\<user>\SecondLife

-;Push $0

-;Push $1

-;Push $2

-;

-;  DetailPrint "Deleting files in Documents and Settings folder"

-;

-;  StrCpy $0 0 ; Index number used to iterate via EnumRegKey

-;

-;  LOOP:

-;    EnumRegKey $1 HKEY_LOCAL_MACHINE "SOFTWARE\Microsoft\Windows NT\CurrentVersion\ProfileList" $0

-;    StrCmp $1 "" DONE               ; no more users

-;

-;    ReadRegStr $2 HKEY_LOCAL_MACHINE "SOFTWARE\Microsoft\Windows NT\CurrentVersion\ProfileList\$1" "ProfileImagePath" 

-;    StrCmp $2 "" CONTINUE 0         ; "ProfileImagePath" value is missing

-;

-;    ; Required since ProfileImagePath is of type REG_EXPAND_SZ

-;    ExpandEnvStrings $2 $2

-;

-;       ; If uninstalling a normal install remove everything

-;       ; Otherwise (preview/dmz etc) just remove cache

-;    StrCmp $INSTFLAGS "" RM_ALL RM_CACHE

-;      RM_ALL:

-;        RMDir /r "$2\Application Data\SecondLife"

-;        GoTo CONTINUE

-;      RM_CACHE:

-;        RMDir /r "$2\Application Data\SecondLife\Cache"

-;

-;  CONTINUE:

-;    IntOp $0 $0 + 1

-;    Goto LOOP

-;  DONE:

-;

-;Pop $2

-;Pop $1

-;Pop $0

-;

-;; Delete files in Documents and Settings\All Users\SecondLife

-;Push $0

-;  ReadRegStr $0 HKEY_LOCAL_MACHINE "SOFTWARE\Microsoft\Windows\CurrentVersion\Explorer\Shell Folders" "Common AppData"

-;  StrCmp $0 "" +2

-;  RMDir /r "$0\SecondLife"

-;Pop $0

-;

-;; Delete filse in C:\Windows\Application Data\SecondLife

-;; If the user is running on a pre-NT system, Application Data lives here instead of

-;; in Documents and Settings.

-;RMDir /r "$WINDIR\Application Data\SecondLife"

-;

-;FunctionEnd

-

-;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;

-; Close the program, if running. Modifies no variables.

-; Allows user to bail out of uninstall process.

-;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;

-Function un.CloseSecondLife

-  Push $0

-  FindWindow $0 "Second Life" ""

-  IntCmp $0 0 DONE

-  MessageBox MB_OKCANCEL $(CloseSecondLifeUnInstMB) IDOK CLOSE IDCANCEL CANCEL_UNINSTALL

-

-  CANCEL_UNINSTALL:

-    Quit

-

-  CLOSE:

-    DetailPrint $(CloseSecondLifeUnInstDP)

-    SendMessage $0 16 0 0

-

-  LOOP:

-          FindWindow $0 "Second Life" ""

-          IntCmp $0 0 DONE

-          Sleep 500

-          Goto LOOP

-

-  DONE:

-    Pop $0

-    Return

-FunctionEnd

-

-;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;

-;;; Delete the installed files

-;;; This deletes the uninstall executable, but it works 

-;;; because it is copied to temp directory before running

-;;;

-;;; Note:  You must list all files here, because we only

-;;; want to delete our files, not things users left in the

-;;; application directories.

-;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;

-Function un.ProgramFiles

-

-;; Remove mozilla file first so recursive directory deletion doesn't get hung up

-Delete "$INSTDIR\app_settings\mozilla\components"

-

-;; This placeholder is replaced by the complete list of files to uninstall by viewer_manifest.py

-%%DELETE_FILES%%

-

-;; Optional/obsolete files.  Delete won't fail if they don't exist.

-Delete "$INSTDIR\dronesettings.ini"

-Delete "$INSTDIR\message_template.msg"

-Delete "$INSTDIR\newview.pdb"

-Delete "$INSTDIR\newview.map"

-Delete "$INSTDIR\SecondLife.pdb"

-Delete "$INSTDIR\SecondLife.map"

-Delete "$INSTDIR\comm.dat"

-Delete "$INSTDIR\*.glsl"

-Delete "$INSTDIR\motions\*.lla"

-Delete "$INSTDIR\trial\*.html"

-Delete "$INSTDIR\newview.exe"

-;; Remove entire help directory

-Delete "$INSTDIR\help\Advanced\*"

-RMDir  "$INSTDIR\help\Advanced"

-Delete "$INSTDIR\help\basics\*"

-RMDir  "$INSTDIR\help\basics"

-Delete "$INSTDIR\help\Concepts\*"

-RMDir  "$INSTDIR\help\Concepts"

-Delete "$INSTDIR\help\welcome\*"

-RMDir  "$INSTDIR\help\welcome"

-Delete "$INSTDIR\help\*"

-RMDir  "$INSTDIR\help"

-

-Delete "$INSTDIR\uninst.exe"

-RMDir "$INSTDIR"

-

-IfFileExists "$INSTDIR" FOLDERFOUND NOFOLDER

-

-FOLDERFOUND:

-  MessageBox MB_YESNO $(DeleteProgramFilesMB) IDNO NOFOLDER

-  RMDir /r "$INSTDIR"

-

-NOFOLDER:

-

-FunctionEnd

-

-;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;

-;;; Uninstall settings

-;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;

-UninstallText $(UninstallTextMsg)

-ShowUninstDetails show

-

-;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;

-;;; Uninstall section

-;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;

-Section Uninstall

-

-; Start with some default values.

-StrCpy $INSTFLAGS ""

-StrCpy $INSTPROG "${INSTNAME}"

-StrCpy $INSTEXE "${INSTEXE}"

-StrCpy $INSTSHORTCUT "${SHORTCUT}"

-Call un.CheckStartupParams              ; Figure out where, what and how to uninstall.

-Call un.CheckIfAdministrator            ; Make sure the user can install/uninstall

-

-; uninstall for all users (if you change this, change it in the install as well)

-SetShellVarContext all                  

-

-; Make sure we're not running

-Call un.CloseSecondLife

-

-; Clean up registry keys

-DeleteRegKey HKEY_LOCAL_MACHINE "SOFTWARE\Linden Research, Inc.\$INSTPROG"

-DeleteRegKey HKEY_LOCAL_MACHINE "SOFTWARE\Microsoft\Windows\CurrentVersion\Uninstall\$INSTPROG"

-

-; Clean up shortcuts

-Delete "$SMPROGRAMS\$INSTSHORTCUT\*.*"

-RMDir  "$SMPROGRAMS\$INSTSHORTCUT"

-

-Delete "$DESKTOP\$INSTSHORTCUT.lnk"

-Delete "$INSTDIR\$INSTSHORTCUT.lnk"

-Delete "$INSTDIR\Uninstall $INSTSHORTCUT.lnk"

-

-; Clean up cache and log files.

-; Leave them in-place for non AGNI installs.

-

-!ifdef UNINSTALL_SETTINGS

-Call un.DocumentsAndSettingsFolder

-!endif

-

-Call un.ProgramFiles

-

-SectionEnd                              ; end of uninstall section

-

-;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;

-; (From the NSIS wiki, DK)

-; GetParameterValue

-;

-; Usage:

-; !insertmacro GetParameterValue "/L=" "1033"

-; pop $R0

-;

-; Returns on top of stack

-;

-; Example command lines:

-; foo.exe /S /L=1033 /D=C:\Program Files\Foo

-; or:

-; foo.exe /S "/L=1033" /D="C:\Program Files\Foo"

-; gpv "/L=" "1033"

-;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;

-

- !macro GetParameterValue SWITCH DEFAULT

-   Push $0

-   Push $1

-   Push $2

-   Push $3

-   Push $4

-

- ;$CMDLINE='"My Setup\Setup.exe" /L=1033 /S'

-   Push "$CMDLINE"

-   Push '${SWITCH}"'

-   !insertmacro StrStr

-   Pop $0

-   StrCmp "$0" "" gpv_notquoted

- ;$0='/L="1033" /S'

-   StrLen $2 "$0"

-   Strlen $1 "${SWITCH}"

-   IntOp $1 $1 + 1

-   StrCpy $0 "$0" $2 $1

- ;$0='1033" /S'

-   Push "$0"

-   Push '"'

-   !insertmacro StrStr

-   Pop $1

-   StrLen $2 "$0"

-   StrLen $3 "$1"

-   IntOp $4 $2 - $3

-   StrCpy $0 $0 $4 0

-   Goto gpv_done

-

-   gpv_notquoted:

-   Push "$CMDLINE"

-   Push "${SWITCH}"

-   !insertmacro StrStr

-   Pop $0

-   StrCmp "$0" "" gpv_done

- ;$0='/L="1033" /S'

-   StrLen $2 "$0"

-   Strlen $1 "${SWITCH}"

-   StrCpy $0 "$0" $2 $1

- ;$0=1033 /S'

-   Push "$0"

-   Push ' '

-   !insertmacro StrStr

-   Pop $1

-   StrLen $2 "$0"

-   StrLen $3 "$1"

-   IntOp $4 $2 - $3

-   StrCpy $0 $0 $4 0

-   Goto gpv_done

-

-   gpv_done:

-   StrCmp "$0" "" 0 +2

-   StrCpy $0 "${DEFAULT}"

-

-   Pop $4

-   Pop $3

-   Pop $2

-   Pop $1

-   Exch $0

- !macroend

-

-; And I had to modify StrStr a tiny bit.

-; Possible upgrade switch the goto's to use ${__LINE__}

-

-!macro STRSTR

-  Exch $R1 ; st=haystack,old$R1, $R1=needle

-  Exch    ; st=old$R1,haystack

-  Exch $R2 ; st=old$R1,old$R2, $R2=haystack

-  Push $R3

-  Push $R4

-  Push $R5

-  StrLen $R3 $R1

-  StrCpy $R4 0

-  ; $R1=needle

-  ; $R2=haystack

-  ; $R3=len(needle)

-  ; $R4=cnt

-  ; $R5=tmp

- ;  loop;

-    StrCpy $R5 $R2 $R3 $R4

-    StrCmp $R5 $R1 +4

-    StrCmp $R5 "" +3

-    IntOp $R4 $R4 + 1

-    Goto -4

- ;  done;

-  StrCpy $R1 $R2 "" $R4

-  Pop $R5

-  Pop $R4

-  Pop $R3

-  Pop $R2

-  Exch $R1

-!macroend

-

-Function GetProgramName

-  !insertmacro GetParameterValue "/P=" "SecondLife"

-FunctionEnd

-

-Function un.GetProgramName

-  !insertmacro GetParameterValue "/P=" "SecondLife"

-FunctionEnd

-

-;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;

-; (From the NSIS documentation, JC)

-; GetWindowsVersion

-;

-; Based on Yazno's function, http://yazno.tripod.com/powerpimpit/

-; Updated by Joost Verburg

-;

-; Returns on top of stack

-;

-; Windows Version (95, 98, ME, NT x.x, 2000, XP, 2003)

-; or

-; '' (Unknown Windows Version)

-;

-; Usage:

-;   Call GetWindowsVersion

-;   Pop $R0

-;   ; at this point $R0 is "NT 4.0" or whatnot

-;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;

-Function GetWindowsVersion

- 

-   Push $R0

-   Push $R1

- 

-   ReadRegStr $R0 HKLM \

-   "SOFTWARE\Microsoft\Windows NT\CurrentVersion" CurrentVersion

-

-   IfErrors 0 lbl_winnt

-   

-   ; we are not NT

-   ReadRegStr $R0 HKLM \

-   "SOFTWARE\Microsoft\Windows\CurrentVersion" VersionNumber

- 

-   StrCpy $R1 $R0 1

-   StrCmp $R1 '4' 0 lbl_error

- 

-   StrCpy $R1 $R0 3

- 

-   StrCmp $R1 '4.0' lbl_win32_95

-   StrCmp $R1 '4.9' lbl_win32_ME lbl_win32_98

- 

-   lbl_win32_95:

-     StrCpy $R0 '95'

-   Goto lbl_done

- 

-   lbl_win32_98:

-     StrCpy $R0 '98'

-   Goto lbl_done

- 

-   lbl_win32_ME:

-     StrCpy $R0 'ME'

-   Goto lbl_done

- 

-   lbl_winnt:

- 

-   StrCpy $R1 $R0 1

- 

-   StrCmp $R1 '3' lbl_winnt_x

-   StrCmp $R1 '4' lbl_winnt_x

- 

-   StrCpy $R1 $R0 3

- 

-   StrCmp $R1 '5.0' lbl_winnt_2000

-   StrCmp $R1 '5.1' lbl_winnt_XP

-   StrCmp $R1 '5.2' lbl_winnt_2003 lbl_error

- 

-   lbl_winnt_x:

-     StrCpy $R0 "NT $R0" 6

-   Goto lbl_done

- 

-   lbl_winnt_2000:

-     Strcpy $R0 '2000'

-   Goto lbl_done

- 

-   lbl_winnt_XP:

-     Strcpy $R0 'XP'

-   Goto lbl_done

- 

-   lbl_winnt_2003:

-     Strcpy $R0 '2003'

-   Goto lbl_done

- 

-   lbl_error:

-     Strcpy $R0 ''

-   lbl_done:

- 

-   Pop $R1

-   Exch $R0

- 

-FunctionEnd

-

-;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;

-!define LANGUAGE_SELECTION_REGISTRY_ROOT "HKCU" 

-!define LANGUAGE_SELECTION_REGISTRY_KEY "Software\Linden Research, Inc." 

-!define LANGUAGE_SELECTION_REGISTRY_VALUENAME "Installer Language"

-

-;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;

-;;  Note: to add new languages, add an entry to the menu

-;;  and then add an entry to the language ID selector below

-;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;

-Function .onInit

-

-        ; read the language from registry (ok if not there) and set langauge menu

-        ReadRegStr $0 '${LANGUAGE_SELECTION_REGISTRY_ROOT}' '${LANGUAGE_SELECTION_REGISTRY_KEY}' '${LANGUAGE_SELECTION_REGISTRY_VALUENAME}'

-        StrCpy $LANGUAGE $0

-

-        Push ""

-        Push ${LANG_ENGLISH}

-        Push English

-        Push ${LANG_GERMAN}

-        Push German

-        Push ${LANG_JAPANESE}

-        Push Japanese

-        Push ${LANG_KOREAN}

-        Push Korean

-        Push A ; A means auto count languages for the auto count to work the first empty push (Push "") must remain

-        LangDLL::LangDialog "Installer Language" "Please select the language of the installer"

-        Pop $LANGUAGE

-        StrCmp $LANGUAGE "cancel" 0 +2

-                Abort

-

-        ; save language in registry             

-        WriteRegStr '${LANGUAGE_SELECTION_REGISTRY_ROOT}' '${LANGUAGE_SELECTION_REGISTRY_KEY}' '${LANGUAGE_SELECTION_REGISTRY_VALUENAME}' $LANGUAGE

-        

-        ; generate language ID that will be used as a command line arg  

-        StrCmp $LANGUAGE "1042" 0 +3

-        StrCpy $LANGFLAGS " -set SystemLanguage ko"

-        Goto EndOfFunc

-        StrCmp $LANGUAGE "1041" 0 +3

-        StrCpy $LANGFLAGS " -set SystemLanguage ja"

-        Goto EndOfFunc

-        StrCmp $LANGUAGE "1031" 0 +3

-        StrCpy $LANGFLAGS " -set SystemLanguage de"

-        Goto EndOfFunc

-        StrCmp $LANGUAGE "1033" 0 +3

-        StrCpy $LANGFLAGS " -set SystemLanguage en-us"

-        Goto EndOfFunc

-        

-        EndOfFunc:

-

-FunctionEnd

-

-;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;

-Function un.onInit

-

-        ; read language from registry and set for ininstaller

-        ReadRegStr $0 '${LANGUAGE_SELECTION_REGISTRY_ROOT}' '${LANGUAGE_SELECTION_REGISTRY_KEY}' '${LANGUAGE_SELECTION_REGISTRY_VALUENAME}'

-        StrCpy $LANGUAGE $0

-

-FunctionEnd

-

-;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;; EOF  ;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
\ No newline at end of file
diff --git a/linden/indra/newview/licenses-linux.txt b/linden/indra/newview/licenses-linux.txt
index a0dc048..1892b81 100644
--- a/linden/indra/newview/licenses-linux.txt
+++ b/linden/indra/newview/licenses-linux.txt
@@ -514,3 +514,36 @@ jloup@gzip.org
 
 Mark Adler 
 madler@alumni.caltech.edu 
+
+=================================
+tcmalloc/Google perftools license
+=================================
+
+Copyright (c) 2005, Google Inc.
+All rights reserved.
+
+Redistribution and use in source and binary forms, with or without
+modification, are permitted provided that the following conditions are
+met:
+
+    * Redistributions of source code must retain the above copyright
+notice, this list of conditions and the following disclaimer.
+    * Redistributions in binary form must reproduce the above
+copyright notice, this list of conditions and the following disclaimer
+in the documentation and/or other materials provided with the
+distribution.
+    * Neither the name of Google Inc. nor the names of its
+contributors may be used to endorse or promote products derived from
+this software without specific prior written permission.
+
+THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+"AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
+LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
+A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
+OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
+SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
+LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
+DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
+THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+(INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
+OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
diff --git a/linden/indra/newview/linux_tools/wrapper.sh b/linden/indra/newview/linux_tools/wrapper.sh
index 5f128e8..048aaf6 100755
--- a/linden/indra/newview/linux_tools/wrapper.sh
+++ b/linden/indra/newview/linux_tools/wrapper.sh
@@ -33,6 +33,13 @@ export LL_GL_BASICEXT=x
 ##   LL_GL_BLACKLIST which solves your problems.
 #export LL_GL_BLACKLIST=abcdefghijklmno
 
+## - For advanced debugging cases, you can run the viewer under the
+##   control of another program, such as strace, gdb, or valgrind.  If
+##   you're building your own viewer, bear in mind that the executable
+##   in the bin directory will be stripped: you should replace it with
+##   an unstripped binary before you run.
+#export LL_WRAPPER='valgrind --log-file=secondlife.vg --leak-check=full --suppressions=/usr/lib/valgrind/glibc-2.5.supp --suppressions=secondlife-i686.supp'
+
 ## - Avoids an often-buggy X feature that doesn't really benefit us anyway.
 export SDL_VIDEO_X11_DGAMOUSE=0
 
@@ -41,7 +48,7 @@ export SDL_VIDEO_X11_DGAMOUSE=0
 
 RUN_PATH=`dirname "$0" || echo .`
 cd "${RUN_PATH}"
-LD_LIBRARY_PATH="`pwd`"/lib:"`pwd`"/app_settings/mozilla-runtime-linux-i686:"${LD_LIBRARY_PATH}" bin/do-not-directly-run-secondlife-bin `cat gridargs.dat` $@ | cat
+LD_LIBRARY_PATH="`pwd`"/lib:"`pwd`"/app_settings/mozilla-runtime-linux-i686:"${LD_LIBRARY_PATH}" $LL_WRAPPER bin/do-not-directly-run-secondlife-bin `cat gridargs.dat` $@ | cat
 
 echo
 echo '*********************************************************'
diff --git a/linden/indra/newview/llagent.cpp b/linden/indra/newview/llagent.cpp
index ab51120..83b8c0c 100644
--- a/linden/indra/newview/llagent.cpp
+++ b/linden/indra/newview/llagent.cpp
@@ -4983,7 +4983,7 @@ BOOL LLAgent::allowOperation(PermissionBit op,
                                                          const LLPermissions& perm,
                                                          U64 group_proxy_power,
                                                          U8 god_minimum)
-{
+ {
         // Check god level.
         if (getGodLevel() >= god_minimum) return TRUE;
 
diff --git a/linden/indra/newview/llagent.h b/linden/indra/newview/llagent.h
index af593e0..e375227 100644
--- a/linden/indra/newview/llagent.h
+++ b/linden/indra/newview/llagent.h
@@ -851,12 +851,12 @@ private:
 
         class createStandardWearablesAllDoneCallback : public LLRefCount
         {
-        public:
+        protected:
                 ~createStandardWearablesAllDoneCallback();
         };
         class sendAgentWearablesUpdateCallback : public LLRefCount
         {
-        public:
+        protected:
                 ~sendAgentWearablesUpdateCallback();
         };
 
@@ -886,7 +886,6 @@ private:
                         S32 index,
                         LLWearable* wearable,
                         U32 todo = CALL_NONE);
-                ~addWearableToAgentInventoryCallback() {};
                 virtual void fire(const LLUUID& inv_item);
 
         private:
diff --git a/linden/indra/newview/llcallingcard.cpp b/linden/indra/newview/llcallingcard.cpp
index 3e00f40..22a7f20 100644
--- a/linden/indra/newview/llcallingcard.cpp
+++ b/linden/indra/newview/llcallingcard.cpp
@@ -130,6 +130,7 @@ LLAvatarTracker::~LLAvatarTracker()
 {
         deleteTrackingData();
         std::for_each(mObservers.begin(), mObservers.end(), DeletePointer());
+        std::for_each(mBuddyInfo.begin(), mBuddyInfo.end(), DeletePairedPointer());
 }
 
 void LLAvatarTracker::track(const LLUUID& avatar_id, const std::string& name)
diff --git a/linden/indra/newview/llchatbar.cpp b/linden/indra/newview/llchatbar.cpp
index a6feac7..539c935 100644
--- a/linden/indra/newview/llchatbar.cpp
+++ b/linden/indra/newview/llchatbar.cpp
@@ -118,8 +118,8 @@ LLChatBar::LLChatBar(const std::string& name, const LLRect& rect)
                 mInputEditor->setRevertOnEsc( FALSE );
                 mInputEditor->setIgnoreTab(TRUE);
                 mInputEditor->setPassDelete(TRUE);
-
                 mInputEditor->setMaxTextLength(1023);
+                mInputEditor->setEnableLineHistory(TRUE);
         }
 
         // Build the list of gestures
@@ -446,6 +446,8 @@ void LLChatBar::sendChat( EChatType type )
 
         if (!text.empty())
         {
+                // store sent line in history, duplicates will get filtered
+                mInputEditor->updateHistory();
                 // Check if this is destined for another channel
                 S32 channel = 0;
                 stripChannelNumber(text, &channel);
diff --git a/linden/indra/newview/llcontroldef.cpp b/linden/indra/newview/llcontroldef.cpp
index 01d7edf..2b394e9 100644
--- a/linden/indra/newview/llcontroldef.cpp
+++ b/linden/indra/newview/llcontroldef.cpp
@@ -742,6 +742,9 @@ void declare_settings()
         // Threading
         gSavedSettings.declareBOOL("RunMultipleThreads", FALSE, "If TRUE keep background threads active during render");
 
+        // Cooperative Multitasking
+        gSavedSettings.declareS32("BackgroundYieldTime", 40, "Amount of time to yield every frame to other applications when SL is not the foreground window (milliseconds)");
+
         // Camera control
         gSavedSettings.declareBOOL("AutoPilotLocksCamera", FALSE, "Keep camera position locked when avatar walks to selected position");
         //gSavedSettings.declareBOOL("AvatarLooksAtCamera", TRUE, "[NOT USED]");
@@ -1143,10 +1146,12 @@ void declare_settings()
         // Time in seconds.
         gSavedSettings.declareF32("NotifyTipDuration", 4.f, "Length of time that notification tips stay on screen (seconds)");
 
-
         gSavedSettings.declareBOOL("NotifyMoneyChange", TRUE, "Pop up notifications for all L$ transactions");
+
         gSavedSettings.declareBOOL("ShowNewInventory", TRUE,
-                "Automatic Previews of new notecards/textures/landmarks");
+                "Automatically views new notecards/textures/landmarks");
+        gSavedSettings.declareBOOL("AutoAcceptNewInventory", FALSE,
+                "Automatically accept new notecards/textures/landmarks");
 
         // Bitfield
         // 1 = by date
@@ -1245,6 +1250,7 @@ void declare_settings()
         // CP: making this TRUE by default since there is no internal Web browser
         //         now and other components may interrogate this setting
         gSavedSettings.declareBOOL("UseExternalBrowser", TRUE, "[NOT USED]");
+        gSavedSettings.declareBOOL("CookiesEnabled", TRUE, "Accept cookies from Web sites?");
 
         // browser home page
         gSavedSettings.declareString("BrowserHomePage", "http://www.secondlife.com", "[NOT USED]");
diff --git a/linden/indra/newview/llcubemap.h b/linden/indra/newview/llcubemap.h
index d75d6e7..911248f 100644
--- a/linden/indra/newview/llcubemap.h
+++ b/linden/indra/newview/llcubemap.h
@@ -41,7 +41,6 @@ class LLCubeMap : public LLRefCount
 {
 public:
         LLCubeMap();
-        ~LLCubeMap();
         void init(const std::vector<LLPointer<LLImageRaw> >& rawimages);
         void initGL();
         void initRawData(const std::vector<LLPointer<LLImageRaw> >& rawimages);
@@ -66,6 +65,7 @@ public:
         void destroyGL();
 
 protected:
+        ~LLCubeMap();
         LLGLenum mTargets[6];
         LLPointer<LLImageGL> mImages[6];
         LLPointer<LLImageRaw> mRawImages[6];
diff --git a/linden/indra/newview/lldrawable.h b/linden/indra/newview/lldrawable.h
index 3bb5525..7429292 100644
--- a/linden/indra/newview/lldrawable.h
+++ b/linden/indra/newview/lldrawable.h
@@ -199,7 +199,7 @@ public:
         static void cleanupDeadDrawables();
 
 protected:
-        virtual ~LLDrawable() { destroy(); }
+        ~LLDrawable() { destroy(); }
         void moveUpdatePipeline(BOOL moved);
         void updatePartition();
         BOOL updateMoveDamped();
diff --git a/linden/indra/newview/llflexibleobject.cpp b/linden/indra/newview/llflexibleobject.cpp
index d4080c5..0dce348 100644
--- a/linden/indra/newview/llflexibleobject.cpp
+++ b/linden/indra/newview/llflexibleobject.cpp
@@ -62,6 +62,7 @@ LLVolumeImplFlexible::LLVolumeImplFlexible(LLViewerObject* vo, LLFlexibleObjectD
         mInitializedRes = -1;
         mSimulateRes = 0;
         mFrameNum = 0;
+        mRenderRes = 1;
 }//-----------------------------------------------
 
 LLVector3 LLVolumeImplFlexible::getFramePosition() const
@@ -253,7 +254,7 @@ BOOL LLVolumeImplFlexible::doIdleUpdate(LLAgent &agent, LLWorld &world, const F6
 {
         if (!gPipeline.hasRenderDebugFeatureMask(LLPipeline::RENDER_DEBUG_FEATURE_FLEXIBLE))
         {
-                return TRUE;
+                return FALSE; // (we are not initialized or updated)
         }
 
         LLFastTimer ftm(LLFastTimer::FTM_FLEXIBLE_UPDATE);
@@ -261,7 +262,7 @@ BOOL LLVolumeImplFlexible::doIdleUpdate(LLAgent &agent, LLWorld &world, const F6
         if (mVO->mDrawable.isNull())
         {
                 // Don't do anything until we have a drawable
-                return TRUE;
+                return FALSE; // (we are not initialized or updated)
         }
 
         //flexible objects never go static
@@ -346,8 +347,13 @@ void LLVolumeImplFlexible::doFlexibleUpdate()
         if (mSimulateRes == 0)
         {
                 mVO->markForUpdate(TRUE);
-                doIdleUpdate(gAgent, *gWorldp, 0.0);
+                if (!doIdleUpdate(gAgent, *gWorldp, 0.0))
+                {
+                        return; // we did not get updated or initialized, proceeding without can be dangerous
+                }
         }
+
+        llassert_always(mInitialized);
         
         S32 num_sections = 1 << mSimulateRes;
 
diff --git a/linden/indra/newview/llfloateravatarinfo.cpp b/linden/indra/newview/llfloateravatarinfo.cpp
index 2245d31..c4b8167 100644
--- a/linden/indra/newview/llfloateravatarinfo.cpp
+++ b/linden/indra/newview/llfloateravatarinfo.cpp
@@ -267,6 +267,12 @@ void LLFloaterAvatarInfo::draw()
         LLFloater::draw();
 }
 
+// virtual
+BOOL LLFloaterAvatarInfo::canClose()
+{
+        return mPanelAvatarp && mPanelAvatarp->canClose();
+}
+
 LLFloaterAvatarInfo* LLFloaterAvatarInfo::getInstance(const LLUUID &id)
 {
         return gAvatarInfoInstances.getIfThere(gAgentID);
diff --git a/linden/indra/newview/llfloateravatarinfo.h b/linden/indra/newview/llfloateravatarinfo.h
index 7ca6882..eedbfba 100644
--- a/linden/indra/newview/llfloateravatarinfo.h
+++ b/linden/indra/newview/llfloateravatarinfo.h
@@ -69,6 +69,8 @@ public:
 
         /*virtual*/ void draw();
 
+        /*virtual*/ BOOL canClose();
+
         /*virtual*/ void loadAsset();
         /*virtual*/ EAssetStatus getAssetStatus();
 
diff --git a/linden/indra/newview/llfloaterbuy.cpp b/linden/indra/newview/llfloaterbuy.cpp
index be52084..4070ea7 100644
--- a/linden/indra/newview/llfloaterbuy.cpp
+++ b/linden/indra/newview/llfloaterbuy.cpp
@@ -59,7 +59,7 @@ LLFloaterBuy::LLFloaterBuy()
         childSetAction("cancel_btn", onClickCancel, this);
         childSetAction("buy_btn", onClickBuy, this);
 
-        setDefaultBtn("buy_btn");
+        setDefaultBtn("cancel_btn"); // to avoid accidental buy (SL-43130)
 }
 
 LLFloaterBuy::~LLFloaterBuy()
diff --git a/linden/indra/newview/llfloaterbuycontents.cpp b/linden/indra/newview/llfloaterbuycontents.cpp
index 5e8d921..7288b8d 100644
--- a/linden/indra/newview/llfloaterbuycontents.cpp
+++ b/linden/indra/newview/llfloaterbuycontents.cpp
@@ -64,7 +64,7 @@ LLFloaterBuyContents::LLFloaterBuyContents()
         childDisable("buy_btn");
         childDisable("wear_check");
 
-        setDefaultBtn("buy_btn");
+        setDefaultBtn("cancel_btn"); // to avoid accidental buy (SL-43130)
 }
 
 LLFloaterBuyContents::~LLFloaterBuyContents()
diff --git a/linden/indra/newview/llfloatergesture.cpp b/linden/indra/newview/llfloatergesture.cpp
index 5b191e4..9746787 100644
--- a/linden/indra/newview/llfloatergesture.cpp
+++ b/linden/indra/newview/llfloatergesture.cpp
@@ -352,7 +352,6 @@ public:
         {
                 mTitle = title;
         }
-        ~GestureShowCallback() {}
         void fire(const LLUUID &inv_item)
         {
                 LLPreviewGesture::show(mTitle.c_str(), inv_item, LLUUID::null);
diff --git a/linden/indra/newview/llfloaterinspect.cpp b/linden/indra/newview/llfloaterinspect.cpp
index 80da7b6..4899649 100644
--- a/linden/indra/newview/llfloaterinspect.cpp
+++ b/linden/indra/newview/llfloaterinspect.cpp
@@ -1,3 +1,31 @@
+/** 
+ * @file llfloaterinspect.cpp
+ * @brief Floater for object inspection tool
+ *
+ * Copyright (c) 2002-2007, Linden Research, Inc.
+ * 
+ * Second Life Viewer Source Code
+ * The source code in this file ("Source Code") is provided by Linden Lab
+ * to you under the terms of the GNU General Public License, version 2.0
+ * ("GPL"), unless you have obtained a separate licensing agreement
+ * ("Other License"), formally executed by you and Linden Lab.  Terms of
+ * the GPL can be found in doc/GPL-license.txt in this distribution, or
+ * online at http://secondlife.com/developers/opensource/gplv2
+ * 
+ * There are special exceptions to the terms and conditions of the GPL as
+ * it is applied to this Source Code. View the full text of the exception
+ * in the file doc/FLOSS-exception.txt in this software distribution, or
+ * online at http://secondlife.com/developers/opensource/flossexception
+ * 
+ * By copying, modifying or distributing this software, you acknowledge
+ * that you have read and understood your obligations described above,
+ * and agree to abide by those obligations.
+ * 
+ * ALL LINDEN LAB SOURCE CODE IS PROVIDED "AS IS." LINDEN LAB MAKES NO
+ * WARRANTIES, EXPRESS, IMPLIED OR OTHERWISE, REGARDING ITS ACCURACY,
+ * COMPLETENESS OR PERFORMANCE.
+ */
+
 #include "llviewerprecompiledheaders.h"
 #include "llfloateravatarinfo.h"
 #include "llfloaterinspect.h"
diff --git a/linden/indra/newview/llfloaterpreference.cpp b/linden/indra/newview/llfloaterpreference.cpp
index 963c268..f7392c4 100644
--- a/linden/indra/newview/llfloaterpreference.cpp
+++ b/linden/indra/newview/llfloaterpreference.cpp
@@ -52,7 +52,7 @@
 #include "llpanelgeneral.h"
 #include "llpanelinput.h"
 #include "llpanelmsgs.h"
-//#include "llpanelweb.h"
+#include "llpanelweb.h"
 #include "llprefschat.h"
 #include "llprefsim.h"
 #include "llresizehandle.h"
@@ -63,7 +63,6 @@
 #include "llviewernetwork.h"
 #include "llvieweruictrlfactory.h"
 #include "llviewerwindow.h"
-//#include "viewer.h"
 #include "llkeyboard.h"
 #include "llscrollcontainer.h"
 
@@ -119,6 +118,12 @@ LLPreferenceCore::LLPreferenceCore(LLTabContainerCommon* tab_container, LLButton
         mTabContainer->addTabPanel(mNetworkPanel, mNetworkPanel->getLabel(), FALSE, onTabChanged, mTabContainer);
         mNetworkPanel->setDefaultBtn(default_btn);
 
+        #if LL_LIBXUL_ENABLED
+        mWebPanel = new LLPanelWeb();
+        mTabContainer->addTabPanel(mWebPanel, mWebPanel->getLabel(), FALSE, onTabChanged, mTabContainer);
+        mWebPanel->setDefaultBtn(default_btn);
+        #endif
+
         mDisplayPanel = new LLPanelDisplay();
         mTabContainer->addTabPanel(mDisplayPanel, mDisplayPanel->getLabel(), FALSE, onTabChanged, mTabContainer);
         mDisplayPanel->setDefaultBtn(default_btn);
@@ -144,16 +149,10 @@ LLPreferenceCore::LLPreferenceCore(LLTabContainerCommon* tab_container, LLButton
         mPrefsIM->getPanel()->setDefaultBtn(default_btn);
 
         mMsgPanel = new LLPanelMsgs();
-        gUICtrlFactory->buildPanel(mMsgPanel, "panel_settings_msgbox.xml");
         mTabContainer->addTabPanel(mMsgPanel, mMsgPanel->getLabel(), FALSE, onTabChanged, mTabContainer);
         mMsgPanel->setDefaultBtn(default_btn);
 
         mTabContainer->selectTab(gSavedSettings.getS32("LastPrefTab"));
-
-//      Web prefs removed from Loopy build 
-//      mWebPanel = new LLPanelWeb();
-//      gUICtrlFactory->buildPanel(mWebPanel, "panel_settings_web.xml");
-//      addTabPanel(mWebPanel, "Web", FALSE, onTabChanged, this);
 }
 
 LLPreferenceCore::~LLPreferenceCore()
@@ -208,11 +207,13 @@ LLPreferenceCore::~LLPreferenceCore()
                 delete mMsgPanel;
                 mMsgPanel = NULL;
         }
-        //if (mWebPanel)
-        //{
-        //      delete mWebPanel;
-        //      mWebPanel = NULL;
-        //}
+        #if LL_LIBXUL_ENABLED
+        if (mWebPanel)
+        {
+                delete mWebPanel;
+                mWebPanel = NULL;
+        }
+        #endif
 }
 
 
@@ -228,7 +229,9 @@ void LLPreferenceCore::apply()
         mPrefsChat->apply();
         mPrefsIM->apply();
         mMsgPanel->apply();
-//      mWebPanel->apply();
+        #if LL_LIBXUL_ENABLED
+        mWebPanel->apply();
+        #endif
 }
 
 
@@ -244,7 +247,9 @@ void LLPreferenceCore::cancel()
         mPrefsChat->cancel();
         mPrefsIM->cancel();
         mMsgPanel->cancel();
-//      mWebPanel->cancel();
+        #if LL_LIBXUL_ENABLED
+        mWebPanel->cancel();
+        #endif
 }
 
 // static
@@ -311,6 +316,7 @@ BOOL LLFloaterPreference::postBuild()
 LLFloaterPreference::~LLFloaterPreference()
 {
         sInstance = NULL;
+        delete mPreferenceCore;
 }
 
 
diff --git a/linden/indra/newview/llfloaterpreference.h b/linden/indra/newview/llfloaterpreference.h
index 7a6789f..1823069 100644
--- a/linden/indra/newview/llfloaterpreference.h
+++ b/linden/indra/newview/llfloaterpreference.h
@@ -46,11 +46,11 @@ class LLPanelDisplay3;
 class LLPanelAudioPrefs;
 class LLPanelDebug;
 class LLPanelNetwork;
+class LLPanelWeb;
 class LLMessageSystem;
 class LLPrefsChat;
 class LLPrefsIM;
 class LLPanelMsgs;
-//class LLPanelWeb;             // Web prefs removed from Loopy build 
 class LLScrollListCtrl;
 
 class LLPreferenceCore
@@ -85,7 +85,7 @@ private:
         LLPrefsChat                             *mPrefsChat;
         LLPrefsIM                               *mPrefsIM;
         LLPanelMsgs                             *mMsgPanel;
-//      LLPanelWeb*                             mWebPanel;
+        LLPanelWeb                              *mWebPanel;
 };
 
 // Floater to control preferences (display, audio, bandwidth, general.
diff --git a/linden/indra/newview/llfolderview.cpp b/linden/indra/newview/llfolderview.cpp
index ff0ad3f..bd5be8e 100644
--- a/linden/indra/newview/llfolderview.cpp
+++ b/linden/indra/newview/llfolderview.cpp
@@ -1921,7 +1921,7 @@ void LLFolderViewFolder::requestArrange(BOOL include_descendants)
 { 
         mLastArrangeGeneration = -1; 
         // flag all items up to root
-        if (mParentFolder && !mParentFolder->needsArrange())
+        if (mParentFolder)
         {
                 mParentFolder->requestArrange();
         }
@@ -4282,7 +4282,8 @@ void LLFolderView::idle(void* user_data)
         {
                 self->scrollToShowItem(self->mSelectedItems.back());
                 // continue scrolling until animated layout change is done
-                if (!self->needsArrange() || !self->isInVisibleChain())
+                if (self->getCompletedFilterGeneration() >= self->mFilter.getMinRequiredGeneration() &&
+                        (!self->needsArrange() || !self->isInVisibleChain()))
                 {
                         self->mNeedsScroll = FALSE;
                 }
diff --git a/linden/indra/newview/llgroupmgr.cpp b/linden/indra/newview/llgroupmgr.cpp
index fbdcf81..8e49749 100644
--- a/linden/indra/newview/llgroupmgr.cpp
+++ b/linden/indra/newview/llgroupmgr.cpp
@@ -49,6 +49,7 @@
 #include "llviewerwindow.h"
 #include "llfloaterdirectory.h"
 #include "llfloatergroupinfo.h"
+#include "lluictrlfactory.h"
 
 LLGroupMgr sGroupMgr; // use local instance so that it gets cleaned up on application exit
 LLGroupMgr* gGroupMgr = &sGroupMgr;
@@ -1729,21 +1730,28 @@ void LLGroupMgr::cancelGroupRoleChanges(const LLUUID& group_id)
 //static
 bool LLGroupMgr::parseRoleActions(const LLString& xml_filename)
 {
-        LLXmlTree xml_tree;
-        LLString xml_file = LLUI::locateSkin(xml_filename);
-        BOOL success = xml_tree.parseFile(xml_file, TRUE );
-        LLXmlTreeNode* root = xml_tree.getRoot();
+        LLXMLNodePtr root;
+
+        BOOL success = LLUICtrlFactory::getLayeredXMLNode(xml_filename, root);  
+        
         if (!success || !root || !root->hasName( "role_actions" ))
         {
                 llerrs << "Problem reading UI role_actions file: " << xml_filename << llendl;
                 return false;
         }
 
-        for (LLXmlTreeNode* action_set = root->getChildByName("action_set");
-                action_set != NULL; action_set = root->getNextNamedChild())
+        LLXMLNodeList role_list;
+        LLXMLNodeList::iterator role_iter;
+
+        root->getChildren("action_set", role_list, false);
+        
+        for (role_iter = role_list.begin(); role_iter != role_list.end(); ++role_iter)
         {
+                LLXMLNodePtr action_set = role_iter->second;
+
                 LLRoleActionSet* role_action_set = new LLRoleActionSet();
                 LLRoleAction* role_action_data = new LLRoleAction();
+                
                 // name=
                 LLString action_set_name;
                 if (action_set->getAttributeString("name", action_set_name))
@@ -1774,9 +1782,15 @@ bool LLGroupMgr::parseRoleActions(const LLString& xml_filename)
                 // power mask=
                 U64 set_power_mask = 0;
 
-                for (LLXmlTreeNode* action = action_set->getChildByName("action");
-                        action != NULL; action = action_set->getNextNamedChild())
+                LLXMLNodeList action_list;
+                LLXMLNodeList::iterator action_iter;
+
+                action_set->getChildren("action", action_list, false);
+
+                for (action_iter = action_list.begin(); action_iter != action_list.end(); ++action_iter)
                 {
+                        LLXMLNodePtr action = action_iter->second;
+
                         LLRoleAction* role_action = new LLRoleAction();
 
                         // name=
diff --git a/linden/indra/newview/llgroupnotify.cpp b/linden/indra/newview/llgroupnotify.cpp
index ef20138..aa84e3d 100644
--- a/linden/indra/newview/llgroupnotify.cpp
+++ b/linden/indra/newview/llgroupnotify.cpp
@@ -215,8 +215,8 @@ LLGroupNotifyBox::LLGroupNotifyBox(const char* subject,
         LLStyle headerstyle(true,LLColor4::black,"SansSerifBig");
         LLStyle datestyle(true,LLColor4::black,"serif");
 
-        text->appendStyledText(subject,false,false,headerstyle);
-        text->appendStyledText(time_buf,false,false,datestyle);
+        text->appendStyledText(subject,false,false,&headerstyle);
+        text->appendStyledText(time_buf,false,false,&datestyle);
         // Sadly, our LLTextEditor can't handle both styled and unstyled text
         // at the same time.  Hence this space must be styled. JC
         text->appendColoredText(" ",false,false,LLColor4::grey4);
diff --git a/linden/indra/newview/llhudeffecttrail.cpp b/linden/indra/newview/llhudeffecttrail.cpp
index 79c05d7..7cfc3e1 100644
--- a/linden/indra/newview/llhudeffecttrail.cpp
+++ b/linden/indra/newview/llhudeffecttrail.cpp
@@ -188,7 +188,7 @@ void LLHUDEffectSpiral::triggerLocal()
                 {
                         if (show_beam)
                         {
-                                LLViewerPartSourceBeam *psb = new LLViewerPartSourceBeam;
+                                LLPointer<LLViewerPartSourceBeam> psb = new LLViewerPartSourceBeam;
                                 psb->setColor(color);
                                 psb->setSourceObject(mSourceObject);
                                 psb->setTargetObject(mTargetObject);
@@ -203,7 +203,7 @@ void LLHUDEffectSpiral::triggerLocal()
                         {
                                 if (show_beam)
                                 {
-                                        LLViewerPartSourceBeam *psb = new LLViewerPartSourceBeam;
+                                        LLPointer<LLViewerPartSourceBeam> psb = new LLViewerPartSourceBeam;
                                         psb->setSourceObject(mSourceObject);
                                         psb->setTargetObject(NULL);
                                         psb->setColor(color);
@@ -224,7 +224,7 @@ void LLHUDEffectSpiral::triggerLocal()
                                 {
                                         pos = gAgent.getPosAgentFromGlobal(mPositionGlobal);
                                 }
-                                LLViewerPartSourceSpiral *pss = new LLViewerPartSourceSpiral(pos);
+                                LLPointer<LLViewerPartSourceSpiral> pss = new LLViewerPartSourceSpiral(pos);
                                 if (!mSourceObject.isNull())
                                 {
                                         pss->setSourceObject(mSourceObject);
@@ -238,10 +238,10 @@ void LLHUDEffectSpiral::triggerLocal()
         }
         else
         {
-                LLViewerPartSource *ps = mPartSourcep;
+                LLPointer<LLViewerPartSource>& ps = mPartSourcep;
                 if (mPartSourcep->getType() == LLViewerPartSource::LL_PART_SOURCE_BEAM)
                 {
-                        LLViewerPartSourceBeam *psb = (LLViewerPartSourceBeam *)ps;
+                        LLViewerPartSourceBeam *psb = (LLViewerPartSourceBeam *)ps.get();
                         psb->setSourceObject(mSourceObject);
                         psb->setTargetObject(mTargetObject);
                         psb->setColor(color);
@@ -252,7 +252,7 @@ void LLHUDEffectSpiral::triggerLocal()
                 }
                 else
                 {
-                        LLViewerPartSourceSpiral *pss = (LLViewerPartSourceSpiral *)ps;
+                        LLViewerPartSourceSpiral *pss = (LLViewerPartSourceSpiral *)ps.get();
                         pss->setSourceObject(mSourceObject);
                 }
         }
diff --git a/linden/indra/newview/llhudobject.h b/linden/indra/newview/llhudobject.h
index bacffce..b3af006 100644
--- a/linden/indra/newview/llhudobject.h
+++ b/linden/indra/newview/llhudobject.h
@@ -94,7 +94,7 @@ protected:
         static void sortObjects();
 
         LLHUDObject(const U8 type);
-        virtual ~LLHUDObject();
+        ~LLHUDObject();
 
         virtual void render() = 0;
         virtual void renderForSelect() {};
diff --git a/linden/indra/newview/llimpanel.cpp b/linden/indra/newview/llimpanel.cpp
index d95abf3..3c89131 100644
--- a/linden/indra/newview/llimpanel.cpp
+++ b/linden/indra/newview/llimpanel.cpp
@@ -33,6 +33,7 @@
 #include "indra_constants.h"
 #include "llfocusmgr.h"
 #include "llfontgl.h"
+#include "llhttpclient.h"
 #include "llrect.h"
 #include "llerror.h"
 #include "llstring.h"
@@ -60,6 +61,7 @@
 #include "llvieweruictrlfactory.h"
 #include "lllogchat.h"
 #include "llfloaterhtml.h"
+#include "llviewerregion.h"
 #include "llweb.h"
 
 //
@@ -113,8 +115,7 @@ bool send_start_session_messages(const LLUUID& temp_session_id,
                                                                  const LLDynamicArray<LLUUID>& ids,
                                                                  EInstantMessage dialog)
 {
-        if ( (dialog == IM_SESSION_911_START) ||
-                 (dialog == IM_SESSION_GROUP_START) ||
+        if ( (dialog == IM_SESSION_GROUP_START) ||
                  (dialog == IM_SESSION_CONFERENCE_START) )
         {
                 S32 count = ids.size();
@@ -129,7 +130,6 @@ bool send_start_session_messages(const LLUUID& temp_session_id,
                 switch(dialog)
                 {
                 case IM_SESSION_GROUP_START:
-                case IM_SESSION_911_START:
                         gMessageSystem->addBinaryDataFast(_PREHASH_BinaryBucket,
                                                                                           EMPTY_BINARY_BUCKET,
                                                                                           EMPTY_BINARY_BUCKET_SIZE);
@@ -210,35 +210,58 @@ LLFloaterIMPanel::LLFloaterIMPanel(const std::string& name,
         mSessionInitialized(FALSE),
         mSessionInitRequested(FALSE)
 {
-        init(session_label);
-
         mSessionInitialTargetIDs = ids;
+        init(session_label);
 }
 
 
 void LLFloaterIMPanel::init(const LLString& session_label)
 {
         gUICtrlFactory->buildFloater(this,
-                                                                 "floater_instant_message.xml",
-                                                                 NULL,
-                                                                 FALSE);
-
+                                     "floater_instant_message.xml",
+                                     NULL,
+                                     FALSE);
+        
         setLabel(session_label);
         setTitle(session_label);
         mInputEditor->setMaxTextLength(1023);
+        // enable line history support for instant message bar
+        mInputEditor->setEnableLineHistory(TRUE);
 
         if ( gSavedPerAccountSettings.getBOOL("LogShowHistory") )
         {
                 LLLogChat::loadHistory(session_label,
-                                                           &chatFromLogFile,
-                                                           (void *)this);
+                                       &chatFromLogFile,
+                                       (void *)this);
         }
 
-        if(IM_SESSION_911_START == mDialog)
+        if ( !mSessionInitialized )
         {
-                LLTextBox* live_help_text = 
-                        LLUICtrlFactory::getTextBoxByName(this, "live_help_dialog");
-                addHistoryLine(live_help_text->getText());
+                if ( !send_start_session_messages(
+                                 mSessionUUID,
+                                 mOtherParticipantUUID,
+                                 mSessionInitialTargetIDs,
+                                 mDialog) )
+                {
+                        //we don't need to need to wait for any responses
+                        //so we're already initialized
+                        mSessionInitialized = TRUE;
+                }
+                else
+                {
+                        //locally echo a little "starting session" message
+                        LLUIString session_start = sSessionStartString;
+
+                        session_start.setArg("[NAME]", getTitle());
+                        mSessionStartMsgPos = 
+                                mHistoryEditor->getText().length();
+
+                        bool log_to_file = false;
+                        addHistoryLine(
+                                session_start,
+                                LLColor4::grey,
+                                log_to_file);
+                }
         }
 }
 
@@ -253,7 +276,6 @@ BOOL LLFloaterIMPanel::postBuild()
         requires("title_string", WIDGET_TYPE_TEXT_BOX);
         requires("typing_start_string", WIDGET_TYPE_TEXT_BOX);
         requires("session_start_string", WIDGET_TYPE_TEXT_BOX);
-        requires("teleport_btn", WIDGET_TYPE_BUTTON);
 
         if (checkRequirements())
         {
@@ -271,16 +293,10 @@ BOOL LLFloaterIMPanel::postBuild()
                 LLButton* close_btn = LLUICtrlFactory::getButtonByName(this, "close_btn");
                 close_btn->setClickedCallback(&LLFloaterIMPanel::onClickClose, this);
 
-                LLButton* tp_btn = LLUICtrlFactory::getButtonByName(this, "teleport_btn");
-                tp_btn->setClickedCallback(&LLFloaterIMPanel::onTeleport, this);
-                tp_btn->setVisible(FALSE);
-                tp_btn->setEnabled(FALSE);
-
                 mHistoryEditor = LLViewerUICtrlFactory::getViewerTextEditorByName(this, "im_history");
                 mHistoryEditor->setParseHTML(TRUE);
 
-                if (IM_SESSION_GROUP_START == mDialog
-                        || IM_SESSION_911_START == mDialog)
+                if (IM_SESSION_GROUP_START == mDialog)
                 {
                         profile_btn->setEnabled(FALSE);
                 }
@@ -326,55 +342,55 @@ void LLFloaterIMPanel::draw()
         LLFloater::draw();
 }
 
+class LLSessionInviteResponder : public LLHTTPClient::Responder
+{
+public:
+        LLSessionInviteResponder(const LLUUID& session_id)
+        {
+                mSessionID = session_id;
+        }
+
+        void error(U32 statusNum, const std::string& reason)
+        {
+                llinfos << "Error inviting all agents to session" << llendl;
 
-BOOL LLFloaterIMPanel::addParticipants(const LLDynamicArray<LLUUID>& ids)
+                //throw something back to the viewer here?
+        }
+
+private:
+        LLUUID mSessionID;
+};
+
+BOOL LLFloaterIMPanel::inviteToSession(const LLDynamicArray<LLUUID>& ids)
 {
         S32 count = ids.count();
 
         if( isAddAllowed() && (count > 0) )
         {
-                llinfos << "LLFloaterIMPanel::addParticipants() - adding participants" << llendl;
-                const S32 MAX_AGENTS = 50;
-                if(count > MAX_AGENTS) return FALSE;
-
-                LLMessageSystem *msg = gMessageSystem;
-                msg->newMessageFast(_PREHASH_ImprovedInstantMessage);
-                msg->nextBlockFast(_PREHASH_AgentData);
-                msg->addUUIDFast(_PREHASH_AgentID, gAgent.getID());
-                msg->addUUIDFast(_PREHASH_SessionID, gAgent.getSessionID());
-                msg->nextBlockFast(_PREHASH_MessageBlock);
-                msg->addBOOLFast(_PREHASH_FromGroup, FALSE);
-                msg->addUUIDFast(_PREHASH_ToAgentID, mOtherParticipantUUID);
-                msg->addU8Fast(_PREHASH_Offline, IM_ONLINE);
-                msg->addU8Fast(_PREHASH_Dialog, IM_SESSION_ADD);
-                msg->addUUIDFast(_PREHASH_ID, mSessionUUID);
-                msg->addU32Fast(_PREHASH_Timestamp, NO_TIMESTAMP); // no timestamp necessary
-                std::string name;
-                gAgent.buildFullname(name);
-                msg->addStringFast(_PREHASH_FromAgentName, name);
-                msg->addStringFast(_PREHASH_Message, LLString::null);
-                msg->addU32Fast(_PREHASH_ParentEstateID, 0);
-                msg->addUUIDFast(_PREHASH_RegionID, LLUUID::null);
-                msg->addVector3Fast(_PREHASH_Position, gAgent.getPositionAgent());
+                llinfos << "LLFloaterIMPanel::inviteToSession() - adding participants" << llendl;
 
-                // *FIX: this could suffer from endian issues
-                S32 bucket_size = UUID_BYTES * count;
-                U8* bucket = new U8[bucket_size];
-                U8* pos = bucket;
-                for(S32 i = 0; i < count; ++i)
+                std::string url =
+                        gAgent.getRegion()->getCapability("ChatSessionRequest");
+
+                LLSD data;
+                data["params"] = LLSD::emptyArray();
+                for (int i = 0; i < count; i++)
                 {
-                        memcpy(pos, &(ids.get(i)), UUID_BYTES);
-                        pos += UUID_BYTES;
+                        data["params"].append(ids.get(i));
                 }
-                msg->addBinaryDataFast(_PREHASH_BinaryBucket,
-                                                           bucket,
-                                                           bucket_size);
-                delete[] bucket;
-                gAgent.sendReliableMessage();
+
+                data["method"] = "invite";
+                data["session-id"] = mSessionUUID;
+                LLHTTPClient::post(
+                        url,
+                        data,
+                        new LLSessionInviteResponder(mSessionUUID));
+                
         }
         else
         {
-                llinfos << "LLFloaterIMPanel::addParticipants() - no need to add agents for "
+                llinfos << "LLFloaterIMPanel::inviteToSession -"
+                                << " no need to invite agents for "
                                 << mDialog << llendl;
                 // successful add, because everyone that needed to get added
                 // was added.
@@ -530,7 +546,7 @@ BOOL LLFloaterIMPanel::dropCallingCard(LLInventoryItem* item, BOOL drop)
                 {
                         LLDynamicArray<LLUUID> ids;
                         ids.put(item->getCreatorUUID());
-                        addParticipants(ids);
+                        inviteToSession(ids);
                 }
         }
         else
@@ -566,7 +582,7 @@ BOOL LLFloaterIMPanel::dropCategory(LLInventoryCategory* category, BOOL drop)
                         {
                                 ids.put(items.get(i)->getCreatorUUID());
                         }
-                        addParticipants(ids);
+                        inviteToSession(ids);
                 }
         }
         return rv;
@@ -576,7 +592,7 @@ BOOL LLFloaterIMPanel::isAddAllowed() const
 {
 
         return ((IM_SESSION_CONFERENCE_START == mDialog) 
-                        || (IM_SESSION_ADD) );
+                        || (IM_SESSION_INVITE) );
 }
 
 
@@ -610,39 +626,6 @@ void LLFloaterIMPanel::onClickClose( void* userdata )
         }
 }
 
-void LLFloaterIMPanel::addTeleportButton()
-{
-        LLButton* btn =
-                LLViewerUICtrlFactory::getButtonByName(this, "teleport_btn");
-
-        if ( !btn->getEnabled() )
-        {
-                //it's required, don't need to check for null here
-                // adjust the size of the editor to make room for the button
-                LLRect rect = mInputEditor->getRect();
-                S32 editor_right = rect.mRight - btn->getRect().getWidth();
-                rect.mRight = editor_right;
-                mInputEditor->reshape(rect.getWidth(), rect.getHeight(), FALSE);
-                mInputEditor->setRect(rect);
-
-                btn->setVisible(TRUE);
-                btn->setEnabled(TRUE);
-        }
-}
-
-// static
-void LLFloaterIMPanel::onTeleport(void* userdata)
-{
-        LLFloaterIMPanel* self = (LLFloaterIMPanel*) userdata;
-        if(self)
-        {
-                send_simple_im(self->mSessionUUID, //to
-                                           "",
-                                           IM_TELEPORT_911,
-                                           self->mSessionUUID);//session
-        }
-}
-
 // static
 void LLFloaterIMPanel::onInputEditorFocusReceived( LLUICtrl* caller, void* userdata )
 {
@@ -690,7 +673,7 @@ void LLFloaterIMPanel::onClose(bool app_quitting)
                         name.c_str(), 
                         "",
                         IM_ONLINE,
-                        IM_SESSION_DROP,
+                        IM_SESSION_LEAVE,
                         mSessionUUID);
                 gAgent.sendReliableMessage();
         }
@@ -715,11 +698,7 @@ void deliver_message(const std::string& utf8_text,
         // which case it's probably an IM to everyone.
         U8 new_dialog = dialog;
 
-        if ( dialog == IM_SESSION_911_START )
-        {
-                new_dialog = IM_SESSION_911_SEND;
-        }
-        else if ( dialog != IM_NOTHING_SPECIAL )
+        if ( dialog != IM_NOTHING_SPECIAL )
         {
                 new_dialog = IM_SESSION_SEND;
         }
@@ -755,49 +734,6 @@ void LLFloaterIMPanel::sendMsg()
                 std::string utf8_text = wstring_to_utf8str(text);
                 utf8_text = utf8str_truncate(utf8_text, MAX_MSG_BUF_SIZE - 1);
 
-                if ( !mSessionInitialized )
-                {
-                        //we send requests (if we need to) to initialize our session
-                        if ( !mSessionInitRequested )
-                        {
-                                mSessionInitRequested = TRUE;
-                                if ( !send_start_session_messages(mSessionUUID,
-                                                                                                 mOtherParticipantUUID,
-                                                                                                 mSessionInitialTargetIDs,
-                                                                                                 mDialog) )
-                                {
-                                        //we don't need to need to wait for any responses
-                                        //so we don't need to disable
-                                        mSessionInitialized = TRUE;
-                                }
-                                else
-                                {
-                                        //queue up the message to send once the session is
-                                        //initialized
-                                        mQueuedMsgsForInit.append(utf8_text);
-
-                                        //locally echo a little "starting session" message
-                                        LLUIString session_start = sSessionStartString;
-
-                                        session_start.setArg("[NAME]", getTitle());
-                                        mSessionStartMsgPos = 
-                                                mHistoryEditor->getText().length();
-
-                                        bool log_to_file = false;
-                                        addHistoryLine(session_start,
-                                                                   LLColor4::grey,
-                                                                   log_to_file);
-
-                                }
-                        }
-                        else
-                        {
-                                //queue up the message to send once the session is
-                                //initialized
-                                mQueuedMsgsForInit.append(utf8_text);
-                        }
-                }
-
                 if ( mSessionInitialized )
                 {
                         deliver_message(utf8_text,
@@ -831,6 +767,10 @@ void LLFloaterIMPanel::sendMsg()
                                 addHistoryLine(history_echo);
                         }
                 }
+                else
+                {
+                        mQueuedMsgsForInit.append(utf8_text);
+                }
 
                 gViewerStats->incStat(LLViewerStats::ST_IM_COUNT);
         }
@@ -969,3 +909,4 @@ void LLFloaterIMPanel::chatFromLogFile(LLString line, void* userdata)
         self->mHistoryEditor->appendColoredText(line, false, true, LLColor4::grey);
 
 }
+
diff --git a/linden/indra/newview/llimpanel.h b/linden/indra/newview/llimpanel.h
index e760513..00b7033 100644
--- a/linden/indra/newview/llimpanel.h
+++ b/linden/indra/newview/llimpanel.h
@@ -71,7 +71,7 @@ public:
 
         // add target ids to the session. 
         // Return TRUE if successful, otherwise FALSE.
-        BOOL addParticipants(const LLDynamicArray<LLUUID>& agent_ids);
+        BOOL inviteToSession(const LLDynamicArray<LLUUID>& agent_ids);
 
         void addHistoryLine(const std::string &utf8msg, 
                                                 const LLColor4& color = LLColor4::white, 
@@ -98,10 +98,7 @@ public:
 
         const LLUUID& getSessionID() const { return mSessionUUID; }
         const LLUUID& getOtherParticipantID() const { return mOtherParticipantUUID; }
-
-        // HACK -- for enabling a teleport button for helpers
-        static void onTeleport(void* userdata);
-        void addTeleportButton();
+        const EInstantMessage getDialogType() const { return mDialog; }
 
         void sessionInitReplyReceived(const LLUUID& im_session_id);
 
diff --git a/linden/indra/newview/llimview.cpp b/linden/indra/newview/llimview.cpp
index 02578d2..111852d 100644
--- a/linden/indra/newview/llimview.cpp
+++ b/linden/indra/newview/llimview.cpp
@@ -32,29 +32,37 @@
 
 #include "llfontgl.h"
 #include "llrect.h"
+#include "lldbstrings.h"
 #include "llerror.h"
 #include "llbutton.h"
+#include "llsdutil.h"
 #include "llstring.h"
 #include "linked_lists.h"
 #include "llvieweruictrlfactory.h"
 
 #include "llagent.h"
 #include "llcallingcard.h"
+#include "llchat.h"
 #include "llviewerwindow.h"
 #include "llresmgr.h"
+#include "llfloaterchat.h"
 #include "llfloaternewim.h"
+#include "llhttpclient.h"
 #include "llhttpnode.h"
 #include "llimpanel.h"
 #include "llresizebar.h"
 #include "lltabcontainer.h"
 #include "viewer.h"
 #include "llfloater.h"
+#include "llmutelist.h"
 #include "llresizehandle.h"
 #include "llkeyboard.h"
 #include "llui.h"
 #include "llviewermenu.h"
 #include "llcallingcard.h"
 #include "lltoolbar.h"
+#include "llviewermessage.h"
+#include "llviewerregion.h"
 
 const EInstantMessage GROUP_DIALOG = IM_SESSION_GROUP_START;
 const EInstantMessage DEFAULT_DIALOG = IM_NOTHING_SPECIAL;
@@ -149,11 +157,9 @@ BOOL LLFloaterIM::postBuild()
                 sErrorStringsMap["no_user_911"] =
                         childGetText("user_no_help");
 
-                sEventStringsMap["add"] = childGetText("add_session_event");;
+                sEventStringsMap["add"] = childGetText("add_session_event");
                 sEventStringsMap["message"] =
-                        childGetText("message_session_event");;
-                sEventStringsMap["teleport"] =
-                        childGetText("teleport_session_event");;
+                        childGetText("message_session_event");
 
                 sForceCloseSessionMap["removed"] =
                         childGetText("removed_from_group");
@@ -377,10 +383,10 @@ void LLIMView::addMessage(
                 //if we have recently requsted to be dropped from a session
                 //but are still receiving messages from the session, don't make
                 //a new floater
-//              if ( mSessionsDropRequested.has(session_id.asString()) )
-//              {
-//                      return ;
-//              }
+                if ( mSessionsDropRequested.has(session_id.asString()) )
+                {
+                        return ;
+                }
 
                 const char* name = from;
                 if(session_name && (strlen(session_name)>1))
@@ -543,10 +549,10 @@ void LLIMView::removeSession(const LLUUID& session_id)
                 //mTabContainer->removeTabPanel(floater);
         }
 
-//      if ( session_id.notNull() )
-//      {
-//              mSessionsDropRequested[session_id.asString()] = LLSD();
-//      }
+        if ( session_id.notNull() && floater->getDialogType() != IM_NOTHING_SPECIAL )
+        {
+                mSessionsDropRequested[session_id.asString()] = LLSD();
+        }
 }
 
 void LLIMView::refresh()
@@ -851,9 +857,10 @@ public:
                 desc.source(__FILE__, __LINE__);
         }
 
-        virtual void post(ResponsePtr response,
-                                          const LLSD& context,
-                                          const LLSD& input) const
+        virtual void post(
+                ResponsePtr response,
+                const LLSD& context,
+                const LLSD& input) const
         {
                 LLSD body;
                 LLUUID temp_session_id;
@@ -867,8 +874,9 @@ public:
                 if ( success )
                 {
                         session_id = body["session_id"].asUUID();
-                        gIMView->updateFloaterSessionID(temp_session_id,
-                                                                                        session_id);
+                        gIMView->updateFloaterSessionID(
+                                temp_session_id,
+                                session_id);
                 }
                 else
                 {
@@ -883,11 +891,11 @@ public:
                                         sErrorStringsMap[body["error"].asString()];
                                 args["[RECIPIENT]"] = floater->getTitle();
 
-                                gViewerWindow->alertXml("IMSessionStartError",
-                                                                                args,
-                                                                                onConfirmForceCloseError,
-                                                                                floater);
-
+                                gViewerWindow->alertXml(
+                                        "IMSessionStartError",
+                                        args,
+                                        onConfirmForceCloseError,
+                                        floater);
                         }
                 }
         }
@@ -990,18 +998,163 @@ public:
         }
 };
 
+class LLViewerChatterBoxSessionAgentListUpdates : public LLHTTPNode
+{
+public:
+        virtual void post(
+                ResponsePtr responder,
+                const LLSD& context,
+                const LLSD& input) const
+        {
+        }
+};
+
+class LLViewerChatterBoxInvitation : public LLHTTPNode
+{
+public:
+        virtual void post(
+                ResponsePtr responder,
+                const LLSD& context,
+                const LLSD& input) const
+        {
+                if ( input["body"].has("instantmessage") )
+                {
+                        LLSD message_params =
+                                input["body"]["instantmessage"]["message_params"];
+
+                        //this is just replicated code from process_improved_im
+                        //and should really go in it's own function -jwolk
+                        if (gNoRender)
+                        {
+                                return;
+                        }
+
+                        char buffer[DB_IM_MSG_BUF_SIZE * 2];  /* Flawfinder: ignore */
+                        LLChat chat;
+
+                        std::string message = message_params["message"].asString();
+                        std::string name = message_params["from_name"].asString();
+                        LLUUID from_id = message_params["from_id"].asUUID();
+                        LLUUID session_id = message_params["id"].asUUID();
+                        std::vector<U8> bin_bucket = message_params["data"]["binary_bucket"].asBinary();
+                        U8 offline = (U8)message_params["offline"].asInteger();
+                        
+                        time_t timestamp =
+                                (time_t) message_params["timestamp"].asInteger();
+
+                        BOOL is_busy = gAgent.getBusy();
+                        BOOL is_muted =  gMuteListp->isMuted(from_id, name);
+                        BOOL is_linden = gMuteListp->isLinden(
+                                name.c_str());
+                        char separator_string[3]=": ";          /* Flawfinder: ignore */
+                        int message_offset=0;
+
+                        //Handle IRC styled /me messages.
+                        if (!strncmp(message.c_str(), "/me ", 4) ||
+                                !strncmp(message.c_str(), "/me'", 4))
+                        {
+                                strcpy(separator_string,"");       /* Flawfinder: ignore */
+                                message_offset = 3;
+                        }
+                        
+                        chat.mMuted = is_muted && !is_linden;
+                        chat.mFromID = from_id;
+                        chat.mFromName = name;
+                        if (!is_linden && is_busy)
+                        {
+                                return;
+                        }
+
+                        // standard message, not from system
+                        char saved[MAX_STRING];         /* Flawfinder: ignore */
+                        saved[0] = '\0';
+                        if(offline == IM_OFFLINE)
+                        {
+                                char time_buf[TIME_STR_LENGTH]; /* Flawfinder: ignore */
+                                snprintf(saved,         /* Flawfinder: ignore */
+                                                 MAX_STRING, 
+                                                 "(Saved %s) ", 
+                                                 formatted_time(timestamp, time_buf));
+                        }
+                        snprintf(
+                                buffer,
+                                sizeof(buffer),
+                                "%s%s%s%s",
+                                name.c_str(),
+                                separator_string,
+                                saved,
+                                (message.c_str() + message_offset)); /*Flawfinder: ignore*/
+
+                        BOOL is_this_agent = FALSE;
+                        if(from_id == gAgentID)
+                        {
+                                from_id = LLUUID::null;
+                                is_this_agent = TRUE;
+                        }
+                        gIMView->addMessage(
+                                session_id,
+                                from_id,
+                                name.c_str(),
+                                buffer,
+                                (char*)&bin_bucket[0],
+                                IM_SESSION_INVITE,
+                                message_params["parent_estate_id"].asInteger(),
+                                message_params["region_id"].asUUID(),
+                                ll_vector3_from_sd(message_params["position"]));
+
+                        snprintf(
+                                buffer,
+                                sizeof(buffer),
+                                "IM: %s%s%s%s",
+                                name.c_str(),
+                                separator_string,
+                                saved,
+                                (message.c_str()+message_offset)); /* Flawfinder: ignore */
+                        chat.mText = buffer;
+                        LLFloaterChat::addChat(chat, TRUE, is_this_agent);
+
+                        //if we succesfully accepted the invitation
+                        //send a message back down
+
+                        //TODO - When availble, have this response just be part
+                        //of an automatic response system
+                        std::string url = gAgent.getRegion()->getCapability(
+                                "ChatSessionRequest");
+
+                        if ( url != "" )
+                        {
+                                LLSD data;
+                                data["method"] = "accept invitation";
+                                data["session-id"] = input["body"]["session_id"];
+                                LLHTTPClient::post(
+                                        url,
+                                        data,
+                                        NULL);
+                        }
+                } //end if invitation has instant message
+        }
+};
+
 LLHTTPRegistration<LLViewerIMSessionStartReply>
    gHTTPRegistrationMessageImsessionstartreply(
-           "/message/IMSessionStartReply");
+           "/message/ChatterBoxSessionStartReply");
 
 LLHTTPRegistration<LLViewerIMSessionEventReply>
    gHTTPRegistrationMessageImsessioneventreply(
-           "/message/IMSessionEventReply");
+           "/message/ChatterBoxSessionEventReply");
 
 LLHTTPRegistration<LLViewerForceCloseIMSession>
     gHTTPRegistrationMessageForceCloseImSession(
-                "/message/ForceCloseIMSession");
+                "/message/ForceCloseChatterBoxSession");
 
 LLHTTPRegistration<LLViewerIMSessionDropReply>
     gHTTPRegistrationMessageImSessionDropReply(
-                "/message/IMSessionDropReply");
+                "/message/ChatterBoxSessionLeaveReply");
+
+LLHTTPRegistration<LLViewerChatterBoxSessionAgentListUpdates>
+    gHTTPRegistrationMessageChatterboxsessionagentlistupdates(
+            "/message/ChatterBoxSessionAgentListUpdates");
+
+LLHTTPRegistration<LLViewerChatterBoxInvitation>
+    gHTTPRegistrationMessageChatterBoxInvitation(
+                "/message/ChatterBoxInvitation");
diff --git a/linden/indra/newview/llinventorybridge.cpp b/linden/indra/newview/llinventorybridge.cpp
index a7b80ae..0d5c30e 100644
--- a/linden/indra/newview/llinventorybridge.cpp
+++ b/linden/indra/newview/llinventorybridge.cpp
@@ -822,7 +822,7 @@ LLString LLItemBridge::getLabelSuffix() const
         if(item) 
         {
                 // it's a bit confusing to put nocopy/nomod/etc on calling cards.
-                if(LLAssetType::AT_CALLINGCARD != item->getType()
+                if( LLAssetType::AT_CALLINGCARD != item->getType()
                    && item->getPermissions().getOwner() == gAgent.getID())
                 {
                         BOOL copy = item->getPermissions().allowCopyBy(gAgent.getID());
@@ -834,14 +834,32 @@ LLString LLItemBridge::getLabelSuffix() const
                         const char* NO_MOD = " (no modify)";
                         const char* NO_XFER = " (no transfer)";
                         const char* scopy;
-                        if(copy) scopy = EMPTY;
-                        else scopy = NO_COPY;
+                        if(copy)
+                        {
+                                scopy = EMPTY;
+                        }
+                        else
+                        {
+                                scopy = NO_COPY;
+                        };
                         const char* smod;
-                        if(mod) smod = EMPTY;
-                        else smod = NO_MOD;
+                        if(mod)
+                        {
+                                smod = EMPTY;
+                        }
+                        else
+                        {
+                                smod = NO_MOD;
+                        };
                         const char* sxfer;
-                        if(xfer) sxfer = EMPTY;
-                        else sxfer = NO_XFER;
+                        if(xfer)
+                        {
+                                sxfer = EMPTY;
+                        }
+                        else
+                        {
+                                sxfer = NO_XFER;
+                        };
                         char buffer[MAX_STRING];                /*Flawfinder: ignore*/
                         snprintf(                                               /* Flawfinder: ignore */
                                 buffer,
@@ -2510,14 +2528,14 @@ void LLLandmarkBridge::performAction(LLFolderView* folder, LLInventoryModel* mod
         else LLItemBridge::performAction(folder, model, action);
 }
 
-void open_landmark(const LLUUID& item_id, 
+void open_landmark(LLViewerInventoryItem* inv_item,
                                    const LLString& title,
                                    BOOL show_keep_discard,
                                    const LLUUID& source_id,
                                    BOOL take_focus)
 {
         // See if we can bring an exiting preview to the front
-        if( !LLPreview::show( item_id, take_focus ) )
+        if( !LLPreview::show( inv_item->getUUID(), take_focus ) )
         {
                 // There isn't one, so make a new preview
                 S32 left, top;
@@ -2525,11 +2543,12 @@ void open_landmark(const LLUUID& item_id,
                 LLRect rect = gSavedSettings.getRect("PreviewLandmarkRect");
                 rect.translate( left - rect.mLeft, top - rect.mTop );
 
-                LLPreviewLandmark* preview = new LLPreviewLandmark("preview landmark",
+                LLPreviewLandmark* preview = new LLPreviewLandmark(title,
                                                                   rect,
                                                                   title,
-                                                                  item_id,
-                                                                  show_keep_discard);
+                                                                  inv_item->getUUID(),
+                                                                  show_keep_discard,
+                                                                  inv_item);
                 preview->setSourceID(source_id);
                 if(take_focus) preview->setFocus(TRUE);
                 // keep onscreen
@@ -2542,7 +2561,7 @@ void LLLandmarkBridge::openItem()
         LLViewerInventoryItem* item = getItem();
         if( item )
         {
-                open_landmark(mUUID, LLString("  ") + getPrefix() + item->getName(), FALSE);
+                open_landmark(item, LLString("  ") + getPrefix() + item->getName(), FALSE);
         }
 }
 
@@ -2769,14 +2788,15 @@ LLViewerImage* LLNotecardBridge::getIcon() const
         return get_item_icon(LLAssetType::AT_NOTECARD, LLInventoryType::IT_NOTECARD, 0, FALSE);
 }
 
-void open_notecard(const LLUUID& item_id, 
+void open_notecard(LLViewerInventoryItem* inv_item,
                                    const LLString& title,
+                                   const LLUUID& object_id,
                                    BOOL show_keep_discard,
                                    const LLUUID& source_id,
                                    BOOL take_focus)
 {
         // See if we can bring an existing preview to the front
-        if(!LLPreview::show(item_id, take_focus))
+        if(!LLPreview::show(inv_item->getUUID(), take_focus))
         {
                 // There isn't one, so make a new preview
                 S32 left, top;
@@ -2784,13 +2804,9 @@ void open_notecard(const LLUUID& item_id,
                 LLRect rect = gSavedSettings.getRect("NotecardEditorRect");
                 rect.translate(left - rect.mLeft, top - rect.mTop);
                 LLPreviewNotecard* preview;
-                preview = new LLPreviewNotecard("preview notecard",
-                                                                                  rect,
-                                                                                  title,
-                                                                                  item_id,
-                                                                                  LLUUID::null,
-                                                                                  LLUUID::null,
-                                                                                  show_keep_discard);
+                preview = new LLPreviewNotecard("preview notecard", rect, title,
+                                                inv_item->getUUID(), object_id, inv_item->getAssetUUID(),
+                                                show_keep_discard, inv_item);
                 preview->setSourceID(source_id);
                 if(take_focus) preview->setFocus(TRUE);
                 // Force to be entirely onscreen.
@@ -2809,23 +2825,22 @@ void open_notecard(const LLUUID& item_id,
                 //              {
                 //                      // create new multipreview if it doesn't exist
                 //                      LLMultiPreview* preview_hostp = new LLMultiPreview(existing_preview->getRect());
-
                 //                      preview_hostp->addFloater(existing_preview);
                 //              }
                 //              // add this preview to existing host
                 //              preview_hostp->addFloater(preview);
                 //      }
                 //}
-
         }
 }
 
+
 void LLNotecardBridge::openItem()
 {
         LLViewerInventoryItem* item = getItem();
         if (item)
         {
-                open_notecard(mUUID, getPrefix() + item->getName(), FALSE);
+                open_notecard(item, getPrefix() + item->getName(), LLUUID::null, FALSE);
         }
 }
 
@@ -3460,10 +3475,13 @@ public:
                  * Do nothing.  We only care about the destructor
                  */
         }
+
+protected:
         ~LLWearInventoryCategoryCallback()
         {
                 wear_inventory_category_on_avatar(gInventory.getCategory(mCatID), mAppend);
         }
+
 private:
         LLUUID mCatID;
         bool mAppend;
diff --git a/linden/indra/newview/llinventoryview.h b/linden/indra/newview/llinventoryview.h
index 7b29864..536370b 100644
--- a/linden/indra/newview/llinventoryview.h
+++ b/linden/indra/newview/llinventoryview.h
@@ -329,8 +329,8 @@ void wear_outfit_by_name(const char* name);
 void wear_inventory_category(LLInventoryCategory* category, bool copy, bool append);
 
 // These methods can open items without the inventory being visible
-void open_notecard(const LLUUID& item_id, const LLString& title, BOOL show_keep_discard, const LLUUID& source_id = LLUUID::null, BOOL take_focus = TRUE);
-void open_landmark(const LLUUID& item_id, const LLString& title, BOOL show_keep_discard, const LLUUID& source_id = LLUUID::null, BOOL take_focus = TRUE);
+void open_notecard(LLViewerInventoryItem* inv_item, const LLString& title, const LLUUID& object_id, BOOL show_keep_discard, const LLUUID& source_id = LLUUID::null, BOOL take_focus = TRUE);
+void open_landmark(LLViewerInventoryItem* inv_item, const LLString& title,                          BOOL show_keep_discard, const LLUUID& source_id = LLUUID::null, BOOL take_focus = TRUE);
 void open_texture(const LLUUID& item_id, const LLString& title, BOOL show_keep_discard, const LLUUID& source_id = LLUUID::null, BOOL take_focus = TRUE);
 
 LLUUID get_item_icon_uuid(LLAssetType::EType asset_type,
diff --git a/linden/indra/newview/llmutelist.cpp b/linden/indra/newview/llmutelist.cpp
index e62bf19..c2ca740 100644
--- a/linden/indra/newview/llmutelist.cpp
+++ b/linden/indra/newview/llmutelist.cpp
@@ -185,12 +185,7 @@ BOOL LLMuteList::isLinden(const LLString& name) const
         if (token_iter == tokens.end()) return FALSE;
         
         LLString last_name = *token_iter;
-        
-        if (last_name == "Linden")
-        {
-                return TRUE;
-        }
-        return FALSE;
+        return last_name == "Linden";
 }
 
 
diff --git a/linden/indra/newview/llnotify.cpp b/linden/indra/newview/llnotify.cpp
index a84341d..e2626b4 100644
--- a/linden/indra/newview/llnotify.cpp
+++ b/linden/indra/newview/llnotify.cpp
@@ -89,6 +89,13 @@ void LLNotifyBox::showXml( const LLString& xml_desc, const LLString::format_map_
         gNotifyBoxView->addChild(notify);
 }
 
+LLPointer<LLNotifyBoxTemplate> LLNotifyBox::sDefaultTemplate;
+
+void LLNotifyBox::cleanup()
+{
+        sDefaultTemplate = NULL;
+}
+
 //---------------------------------------------------------------------------
 
 LLNotifyBox::LLNotifyBox(const LLString& xml_desc, const LLString::format_map_t& args,
@@ -118,8 +125,12 @@ LLNotifyBox::LLNotifyBox(const LLString& xml_desc, const LLString::format_map_t&
 
         // get template
         
-        static LLNotifyBoxTemplate default_template;
-        LLNotifyBoxTemplate* xml_template;
+        if (!sDefaultTemplate)
+        {
+                sDefaultTemplate = new LLNotifyBoxTemplate;
+        }
+        
+        LLPointer<LLNotifyBoxTemplate> xml_template;
         template_map_t::iterator iter = sNotifyTemplates.find(xml_desc);
         if (iter != sNotifyTemplates.end())
         {
@@ -128,8 +139,8 @@ LLNotifyBox::LLNotifyBox(const LLString& xml_desc, const LLString::format_map_t&
         else
         {
                 LLString tmsg = "[Notification template not found:\n " + xml_desc + " ]";
-                default_template.setMessage(tmsg);
-                xml_template = &default_template;
+                sDefaultTemplate->setMessage(tmsg);
+                xml_template = sDefaultTemplate;
         }
 
         // setup paramaters
@@ -630,31 +641,24 @@ bool LLNotifyBox::parseNotify(const LLString& xml_filename)
                         continue;
                 }
                 
-                LLNotifyBoxTemplate* xml_template = new LLNotifyBoxTemplate;
+                LLPointer<LLNotifyBoxTemplate> xml_template = new LLNotifyBoxTemplate;
 
                 // label=
                 LLString notify_name;
                 if (notify->getAttributeString("name", notify_name))
                 {
-                        if (xml_template)
-                        {
-                                xml_template->mLabel = notify_name;
-                        }
+                        xml_template->mLabel = notify_name;
                 }
                 else
                 {
                         llwarns << "Unable to parse notify with no name" << llendl;
-                        delete xml_template;
                         continue;
                 }
                 // modal=
                 BOOL tip;
                 if (notify->getAttributeBOOL("tip", tip))
                 {
-                        if (xml_template)
-                        {
-                                xml_template->mIsTip = tip;
-                        }
+                        xml_template->mIsTip = tip;
                 }
                                 
                 S32 btn_idx = 0;
@@ -664,10 +668,7 @@ bool LLNotifyBox::parseNotify(const LLString& xml_filename)
                         // <message>
                         if (child->hasName("message"))
                         {
-                                if (xml_template)
-                                {
-                                        xml_template->mMessage = child->getTextContents();
-                                }
+                                xml_template->mMessage = child->getTextContents();
                         }
 
                         // <option>
@@ -681,10 +682,7 @@ bool LLNotifyBox::parseNotify(const LLString& xml_filename)
                                 {
                                         ignore_text = label;
                                 }
-                                if (xml_template)
-                                {
-                                        xml_template->addOption(label, is_default);
-                                }
+                                xml_template->addOption(label, is_default);
                                 btn_idx++;
                         }
                 }
@@ -694,10 +692,7 @@ bool LLNotifyBox::parseNotify(const LLString& xml_filename)
                 {
                         xml_template->addOption("OK", FALSE);
                 }
-                if (xml_template)
-                {
-                        sNotifyTemplates[xml_template->mLabel] = xml_template;
-                }
+                sNotifyTemplates[xml_template->mLabel] = xml_template;
         }
         return true;
 }
diff --git a/linden/indra/newview/llnotify.h b/linden/indra/newview/llnotify.h
index 013b2d9..8136cfc 100644
--- a/linden/indra/newview/llnotify.h
+++ b/linden/indra/newview/llnotify.h
@@ -61,6 +61,11 @@ public:
         BOOL isTip() const { return mIsTip; }
         /*virtual*/ void setVisible(BOOL visible);
 
+        notify_callback_t getNotifyCallback() { return mCallback; }
+        void* getUserData() { return mData; }
+
+        static void cleanup();
+
 protected:
         LLNotifyBox(const LLString& xml_desc, const LLString::format_map_t& args,
                                                          notify_callback_t callback, void* user_data,
@@ -93,6 +98,8 @@ protected:
 private:
         void drawBackground() const;
 
+        static LLPointer<LLNotifyBoxTemplate> sDefaultTemplate;
+
 protected:
         BOOL mIsTip;
         BOOL mAnimating; // Are we sliding onscreen?
diff --git a/linden/indra/newview/lloverlaybar.cpp b/linden/indra/newview/lloverlaybar.cpp
index f34dc87..401cb02 100644
--- a/linden/indra/newview/lloverlaybar.cpp
+++ b/linden/indra/newview/lloverlaybar.cpp
@@ -328,27 +328,6 @@ void LLOverlayBar::refresh()
                 {
                         mMusicRemote->setVisible(TRUE);
                         mMusicRemote->setEnabled(TRUE);
-
-                        S32 musicPlaying = gAudiop->isInternetStreamPlaying();
-
-                        if ( musicPlaying == 0 )        // stopped
-                        {
-                                mMusicRemote->setTransportState ( LLMediaRemoteCtrl::Stop, FALSE );
-                        }
-                        else
-                        if ( musicPlaying == 1 )        // playing
-                        {
-                                mMusicRemote->setTransportState ( LLMediaRemoteCtrl::Play, FALSE );
-                                if (gAudiop)
-                                {
-                                        gAudiop->setInternetStreamGain ( gSavedSettings.getF32 ( "AudioLevelMusic" ) );
-                                }
-                        }
-                        else
-                        if ( musicPlaying == 2 )        // paused
-                        {
-                                mMusicRemote->setTransportState ( LLMediaRemoteCtrl::Stop, FALSE );
-                        }
                 }
         }
 
diff --git a/linden/indra/newview/llpanelavatar.cpp b/linden/indra/newview/llpanelavatar.cpp
index 9c73dad..0180bb3 100644
--- a/linden/indra/newview/llpanelavatar.cpp
+++ b/linden/indra/newview/llpanelavatar.cpp
@@ -865,14 +865,44 @@ void LLPanelAvatarClassified::refresh()
         bool allow_delete = (tab_count > 0);
         bool show_help = (tab_count == 0);
 
-        childSetEnabled("New...",self && allow_new);
-        childSetEnabled("Delete...",self && allow_delete);
+        // *HACK: Don't allow making new classifieds from inside the directory.
+        // The logic for save/don't save when closing is too hairy, and the 
+        // directory is conceptually read-only. JC
+        bool in_directory = false;
+        LLView* view = this;
+        while (view)
+        {
+                if (view->getName() == "directory")
+                {
+                        in_directory = true;
+                        break;
+                }
+                view = view->getParent();
+        }
+        childSetEnabled("New...", self && !in_directory && allow_new);
+        childSetVisible("New...", !in_directory);
+        childSetEnabled("Delete...", self && !in_directory && allow_delete);
+        childSetVisible("Delete...", !in_directory);
         childSetVisible("classified tab",!show_help);
 
         sendAvatarProfileRequestIfNeeded("avatarclassifiedsrequest");
 }
 
 
+BOOL LLPanelAvatarClassified::canClose()
+{
+        LLTabContainerCommon* tabs = LLViewerUICtrlFactory::getTabContainerByName(this, "classified tab");
+        for (S32 i = 0; i < tabs->getTabCount(); i++)
+        {
+                LLPanelClassified* panel = (LLPanelClassified*)tabs->getPanelByIndex(i);
+                if (!panel->canClose())
+                {
+                        return FALSE;
+                }
+        }
+        return TRUE;
+}
+
 BOOL LLPanelAvatarClassified::titleIsValid()
 {
         LLTabContainerCommon* tabs = LLViewerUICtrlFactory::getTabContainerByName(this, "classified tab");
@@ -1300,6 +1330,11 @@ LLPanelAvatar::~LLPanelAvatar()
 }
 
 
+BOOL LLPanelAvatar::canClose()
+{
+        return mPanelClassified && mPanelClassified->canClose();
+}
+
 void LLPanelAvatar::setAvatar(LLViewerObject *avatarp)
 {
         // find the avatar and grab the name
diff --git a/linden/indra/newview/llpanelavatar.h b/linden/indra/newview/llpanelavatar.h
index 8df5df1..b3b4e72 100644
--- a/linden/indra/newview/llpanelavatar.h
+++ b/linden/indra/newview/llpanelavatar.h
@@ -214,6 +214,10 @@ public:
 
         /*virtual*/ void refresh();
 
+        // If can close, return TRUE.  If cannot close, pop save/discard dialog
+        // and return FALSE.
+        BOOL canClose();
+
         void apply();
 
         BOOL titleIsValid();
@@ -267,6 +271,10 @@ public:
 
         /*virtual*/ BOOL        postBuild(void);
 
+        // If can close, return TRUE.  If cannot close, pop save/discard dialog
+        // and return FALSE.
+        BOOL canClose();
+
         void setAvatar(LLViewerObject *avatarp);
 
         // Fill in the avatar ID and handle some field fill-in, as well as 
diff --git a/linden/indra/newview/llpanelclassified.cpp b/linden/indra/newview/llpanelclassified.cpp
index 7a2542d..408f91a 100644
--- a/linden/indra/newview/llpanelclassified.cpp
+++ b/linden/indra/newview/llpanelclassified.cpp
@@ -60,6 +60,7 @@
 #include "llfloaterworldmap.h"
 #include "llviewergenericmessage.h"     // send_generic_message
 #include "llviewerwindow.h"     // for window width, height
+#include "viewer.h"     // app_abort_quit()
 
 const S32 MINIMUM_PRICE_FOR_LISTING = 50;       // L$
 
@@ -97,11 +98,12 @@ std::list<LLPanelClassified*> LLPanelClassified::sAllPanels;
 LLPanelClassified::LLPanelClassified(BOOL in_finder)
 :       LLPanel("Classified Panel"),
         mInFinder(in_finder),
+        mDirty(false),
+        mForceClose(false),
         mClassifiedID(),
         mCreatorID(),
         mPriceForListing(0),
         mDataRequested(FALSE),
-        mEnableCommit(FALSE),
         mPaidFor(FALSE),
     mPosGlobal(),
     mSnapshotCtrl(NULL),
@@ -152,7 +154,7 @@ void LLPanelClassified::reset()
         // Don't request data, this isn't valid
         mDataRequested = TRUE;
 
-        mEnableCommit = FALSE;
+        mDirty = false;
         mPaidFor = FALSE;
 
         mPosGlobal.clearVec();
@@ -235,7 +237,6 @@ BOOL LLPanelClassified::postBuild()
         mUpdateBtn = LLUICtrlFactory::getButtonByName(this, "classified_update_btn");
     mUpdateBtn->setClickedCallback(onClickUpdate);
     mUpdateBtn->setCallbackUserData(this);
-        mEnableCommit = TRUE;
 
         if (!mInFinder)
         {
@@ -268,12 +269,58 @@ void LLPanelClassified::apply()
 {
         // Apply is used for automatically saving results, so only
         // do that if there is a difference, and this is a save not create.
-        if (mEnableCommit && mPaidFor)
+        if (mDirty && mPaidFor)
         {
                 sendClassifiedInfoUpdate();
         }
 }
 
+
+// static
+void LLPanelClassified::saveCallback(S32 option, void* data)
+{
+        LLPanelClassified* self = (LLPanelClassified*)data;
+        switch(option)
+        {
+                case 0: // Save
+                        self->sendClassifiedInfoUpdate();
+                        // fall through to close
+
+                case 1: // Don't Save
+                        {
+                                self->mForceClose = true;
+                                // Close containing floater
+                                LLView* view = self;
+                                while (view)
+                                {
+                                        if (view->getWidgetType() == WIDGET_TYPE_FLOATER)
+                                        {
+                                                LLFloater* f = (LLFloater*)view;
+                                                f->close();
+                                                break;
+                                        }
+                                        view = view->getParent();
+                                }
+                        }
+                        break;
+
+                case 2: // Cancel
+                default:
+                        app_abort_quit();
+                        break;
+        }
+}
+
+BOOL LLPanelClassified::canClose()
+{
+        if (mForceClose || !mDirty) return TRUE;
+
+        LLString::format_map_t args;
+        args["[NAME]"] = mNameEditor->getText();
+        LLAlertDialog::showXml("ClassifiedSave", args, saveCallback, this);
+        return FALSE;
+}
+
 // Fill in some reasonable defaults for a new classified.
 void LLPanelClassified::initNewClassified()
 {
@@ -416,6 +463,8 @@ void LLPanelClassified::sendClassifiedInfoUpdate()
         msg->addU8Fast(_PREHASH_ClassifiedFlags, flags);
         msg->addS32("PriceForListing", mPriceForListing);
         gAgent.sendReliableMessage();
+
+        mDirty = false;
 }
 
 
@@ -627,7 +676,7 @@ void LLPanelClassified::refresh()
                 mSetBtn->setVisible(is_self);
                 mSetBtn->setEnabled(is_self);
 
-                mUpdateBtn->setEnabled(is_self && mEnableCommit);
+                mUpdateBtn->setEnabled(is_self && mDirty);
                 mUpdateBtn->setVisible(is_self);
         }
 }
@@ -710,7 +759,6 @@ void LLPanelClassified::callbackConfirmPublish(S32 option, void* data)
                 LLTabContainerVertical* tab = (LLTabContainerVertical*)self->getParent();
                 tab->setCurrentTabName(self->mNameEditor->getText());
         }
-        self->mEnableCommit = FALSE;
 }
 
 // static
@@ -789,14 +837,14 @@ void LLPanelClassified::onCommitAny(LLUICtrl* ctrl, void* data)
         LLPanelClassified* self = (LLPanelClassified*)data;
         if (self)
         {
-                self->mEnableCommit = TRUE;
+                self->mDirty = true;
         }
 }
 
 // static
 void LLPanelClassified::onFocusReceived(LLUICtrl* ctrl, void* data)
 {
-        // first, allow the data to be saved
+        // allow the data to be saved
         onCommitAny(ctrl, data);
 }
 
diff --git a/linden/indra/newview/llpanelclassified.h b/linden/indra/newview/llpanelclassified.h
index 498f8a5..0ebac2c 100644
--- a/linden/indra/newview/llpanelclassified.h
+++ b/linden/indra/newview/llpanelclassified.h
@@ -63,10 +63,14 @@ public:
 
     /*virtual*/ void draw();
 
-        void refresh();
+        /*virtual*/ void refresh();
 
         void apply();
 
+        // If can close, return TRUE.  If cannot close, pop save/discard dialog
+        // and return FALSE.
+        BOOL canClose();
+
         // Setup a new classified, including creating an id, giving a sane
         // initial position, etc.
         void initNewClassified();
@@ -94,6 +98,8 @@ public:
         static void callbackConfirmPublish(S32 option, void* data);
 
 protected:
+        static void saveCallback(S32 option, void* data);
+
         static void onClickUpdate(void* data);
     static void onClickTeleport(void* data);
     static void onClickMap(void* data);
@@ -107,6 +113,8 @@ protected:
 
 protected:
         BOOL mInFinder;
+        bool mDirty;
+        bool mForceClose;
     LLUUID mClassifiedID;
     LLUUID mRequestedID;
         LLUUID mCreatorID;
@@ -115,7 +123,6 @@ protected:
 
         // Data will be requested on first draw
         BOOL mDataRequested;
-        BOOL mEnableCommit;
 
         // For avatar panel classifieds only, has the user been charged
         // yet for this classified?  That is, have they saved once?
diff --git a/linden/indra/newview/llpanelgeneral.cpp b/linden/indra/newview/llpanelgeneral.cpp
index d60471d..10aef2c 100644
--- a/linden/indra/newview/llpanelgeneral.cpp
+++ b/linden/indra/newview/llpanelgeneral.cpp
@@ -196,7 +196,6 @@ void LLPanelGeneral::refresh()
         mAFKTimeout = gSavedSettings.getF32("AFKTimeout");
         mMiniMapRotate = gSavedSettings.getBOOL("MiniMapRotate");
         mNotifyMoney = gSavedSettings.getBOOL("NotifyMoneyChange");
-        mShowNewInventory = gSavedSettings.getBOOL("ShowNewInventory");
         mUseDefaultColor = gSavedSettings.getBOOL("UseDefaultColorPicker");
         mEffectColor = gSavedSettings.getColor4("EffectColor");
 
@@ -217,7 +216,6 @@ void LLPanelGeneral::cancel()
         gSavedSettings.setF32("AFKTimeout", mAFKTimeout );
         gSavedSettings.setBOOL("MiniMapRotate", mMiniMapRotate );
         gSavedSettings.setBOOL("NotifyMoneyChange", mNotifyMoney );
-        gSavedSettings.setBOOL("ShowNewInventory", mShowNewInventory);
         gSavedSettings.setBOOL("UseDefaultColorPicker", mUseDefaultColor );
         gSavedSettings.setColor4("EffectColor", mEffectColor );
         gSavedSettings.setString("Language", mLanguage);
diff --git a/linden/indra/newview/llpanelgeneral.h b/linden/indra/newview/llpanelgeneral.h
index fe4ff4e..a9bc662 100644
--- a/linden/indra/newview/llpanelgeneral.h
+++ b/linden/indra/newview/llpanelgeneral.h
@@ -61,7 +61,6 @@ protected:
         BOOL mChatOnlineNotification;
         F32 mAFKTimeout;
         BOOL mNotifyMoney;
-        BOOL mShowNewInventory;
         BOOL mUseDefaultColor;
         LLColor4 mEffectColor;
         BOOL mMiniMapRotate;
diff --git a/linden/indra/newview/llpanelgroup.cpp b/linden/indra/newview/llpanelgroup.cpp
index 47dacf3..8061e42 100644
--- a/linden/indra/newview/llpanelgroup.cpp
+++ b/linden/indra/newview/llpanelgroup.cpp
@@ -78,7 +78,7 @@ BOOL LLPanelGroupTab::postBuild()
         if (txt)
         {
                 mHelpText = txt->getText();
-                removeChild(txt);
+                removeChild(txt, TRUE);
         }
         return TRUE;
 }
@@ -285,13 +285,13 @@ BOOL LLPanelGroup::postBuild()
         if (txt)
         {
                 mDefaultNeedsApplyMesg = txt->getText();
-                removeChild(txt);
+                removeChild(txt, TRUE);
         }
         txt = (LLTextBox*)getChildByName("want_apply_text");
         if (txt)
         {
                 mWantApplyMesg = txt->getText();
-                removeChild(txt);
+                removeChild(txt, TRUE);
         }
 
         LLButton* button = (LLButton*) getChildByName("btn_ok");
diff --git a/linden/indra/newview/llpanelgroupgeneral.cpp b/linden/indra/newview/llpanelgroupgeneral.cpp
index 5ec9651..0888cad 100644
--- a/linden/indra/newview/llpanelgroupgeneral.cpp
+++ b/linden/indra/newview/llpanelgroupgeneral.cpp
@@ -135,7 +135,7 @@ BOOL LLPanelGroupGeneral::postBuild()
         if (founder)
         {
                 mFounderName = new LLNameBox(founder->getName(),founder->getRect(),LLUUID::null,FALSE,founder->getFont(),founder->getMouseOpaque());
-                removeChild(founder);
+                removeChild(founder, TRUE);
                 addChild(mFounderName);
         }
 
@@ -221,14 +221,14 @@ BOOL LLPanelGroupGeneral::postBuild()
         if (txt)
         {
                 mIncompleteMemberDataStr = txt->getText();
-                removeChild(txt);
+                removeChild(txt, TRUE);
         }
 
         txt = (LLTextBox*)getChildByName("confirm_group_create_str");
         if (txt)
         {
                 mConfirmGroupCreateStr = txt->getText();
-                removeChild(txt);
+                removeChild(txt, TRUE);
         }
 
         // If the group_id is null, then we are creating a new group
diff --git a/linden/indra/newview/llpanelgrouplandmoney.cpp b/linden/indra/newview/llpanelgrouplandmoney.cpp
index b7a74b1..117145e 100644
--- a/linden/indra/newview/llpanelgrouplandmoney.cpp
+++ b/linden/indra/newview/llpanelgrouplandmoney.cpp
@@ -569,14 +569,14 @@ BOOL LLPanelGroupLandMoney::postBuild()
         if ( no_permsp )
         {
                 mImplementationp->mCantViewParcelsText = no_permsp->getText();
-                removeChild(no_permsp);
+                removeChild(no_permsp, TRUE);
         }
 
         no_permsp = (LLTextBox*) getChildByName("cant_view_group_accounting_text");
         if ( no_permsp )
         {
                 mImplementationp->mCantViewAccountsText = no_permsp->getText();
-                removeChild(no_permsp);
+                removeChild(no_permsp, TRUE);
         }
 
         
diff --git a/linden/indra/newview/llpanelgroupnotices.cpp b/linden/indra/newview/llpanelgroupnotices.cpp
index a001455..e335929 100644
--- a/linden/indra/newview/llpanelgroupnotices.cpp
+++ b/linden/indra/newview/llpanelgroupnotices.cpp
@@ -279,7 +279,7 @@ BOOL LLPanelGroupNotices::postBuild()
         if (txt)
         {
                 mNoNoticesStr = txt->getText();
-                removeChild(txt);
+                removeChild(txt, TRUE);
         }
 
         mPanelCreateNotice = (LLPanel*) getChildByName("panel_create_new_notice",recurse);
@@ -294,7 +294,7 @@ BOOL LLPanelGroupNotices::postBuild()
         target->setToolTip(dtv->getToolTip());
 
         mPanelCreateNotice->addChild(target);
-        mPanelCreateNotice->removeChild(dtv);
+        mPanelCreateNotice->removeChild(dtv, TRUE);
 
         arrangeNoticeView(VIEW_PAST_NOTICE);
 
diff --git a/linden/indra/newview/llpanelgrouproles.cpp b/linden/indra/newview/llpanelgrouproles.cpp
index 5765a12..e6944d9 100644
--- a/linden/indra/newview/llpanelgrouproles.cpp
+++ b/linden/indra/newview/llpanelgrouproles.cpp
@@ -172,13 +172,13 @@ BOOL LLPanelGroupRoles::postBuild()
         if (txt)
         {
                 mDefaultNeedsApplyMesg = txt->getText();
-                removeChild(txt);
+                removeChild(txt, TRUE);
         }
         txt = (LLTextBox*)getChildByName("want_apply_text");
         if (txt)
         {
                 mWantApplyMesg = txt->getText();
-                removeChild(txt);
+                removeChild(txt, TRUE);
         }
 
         return LLPanelGroupTab::postBuild();
@@ -541,21 +541,21 @@ BOOL LLPanelGroupSubTab::postBuild()
         if (icon && icon->getImage().notNull())
         {
                 mActionIcons["folder"] = icon->getImage();
-                removeChild(icon);
+                removeChild(icon, TRUE);
         }
 
         icon = (LLIconCtrl*) getChildByName("power_all_have_icon",no_recurse);
         if (icon && icon->getImage().notNull())
         {
                 mActionIcons["full"] = icon->getImage();
-                removeChild(icon);
+                removeChild(icon, TRUE);
         }
 
         icon = (LLIconCtrl*) getChildByName("power_partial_icon",no_recurse);
         if (icon && icon->getImage().notNull())
         {
                 mActionIcons["partial"] = icon->getImage();
-                removeChild(icon);
+                removeChild(icon, TRUE);
         }
 
         return LLPanelGroupTab::postBuild();
@@ -1825,7 +1825,7 @@ BOOL LLPanelGroupRolesSubTab::postBuildSubTab(LLView* root)
         if (txt)
         {
                 mRemoveEveryoneTxt = txt->getText();
-                parent->removeChild(txt);
+                parent->removeChild(txt, TRUE);
         }
 
         mCreateRoleButton = 
diff --git a/linden/indra/newview/llpanelgroupvoting.cpp b/linden/indra/newview/llpanelgroupvoting.cpp
index eca188e..8b8cd76 100644
--- a/linden/indra/newview/llpanelgroupvoting.cpp
+++ b/linden/indra/newview/llpanelgroupvoting.cpp
@@ -1299,28 +1299,28 @@ BOOL LLPanelGroupVoting::postBuild()
         if (txt)
         {
                 mImpl->mViewProposalHeaderText = txt->getText();
-                removeChild(txt);
+                removeChild(txt, TRUE);
         }
 
         txt = (LLTextBox*) getChildByName("proposals_header_create_txt", recurse);
         if (txt)
         {
                 mImpl->mCreateProposalHeaderText = txt->getText();
-                removeChild(txt);
+                removeChild(txt, TRUE);
         }
 
         txt = (LLTextBox*) getChildByName("proposals_header_vote_txt", recurse);
         if (txt)
         {
                 mImpl->mVoteProposalHeaderText = txt->getText();
-                removeChild(txt);
+                removeChild(txt, TRUE);
         }
 
         txt = (LLTextBox*) getChildByName("empty_proposal_txt", recurse);
         if (txt)
         {
                 mImpl->mEmptyProposalText = txt->getText();
-                removeChild(txt);
+                removeChild(txt, TRUE);
         }
 
         mImpl->updateQuorumText();
diff --git a/linden/indra/newview/llpanelmsgs.cpp b/linden/indra/newview/llpanelmsgs.cpp
index 3f5314c..3a8729c 100644
--- a/linden/indra/newview/llpanelmsgs.cpp
+++ b/linden/indra/newview/llpanelmsgs.cpp
@@ -35,14 +35,29 @@
 #include "llviewercontrol.h"
 #include "llvieweruictrlfactory.h"
 
+class LLPopupData
+{
+public:
+        LLPopupData() : mShowNewInventory(FALSE), mAutoAcceptNewInventory(FALSE) { }
+
+        BOOL mShowNewInventory;
+        BOOL mAutoAcceptNewInventory;
+};
+
+LLPopupData sPopupData;
 
 //-----------------------------------------------------------------------------
 LLPanelMsgs::LLPanelMsgs() : 
         LLPanel("Messages Panel"),
-        mDisabledPopups( 0 ),
-        mEnabledPopups( 0 )
+        mDisabledPopups( NULL ),
+        mEnabledPopups( NULL )
 {
-};
+        gUICtrlFactory->buildPanel(this, "panel_preferences_popups.xml");
+}
+
+
+LLPanelMsgs::~LLPanelMsgs()
+{ }
 
 //-----------------------------------------------------------------------------
 // postBuild()
@@ -54,6 +69,10 @@ BOOL LLPanelMsgs::postBuild()
         childSetAction("enable_popup", onClickEnablePopup, this);
         childSetAction("reset_dialogs_btn", onClickResetDialogs, this);
         buildLists();
+
+        sPopupData.mAutoAcceptNewInventory = gSavedSettings.getBOOL("AutoAcceptNewInventory");
+        sPopupData.mShowNewInventory = gSavedSettings.getBOOL("ShowNewInventory");
+
         return TRUE;
 }
 
@@ -132,14 +151,19 @@ void LLPanelMsgs::draw()
         LLPanel::draw();
 }
 
+
 void LLPanelMsgs::apply()
 {
 }
 
+
 void LLPanelMsgs::cancel()
 {
+        gSavedSettings.setBOOL("ShowNewInventory", sPopupData.mShowNewInventory);
+        gSavedSettings.setBOOL("AutoAcceptNewInventory", sPopupData.mAutoAcceptNewInventory);
 }
 
+
 //static 
 void LLPanelMsgs::onClickEnablePopup(void* user_data)
 {
diff --git a/linden/indra/newview/llpanelmsgs.h b/linden/indra/newview/llpanelmsgs.h
index 51e0498..58b6b95 100644
--- a/linden/indra/newview/llpanelmsgs.h
+++ b/linden/indra/newview/llpanelmsgs.h
@@ -37,10 +37,10 @@ class LLPanelMsgs : public LLPanel
 {
 public:
         LLPanelMsgs();
-        virtual ~LLPanelMsgs() {};
+        /*virtual*/ ~LLPanelMsgs();
 
-        virtual BOOL postBuild();
-        virtual void draw();
+        /*virtual*/ BOOL postBuild();
+        /*virtual*/ void draw();
 
         void apply();
         void cancel();
diff --git a/linden/indra/newview/llpanelnetwork.cpp b/linden/indra/newview/llpanelnetwork.cpp
index eaf2075..8676c33 100644
--- a/linden/indra/newview/llpanelnetwork.cpp
+++ b/linden/indra/newview/llpanelnetwork.cpp
@@ -53,11 +53,6 @@
 #include "llvieweruictrlfactory.h"
 #include "llviewerwindow.h"
 
-#if LL_LIBXUL_ENABLED
-#include "llmozlib.h"
-#endif // LL_LIBXUL_ENABLED
-
-
 LLPanelNetwork::LLPanelNetwork()
 {
         gUICtrlFactory->buildPanel(this, "panel_preferences_network.xml");
@@ -113,11 +108,6 @@ void LLPanelNetwork::cancel()
 // static
 void LLPanelNetwork::onClickClearCache(void*)
 {
-#if LL_LIBXUL_ENABLED
-        // clear Mozilla cache
-        LLMozLib::getInstance()->clearCache();
-#endif // LL_LIBXUL_ENABLED
-
         // flag client cache for clearing next time the client runs
         gSavedSettings.setBOOL("PurgeCacheOnNextStartup", TRUE);
         gViewerWindow->alertXml("CacheWillClear");
diff --git a/linden/indra/newview/llpanelobject.cpp b/linden/indra/newview/llpanelobject.cpp
index 9fe94f9..ae1c213 100644
--- a/linden/indra/newview/llpanelobject.cpp
+++ b/linden/indra/newview/llpanelobject.cpp
@@ -1182,6 +1182,9 @@ void LLPanelObject::onCommitParametric( LLUICtrl* ctrl, void* userdata )
         if (selected_type == MI_SCULPT)
         {
                 self->mObject->setParameterEntryInUse(LLNetworkData::PARAMS_SCULPT, TRUE, TRUE);
+                LLSculptParams *sculpt_params = (LLSculptParams *)self->mObject->getParameterEntry(LLNetworkData::PARAMS_SCULPT);
+                if (sculpt_params)
+                        volume_params.setSculptID(sculpt_params->getSculptTexture(), 0);
         }
         else
         {
diff --git a/linden/indra/newview/llpanelweb.cpp b/linden/indra/newview/llpanelweb.cpp
index e1e4247..5b0b7e6 100644
--- a/linden/indra/newview/llpanelweb.cpp
+++ b/linden/indra/newview/llpanelweb.cpp
@@ -1,8 +1,8 @@
 /** 
- * @file llpanelweb.cpp
- * @brief Web browser options
+ * @file LLPanelWeb.cpp
+ * @brief Network preferences panel
  *
- * Copyright (c) 2003-2007, Linden Research, Inc.
+ * Copyright (c) 2001-2007, Linden Research, Inc.
  * 
  * Second Life Viewer Source Code
  * The source code in this file ("Source Code") is provided by Linden Lab
@@ -28,345 +28,127 @@
 
 #include "llviewerprecompiledheaders.h"
 
+// file include
 #include "llpanelweb.h"
 
+// linden library includes
+#include "llerror.h"
+#include "llrect.h"
+#include "llstring.h"
+
+// project includes
 #include "llbutton.h"
-#include "llscrolllistctrl.h"
+#include "llui.h"
+#include "lluictrlfactory.h"
 #include "llcheckboxctrl.h"
-#include "llradiogroup.h"
-#include "lllineeditor.h"
-#include "llfirstuse.h"
 #include "llviewercontrol.h"
-#include "llmediaengine.h"
-#include "llstartup.h"
-#include "llurlwhitelist.h"
 #include "llvieweruictrlfactory.h"
+#include "llviewerwindow.h"
+
+#if LL_LIBXUL_ENABLED
+#include "llmozlib.h"
+#endif // LL_LIBXUL_ENABLED
 
 LLPanelWeb::LLPanelWeb()
-:       LLPanel("Web Panel"),
-        mExternalBrowserCheck(NULL),
-        mBrowserHomePage(NULL),
-        mWebPagesOnPrimsCheck(NULL),
-        mTrustedSitesList(NULL),
-        mProxyEnabled(NULL),
-        mProxyAddress(NULL),
-        mProxyPort(NULL),
-        mProxySocks45(NULL),
-        mProxyExclusions(NULL),
-        mAddTrustedSite(NULL),
-        mTrustedSiteEntry(NULL),
-        mRemTrustedSite(NULL)
 {
-        mLoggedIn = ( gStartupState >= STATE_STARTED );
+        gUICtrlFactory->buildPanel(this, "panel_preferences_web.xml");
 }
 
-//-----------------------------------------------------------------------------
-// postBuild()
-//-----------------------------------------------------------------------------
 BOOL LLPanelWeb::postBuild()
 {
-        mExternalBrowserCheck = LLViewerUICtrlFactory::getCheckBoxByName(this, "external_browser_check");
-        mExternalBrowserCheck->setCallbackUserData ( this );
-        mExternalBrowserCheck->setCommitCallback ( onCommitExternalBrowser );
-
-        mWebPagesOnPrimsCheck = LLViewerUICtrlFactory::getCheckBoxByName(this, "web_pages_on_prims_check");
-
-        mBrowserHomePage = LLViewerUICtrlFactory::getLineEditorByName(this, "home_page");
-
-        mProxyEnabled = LLViewerUICtrlFactory::getCheckBoxByName(this, "proxy_enabled");
-        mProxyEnabled->setCallbackUserData ( this );
-        mProxyEnabled->setCommitCallback ( onCommitProxyEnabled );
-        mProxyAddress = LLViewerUICtrlFactory::getLineEditorByName(this, "proxy_address");
-        mProxyPort = LLViewerUICtrlFactory::getLineEditorByName(this, "proxy_port");
-        mProxySocks45 = LLViewerUICtrlFactory::getRadioGroupByName(this, "socks_4_5");
-        mProxyExclusions = LLViewerUICtrlFactory::getLineEditorByName(this, "proxy_exclusions");
-
-        mAddTrustedSite = LLViewerUICtrlFactory::getButtonByName(this, "add_trusted");
-        mAddTrustedSite->setEnabled ( FALSE );
-        mAddTrustedSite->setCallbackUserData ( this );
-        mAddTrustedSite->setClickedCallback ( onAddTrustedSite );
-
-        mTrustedSitesList = LLViewerUICtrlFactory::getScrollListByName(this, "trusted_sites_list");
-        mTrustedSitesList->setAllowMultipleSelection ( TRUE );
-        mTrustedSitesList->setCommitOnSelectionChange ( TRUE );
-        mTrustedSitesList->setCallbackUserData ( this );
-        mTrustedSitesList->setCommitCallback ( onTrustedSiteListCommit );
-
-        mTrustedSiteEntry = LLViewerUICtrlFactory::getLineEditorByName(this, "trusted_site_entry");
-        mTrustedSiteEntry->setCallbackUserData ( this );
-        mTrustedSiteEntry->setKeystrokeCallback ( onTrustedSiteEntryKeystroke );
-
-        mRemTrustedSite = LLViewerUICtrlFactory::getButtonByName(this, "rem_trusted");
-        mRemTrustedSite->setEnabled ( FALSE );
-        mRemTrustedSite->setCallbackUserData ( this );
-        mRemTrustedSite->setClickedCallback ( onRemTrustedSite );
-        
-        BOOL use_external_browser = gSavedSettings.getBOOL("UseExternalBrowser");
-        mExternalBrowserCheck->set(use_external_browser);
-
-        LLString strVal = gSavedSettings.getString ( "BrowserHomePage" );
-        mBrowserHomePage->setText ( strVal );
-
-        BOOL boolVal = gSavedSettings.getBOOL ( "BrowserProxyEnabled" );
-        mProxyEnabled->set ( boolVal );
-
-        strVal = gSavedSettings.getString ( "BrowserProxyAddress" );
-        mProxyAddress->setText ( strVal );
-
-        S32 port = gSavedSettings.getS32 ( "BrowserProxyPort" );
-        std::stringstream codec;
-        codec << port;
-        mProxyPort->setText ( codec.str () );
-
-        S32 numVal = gSavedSettings.getS32 ( "BrowserProxySocks45" );
-        mProxySocks45->setSelectedIndex ( numVal - 4 );
-
-        strVal = gSavedSettings.getString ( "BrowserProxyExclusions" );
-        mProxyExclusions->setText ( strVal );
-
-        // switch on/off UI depending on state of 'use external browser' checkbox
-        configExternaBrowserEnabledUI ( mExternalBrowserCheck->get() );
-
-        // switch on/off UI depending on which type of proxy is chosen (only if internal browseR)
-        if ( ! mExternalBrowserCheck->get() )
-                 configProxyEnabledUI ( mProxyEnabled->get() );
+        childSetAction( "clear_cache", onClickClearCache, this );
+        childSetAction( "clear_cookies", onClickClearCookies, this );
+        childSetEnabled( "connection_port", gSavedSettings.getBOOL( "CookiesEnabled" ) );
+        childSetCommitCallback( "cookies_enabled", onCommitCookies, this );
 
-        BOOL use_web_pages_on_prims = gSavedSettings.getBOOL("UseWebPagesOnPrims");
-        mWebPagesOnPrimsCheck->set(use_web_pages_on_prims);
-
-        // load the list of trusted sites
-        loadTrustedSiteList ();
+        refresh();
 
         return TRUE;
 }
 
-// helper function to enable/disable proxy UI based on what type of proxy is selected
-void LLPanelWeb::configProxyEnabledUI ( BOOL enabled )
+LLPanelWeb::~LLPanelWeb()
 {
-        if ( enabled )
-        {
-                mProxyAddress->setEnabled ( TRUE );
-                mProxyPort->setEnabled ( TRUE );
-                mProxySocks45->setEnabled ( TRUE);
-                mProxyExclusions->setEnabled ( TRUE );
-        }
-        else
-        {
-                mProxyAddress->setEnabled ( FALSE );
-                mProxyPort->setEnabled ( FALSE );
-                mProxySocks45->setEnabled ( FALSE );
-                mProxyExclusions->setEnabled ( FALSE );
-        };
+        // Children all cleaned up by default view destructor.
 }
 
-// helper function to enable/disable proxy UI based on what type of proxy is selected
-void LLPanelWeb::configExternaBrowserEnabledUI ( BOOL enabled )
+void LLPanelWeb::apply()
 {
-        if ( enabled )
-        {
-                mBrowserHomePage->setEnabled ( FALSE );
-                mWebPagesOnPrimsCheck->setEnabled ( FALSE );
-                mTrustedSitesList->setEnabled ( FALSE );
-                mProxyEnabled->setEnabled ( FALSE );
-                mProxyAddress->setEnabled ( FALSE );
-                mProxyPort->setEnabled ( FALSE );
-                mProxySocks45->setEnabled ( FALSE );
-                mProxyExclusions->setEnabled ( FALSE );
-                mAddTrustedSite->setEnabled ( FALSE );
-                mTrustedSiteEntry->setEnabled ( FALSE );
-                mRemTrustedSite->setEnabled ( FALSE );
-        }
-        else
-        {
-                mBrowserHomePage->setEnabled ( TRUE );
-                mWebPagesOnPrimsCheck->setEnabled ( TRUE );
-                mTrustedSitesList->setEnabled ( TRUE );
-                mProxyEnabled->setEnabled ( TRUE );
-                mProxyAddress->setEnabled ( TRUE );
-                mProxyPort->setEnabled ( TRUE );
-                mProxySocks45->setEnabled ( TRUE);
-                mProxyExclusions->setEnabled ( TRUE );
-                mAddTrustedSite->setEnabled ( TRUE );
-                mTrustedSiteEntry->setEnabled ( TRUE );
-
-                // only set this to enabled if there is text in the entry widget
-                if ( mTrustedSiteEntry->getLength() )
-                        mAddTrustedSite->setEnabled ( TRUE );
-                else
-                        mAddTrustedSite->setEnabled ( FALSE );
-
-                // only set this to enabled if something is selected in the list of trusted sites
-                if ( mTrustedSitesList->getFirstSelected () )
-                        mRemTrustedSite->setEnabled ( TRUE );
-                else
-                        mRemTrustedSite->setEnabled ( FALSE );
-        };
-
-        // final check - disable the white list options if not
-        // logged in since they are on a per-user basis
-        if ( ! mLoggedIn )
-        {
-                mTrustedSitesList->setEnabled ( FALSE );
-                mAddTrustedSite->setEnabled ( FALSE );
-                mTrustedSiteEntry->setEnabled ( FALSE );
-                mRemTrustedSite->setEnabled ( FALSE );
-        };
 }
 
-void LLPanelWeb::onCommitExternalBrowser ( LLUICtrl* ctrl, void* data )
+void LLPanelWeb::refresh()
 {
-        LLPanelWeb* self = (LLPanelWeb*)data;
+        LLPanel::refresh();
 
-        // update state of UI when proxy type changes
-        BOOL value = self->mExternalBrowserCheck->get ();
-        self->configExternaBrowserEnabledUI ( value );
-}
+        mCookiesEnabled = gSavedSettings.getBOOL("CookiesEnabled");
 
-void LLPanelWeb::onCommitProxyEnabled ( LLUICtrl* ctrl, void* data )
-{
-        LLPanelWeb* self = (LLPanelWeb*)data;
+#if LL_LIBXUL_ENABLED
+        llinfos << "setting cookies enabled to " << mCookiesEnabled << llendl;
+        LLMozLib::getInstance()->enableCookies( mCookiesEnabled );
+#endif // LL_LIBXUL_ENABLED
 
-        // update state of UI when proxy type changes
-        BOOL value = self->mProxyEnabled->get ();
-        self->configProxyEnabledUI ( value );
 }
 
-void LLPanelWeb::onTrustedSiteListCommit ( LLUICtrl* ctrl, void* data )
-{
-        LLPanelWeb* self = (LLPanelWeb*)data;
-
-        // something was selected so enable the REMOVE button
-        self->mRemTrustedSite->setEnabled ( TRUE );
-};
-
-void LLPanelWeb::onTrustedSiteEntryKeystroke ( LLLineEditor* caller, void* data )
+void LLPanelWeb::cancel()
 {
-        LLPanelWeb* self = (LLPanelWeb*)data;
+#if LL_LIBXUL_ENABLED
+        llinfos << "setting cookies enabled to " << mCookiesEnabled << llendl;
+        LLMozLib::getInstance()->enableCookies( mCookiesEnabled );
+#endif // LL_LIBXUL_ENABLED
 
-        if ( caller->getLength () )
-                self->mAddTrustedSite->setEnabled ( TRUE );
-        else
-                self->mAddTrustedSite->setEnabled ( FALSE );
+        gSavedSettings.setBOOL( "CookiesEnabled", mCookiesEnabled );
 }
 
-// add site to list
-void LLPanelWeb::onAddTrustedSite ( void* data )
+// static
+void LLPanelWeb::onClickClearCache(void*)
 {
-        LLPanelWeb* self = (LLPanelWeb*)data;
-
-        if ( self->mTrustedSiteEntry->getLength () )
-        {
-                // add to list
-                self->mTrustedSitesList->addSimpleItem ( self->mTrustedSiteEntry->getText () );
-
-                // remove from entry field
-                self->mTrustedSiteEntry->clear ();
-
-                // nothing in entry field so disable add button
-                self->mAddTrustedSite->setEnabled ( FALSE );
-        };
+#if LL_LIBXUL_ENABLED
+        gViewerWindow->alertXml("ConfirmClearBrowserCache", callback_clear_browser_cache, 0);
+#endif // LL_LIBXUL_ENABLED
 }
 
-// remove site from list
-void LLPanelWeb::onRemTrustedSite ( void* data )
+//static
+void LLPanelWeb::callback_clear_browser_cache(S32 option, void* userdata)
 {
-        LLPanelWeb* self = (LLPanelWeb*)data;
-
-        self->mTrustedSitesList->deleteSelectedItems ();
-
-        // once we delete something, nothing is selected so disable the REMOVE button
-        self->mRemTrustedSite->setEnabled ( FALSE );
+#if LL_LIBXUL_ENABLED
+        if ( option == 0 ) // YES
+        {
+                llinfos << "clearing browser cache" << llendl;
+                LLMozLib::getInstance()->clearCache();
+        }
+#endif // LL_LIBXUL_ENABLED
 }
 
-// save off the list of trusted sites
-void LLPanelWeb::loadTrustedSiteList ()
+// static
+void LLPanelWeb::onClickClearCookies(void*)
 {
-        // can't access white list file when not logged in since
-        // the filename is based on the SL username
-        if ( ! mLoggedIn )
-                return;
-
-        LLUrlWhiteList* theWhiteList = LLUrlWhiteList::getInstance ();
-
-        if ( theWhiteList->load () )
-        {
-                mTrustedSitesList->clear ();
-
-                LLString each;
-                if ( theWhiteList->getFirst ( each ) )
-                {
-                        mTrustedSitesList->addSimpleItem ( each );
-
-                        while ( theWhiteList->getNext ( each ) )
-                        {
-                                mTrustedSitesList->addSimpleItem ( each );
-                        };
-                };
-        };
+#if LL_LIBXUL_ENABLED
+        gViewerWindow->alertXml("ConfirmClearCookies", callback_clear_cookies, 0);
+#endif // LL_LIBXUL_ENABLED
 }
 
-// save off the list of trusted sites
-void LLPanelWeb::saveTrustedSiteList ()
+//static
+void LLPanelWeb::callback_clear_cookies(S32 option, void* userdata)
 {
-        // can't access white list file when not logged in since
-        // the filename is based on the SL username
-        if ( ! mLoggedIn )
-                return;
-
-        // erase the white list before we re-add items to it
-        LLUrlWhiteList::getInstance ()->clear ();
-
-        // step through each item in the scroll list
-        std::vector<LLScrollListItem*> data_list = mTrustedSitesList->getAllData();
-        std::vector<LLScrollListItem*>::iterator data_itor;
-        for (data_itor = data_list.begin(); data_itor != data_list.end(); ++data_itor)
+#if LL_LIBXUL_ENABLED
+        if ( option == 0 ) // YES
         {
-                LLScrollListItem* each = *data_itor;
-                LLUrlWhiteList::getInstance ()->addItem ( each->getColumn ( 0 )->getText (), false );
+                llinfos << "clearing browser cookies" << llendl;
+                LLMozLib::getInstance()->clearAllCookies();
         }
-
-        LLUrlWhiteList::getInstance ()->save ();
+#endif // LL_LIBXUL_ENABLED
 }
 
-// save off the list of trusted sites
-void LLPanelWeb::apply()
+// static
+void LLPanelWeb::onCommitCookies(LLUICtrl* ctrl, void* data)
 {
+  LLPanelWeb* self = (LLPanelWeb*)data;
+  LLCheckBoxCtrl* check = (LLCheckBoxCtrl*)ctrl;
 
-        BOOL use_external_browser = mExternalBrowserCheck->get();
-        gSavedSettings.setBOOL("UseExternalBrowser", use_external_browser);
-
-        gSavedSettings.setString ( "BrowserHomePage", mBrowserHomePage->getText() );
-
-        BOOL enabled = mProxyEnabled->get ();
-        gSavedSettings.setBOOL ( "BrowserProxyEnabled", enabled );
-
-        gSavedSettings.setString ( "BrowserProxyAddress", mProxyAddress->getText() );
-
-        S32 port;
-        std::stringstream codec ( mProxyPort->getText () );
-        codec >> port;
-        gSavedSettings.setS32 ( "BrowserProxyPort", port );
-
-        S32 socks = mProxySocks45->getSelectedIndex () + 4;
-        gSavedSettings.setS32 ( "BrowserProxySocks45", socks );
+  if (!self || !check) return;
 
-        gSavedSettings.setString ( "BrowserProxyExclusions", mProxyExclusions->getText() );
-
-        BOOL use_web_pages_on_prims = mWebPagesOnPrimsCheck->get();
-        gSavedSettings.setBOOL("UseWebPagesOnPrims", use_web_pages_on_prims);
-
-        // save off the list of trusted sites
-        saveTrustedSiteList ();
-
-        // update the media engine with the proxy information
-        if ( LLMediaEngine::getInstance() && LLMediaEngine::getInstance()->isAvailable() )
-        {
-                LLMediaEngine::getInstance()->setNetworkProxy ( enabled,
-                                                                                                                mProxyAddress->getText(), port, socks,
-                                                                                                                mProxyExclusions->getText() );
-        };
-}
-
-void LLPanelWeb::cancel()
-{
+#if LL_LIBXUL_ENABLED
+        llinfos << "setting cookies enabled to " << check->get() << llendl;
+        LLMozLib::getInstance()->enableCookies( check->get() );
+#endif // LL_LIBXUL_ENABLED
+  
 }
diff --git a/linden/indra/newview/llpanelweb.h b/linden/indra/newview/llpanelweb.h
index 0703f90..48b0742 100644
--- a/linden/indra/newview/llpanelweb.h
+++ b/linden/indra/newview/llpanelweb.h
@@ -30,53 +30,31 @@
 #define LL_LLPANELWEB_H
 
 #include "llpanel.h"
+#include "llviewerthrottle.h"
 
-class LLScrollListCtrl;
 class LLCheckBoxCtrl;
-class LLLineEditor;
-class LLRadioGroup;
-//class LLButton;
+class LLButton;
 
 class LLPanelWeb : public LLPanel
 {
 public:
         LLPanelWeb();
-        virtual ~LLPanelWeb(){};
+        virtual ~LLPanelWeb();
 
         virtual BOOL postBuild();
-
-        void apply();
-        void cancel();
-
-        void loadTrustedSiteList ();
-        void saveTrustedSiteList ();
-
-        void configProxyEnabledUI ( BOOL enabled );
-        static void onCommitProxyEnabled ( LLUICtrl* ctrl, void* data );
-
-        void configExternaBrowserEnabledUI ( BOOL enabled );
-        static void onCommitExternalBrowser ( LLUICtrl* ctrl, void* data );
-
-        static void onTrustedSiteListCommit ( LLUICtrl* ctrl, void* data );
-        static void onTrustedSiteEntryFocusChange ( LLUICtrl* ctrl, void* data );
-        static void onTrustedSiteEntryKeystroke ( LLLineEditor* caller, void* data );
-        static void onAddTrustedSite ( void* data );
-        static void onRemTrustedSite ( void* data );
-
-protected:
-        BOOL mLoggedIn;
-        LLCheckBoxCtrl* mExternalBrowserCheck;
-        LLLineEditor* mBrowserHomePage;
-        LLCheckBoxCtrl* mWebPagesOnPrimsCheck;
-        LLScrollListCtrl* mTrustedSitesList;
-        LLCheckBoxCtrl* mProxyEnabled;
-        LLLineEditor* mProxyAddress;
-        LLLineEditor* mProxyPort;
-        LLRadioGroup* mProxySocks45;
-        LLLineEditor* mProxyExclusions;
-        LLButton* mAddTrustedSite;
-        LLLineEditor* mTrustedSiteEntry;
-        LLButton* mRemTrustedSite;
+        virtual void refresh();
+        virtual void apply();   // Apply the changed values.
+        virtual void cancel();  // Cancel the changed values.
+
+private:
+        static void onClickClearCache(void*);
+        static void onClickClearCookies(void*);
+        static void callback_clear_browser_cache(S32 option, void* userdata);
+        static void callback_clear_cookies(S32 option, void* userdata);
+        static void onCommitCookies(LLUICtrl* ctrl, void* data);
+
+private:
+        BOOL mCookiesEnabled;
 };
 
 #endif
diff --git a/linden/indra/newview/llpreview.cpp b/linden/indra/newview/llpreview.cpp
index 7137f85..9b2d3f8 100644
--- a/linden/indra/newview/llpreview.cpp
+++ b/linden/indra/newview/llpreview.cpp
@@ -70,7 +70,7 @@ LLPreview::LLPreview(const std::string& name) :
         mAutoFocus = FALSE;
 }
 
-LLPreview::LLPreview(const std::string& name, const LLRect& rect, const std::string& title, const LLUUID& item_uuid, const LLUUID& object_uuid, BOOL allow_resize, S32 min_width, S32 min_height )
+LLPreview::LLPreview(const std::string& name, const LLRect& rect, const std::string& title, const LLUUID& item_uuid, const LLUUID& object_uuid, BOOL allow_resize, S32 min_width, S32 min_height, LLPointer<LLViewerInventoryItem> inv_item )
 :       LLFloater(name, rect, title, allow_resize, min_width, min_height ),
         mItemUUID(item_uuid),
         mSourceID(LLUUID::null),
@@ -79,7 +79,8 @@ LLPreview::LLPreview(const std::string& name, const LLRect& rect, const std::str
         mForceClose( FALSE ),
         mUserResized(FALSE),
         mCloseAfterSave(FALSE),
-        mAssetStatus(PREVIEW_ASSET_UNLOADED)
+        mAssetStatus(PREVIEW_ASSET_UNLOADED),
+        mItem(inv_item)
 {
         mAuxItem = new LLInventoryItem;
         // don't necessarily steal focus on creation -- sometimes these guys pop up without user action
@@ -154,9 +155,11 @@ void LLPreview::setSourceID(const LLUUID& source_id)
         sPreviewsBySource.insert(preview_multimap_t::value_type(mSourceID, mViewHandle));
 }
 
-LLViewerInventoryItem* LLPreview::getItem() const
+const LLViewerInventoryItem *LLPreview::getItem() const
 {
-        LLViewerInventoryItem* item = NULL;
+        if(mItem)
+                return mItem;
+        const LLViewerInventoryItem *item = NULL;
         if(mObjectUUID.isNull())
         {
                 // it's an inventory item, so get the item.
@@ -177,7 +180,7 @@ LLViewerInventoryItem* LLPreview::getItem() const
 // Sub-classes should override this function if they allow editing
 void LLPreview::onCommit()
 {
-        LLViewerInventoryItem* item = getItem();
+        const LLViewerInventoryItem *item = getItem();
         if(item)
         {
                 if (!item->isComplete())
@@ -350,7 +353,7 @@ BOOL LLPreview::handleHover(S32 x, S32 y, MASK mask)
         {
                 S32 screen_x;
                 S32 screen_y;
-                LLViewerInventoryItem *item = getItem();
+                const LLViewerInventoryItem *item = getItem();
 
                 localPointToScreen(x, y, &screen_x, &screen_y );
                 if(item
@@ -436,7 +439,7 @@ void LLPreview::onDiscardBtn(void* data)
 {
         LLPreview* self = (LLPreview*)data;
 
-        LLViewerInventoryItem* item = self->getItem();
+        const LLViewerInventoryItem* item = self->getItem();
         if (!item) return;
 
         self->mForceClose = TRUE;
diff --git a/linden/indra/newview/llpreview.h b/linden/indra/newview/llpreview.h
index c8c0355..0369227 100644
--- a/linden/indra/newview/llpreview.h
+++ b/linden/indra/newview/llpreview.h
@@ -71,13 +71,13 @@ public:
 public:
         // Used for XML-based construction.
         LLPreview(const std::string& name);
-        LLPreview(const std::string& name, const LLRect& rect, const std::string& title, const LLUUID& item_uuid, const LLUUID& object_uuid, BOOL allow_resize = FALSE, S32 min_width = 0, S32 min_height = 0 );
+        LLPreview(const std::string& name, const LLRect& rect, const std::string& title, const LLUUID& item_uuid, const LLUUID& object_uuid, BOOL allow_resize = FALSE, S32 min_width = 0, S32 min_height = 0, LLPointer<LLViewerInventoryItem> inv_item = NULL );
         virtual ~LLPreview();
 
         void setItemID(const LLUUID& item_id);
         void setObjectID(const LLUUID& object_id);
         void setSourceID(const LLUUID& source_id);
-        LLViewerInventoryItem* getItem() const;
+        const LLViewerInventoryItem *getItem() const; // searches if not constructed with it
 
         static LLPreview* find(const LLUUID& item_uuid);
         static LLPreview*       show(const LLUUID& item_uuid, BOOL take_focus = TRUE );
@@ -154,6 +154,7 @@ protected:
         static preview_map_t sInstances;
         LLUUID mNotecardInventoryID;
         LLUUID mObjectID;
+        LLPointer<LLViewerInventoryItem> mItem;
 };
 
 
diff --git a/linden/indra/newview/llpreviewanim.cpp b/linden/indra/newview/llpreviewanim.cpp
index ae98fb0..2eb3b75 100644
--- a/linden/indra/newview/llpreviewanim.cpp
+++ b/linden/indra/newview/llpreviewanim.cpp
@@ -51,7 +51,7 @@ LLPreviewAnim::LLPreviewAnim(const std::string& name, const LLRect& rect, const
         childSetAction("Anim play btn",playAnim,this);
         childSetAction("Anim audition btn",auditionAnim,this);
 
-        LLInventoryItem* item = getItem();
+        const LLInventoryItem* item = getItem();
         
         childSetCommitCallback("desc", LLPreview::onText, this);
         childSetText("desc", item->getDescription());
@@ -107,7 +107,7 @@ void LLPreviewAnim::endAnimCallback( void *userdata )
 void LLPreviewAnim::playAnim( void *userdata )
 {
         LLPreviewAnim* self = (LLPreviewAnim*) userdata;
-        LLInventoryItem *item = self->getItem();
+        const LLInventoryItem *item = self->getItem();
 
         if(item)
         {
@@ -144,7 +144,7 @@ void LLPreviewAnim::playAnim( void *userdata )
 void LLPreviewAnim::auditionAnim( void *userdata )
 {
         LLPreviewAnim* self = (LLPreviewAnim*) userdata;
-        LLInventoryItem *item = self->getItem();
+        const LLInventoryItem *item = self->getItem();
 
         if(item)
         {
@@ -180,7 +180,7 @@ void LLPreviewAnim::auditionAnim( void *userdata )
 void LLPreviewAnim::saveAnim( void *userdata )
 {
         LLPreviewAnim* self = (LLPreviewAnim*) userdata;
-        LLInventoryItem *item = self->getItem();
+        const LLInventoryItem *item = self->getItem();
 
         if(item)
         {
@@ -206,7 +206,7 @@ void LLPreviewAnim::saveAnim( void *userdata )
 
 void LLPreviewAnim::onClose(bool app_quitting)
 {
-        LLInventoryItem *item = getItem();
+        const LLInventoryItem *item = getItem();
 
         if(item)
         {
diff --git a/linden/indra/newview/llpreviewgesture.cpp b/linden/indra/newview/llpreviewgesture.cpp
index 2bb0108..23e6aa5 100644
--- a/linden/indra/newview/llpreviewgesture.cpp
+++ b/linden/indra/newview/llpreviewgesture.cpp
@@ -524,7 +524,7 @@ BOOL LLPreviewGesture::postBuild()
         addSounds();
 
 
-        LLInventoryItem* item = getItem();
+        const LLInventoryItem* item = getItem();
 
         if (item) 
         {
@@ -850,7 +850,7 @@ void LLPreviewGesture::initDefaultGesture()
 
 void LLPreviewGesture::loadAsset()
 {
-        LLInventoryItem* item = getItem();
+        const LLInventoryItem* item = getItem();
         if (!item) return;
 
         LLUUID asset_id = item->getAssetUUID();
@@ -1120,7 +1120,7 @@ void LLPreviewGesture::saveIfNeeded()
                 file.write((U8*)buffer, size);
 
                 // Upload that asset to the database
-                LLInventoryItem* item = getItem();
+                const LLInventoryItem* item = getItem();
                 if (item)
                 {
                         std::string agent_url = gAgent.getRegion()->getCapability("UpdateGestureAgentInventory");
diff --git a/linden/indra/newview/llpreviewlandmark.cpp b/linden/indra/newview/llpreviewlandmark.cpp
index f4637dd..62d103b 100644
--- a/linden/indra/newview/llpreviewlandmark.cpp
+++ b/linden/indra/newview/llpreviewlandmark.cpp
@@ -70,7 +70,8 @@ LLPreviewLandmark::LLPreviewLandmark(const std::string& name,
                                                                          const LLRect& rect,
                                                                          const std::string& title,
                                                                          const LLUUID& item_uuid,
-                                                                         BOOL show_keep_discard)
+                                                                         BOOL show_keep_discard,
+                                                                         LLViewerInventoryItem* inv_item)
 :       LLPreview(name,
                           LLRect(rect.mLeft, 
                                         rect.mTop, 
@@ -78,7 +79,10 @@ LLPreviewLandmark::LLPreviewLandmark(const std::string& name,
                                         rect.mBottom), 
                           title, 
                           item_uuid, 
-                          LLUUID::null),
+                          LLUUID::null, // object id
+                          FALSE,  // allow resize
+                          0, 0, // min dimensions
+                          inv_item),
         mLandmark( NULL )
 {
         
@@ -97,7 +101,7 @@ LLPreviewLandmark::LLPreviewLandmark(const std::string& name,
         childSetAction("Teleport btn", onTeleportBtn,this);
         childSetAction("Show on Map btn", onMapBtn,this);
 
-        LLInventoryItem* item = getItem();
+        const LLInventoryItem* item = getItem();
         
         childSetCommitCallback("desc", LLPreview::onText, this);
         childSetText("desc", item->getDescription());
@@ -135,7 +139,7 @@ void LLPreviewLandmark::onTeleportBtn( void* userdata )
         LLPreviewLandmark* self = (LLPreviewLandmark*) userdata;
         gFocusMgr.setKeyboardFocus(NULL, NULL);
         
-        LLInventoryItem *item = self->getItem();
+        const LLInventoryItem *item = self->getItem();
         if(item)
         {
                 gAgent.teleportViaLandmark(item->getAssetUUID());
@@ -181,7 +185,7 @@ void LLPreviewLandmark::getDegreesAndDist( F32* degrees, F64* horiz_dist, F64* v
 
 const LLString& LLPreviewLandmark::getName() const
 {
-        LLInventoryItem *item = getItem();
+        const LLInventoryItem *item = getItem();
         if (item)
         {
                 return item->getName();
@@ -210,7 +214,7 @@ void LLPreviewLandmark::draw()
 {
         if( getVisible() )
         {
-                LLInventoryItem *item = getItem();
+                const LLInventoryItem *item = getItem();
 
                 if( item && !mLandmark )
                 {
@@ -248,7 +252,7 @@ void LLPreviewLandmark::draw()
 
 void LLPreviewLandmark::loadAsset()
 {
-        LLInventoryItem *item = getItem();
+        const LLInventoryItem *item = getItem();
 
         if( item && !mLandmark )
         {
@@ -259,7 +263,7 @@ void LLPreviewLandmark::loadAsset()
 
 LLPreview::EAssetStatus LLPreviewLandmark::getAssetStatus()
 {
-        LLInventoryItem *item = getItem();
+        const LLInventoryItem *item = getItem();
         if (item && gLandmarkList.assetExists(item->getAssetUUID()))
         {
                 mAssetStatus = PREVIEW_ASSET_LOADED;
diff --git a/linden/indra/newview/llpreviewlandmark.h b/linden/indra/newview/llpreviewlandmark.h
index 76ab452..ff3f88c 100644
--- a/linden/indra/newview/llpreviewlandmark.h
+++ b/linden/indra/newview/llpreviewlandmark.h
@@ -60,7 +60,8 @@ class LLPreviewLandmark : public LLPreview
 public:
         LLPreviewLandmark(const std::string& name, const LLRect& rect, const std::string& title,
                                           const LLUUID& item_uuid,
-                                          BOOL show_keep_discard = FALSE);
+                                          BOOL show_keep_discard = FALSE,
+                                          LLViewerInventoryItem* inv_item = NULL);
         virtual ~LLPreviewLandmark();
 
         /*virtual*/ void                        draw();
diff --git a/linden/indra/newview/llpreviewnotecard.cpp b/linden/indra/newview/llpreviewnotecard.cpp
index 471fe8a..5943b3e 100644
--- a/linden/indra/newview/llpreviewnotecard.cpp
+++ b/linden/indra/newview/llpreviewnotecard.cpp
@@ -81,10 +81,12 @@ LLPreviewNotecard::LLPreviewNotecard(const std::string& name,
                                                                          const LLUUID& item_id, 
                                                                          const LLUUID& object_id,
                                                                          const LLUUID& asset_id,
-                                                                         BOOL show_keep_discard) :
+                                                                         BOOL show_keep_discard,
+                                                                         LLPointer<LLViewerInventoryItem> inv_item) :
         LLPreview(name, rect, title, item_id, object_id, TRUE,
                           PREVIEW_MIN_WIDTH,
-                          PREVIEW_MIN_HEIGHT),
+                          PREVIEW_MIN_HEIGHT,
+                          inv_item),
         mAssetID( asset_id ),
         mNotecardItemID(item_id),
         mObjectID(object_id)
@@ -104,7 +106,7 @@ LLPreviewNotecard::LLPreviewNotecard(const std::string& name,
                 
                 if( mAssetID.isNull() )
                 {
-                        LLInventoryItem* item = getItem();
+                        const LLInventoryItem* item = getItem();
                         if( item )
                         {
                                 mAssetID = item->getAssetUUID();
@@ -121,7 +123,7 @@ LLPreviewNotecard::LLPreviewNotecard(const std::string& name,
                         
         childSetVisible("lock", FALSE); 
         
-        LLInventoryItem* item = getItem();
+        const LLInventoryItem* item = getItem();
         
         childSetCommitCallback("desc", LLPreview::onText, this);
         if (item)
@@ -260,7 +262,7 @@ void LLPreviewNotecard::refreshFromInventory()
 void LLPreviewNotecard::loadAsset()
 {
         // request the asset.
-        LLInventoryItem* item = getItem();
+        const LLInventoryItem* item = getItem();
         LLViewerTextEditor* editor = LLViewerUICtrlFactory::getViewerTextEditorByName(this, "Notecard Editor");
 
         if (!editor)
@@ -384,7 +386,7 @@ void LLPreviewNotecard::onLoadComplete(LLVFS *vfs,
 
                         previewEditor->makePristine();
 
-                        LLInventoryItem* item = preview->getItem();
+                        const LLInventoryItem* item = preview->getItem();
                         BOOL modifiable = item && gAgent.allowOperation(PERM_MODIFY,
                                                                 item->getPermissions(), GP_OBJECT_MANIPULATE);
                         preview->setEnabled(modifiable);
@@ -489,7 +491,7 @@ bool LLPreviewNotecard::saveIfNeeded(LLInventoryItem* copyitem)
                 file.setMaxSize(size);
                 file.write((U8*)buffer.c_str(), size);
 
-                LLInventoryItem* item = getItem();
+                const LLInventoryItem* item = getItem();
                 // save it out to database
                 if (item)
                 {                       
diff --git a/linden/indra/newview/llpreviewnotecard.h b/linden/indra/newview/llpreviewnotecard.h
index 89352e8..715abac 100644
--- a/linden/indra/newview/llpreviewnotecard.h
+++ b/linden/indra/newview/llpreviewnotecard.h
@@ -49,7 +49,8 @@ public:
                                           const LLUUID& item_id,
                                           const LLUUID& object_id = LLUUID::null,
                                           const LLUUID& asset_id = LLUUID::null,
-                                          BOOL show_keep_discard = FALSE);
+                                          BOOL show_keep_discard = FALSE,
+                                          LLPointer<LLViewerInventoryItem> inv_item = NULL);
 
         // llpreview    
         virtual bool saveItem(LLPointer<LLInventoryItem>* itemptr);
diff --git a/linden/indra/newview/llpreviewscript.cpp b/linden/indra/newview/llpreviewscript.cpp
index 86c78a5..9f3533e 100644
--- a/linden/indra/newview/llpreviewscript.cpp
+++ b/linden/indra/newview/llpreviewscript.cpp
@@ -1097,7 +1097,7 @@ LLPreviewLSL::LLPreviewLSL(const std::string& name, const LLRect& rect,
         moveResizeHandleToFront();
 
         
-        LLInventoryItem* item = getItem();      
+        const LLInventoryItem* item = getItem();        
 
         childSetCommitCallback("desc", LLPreview::onText, this);
         childSetText("desc", item->getDescription());
@@ -1151,7 +1151,7 @@ void LLPreviewLSL::loadAsset()
         // *HACK: we poke into inventory to see if it's there, and if so,
         // then it might be part of the inventory library. If it's in the
         // library, then you can see the script, but not modify it.
-        LLInventoryItem* item = gInventory.getItem(mItemUUID);
+        const LLInventoryItem* item = gInventory.getItem(mItemUUID);
         BOOL is_library = item
                 && !gInventory.isObjectDescendentOf(mItemUUID,
                                                                                         gAgent.getInventoryRootID());
@@ -1278,7 +1278,7 @@ void LLPreviewLSL::saveIfNeeded()
         fclose(fp);
         fp = NULL;
 
-        LLInventoryItem *inv_item = getItem();
+        const LLInventoryItem *inv_item = getItem();
         // save it out to asset server
         std::string url = gAgent.getRegion()->getCapability("UpdateScriptAgentInventory");
         if(inv_item)
@@ -1393,8 +1393,8 @@ void LLPreviewLSL::onSaveComplete(const LLUUID& asset_uuid, void* user_data, S32
         {
                 if (info)
                 {
-                        LLViewerInventoryItem* item;
-                        item = (LLViewerInventoryItem*)gInventory.getItem(info->mItemUUID);
+                        const LLViewerInventoryItem* item;
+                        item = (const LLViewerInventoryItem*)gInventory.getItem(info->mItemUUID);
                         if(item)
                         {
                                 LLPointer<LLViewerInventoryItem> new_item = new LLViewerInventoryItem(item);
diff --git a/linden/indra/newview/llpreviewsound.cpp b/linden/indra/newview/llpreviewsound.cpp
index 63a8226..4e12cd0 100644
--- a/linden/indra/newview/llpreviewsound.cpp
+++ b/linden/indra/newview/llpreviewsound.cpp
@@ -59,7 +59,7 @@ LLPreviewSound::LLPreviewSound(const std::string& name, const LLRect& rect, cons
         button = LLUICtrlFactory::getButtonByName(this, "Sound audition btn");
         button->setSoundFlags(LLView::SILENT);
 
-        LLInventoryItem* item = getItem();
+        const LLInventoryItem* item = getItem();
         
         childSetCommitCallback("desc", LLPreview::onText, this);
         childSetText("desc", item->getDescription());
@@ -85,7 +85,7 @@ LLPreviewSound::LLPreviewSound(const std::string& name, const LLRect& rect, cons
 void LLPreviewSound::playSound( void *userdata )
 {
         LLPreviewSound* self = (LLPreviewSound*) userdata;
-        LLInventoryItem *item = self->getItem();
+        const LLInventoryItem *item = self->getItem();
 
         if(item && gAudiop)
         {
@@ -97,7 +97,7 @@ void LLPreviewSound::playSound( void *userdata )
 void LLPreviewSound::auditionSound( void *userdata )
 {
         LLPreviewSound* self = (LLPreviewSound*) userdata;
-        LLInventoryItem *item = self->getItem();
+        const LLInventoryItem *item = self->getItem();
 
         if(item && gAudiop)
         {
diff --git a/linden/indra/newview/llpreviewtexture.cpp b/linden/indra/newview/llpreviewtexture.cpp
index b59846d..af727b9 100644
--- a/linden/indra/newview/llpreviewtexture.cpp
+++ b/linden/indra/newview/llpreviewtexture.cpp
@@ -67,7 +67,7 @@ LLPreviewTexture::LLPreviewTexture(const std::string& name,
         mLastHeight(0),
         mLastWidth(0)
 {
-        LLInventoryItem *item = getItem();
+        const LLInventoryItem *item = getItem();
         if(item)
         {
                 mImageID = item->getAssetUUID();
@@ -177,7 +177,7 @@ void LLPreviewTexture::init()
 
         if (!mCopyToInv) 
         {
-                LLInventoryItem* item = getItem();
+                const LLInventoryItem* item = getItem();
                 
                 if (item)
                 {
diff --git a/linden/indra/newview/llselectmgr.cpp b/linden/indra/newview/llselectmgr.cpp
index ec7ba78..5086432 100644
--- a/linden/indra/newview/llselectmgr.cpp
+++ b/linden/indra/newview/llselectmgr.cpp
@@ -121,7 +121,7 @@ LLColor4 LLSelectMgr::sHighlightParentColor;
 LLColor4 LLSelectMgr::sHighlightChildColor;
 LLColor4 LLSelectMgr::sContextSilhouetteColor;
 
-static LLObjectSelection* get_null_object_selection();
+static LLObjectSelection *get_null_object_selection();
 template<> 
         const LLHandle<LLObjectSelection>::NullFunc 
                 LLHandle<LLObjectSelection>::sNullFunc = get_null_object_selection;
@@ -145,14 +145,26 @@ struct LLDeRezInfo
 //
 
 
+static LLPointer<LLObjectSelection> sNullSelection;
+
 //
 // Functions
 //
 
-LLObjectSelection* get_null_object_selection()
+void LLSelectMgr::cleanupGlobals()
+{
+        delete gSelectMgr;
+        gSelectMgr = NULL;
+        sNullSelection = NULL;
+}
+
+LLObjectSelection *get_null_object_selection()
 {
-        static LLObjectSelection null_selection;
-        return &null_selection;;
+        if (sNullSelection.isNull())
+        {
+                sNullSelection = new LLObjectSelection;
+        }
+        return sNullSelection;
 }
 
 
diff --git a/linden/indra/newview/llselectmgr.h b/linden/indra/newview/llselectmgr.h
index 96db8e5..c344181 100644
--- a/linden/indra/newview/llselectmgr.h
+++ b/linden/indra/newview/llselectmgr.h
@@ -114,9 +114,12 @@ typedef enum e_selection_type
 class LLObjectSelection : public std::list<LLSelectNode*>, public LLRefCount
 {
         friend class LLSelectMgr;
+
+protected:
+        ~LLObjectSelection();
+
 public:
         LLObjectSelection();
-        virtual ~LLObjectSelection();
 
         void updateEffects();
 
@@ -215,6 +218,8 @@ public:
         LLSelectMgr();
         ~LLSelectMgr();
 
+        static void cleanupGlobals();
+
         // LLEditMenuHandler interface
         virtual BOOL canUndo();
         virtual void undo();
diff --git a/linden/indra/newview/llspatialpartition.cpp b/linden/indra/newview/llspatialpartition.cpp
index d62a93e..dbda813 100644
--- a/linden/indra/newview/llspatialpartition.cpp
+++ b/linden/indra/newview/llspatialpartition.cpp
@@ -1717,7 +1717,7 @@ void LLSpatialPartition::processImagery(LLCamera* camera)
                                 cube_map->initGL();
                         }
 
-                        if (gPipeline.mCubeBuffer == NULL)
+                        if (gPipeline.mCubeBuffer.isNull())
                         {
                                 gPipeline.mCubeBuffer = new LLCubeMap();
                                 gPipeline.mCubeBuffer->initGL();
diff --git a/linden/indra/newview/llspatialpartition.h b/linden/indra/newview/llspatialpartition.h
index 5f6d257..3046b73 100644
--- a/linden/indra/newview/llspatialpartition.h
+++ b/linden/indra/newview/llspatialpartition.h
@@ -166,7 +166,6 @@ public:
         } eSetStateMode;
 
         LLSpatialGroup(OctreeNode* node, LLSpatialPartition* part);
-        virtual ~LLSpatialGroup();
 
         BOOL isDead()                                                   { return isState(DEAD); }
         BOOL isState(U32 state) const                   { return mState & state ? TRUE : FALSE; }
@@ -210,6 +209,8 @@ public:
         virtual void handleChildRemoval(const OctreeNode* parent, const OctreeNode* child);
 
 protected:
+        virtual ~LLSpatialGroup();
+
         U32 mState;
         S32 mLODHash;
         static S32 sLODSeed;
@@ -343,11 +344,13 @@ public:
 // class for creating bridges between spatial partitions
 class LLSpatialBridge : public LLDrawable, public LLSpatialPartition
 {
+protected:
+        ~LLSpatialBridge();
+
 public:
         typedef std::vector<LLPointer<LLSpatialBridge> > bridge_vector_t;
         
         LLSpatialBridge(LLDrawable* root, U32 data_mask);
-        virtual ~LLSpatialBridge();
         
         virtual BOOL isSpatialBridge() const            { return TRUE; }
 
diff --git a/linden/indra/newview/llstartup.cpp b/linden/indra/newview/llstartup.cpp
index 54161c0..4af02cb 100644
--- a/linden/indra/newview/llstartup.cpp
+++ b/linden/indra/newview/llstartup.cpp
@@ -505,23 +505,23 @@ BOOL idle_startup()
                 #if LL_DARWIN
                         // For Mac OS, we store both the shared libraries and the runtime files (chrome/, plugins/, etc) in
                         // Second Life.app/Contents/MacOS/.  This matches the way Firefox is distributed on the Mac.
-                        std::string profileBaseDir(gDirUtilp->getExecutableDir());
+                        std::string componentDir(gDirUtilp->getExecutableDir());
                 #elif LL_WINDOWS
-                        std::string profileBaseDir( gDirUtilp->getExpandedFilename( LL_PATH_APP_SETTINGS, "" ) );
-                        profileBaseDir += gDirUtilp->getDirDelimiter();
+                        std::string componentDir( gDirUtilp->getExpandedFilename( LL_PATH_APP_SETTINGS, "" ) );
+                        componentDir += gDirUtilp->getDirDelimiter();
                         #ifdef LL_DEBUG
-                        profileBaseDir += "mozilla_debug";
+                                componentDir += "mozilla_debug";
                         #else
-                        profileBaseDir += "mozilla";
+                                componentDir += "mozilla";
                         #endif
-                #elif LL_LINUX
-                        std::string profileBaseDir( gDirUtilp->getExpandedFilename( LL_PATH_APP_SETTINGS, "" ) );
-                        profileBaseDir += gDirUtilp->getDirDelimiter();
-                        profileBaseDir += "mozilla-runtime-linux-i686";
-                #else
-                        std::string profileBaseDir( gDirUtilp->getExpandedFilename( LL_PATH_APP_SETTINGS, "" ) );
-                        profileBaseDir += gDirUtilp->getDirDelimiter();
-                        profileBaseDir += "mozilla";
+                #elif LL_LINUX
+                        std::string componentDir( gDirUtilp->getExpandedFilename( LL_PATH_APP_SETTINGS, "" ) );
+                        componentDir += gDirUtilp->getDirDelimiter();
+                        componentDir += "mozilla-runtime-linux-i686";
+                #else
+                        std::string componentDir( gDirUtilp->getExpandedFilename( LL_PATH_APP_SETTINGS, "" ) );
+                        componentDir += gDirUtilp->getDirDelimiter();
+                        componentDir += "mozilla";
                 #endif
 
 #if LL_LINUX
@@ -531,7 +531,10 @@ BOOL idle_startup()
                 // and crashness. (SL-35450)
                 std::string saved_locale = setlocale(LC_ALL, NULL);
 #endif // LL_LINUX
-                LLMozLib::getInstance()->init( profileBaseDir, gDirUtilp->getExpandedFilename( LL_PATH_MOZILLA_PROFILE, "" ) );
+
+                // initialize Mozilla - pass in executable dir, location of extra dirs (chrome/, greprefs/, plugins/ etc.) and path to profile dir)
+                LLMozLib::getInstance()->init( gDirUtilp->getExecutableDir(), componentDir, gDirUtilp->getExpandedFilename( LL_PATH_MOZILLA_PROFILE, "" ) );
+
 #if LL_LINUX
                 setlocale(LC_ALL, saved_locale.c_str() );
 #endif // LL_LINUX
@@ -2804,25 +2807,26 @@ void update_app(BOOL mandatory, const std::string& auth_msg)
         LLStringBase<char>::format_map_t args;
         args["[MESSAGE]"] = msg;
         
-        BOOL *mandatoryp = new BOOL(mandatory);
+        // represent a bool as a null/non-null pointer
+        void *mandatoryp = mandatory ? &mandatory : NULL;
 
 #if LL_WINDOWS
         if (mandatory)
         {
                 gViewerWindow->alertXml("DownloadWindowsMandatory", args,
                                                                 update_dialog_callback,
-                                                                (void *)mandatoryp);
+                                                                mandatoryp);
         }
         else
         {
 #if LL_RELEASE_FOR_DOWNLOAD
                 gViewerWindow->alertXml("DownloadWindowsReleaseForDownload", args,
                                                                 update_dialog_callback,
-                                                                (void *)mandatoryp);
+                                                                mandatoryp);
 #else
                 gViewerWindow->alertXml("DownloadWindows", args,
                                                                 update_dialog_callback,
-                                                                (void *)mandatoryp);
+                                                                mandatoryp);
 #endif
         }
 #else
@@ -2830,18 +2834,18 @@ void update_app(BOOL mandatory, const std::string& auth_msg)
         {
                 gViewerWindow->alertXml("DownloadMacMandatory", args,
                                                                 update_dialog_callback,
-                                                                (void *)mandatoryp);
+                                                                mandatoryp);
         }
         else
         {
 #if LL_RELEASE_FOR_DOWNLOAD
                 gViewerWindow->alertXml("DownloadMacReleaseForDownload", args,
                                                                 update_dialog_callback,
-                                                                (void *)mandatoryp);
+                                                                mandatoryp);
 #else
                 gViewerWindow->alertXml("DownloadMac", args,
                                                                 update_dialog_callback,
-                                                                (void *)mandatoryp);
+                                                                mandatoryp);
 #endif
         }
 #endif
@@ -2852,7 +2856,7 @@ void update_app(BOOL mandatory, const std::string& auth_msg)
 void update_dialog_callback(S32 option, void *userdata)
 {
         std::string update_exe_path;
-        BOOL mandatory = *(BOOL *)userdata;
+        BOOL mandatory = userdata != NULL;
 
 #if !LL_RELEASE_FOR_DOWNLOAD
         if (option == 2)
diff --git a/linden/indra/newview/lltexturefetch.cpp b/linden/indra/newview/lltexturefetch.cpp
index f281207..5cdc854 100644
--- a/linden/indra/newview/lltexturefetch.cpp
+++ b/linden/indra/newview/lltexturefetch.cpp
@@ -1257,6 +1257,8 @@ LLTextureFetch::LLTextureFetch(LLTextureCache* cache, bool threaded)
         : LLWorkerThread("TextureFetch", threaded),
           mDebugCount(0),
           mDebugPause(FALSE),
+          mPacketCount(0),
+          mBadPacketCount(0),
           mQueueMutex(getAPRPool()),
           mTextureCache(cache)
 {
diff --git a/linden/indra/newview/lltoolbrush.cpp b/linden/indra/newview/lltoolbrush.cpp
index f2f338e..a1b9526 100644
--- a/linden/indra/newview/lltoolbrush.cpp
+++ b/linden/indra/newview/lltoolbrush.cpp
@@ -417,7 +417,7 @@ void LLToolBrushLand::handleSelect()
 //      if (!mBrushSelected)
         {
                 mLastShowParcelOwners = gSavedSettings.getBOOL("ShowParcelOwners");
-                gSavedSettings.setBOOL("ShowParcelOwners", TRUE);
+                gSavedSettings.setBOOL("ShowParcelOwners", mLastShowParcelOwners);
                 mBrushSelected = TRUE;
         }
 }
@@ -430,6 +430,7 @@ void LLToolBrushLand::handleDeselect()
                 gEditMenuHandler = NULL;
         }
         gFloaterTools->setStatusText("");
+        mLastShowParcelOwners = gSavedSettings.getBOOL("ShowParcelOwners");
         gSavedSettings.setBOOL("ShowParcelOwners", mLastShowParcelOwners);
         gParcelMgr->setSelectionVisible(TRUE);
         mBrushSelected = FALSE;
diff --git a/linden/indra/newview/lltoolcomp.cpp b/linden/indra/newview/lltoolcomp.cpp
index 2c2c0fe..fd1152d 100644
--- a/linden/indra/newview/lltoolcomp.cpp
+++ b/linden/indra/newview/lltoolcomp.cpp
@@ -246,7 +246,14 @@ void LLToolCompTranslate::pickCallback(S32 x, S32 y, MASK mask)
                 {
                         gEditMenuHandler = gSelectMgr;
                 }
-                if(     LLManip::LL_NO_PART != gToolTranslate->mManip->getHighlightedPart() )
+
+                BOOL can_move = gToolTranslate->mManip->getSelection()->getObjectCount() != 0;
+                for (LLViewerObject* objectp = gToolTranslate->mManip->getSelection()->getFirstObject(); objectp; objectp = gToolTranslate->mManip->getSelection()->getNextObject())
+                {
+                        can_move = can_move && objectp->permMove() && (objectp->permModify() || gSavedSettings.getBOOL("SelectLinkedSet"));
+                }
+
+                if(     LLManip::LL_NO_PART != gToolTranslate->mManip->getHighlightedPart() && can_move)
                 {
                         gToolTranslate->setCurrentTool( gToolTranslate->mManip );
                         gToolTranslate->mManip->handleMouseDownOnPart( x, y, mask );
diff --git a/linden/indra/newview/lltoolgrab.cpp b/linden/indra/newview/lltoolgrab.cpp
index b56e762..d6f1f0e 100644
--- a/linden/indra/newview/lltoolgrab.cpp
+++ b/linden/indra/newview/lltoolgrab.cpp
@@ -95,7 +95,11 @@ LLToolGrab::~LLToolGrab()
 // virtual
 void LLToolGrab::handleSelect()
 {
-        gFloaterTools->setStatusText("Drag to move objects, Ctrl to lift, Ctrl-Shift to spin");
+        if(gFloaterTools)
+        {
+                // viewer can crash during startup if we don't check.
+                gFloaterTools->setStatusText("Drag to move objects, Ctrl to lift, Ctrl-Shift to spin");
+        }
         gGrabBtnVertical = FALSE;
         gGrabBtnSpin = FALSE;
 }
diff --git a/linden/indra/newview/lltoolmgr.cpp b/linden/indra/newview/lltoolmgr.cpp
index 069bdac..8ce8111 100644
--- a/linden/indra/newview/lltoolmgr.cpp
+++ b/linden/indra/newview/lltoolmgr.cpp
@@ -206,6 +206,9 @@ LLToolMgr::~LLToolMgr()
         delete gToolPie;
         gToolPie = NULL;
 
+        delete gToolInspect;
+        gToolInspect = NULL;
+
         delete gToolGun;
         gToolGun = NULL;
 
diff --git a/linden/indra/newview/lltoolselectland.cpp b/linden/indra/newview/lltoolselectland.cpp
index 855efd2..3f0d7ba 100644
--- a/linden/indra/newview/lltoolselectland.cpp
+++ b/linden/indra/newview/lltoolselectland.cpp
@@ -218,7 +218,7 @@ void LLToolSelectLand::handleSelect()
 {
         gFloaterTools->setStatusText("Click and drag to select land");
         mLastShowParcelOwners = gSavedSettings.getBOOL("ShowParcelOwners");
-        gSavedSettings.setBOOL("ShowParcelOwners", TRUE);
+        gSavedSettings.setBOOL("ShowParcelOwners", mLastShowParcelOwners);
 }
 
 
@@ -226,6 +226,7 @@ void LLToolSelectLand::handleDeselect()
 {
         gFloaterTools->setStatusText("");
         mSelection = NULL;
+        mLastShowParcelOwners = gSavedSettings.getBOOL("ShowParcelOwners");
         //gParcelMgr->deselectLand();
         gSavedSettings.setBOOL("ShowParcelOwners", mLastShowParcelOwners);
 }
diff --git a/linden/indra/newview/llviewerinventory.h b/linden/indra/newview/llviewerinventory.h
index c60f0e6..513834f 100644
--- a/linden/indra/newview/llviewerinventory.h
+++ b/linden/indra/newview/llviewerinventory.h
@@ -191,7 +191,6 @@ protected:
 class LLInventoryCallback : public LLRefCount
 {
 public:
-        virtual ~LLInventoryCallback() {}
         virtual void fire(const LLUUID& inv_item) = 0;
 };
 
@@ -206,8 +205,11 @@ class RezAttachmentCallback : public LLInventoryCallback
 {
 public:
         RezAttachmentCallback(LLViewerJointAttachment *attachmentp);
-        ~RezAttachmentCallback();
         void fire(const LLUUID& inv_item);
+
+protected:
+        ~RezAttachmentCallback();
+
 private:
         LLViewerJointAttachment* mAttach;
 };
diff --git a/linden/indra/newview/llviewermenu.cpp b/linden/indra/newview/llviewermenu.cpp
index 1ff995e..4119573 100644
--- a/linden/indra/newview/llviewermenu.cpp
+++ b/linden/indra/newview/llviewermenu.cpp
@@ -1428,6 +1428,8 @@ void init_server_menu(LLMenuGL* menu)
         menu->createJumpKeys();
 }
 
+static std::vector<LLPointer<view_listener_t> > sMenus;
+
 //-----------------------------------------------------------------------------
 // cleanup_menus()
 //-----------------------------------------------------------------------------
@@ -1435,6 +1437,32 @@ void cleanup_menus()
 {
         delete gMenuParcelObserver;
         gMenuParcelObserver = NULL;
+
+        delete gPieSelf;
+        gPieSelf = NULL;
+
+        delete gPieAvatar;
+        gPieAvatar = NULL;
+
+        delete gPieObject;
+        gPieObject = NULL;
+
+        delete gPieAttachment;
+        gPieAttachment = NULL;
+
+        delete gPieLand;
+        gPieLand = NULL;
+
+        delete gMenuBarView;
+        gMenuBarView = NULL;
+
+        delete gPopupMenuView;
+        gPopupMenuView = NULL;
+
+        delete gMenuHolder;
+        gMenuHolder = NULL;
+
+        sMenus.clear();
 }
 
 //-----------------------------------------------------------------------------
@@ -3002,24 +3030,6 @@ class LLHelpMOTD : public view_listener_t
         }
 };
 
-class LLHelpLiveHelp : public view_listener_t
-{
-        bool handleEvent(LLPointer<LLEvent> event, const LLSD& userdata)
-        {
-                // the session_id of a 911 session will always be this agent's session id
-                static LLUUID session_id(LLUUID::null);
-                if (session_id.isNull())
-                {
-                        session_id.generate();
-                }
-                gIMView->setFloaterOpen(TRUE);
-                LLDynamicArray<LLUUID> members;
-                members.put(gAgent.getID());
-                gIMView->addSession("Help Request", IM_SESSION_911_START, session_id, members); //xui: translate
-                return true;
-        }
-};
-
 //
 // Major mode switching
 //
@@ -4530,11 +4540,7 @@ class LLToolsStopAllAnimations : public view_listener_t
                 
                 if (!avatarp) return true;
                 
-                LLVOAvatar::AnimSourceIterator anim_it = avatarp->mAnimationSources.begin();
-                for (;anim_it != avatarp->mAnimationSources.end(); ++anim_it)
-                {
-                        avatarp->stopMotion( anim_it->second, TRUE );
-                }
+                avatarp->deactivateAllMotions();
         
                 avatarp->processAnimationStateChanges();
                 return true;
@@ -7525,199 +7531,204 @@ class LLToolsSelectTool : public view_listener_t
         }
 };
 
+static void addMenu(view_listener_t *menu, const char *name)
+{
+        sMenus.push_back(menu);
+        menu->registerListener(gMenuHolder, name);
+}
+
 void initialize_menus()
 {
         // File menu
         init_menu_file();
 
         // Edit menu
-        (new LLEditUndo())->registerListener(gMenuHolder, "Edit.Undo");
-        (new LLEditRedo())->registerListener(gMenuHolder, "Edit.Redo");
-        (new LLEditCut())->registerListener(gMenuHolder, "Edit.Cut");
-        (new LLEditCopy())->registerListener(gMenuHolder, "Edit.Copy");
-        (new LLEditPaste())->registerListener(gMenuHolder, "Edit.Paste");
-        (new LLEditDelete())->registerListener(gMenuHolder, "Edit.Delete");
-        (new LLEditSearch())->registerListener(gMenuHolder, "Edit.Search");
-        (new LLEditSelectAll())->registerListener(gMenuHolder, "Edit.SelectAll");
-        (new LLEditDeselect())->registerListener(gMenuHolder, "Edit.Deselect");
-        (new LLEditDuplicate())->registerListener(gMenuHolder, "Edit.Duplicate");
-        (new LLEditTakeOff())->registerListener(gMenuHolder, "Edit.TakeOff");
-
-        (new LLEditEnableUndo())->registerListener(gMenuHolder, "Edit.EnableUndo");
-        (new LLEditEnableRedo())->registerListener(gMenuHolder, "Edit.EnableRedo");
-        (new LLEditEnableCut())->registerListener(gMenuHolder, "Edit.EnableCut");
-        (new LLEditEnableCopy())->registerListener(gMenuHolder, "Edit.EnableCopy");
-        (new LLEditEnablePaste())->registerListener(gMenuHolder, "Edit.EnablePaste");
-        (new LLEditEnableDelete())->registerListener(gMenuHolder, "Edit.EnableDelete");
-        (new LLEditEnableSelectAll())->registerListener(gMenuHolder, "Edit.EnableSelectAll");
-        (new LLEditEnableDeselect())->registerListener(gMenuHolder, "Edit.EnableDeselect");
-        (new LLEditEnableDuplicate())->registerListener(gMenuHolder, "Edit.EnableDuplicate");
-        (new LLEditEnableTakeOff())->registerListener(gMenuHolder, "Edit.EnableTakeOff");
-        (new LLEditEnableCustomizeAvatar())->registerListener(gMenuHolder, "Edit.EnableCustomizeAvatar");
+        addMenu(new LLEditUndo(), "Edit.Undo");
+        addMenu(new LLEditRedo(), "Edit.Redo");
+        addMenu(new LLEditCut(), "Edit.Cut");
+        addMenu(new LLEditCopy(), "Edit.Copy");
+        addMenu(new LLEditPaste(), "Edit.Paste");
+        addMenu(new LLEditDelete(), "Edit.Delete");
+        addMenu(new LLEditSearch(), "Edit.Search");
+        addMenu(new LLEditSelectAll(), "Edit.SelectAll");
+        addMenu(new LLEditDeselect(), "Edit.Deselect");
+        addMenu(new LLEditDuplicate(), "Edit.Duplicate");
+        addMenu(new LLEditTakeOff(), "Edit.TakeOff");
+
+        addMenu(new LLEditEnableUndo(), "Edit.EnableUndo");
+        addMenu(new LLEditEnableRedo(), "Edit.EnableRedo");
+        addMenu(new LLEditEnableCut(), "Edit.EnableCut");
+        addMenu(new LLEditEnableCopy(), "Edit.EnableCopy");
+        addMenu(new LLEditEnablePaste(), "Edit.EnablePaste");
+        addMenu(new LLEditEnableDelete(), "Edit.EnableDelete");
+        addMenu(new LLEditEnableSelectAll(), "Edit.EnableSelectAll");
+        addMenu(new LLEditEnableDeselect(), "Edit.EnableDeselect");
+        addMenu(new LLEditEnableDuplicate(), "Edit.EnableDuplicate");
+        addMenu(new LLEditEnableTakeOff(), "Edit.EnableTakeOff");
+        addMenu(new LLEditEnableCustomizeAvatar(), "Edit.EnableCustomizeAvatar");
 
         // View menu
-        (new LLViewMouselook())->registerListener(gMenuHolder, "View.Mouselook");
-        (new LLViewBuildMode())->registerListener(gMenuHolder, "View.BuildMode");
-        (new LLViewResetView())->registerListener(gMenuHolder, "View.ResetView");
-        (new LLViewLookAtLastChatter())->registerListener(gMenuHolder, "View.LookAtLastChatter");
-        (new LLViewShowHoverTips())->registerListener(gMenuHolder, "View.ShowHoverTips");
-        (new LLViewHighlightTransparent())->registerListener(gMenuHolder, "View.HighlightTransparent");
-        (new LLViewToggleBeacon())->registerListener(gMenuHolder, "View.ToggleBeacon");
-        (new LLViewToggleRenderType())->registerListener(gMenuHolder, "View.ToggleRenderType");
-        (new LLViewShowHUDAttachments())->registerListener(gMenuHolder, "View.ShowHUDAttachments");
-        (new LLViewZoomOut())->registerListener(gMenuHolder, "View.ZoomOut");
-        (new LLViewZoomIn())->registerListener(gMenuHolder, "View.ZoomIn");
-        (new LLViewZoomDefault())->registerListener(gMenuHolder, "View.ZoomDefault");
-        (new LLViewFullscreen())->registerListener(gMenuHolder, "View.Fullscreen");
-        (new LLViewDefaultUISize())->registerListener(gMenuHolder, "View.DefaultUISize");
-
-        (new LLViewEnableMouselook())->registerListener(gMenuHolder, "View.EnableMouselook");
-        (new LLViewEnableLastChatter())->registerListener(gMenuHolder, "View.EnableLastChatter");
-
-        (new LLViewCheckBuildMode())->registerListener(gMenuHolder, "View.CheckBuildMode");
-        (new LLViewCheckShowHoverTips())->registerListener(gMenuHolder, "View.CheckShowHoverTips");
-        (new LLViewCheckHighlightTransparent())->registerListener(gMenuHolder, "View.CheckHighlightTransparent");
-        (new LLViewCheckBeaconEnabled())->registerListener(gMenuHolder, "View.CheckBeaconEnabled");
-        (new LLViewCheckRenderType())->registerListener(gMenuHolder, "View.CheckRenderType");
-        (new LLViewCheckHUDAttachments())->registerListener(gMenuHolder, "View.CheckHUDAttachments");
+        addMenu(new LLViewMouselook(), "View.Mouselook");
+        addMenu(new LLViewBuildMode(), "View.BuildMode");
+        addMenu(new LLViewResetView(), "View.ResetView");
+        addMenu(new LLViewLookAtLastChatter(), "View.LookAtLastChatter");
+        addMenu(new LLViewShowHoverTips(), "View.ShowHoverTips");
+        addMenu(new LLViewHighlightTransparent(), "View.HighlightTransparent");
+        addMenu(new LLViewToggleBeacon(), "View.ToggleBeacon");
+        addMenu(new LLViewToggleRenderType(), "View.ToggleRenderType");
+        addMenu(new LLViewShowHUDAttachments(), "View.ShowHUDAttachments");
+        addMenu(new LLViewZoomOut(), "View.ZoomOut");
+        addMenu(new LLViewZoomIn(), "View.ZoomIn");
+        addMenu(new LLViewZoomDefault(), "View.ZoomDefault");
+        addMenu(new LLViewFullscreen(), "View.Fullscreen");
+        addMenu(new LLViewDefaultUISize(), "View.DefaultUISize");
+
+        addMenu(new LLViewEnableMouselook(), "View.EnableMouselook");
+        addMenu(new LLViewEnableLastChatter(), "View.EnableLastChatter");
+
+        addMenu(new LLViewCheckBuildMode(), "View.CheckBuildMode");
+        addMenu(new LLViewCheckShowHoverTips(), "View.CheckShowHoverTips");
+        addMenu(new LLViewCheckHighlightTransparent(), "View.CheckHighlightTransparent");
+        addMenu(new LLViewCheckBeaconEnabled(), "View.CheckBeaconEnabled");
+        addMenu(new LLViewCheckRenderType(), "View.CheckRenderType");
+        addMenu(new LLViewCheckHUDAttachments(), "View.CheckHUDAttachments");
 
         // World menu
-        (new LLWorldChat())->registerListener(gMenuHolder, "World.Chat");
-        (new LLWorldStartGesture())->registerListener(gMenuHolder, "World.StartGesture");
-        (new LLWorldAlwaysRun())->registerListener(gMenuHolder, "World.AlwaysRun");
-        (new LLWorldFly())->registerListener(gMenuHolder, "World.Fly");
-        (new LLWorldCreateLandmark())->registerListener(gMenuHolder, "World.CreateLandmark");
-        (new LLWorldSetHomeLocation())->registerListener(gMenuHolder, "World.SetHomeLocation");
-        (new LLWorldTeleportHome())->registerListener(gMenuHolder, "World.TeleportHome");
-        (new LLWorldSetAway())->registerListener(gMenuHolder, "World.SetAway");
-        (new LLWorldSetBusy())->registerListener(gMenuHolder, "World.SetBusy");
+        addMenu(new LLWorldChat(), "World.Chat");
+        addMenu(new LLWorldStartGesture(), "World.StartGesture");
+        addMenu(new LLWorldAlwaysRun(), "World.AlwaysRun");
+        addMenu(new LLWorldFly(), "World.Fly");
+        addMenu(new LLWorldCreateLandmark(), "World.CreateLandmark");
+        addMenu(new LLWorldSetHomeLocation(), "World.SetHomeLocation");
+        addMenu(new LLWorldTeleportHome(), "World.TeleportHome");
+        addMenu(new LLWorldSetAway(), "World.SetAway");
+        addMenu(new LLWorldSetBusy(), "World.SetBusy");
 
-        (new LLWorldEnableCreateLandmark())->registerListener(gMenuHolder, "World.EnableCreateLandmark");
-        (new LLWorldEnableSetHomeLocation())->registerListener(gMenuHolder, "World.EnableSetHomeLocation");
-        (new LLWorldEnableTeleportHome())->registerListener(gMenuHolder, "World.EnableTeleportHome");
-        (new LLWorldEnableBuyLand())->registerListener(gMenuHolder, "World.EnableBuyLand");
+        addMenu(new LLWorldEnableCreateLandmark(), "World.EnableCreateLandmark");
+        addMenu(new LLWorldEnableSetHomeLocation(), "World.EnableSetHomeLocation");
+        addMenu(new LLWorldEnableTeleportHome(), "World.EnableTeleportHome");
+        addMenu(new LLWorldEnableBuyLand(), "World.EnableBuyLand");
 
-        (new LLWorldCheckAlwaysRun())->registerListener(gMenuHolder, "World.CheckAlwaysRun");
+        addMenu(new LLWorldCheckAlwaysRun(), "World.CheckAlwaysRun");
 
-        (new LLWorldForceSun())->registerListener(gMenuHolder, "World.ForceSun");
+        addMenu(new LLWorldForceSun(), "World.ForceSun");
 
         // Tools menu
-        (new LLToolsSelectTool())->registerListener(gMenuHolder, "Tools.SelectTool");
-        (new LLToolsSelectOnlyMyObjects())->registerListener(gMenuHolder, "Tools.SelectOnlyMyObjects");
-        (new LLToolsSelectOnlyMovableObjects())->registerListener(gMenuHolder, "Tools.SelectOnlyMovableObjects");
-        (new LLToolsSelectBySurrounding())->registerListener(gMenuHolder, "Tools.SelectBySurrounding");
-        (new LLToolsShowHiddenSelection())->registerListener(gMenuHolder, "Tools.ShowHiddenSelection");
-        (new LLToolsShowSelectionLightRadius())->registerListener(gMenuHolder, "Tools.ShowSelectionLightRadius");
-        (new LLToolsSnapObjectXY())->registerListener(gMenuHolder, "Tools.SnapObjectXY");
-        (new LLToolsUseSelectionForGrid())->registerListener(gMenuHolder, "Tools.UseSelectionForGrid");
-        (new LLToolsLink())->registerListener(gMenuHolder, "Tools.Link");
-        (new LLToolsUnlink())->registerListener(gMenuHolder, "Tools.Unlink");
-        (new LLToolsStopAllAnimations())->registerListener(gMenuHolder, "Tools.StopAllAnimations");
-        (new LLToolsLookAtSelection())->registerListener(gMenuHolder, "Tools.LookAtSelection");
-        (new LLToolsBuyOrTake())->registerListener(gMenuHolder, "Tools.BuyOrTake");
-        (new LLToolsTakeCopy())->registerListener(gMenuHolder, "Tools.TakeCopy");
-        (new LLToolsSaveToInventory())->registerListener(gMenuHolder, "Tools.SaveToInventory");
-        (new LLToolsSaveToObjectInventory())->registerListener(gMenuHolder, "Tools.SaveToObjectInventory");
-        (new LLToolsSelectedScriptAction())->registerListener(gMenuHolder, "Tools.SelectedScriptAction");
-
-        (new LLToolsEnableToolNotPie())->registerListener(gMenuHolder, "Tools.EnableToolNotPie");
-        (new LLToolsEnableLink())->registerListener(gMenuHolder, "Tools.EnableLink");
-        (new LLToolsEnableUnlink())->registerListener(gMenuHolder, "Tools.EnableUnlink");
-        (new LLToolsEnableBuyOrTake())->registerListener(gMenuHolder, "Tools.EnableBuyOrTake");
-        (new LLToolsEnableTakeCopy())->registerListener(gMenuHolder, "Tools.EnableTakeCopy");
-        (new LLToolsEnableSaveToInventory())->registerListener(gMenuHolder, "Tools.SaveToInventory");
-        (new LLToolsEnableSaveToObjectInventory())->registerListener(gMenuHolder, "Tools.SaveToObjectInventory");
-
-        /*(new LLToolsVisibleBuyObject())->registerListener(gMenuHolder, "Tools.VisibleBuyObject");
-        (new LLToolsVisibleTakeObject())->registerListener(gMenuHolder, "Tools.VisibleTakeObject");*/
+        addMenu(new LLToolsSelectTool(), "Tools.SelectTool");
+        addMenu(new LLToolsSelectOnlyMyObjects(), "Tools.SelectOnlyMyObjects");
+        addMenu(new LLToolsSelectOnlyMovableObjects(), "Tools.SelectOnlyMovableObjects");
+        addMenu(new LLToolsSelectBySurrounding(), "Tools.SelectBySurrounding");
+        addMenu(new LLToolsShowHiddenSelection(), "Tools.ShowHiddenSelection");
+        addMenu(new LLToolsShowSelectionLightRadius(), "Tools.ShowSelectionLightRadius");
+        addMenu(new LLToolsSnapObjectXY(), "Tools.SnapObjectXY");
+        addMenu(new LLToolsUseSelectionForGrid(), "Tools.UseSelectionForGrid");
+        addMenu(new LLToolsLink(), "Tools.Link");
+        addMenu(new LLToolsUnlink(), "Tools.Unlink");
+        addMenu(new LLToolsStopAllAnimations(), "Tools.StopAllAnimations");
+        addMenu(new LLToolsLookAtSelection(), "Tools.LookAtSelection");
+        addMenu(new LLToolsBuyOrTake(), "Tools.BuyOrTake");
+        addMenu(new LLToolsTakeCopy(), "Tools.TakeCopy");
+        addMenu(new LLToolsSaveToInventory(), "Tools.SaveToInventory");
+        addMenu(new LLToolsSaveToObjectInventory(), "Tools.SaveToObjectInventory");
+        addMenu(new LLToolsSelectedScriptAction(), "Tools.SelectedScriptAction");
+
+        addMenu(new LLToolsEnableToolNotPie(), "Tools.EnableToolNotPie");
+        addMenu(new LLToolsEnableLink(), "Tools.EnableLink");
+        addMenu(new LLToolsEnableUnlink(), "Tools.EnableUnlink");
+        addMenu(new LLToolsEnableBuyOrTake(), "Tools.EnableBuyOrTake");
+        addMenu(new LLToolsEnableTakeCopy(), "Tools.EnableTakeCopy");
+        addMenu(new LLToolsEnableSaveToInventory(), "Tools.SaveToInventory");
+        addMenu(new LLToolsEnableSaveToObjectInventory(), "Tools.SaveToObjectInventory");
+
+        /*addMenu(new LLToolsVisibleBuyObject(), "Tools.VisibleBuyObject");
+        addMenu(new LLToolsVisibleTakeObject(), "Tools.VisibleTakeObject");*/
 
         // Help menu
-        (new LLHelpLiveHelp())->registerListener(gMenuHolder, "Help.LiveHelp");
-        (new LLHelpMOTD())->registerListener(gMenuHolder, "Help.MOTD");
+        addMenu(new LLHelpMOTD(), "Help.MOTD");
 
         // Self pie menu
-        (new LLSelfStandUp())->registerListener(gMenuHolder, "Self.StandUp");
-        (new LLSelfRemoveAllAttachments())->registerListener(gMenuHolder, "Self.RemoveAllAttachments");
+        addMenu(new LLSelfStandUp(), "Self.StandUp");
+        addMenu(new LLSelfRemoveAllAttachments(), "Self.RemoveAllAttachments");
 
-        (new LLSelfEnableStandUp())->registerListener(gMenuHolder, "Self.EnableStandUp");
-        (new LLSelfEnableRemoveAllAttachments())->registerListener(gMenuHolder, "Self.EnableRemoveAllAttachments");
+        addMenu(new LLSelfEnableStandUp(), "Self.EnableStandUp");
+        addMenu(new LLSelfEnableRemoveAllAttachments(), "Self.EnableRemoveAllAttachments");
 
          // Avatar pie menu
-        (new LLObjectMute())->registerListener(gMenuHolder, "Avatar.Mute");
-        (new LLAvatarAddFriend())->registerListener(gMenuHolder, "Avatar.AddFriend");
-        (new LLAvatarFreeze())->registerListener(gMenuHolder, "Avatar.Freeze");
-        (new LLAvatarDebug())->registerListener(gMenuHolder, "Avatar.Debug");
-        (new LLAvatarVisibleDebug())->registerListener(gMenuHolder, "Avatar.VisibleDebug");
-        (new LLAvatarEnableDebug())->registerListener(gMenuHolder, "Avatar.EnableDebug");
-        (new LLAvatarGiveCard())->registerListener(gMenuHolder, "Avatar.GiveCard");
-        (new LLAvatarEject())->registerListener(gMenuHolder, "Avatar.Eject");
-        (new LLAvatarSendIM())->registerListener(gMenuHolder, "Avatar.SendIM");
+        addMenu(new LLObjectMute(), "Avatar.Mute");
+        addMenu(new LLAvatarAddFriend(), "Avatar.AddFriend");
+        addMenu(new LLAvatarFreeze(), "Avatar.Freeze");
+        addMenu(new LLAvatarDebug(), "Avatar.Debug");
+        addMenu(new LLAvatarVisibleDebug(), "Avatar.VisibleDebug");
+        addMenu(new LLAvatarEnableDebug(), "Avatar.EnableDebug");
+        addMenu(new LLAvatarGiveCard(), "Avatar.GiveCard");
+        addMenu(new LLAvatarEject(), "Avatar.Eject");
+        addMenu(new LLAvatarSendIM(), "Avatar.SendIM");
         
-        (new LLObjectEnableMute())->registerListener(gMenuHolder, "Avatar.EnableMute");
-        (new LLAvatarEnableAddFriend())->registerListener(gMenuHolder, "Avatar.EnableAddFriend");
-        (new LLAvatarEnableFreezeEject())->registerListener(gMenuHolder, "Avatar.EnableFreezeEject");
+        addMenu(new LLObjectEnableMute(), "Avatar.EnableMute");
+        addMenu(new LLAvatarEnableAddFriend(), "Avatar.EnableAddFriend");
+        addMenu(new LLAvatarEnableFreezeEject(), "Avatar.EnableFreezeEject");
 
         // Object pie menu
-        (new LLObjectOpen())->registerListener(gMenuHolder, "Object.Open");
-        (new LLObjectBuild())->registerListener(gMenuHolder, "Object.Build");
-        (new LLObjectTouch())->registerListener(gMenuHolder, "Object.Touch");
-        (new LLObjectSitOrStand())->registerListener(gMenuHolder, "Object.SitOrStand");
-        (new LLObjectDelete())->registerListener(gMenuHolder, "Object.Delete");
-        (new LLObjectAttachToAvatar())->registerListener(gMenuHolder, "Object.AttachToAvatar");
-        (new LLObjectReturn())->registerListener(gMenuHolder, "Object.Return");
-        (new LLObjectReportAbuse())->registerListener(gMenuHolder, "Object.ReportAbuse");
-        (new LLObjectMute())->registerListener(gMenuHolder, "Object.Mute");
-        (new LLObjectBuy())->registerListener(gMenuHolder, "Object.Buy");
-        (new LLObjectEdit())->registerListener(gMenuHolder, "Object.Edit");
-        (new LLObjectInspect())->registerListener(gMenuHolder, "Object.Inspect");
-
-        (new LLObjectEnableOpen())->registerListener(gMenuHolder, "Object.EnableOpen");
-        (new LLObjectEnableTouch())->registerListener(gMenuHolder, "Object.EnableTouch");
-        (new LLObjectEnableSitOrStand())->registerListener(gMenuHolder, "Object.EnableSitOrStand");
-        (new LLObjectEnableDelete())->registerListener(gMenuHolder, "Object.EnableDelete");
-        (new LLObjectEnableWear())->registerListener(gMenuHolder, "Object.EnableWear");
-        (new LLObjectEnableReturn())->registerListener(gMenuHolder, "Object.EnableReturn");
-        (new LLObjectEnableReportAbuse())->registerListener(gMenuHolder, "Object.EnableReportAbuse");
-        (new LLObjectEnableMute())->registerListener(gMenuHolder, "Object.EnableMute");
-        (new LLObjectEnableBuy())->registerListener(gMenuHolder, "Object.EnableBuy");
-
-        /*(new LLObjectVisibleTouch())->registerListener(gMenuHolder, "Object.VisibleTouch");
-        (new LLObjectVisibleCustomTouch())->registerListener(gMenuHolder, "Object.VisibleCustomTouch");
-        (new LLObjectVisibleStandUp())->registerListener(gMenuHolder, "Object.VisibleStandUp");
-        (new LLObjectVisibleSitHere())->registerListener(gMenuHolder, "Object.VisibleSitHere");
-        (new LLObjectVisibleCustomSit())->registerListener(gMenuHolder, "Object.VisibleCustomSit");*/
+        addMenu(new LLObjectOpen(), "Object.Open");
+        addMenu(new LLObjectBuild(), "Object.Build");
+        addMenu(new LLObjectTouch(), "Object.Touch");
+        addMenu(new LLObjectSitOrStand(), "Object.SitOrStand");
+        addMenu(new LLObjectDelete(), "Object.Delete");
+        addMenu(new LLObjectAttachToAvatar(), "Object.AttachToAvatar");
+        addMenu(new LLObjectReturn(), "Object.Return");
+        addMenu(new LLObjectReportAbuse(), "Object.ReportAbuse");
+        addMenu(new LLObjectMute(), "Object.Mute");
+        addMenu(new LLObjectBuy(), "Object.Buy");
+        addMenu(new LLObjectEdit(), "Object.Edit");
+        addMenu(new LLObjectInspect(), "Object.Inspect");
+
+        addMenu(new LLObjectEnableOpen(), "Object.EnableOpen");
+        addMenu(new LLObjectEnableTouch(), "Object.EnableTouch");
+        addMenu(new LLObjectEnableSitOrStand(), "Object.EnableSitOrStand");
+        addMenu(new LLObjectEnableDelete(), "Object.EnableDelete");
+        addMenu(new LLObjectEnableWear(), "Object.EnableWear");
+        addMenu(new LLObjectEnableReturn(), "Object.EnableReturn");
+        addMenu(new LLObjectEnableReportAbuse(), "Object.EnableReportAbuse");
+        addMenu(new LLObjectEnableMute(), "Object.EnableMute");
+        addMenu(new LLObjectEnableBuy(), "Object.EnableBuy");
+
+        /*addMenu(new LLObjectVisibleTouch(), "Object.VisibleTouch");
+        addMenu(new LLObjectVisibleCustomTouch(), "Object.VisibleCustomTouch");
+        addMenu(new LLObjectVisibleStandUp(), "Object.VisibleStandUp");
+        addMenu(new LLObjectVisibleSitHere(), "Object.VisibleSitHere");
+        addMenu(new LLObjectVisibleCustomSit(), "Object.VisibleCustomSit");*/
 
         // Attachment pie menu
-        (new LLAttachmentDrop())->registerListener(gMenuHolder, "Attachment.Drop");
-        (new LLAttachmentDetach())->registerListener(gMenuHolder, "Attachment.Detach");
+        addMenu(new LLAttachmentDrop(), "Attachment.Drop");
+        addMenu(new LLAttachmentDetach(), "Attachment.Detach");
 
-        (new LLAttachmentEnableDrop())->registerListener(gMenuHolder, "Attachment.EnableDrop");
-        (new LLAttachmentEnableDetach())->registerListener(gMenuHolder, "Attachment.EnableDetach");
+        addMenu(new LLAttachmentEnableDrop(), "Attachment.EnableDrop");
+        addMenu(new LLAttachmentEnableDetach(), "Attachment.EnableDetach");
 
         // Land pie menu
-        (new LLLandBuild())->registerListener(gMenuHolder, "Land.Build");
-        (new LLLandSit())->registerListener(gMenuHolder, "Land.Sit");
-        (new LLLandBuyPass())->registerListener(gMenuHolder, "Land.BuyPass");
-        (new LLLandEdit())->registerListener(gMenuHolder, "Land.Edit");
+        addMenu(new LLLandBuild(), "Land.Build");
+        addMenu(new LLLandSit(), "Land.Sit");
+        addMenu(new LLLandBuyPass(), "Land.BuyPass");
+        addMenu(new LLLandEdit(), "Land.Edit");
 
-        (new LLLandEnableBuyPass())->registerListener(gMenuHolder, "Land.EnableBuyPass");
+        addMenu(new LLLandEnableBuyPass(), "Land.EnableBuyPass");
 
         // Generic actions
-        (new LLShowFloater())->registerListener(gMenuHolder, "ShowFloater");
-        (new LLPromptShowURL())->registerListener(gMenuHolder, "PromptShowURL");
-        (new LLPromptShowFile())->registerListener(gMenuHolder, "PromptShowFile");
-        (new LLShowAgentProfile())->registerListener(gMenuHolder, "ShowAgentProfile");
-        (new LLShowAgentGroups())->registerListener(gMenuHolder, "ShowAgentGroups");
-        (new LLToggleControl())->registerListener(gMenuHolder, "ToggleControl");
-
-        (new LLGoToObject())->registerListener(gMenuHolder, "GoToObject");
-        (new LLPayObject())->registerListener(gMenuHolder, "PayObject");
-
-        (new LLEnablePayObject())->registerListener(gMenuHolder, "EnablePayObject");
-        (new LLEnableEdit())->registerListener(gMenuHolder, "EnableEdit");
-
-        (new LLFloaterVisible())->registerListener(gMenuHolder, "FloaterVisible");
-        (new LLSomethingSelected())->registerListener(gMenuHolder, "SomethingSelected");
-        (new LLSomethingSelectedNoHUD())->registerListener(gMenuHolder, "SomethingSelectedNoHUD");
-        (new LLEditableSelected())->registerListener(gMenuHolder, "EditableSelected");
+        addMenu(new LLShowFloater(), "ShowFloater");
+        addMenu(new LLPromptShowURL(), "PromptShowURL");
+        addMenu(new LLPromptShowFile(), "PromptShowFile");
+        addMenu(new LLShowAgentProfile(), "ShowAgentProfile");
+        addMenu(new LLShowAgentGroups(), "ShowAgentGroups");
+        addMenu(new LLToggleControl(), "ToggleControl");
+
+        addMenu(new LLGoToObject(), "GoToObject");
+        addMenu(new LLPayObject(), "PayObject");
+
+        addMenu(new LLEnablePayObject(), "EnablePayObject");
+        addMenu(new LLEnableEdit(), "EnableEdit");
+
+        addMenu(new LLFloaterVisible(), "FloaterVisible");
+        addMenu(new LLSomethingSelected(), "SomethingSelected");
+        addMenu(new LLSomethingSelectedNoHUD(), "SomethingSelectedNoHUD");
+        addMenu(new LLEditableSelected(), "EditableSelected");
 }
diff --git a/linden/indra/newview/llviewermessage.cpp b/linden/indra/newview/llviewermessage.cpp
index 4973989..87ff5aa 100644
--- a/linden/indra/newview/llviewermessage.cpp
+++ b/linden/indra/newview/llviewermessage.cpp
@@ -787,15 +787,15 @@ void open_offer(const std::vector<LLUUID>& items, const std::string& from_name)
                 if (check_offer_throttle(from_name, false))
                 {
                         // I'm not sure this is a good idea.  JC
-                        // bool show_keep_discard = item->getPermissions().getCreator() != gAgent.getID();
-                        bool show_keep_discard = true;
+                        bool show_keep_discard = item->getPermissions().getCreator() != gAgent.getID();
+                        //bool show_keep_discard = true;
                         switch(item->getType())
                         {
                         case LLAssetType::AT_NOTECARD:
-                                open_notecard(*it, LLString("Note: ") + item->getName(), show_keep_discard, LLUUID::null, FALSE);
+                                open_notecard((LLViewerInventoryItem*)item, LLString("Note: ") + item->getName(), LLUUID::null, show_keep_discard, LLUUID::null, FALSE);
                                 break;
                         case LLAssetType::AT_LANDMARK:
-                                open_landmark(*it, LLString("Landmark: ") + item->getName(), show_keep_discard, LLUUID::null, FALSE);
+                                open_landmark((LLViewerInventoryItem*)item, LLString("Landmark: ") + item->getName(), show_keep_discard, LLUUID::null, FALSE);
                                 break;
                         case LLAssetType::AT_TEXTURE:
                                 open_texture(*it, LLString("Texture: ") + item->getName(), show_keep_discard, LLUUID::null, FALSE);
@@ -850,7 +850,7 @@ void inventory_offer_mute_callback(const LLUUID& blocked_id,
                                                                    const char* first_name,
                                                                    const char* last_name,
                                                                    BOOL is_group,
-                                                                   void*)
+                                                                   void* user_data)
 {
         LLString from_name;
         LLMute::EType type;
@@ -874,10 +874,35 @@ void inventory_offer_mute_callback(const LLUUID& blocked_id,
                 gFloaterMute->show();
                 gFloaterMute->selectMute(blocked_id);
         }
+
+        // purge the offer queue of any previously queued inventory offers from the same source.
+        LLView::child_list_t notification_queue(*(gNotifyBoxView->getChildList()));
+        for(LLView::child_list_iter_t iter = notification_queue.begin();
+                iter != notification_queue.end();
+                iter++)
+        {
+                LLNotifyBox* notification = (LLNotifyBox*)*iter;
+                // scan for other inventory offers (i.e. ignore other types of notifications).
+                // we can tell by looking for the associated callback they were created with.
+                if(notification->getNotifyCallback() == inventory_offer_callback)
+                {
+                        // found one.
+                        // safe to downcast user data because we know it's associated with offer callback.
+                        LLOfferInfo* offer_data = (LLOfferInfo*)notification->getUserData();
+                        if(offer_data == user_data)
+                        {
+                                continue; // don't remove the msg triggering us. it will be dequeued normally.
+                        }
+                        if(offer_data->mFromID == blocked_id) 
+                        {
+                                gNotifyBoxView->removeChild(notification);
+                        }
+                }
+        }
 }
 
-void inventory_offer_callback(S32 option, void* user_data)
-{
+void inventory_offer_callback(S32 button, void* user_data)
+ {
         LLChat chat;
         LLString log_message;
 
@@ -889,9 +914,9 @@ void inventory_offer_callback(S32 option, void* user_data)
         // * callback may be called immediately,
         // * adding the mute sends a message,
         // * we can't build two messages at once.  JC
-        if (option == 2)
+        if (2 == button)
         {
-                gCacheName->get(info->mFromID, info->mFromGroup, inventory_offer_mute_callback, NULL);
+                gCacheName->get(info->mFromID, info->mFromGroup, inventory_offer_mute_callback, user_data);
         }
 
         LLMessageSystem* msg = gMessageSystem;
@@ -922,7 +947,8 @@ void inventory_offer_callback(S32 option, void* user_data)
         }
 
         // XUI:translate
-        LLString from_string;
+        LLString from_string; // Used in the pop-up.
+        LLString chatHistory_string;  // Used in chat history.
         if (info->mFromObject == TRUE)
         {
                 if (info->mFromGroup)
@@ -931,10 +957,12 @@ void inventory_offer_callback(S32 option, void* user_data)
                         if (gCacheName->getGroupName(info->mFromID, group_name))
                         {
                                 from_string = LLString("An object named '") + info->mFromName + "' owned by the group '" + group_name + "'";
+                                chatHistory_string = info->mFromName + " owned by the group '" + group_name + "'";
                         }
                         else
                         {
                                 from_string = LLString("An object named '") + info->mFromName + "' owned by an unknown group";
+                                chatHistory_string = info->mFromName + " owned by an unknown group";
                         }
                 }
                 else
@@ -944,21 +972,23 @@ void inventory_offer_callback(S32 option, void* user_data)
                         if (gCacheName->getName(info->mFromID, first_name, last_name))
                         {
                                 from_string = LLString("An object named '") + info->mFromName + "' owned by " + first_name + " " + last_name;
+                                chatHistory_string = info->mFromName + " owned by " + first_name + " " + last_name;
                         }
                         else
                         {
                                 from_string = LLString("An object named '") + info->mFromName + "' owned by an unknown user";
+                                chatHistory_string = info->mFromName + " owned by an unknown user";
                         }
                 }
         }
         else
         {
-                from_string = info->mFromName;
+                from_string = chatHistory_string = info->mFromName;
         }
         
         bool busy=FALSE;
         
-        switch(option)
+        switch(button)
         {
         case IOR_ACCEPT:
                 // ACCEPT. The math for the dialog works, because the accept
@@ -975,7 +1005,7 @@ void inventory_offer_callback(S32 option, void* user_data)
                 //don't spam them if they are getting flooded
                 if (check_offer_throttle(info->mFromName, true))
                 {
-                        log_message = info->mFromName + " gave you " + info->mDesc + ".";
+                        log_message = chatHistory_string + " gave you " + info->mDesc + ".";
                         chat.mText = log_message;
                         LLFloaterChat::addChatHistory(chat);
                 }
@@ -1017,7 +1047,7 @@ void inventory_offer_callback(S32 option, void* user_data)
                 default:
                         llwarns << "inventory_offer_callback: unknown offer type" << llendl;
                         break;
-                }
+                }       // end switch (info->mIM)
                 break;
 
         case IOR_BUSY:
@@ -1040,6 +1070,10 @@ void inventory_offer_callback(S32 option, void* user_data)
 
                 log_message = "You decline " + info->mDesc + " from " + info->mFromName + ".";
                 chat.mText = log_message;
+                if( gMuteListp->isMuted(info->mFromID ) && ! gMuteListp->isLinden(info->mFromName) )  // muting for SL-42269
+                {
+                        chat.mMuted = TRUE;
+                }
                 LLFloaterChat::addChatHistory(chat);
 
                 // If it's from an agent, we have to fetch the item to throw
@@ -1086,7 +1120,6 @@ void inventory_offer_callback(S32 option, void* user_data)
 
 void inventory_offer_handler(LLOfferInfo* info, BOOL from_task)
 {
-
         //Until throttling is implmented, busy mode should reject inventory instead of silently
         //accepting it.  SEE SL-39554
         if (gAgent.getBusy())
@@ -1101,15 +1134,15 @@ void inventory_offer_handler(LLOfferInfo* info, BOOL from_task)
                 inventory_offer_callback(IOR_MUTE, info);
                 return;
         }
-        
-        if (gSavedSettings.getBOOL("ShowNewInventory")
+
+        // Avoid the Accept/Discard dialog if the user so desires. JC
+        if (gSavedSettings.getBOOL("AutoAcceptNewInventory")
                 && (info->mType == LLAssetType::AT_NOTECARD
                         || info->mType == LLAssetType::AT_LANDMARK
                         || info->mType == LLAssetType::AT_TEXTURE))
         {
                 // For certain types, just accept the items into the inventory,
-                // and we'll automatically open them on receipt.
-                // 0 = accept button
+                // and possibly open them on receipt depending upon "ShowNewInventory".
                 inventory_offer_callback(IOR_ACCEPT, info);
                 return;
         }
@@ -1678,86 +1711,23 @@ void process_improved_im(LLMessageSystem *msg, void **user_data)
         }
         break;
         
-        case IM_SESSION_911_SEND:
+        case IM_SESSION_SEND:
         {
-                //this is just the same code as IM_SESSION_SEND for a bit
-                //I was too lazy to make this a function....sorry - jwolk
                 if (!is_linden && is_busy)
                 {
                         return;
                 }
-                        
-                // standard message, not from system
-                char saved[MAX_STRING];         /* Flawfinder: ignore */
-                saved[0] = '\0';
-                if(offline == IM_OFFLINE)
-                {
-                        char time_buf[TIME_STR_LENGTH];         /* Flawfinder: ignore */
-                        snprintf(saved,         /* Flawfinder: ignore */
-                                         MAX_STRING, 
-                                         "(Saved %s) ", 
-                                         formatted_time(timestamp, time_buf));
-                }
-        
-                snprintf(buffer,                /* Flawfinder: ignore */
-                                 sizeof(buffer),
-                                 "%s%s%s%s",
-                                 name,
-                                 separator_string,
-                                 saved,
-                                 (message+message_offset));
-
-                BOOL is_this_agent = FALSE;
-                if(from_id == gAgentID)
-                {
-                        from_id = LLUUID::null;
-                        is_this_agent = TRUE;
-                }
-
-                gIMView->addMessage(
-                        session_id,
-                        from_id,
-                        name,
-                        buffer,
-                        (char*)binary_bucket,
-                        IM_SESSION_ADD,
-                        parent_estate_id,
-                        region_id,
-                        position);
 
-                snprintf(buffer, sizeof(buffer), "IM: %s%s%s%s", name, separator_string, saved, (message+message_offset));              /* Flawfinder: ignore */
-                chat.mText = buffer;
-                LLFloaterChat::addChat(chat, TRUE, is_this_agent);
-
-                //ok, now we want to add a teleport button if we are receving
-                //a message from not ourself
-                LLFloaterIMPanel* panel =
-                        gIMView->findFloaterBySession(session_id);
-
-                if (panel && !is_this_agent )
-                {
-                        //don't add a teleport button for yourself
-                        panel->addTeleportButton();
-                }
-                break;
-        }
-        case IM_SESSION_SEND:
-        {
-                if (!is_linden && is_busy)
+                // System messages, specifically "Foo Bar has left this session"
+                // are not shown unless you actually have that session open.
+                // Band-aid.  JC
+                if (offline == IM_ONLINE
+                        && chat.mFromName == SYSTEM_FROM
+                        && !gIMView->hasSession(session_id))
                 {
                         return;
                 }
 
-                        // System messages, specifically "Foo Bar has left this session"
-                        // are not shown unless you actually have that session open.
-                        // Band-aid.  JC
-                        if (offline == IM_ONLINE
-                                && chat.mFromName == SYSTEM_FROM
-                                && !gIMView->hasSession(session_id))
-                        {
-                                return;
-                        }
-
                 // standard message, not from system
                 char saved[MAX_STRING];         /* Flawfinder: ignore */
                 saved[0] = '\0';
@@ -1782,7 +1752,7 @@ void process_improved_im(LLMessageSystem *msg, void **user_data)
                         name,
                         buffer,
                         (char*)binary_bucket,
-                        IM_SESSION_ADD,
+                        IM_SESSION_INVITE,
                         parent_estate_id,
                         region_id,
                         position);
@@ -2184,7 +2154,7 @@ void process_chat_from_simulator(LLMessageSystem *msg, void **user_data)
                 if (chat.mSourceType == CHAT_SOURCE_OBJECT 
                         && chat.mChatType != CHAT_TYPE_DEBUG_MSG)
                 {
-                        LLViewerPartSourceChat *psc = new LLViewerPartSourceChat(chatter->getPositionAgent());
+                        LLPointer<LLViewerPartSourceChat> psc = new LLViewerPartSourceChat(chatter->getPositionAgent());
                         psc->setSourceObject(chatter);
                         psc->setColor(color);
                         //We set the particles to be owned by the object's owner, 
diff --git a/linden/indra/newview/llviewerobject.cpp b/linden/indra/newview/llviewerobject.cpp
index 88ac978..5a7ef9d 100644
--- a/linden/indra/newview/llviewerobject.cpp
+++ b/linden/indra/newview/llviewerobject.cpp
@@ -228,6 +228,12 @@ LLViewerObject::~LLViewerObject()
                 mJointInfo = NULL;
         }
 
+        if (mPartSourcep)
+        {
+                mPartSourcep->setDead();
+                mPartSourcep = NULL;
+        }
+
         // Delete memory associated with extra parameters.
         std::map<U16, ExtraParameter*>::iterator iter;
         for (iter = mExtraParameterList.begin(); iter != mExtraParameterList.end(); ++iter)
@@ -4014,7 +4020,7 @@ void LLViewerObject::unpackParticleSource(const S32 block_num, const LLUUID& own
         }
         else
         {
-                LLViewerPartSourceScript *pss = LLViewerPartSourceScript::unpackPSS(this, NULL, block_num);
+                LLPointer<LLViewerPartSourceScript> pss = LLViewerPartSourceScript::unpackPSS(this, NULL, block_num);
                 //If the owner is muted, don't create the system
                 if(gMuteListp->isMuted(owner_id)) return;
 
@@ -4063,7 +4069,7 @@ void LLViewerObject::unpackParticleSource(LLDataPacker &dp, const LLUUID& owner_
         }
         else
         {
-                LLViewerPartSourceScript *pss = LLViewerPartSourceScript::unpackPSS(this, NULL, dp);
+                LLPointer<LLViewerPartSourceScript> pss = LLViewerPartSourceScript::unpackPSS(this, NULL, dp);
                 //If the owner is muted, don't create the system
                 if(gMuteListp->isMuted(owner_id)) return;
                 // We need to be able to deal with a particle source that hasn't changed, but still got an update!
diff --git a/linden/indra/newview/llviewerobject.h b/linden/indra/newview/llviewerobject.h
index cdf2214..2e92672 100644
--- a/linden/indra/newview/llviewerobject.h
+++ b/linden/indra/newview/llviewerobject.h
@@ -116,7 +116,7 @@ public:
 class LLViewerObject : public LLPrimitive, public LLRefCount
 {
 protected:
-        virtual ~LLViewerObject(); // use unref()
+        ~LLViewerObject(); // use unref()
 
         // TomY: Provide for a list of extra parameter structures, mapped by structure name
         struct ExtraParameter
diff --git a/linden/indra/newview/llviewerparcelmgr.cpp b/linden/indra/newview/llviewerparcelmgr.cpp
index 3d4bbe5..437a768 100644
--- a/linden/indra/newview/llviewerparcelmgr.cpp
+++ b/linden/indra/newview/llviewerparcelmgr.cpp
@@ -2577,8 +2577,21 @@ bool LLParcelSelection::hasOthersSelected() const
         return mSelectedOtherCount != 0;
 }
 
+static LLPointer<LLParcelSelection> sNullSelection;
+
 LLParcelSelection* get_null_parcel_selection()
 {
-        static LLParcelSelection null_selection;
-        return &null_selection;
+        if (sNullSelection.isNull())
+        {
+                sNullSelection = new LLParcelSelection;
+        }
+        
+        return sNullSelection;
+}
+
+void LLViewerParcelMgr::cleanupGlobals()
+{
+        delete gParcelMgr;
+        gParcelMgr = NULL;
+        sNullSelection = NULL;
 }
diff --git a/linden/indra/newview/llviewerparcelmgr.h b/linden/indra/newview/llviewerparcelmgr.h
index bade8ef..a10163a 100644
--- a/linden/indra/newview/llviewerparcelmgr.h
+++ b/linden/indra/newview/llviewerparcelmgr.h
@@ -73,12 +73,13 @@ class LLParcelSelection : public LLRefCount
 {
         friend class LLViewerParcelMgr;
 
+protected:
+        ~LLParcelSelection();
+
 public:
         LLParcelSelection(LLParcel* parcel);
         LLParcelSelection();
 
-        ~LLParcelSelection();
-
         // this can return NULL at any time, as parcel selection
         // might have been invalidated.
         LLParcel* getParcel() { return mParcel; }
@@ -119,6 +120,8 @@ public:
         LLViewerParcelMgr();
         ~LLViewerParcelMgr();
 
+        static void cleanupGlobals();
+
         BOOL    selectionEmpty() const;
         F32             getSelectionWidth() const       { return F32(mEastNorth.mdV[VX] - mWestSouth.mdV[VX]); }
         F32             getSelectionHeight() const      { return F32(mEastNorth.mdV[VY] - mWestSouth.mdV[VY]); }
diff --git a/linden/indra/newview/llviewerpartsim.cpp b/linden/indra/newview/llviewerpartsim.cpp
index 8c06381..914eb2d 100644
--- a/linden/indra/newview/llviewerpartsim.cpp
+++ b/linden/indra/newview/llviewerpartsim.cpp
@@ -103,7 +103,7 @@ LLViewerPart &LLViewerPart::operator=(const LLViewerPart &part)
         return *this;
 }
 
-void LLViewerPart::init(LLViewerPartSource *sourcep, LLViewerImage *imagep, LLVPCallback cb)
+void LLViewerPart::init(LLPointer<LLViewerPartSource> sourcep, LLViewerImage *imagep, LLVPCallback cb)
 {
         LLMemType mt(LLMemType::MTYPE_PARTICLES);
         mPartID = LLViewerPart::sNextPartID;
@@ -521,6 +521,7 @@ LLViewerPartGroup *LLViewerPartSim::put(LLViewerPart* part)
                 llwarns << "LLViewerPartSim::put - Particle didn't go into its box!" << llendl;
                 llinfos << groupp->getCenterAgent() << llendl;
                 llinfos << part->mPosAgent << llendl;
+                delete groupp;
                 return NULL;
         }
         return groupp;
@@ -672,7 +673,7 @@ void LLViewerPartSim::updateSimulation()
 }
 
 
-void LLViewerPartSim::addPartSource(LLViewerPartSource *sourcep)
+void LLViewerPartSim::addPartSource(LLPointer<LLViewerPartSource> sourcep)
 {
         LLMemType mt(LLMemType::MTYPE_PARTICLES);
         if (!sourcep)
@@ -693,6 +694,7 @@ void LLViewerPartSim::cleanupRegion(LLViewerRegion *regionp)
 
                 if ((*iter)->getRegion() == regionp)
                 {
+                        delete *iter;
                         i = mViewerPartGroups.erase(iter);                      
                 }
         }
diff --git a/linden/indra/newview/llviewerpartsim.h b/linden/indra/newview/llviewerpartsim.h
index 88eb065..0dc4324 100644
--- a/linden/indra/newview/llviewerpartsim.h
+++ b/linden/indra/newview/llviewerpartsim.h
@@ -53,12 +53,13 @@ typedef void (*LLVPCallback)(LLViewerPart &part, const F32 dt);
 
 class LLViewerPart : public LLPartData, public LLRefCount
 {
+protected:
+        ~LLViewerPart();
 public:
         LLViewerPart();
-        ~LLViewerPart();
 
         LLViewerPart &operator=(const LLViewerPart &part);
-        void init(LLViewerPartSource *sourcep, LLViewerImage *imagep, LLVPCallback cb);
+        void init(LLPointer<LLViewerPartSource> sourcep, LLViewerImage *imagep, LLVPCallback cb);
 
 
         U32                                     mPartID;                                        // Particle ID used primarily for moving between groups
@@ -133,7 +134,7 @@ public:
 
         void updateSimulation();
 
-        void addPartSource(LLViewerPartSource *sourcep);
+        void addPartSource(LLPointer<LLViewerPartSource> sourcep);
 
         void cleanupRegion(LLViewerRegion *regionp);
 
diff --git a/linden/indra/newview/llviewerpartsource.cpp b/linden/indra/newview/llviewerpartsource.cpp
index 333c0ac..e440eae 100644
--- a/linden/indra/newview/llviewerpartsource.cpp
+++ b/linden/indra/newview/llviewerpartsource.cpp
@@ -310,7 +310,7 @@ void LLViewerPartSourceScript::update(const F32 dt)
 }
 
 // static
-LLViewerPartSourceScript *LLViewerPartSourceScript::unpackPSS(LLViewerObject *source_objp, LLViewerPartSourceScript *pssp, const S32 block_num)
+LLPointer<LLViewerPartSourceScript> LLViewerPartSourceScript::unpackPSS(LLViewerObject *source_objp, LLPointer<LLViewerPartSourceScript> pssp, const S32 block_num)
 {
         LLMemType mt(LLMemType::MTYPE_PARTICLES);
         if (!pssp)
@@ -319,7 +319,7 @@ LLViewerPartSourceScript *LLViewerPartSourceScript::unpackPSS(LLViewerObject *so
                 {
                         return NULL;
                 }
-                LLViewerPartSourceScript *new_pssp = new LLViewerPartSourceScript(source_objp);
+                LLPointer<LLViewerPartSourceScript> new_pssp = new LLViewerPartSourceScript(source_objp);
                 if (!new_pssp->mPartSysData.unpackBlock(block_num))
                 {
                         return NULL;
@@ -352,12 +352,12 @@ LLViewerPartSourceScript *LLViewerPartSourceScript::unpackPSS(LLViewerObject *so
 }
 
 
-LLViewerPartSourceScript *LLViewerPartSourceScript::unpackPSS(LLViewerObject *source_objp, LLViewerPartSourceScript *pssp, LLDataPacker &dp)
+LLPointer<LLViewerPartSourceScript> LLViewerPartSourceScript::unpackPSS(LLViewerObject *source_objp, LLPointer<LLViewerPartSourceScript> pssp, LLDataPacker &dp)
 {
         LLMemType mt(LLMemType::MTYPE_PARTICLES);
         if (!pssp)
         {
-                LLViewerPartSourceScript *new_pssp = new LLViewerPartSourceScript(source_objp);
+                LLPointer<LLViewerPartSourceScript> new_pssp = new LLViewerPartSourceScript(source_objp);
                 if (!new_pssp->mPartSysData.unpack(dp))
                 {
                         return NULL;
@@ -420,8 +420,8 @@ void LLViewerPartSourceSpiral::updatePart(LLViewerPart &part, const F32 dt)
         F32 frac = part.mLastUpdateTime/part.mMaxAge;
 
         LLVector3 center_pos;
-        LLViewerPartSource *ps = (LLViewerPartSource*)part.mPartSourcep;
-        LLViewerPartSourceSpiral *pss = (LLViewerPartSourceSpiral *)ps;
+        LLPointer<LLViewerPartSource>& ps = part.mPartSourcep;
+        LLViewerPartSourceSpiral *pss = (LLViewerPartSourceSpiral *)ps.get();
         if (!pss->mSourceObjectp.isNull() && !pss->mSourceObjectp->mDrawable.isNull())
         {
                 part.mPosAgent = pss->mSourceObjectp->getRenderPosition();
@@ -767,3 +767,4 @@ void LLViewerPartSourceChat::setColor(const LLColor4 &color)
         mColor = color;
 }
 
+
diff --git a/linden/indra/newview/llviewerpartsource.h b/linden/indra/newview/llviewerpartsource.h
index 3fd6b85..9d22e72 100644
--- a/linden/indra/newview/llviewerpartsource.h
+++ b/linden/indra/newview/llviewerpartsource.h
@@ -107,8 +107,8 @@ public:
         BOOL updateFromMesg();
 
         // Returns a new particle source to attach to an object...
-        static LLViewerPartSourceScript *unpackPSS(LLViewerObject *source_objp, LLViewerPartSourceScript *pssp, const S32 block_num);
-        static LLViewerPartSourceScript *unpackPSS(LLViewerObject *source_objp, LLViewerPartSourceScript *pssp, LLDataPacker &dp);
+        static LLPointer<LLViewerPartSourceScript> unpackPSS(LLViewerObject *source_objp, LLPointer<LLViewerPartSourceScript> pssp, const S32 block_num);
+        static LLPointer<LLViewerPartSourceScript> unpackPSS(LLViewerObject *source_objp, LLPointer<LLViewerPartSourceScript> pssp, LLDataPacker &dp);
 
         LLViewerImage *getImage() const                         { return mImagep; }
         void setImage(LLViewerImage *imagep);
@@ -157,7 +157,6 @@ class LLViewerPartSourceBeam : public LLViewerPartSource
 {
 public:
         LLViewerPartSourceBeam();
-        ~LLViewerPartSourceBeam();
 
         /*virtual*/ void setDead();
 
@@ -175,6 +174,7 @@ public:
         LLVector3d              mLKGTargetPosGlobal;
         LLColor4 mColor;
 protected:
+        ~LLViewerPartSourceBeam();
 };
 
 
diff --git a/linden/indra/newview/llviewerregion.cpp b/linden/indra/newview/llviewerregion.cpp
index 4409f8b..9e05d4f 100644
--- a/linden/indra/newview/llviewerregion.cpp
+++ b/linden/indra/newview/llviewerregion.cpp
@@ -1303,7 +1303,9 @@ void LLViewerRegion::setSeedCapability(const std::string& url)
         capabilityNames.append("SendUserReportWithScreenshot");
         capabilityNames.append("RequestTextureDownload");
         capabilityNames.append("UntrustedSimulatorMessage");
-        
+        capabilityNames.append("ParcelVoiceInfoRequest");
+        capabilityNames.append("ChatSessionRequest");
+
         LLHTTPClient::post(url, capabilityNames, BaseCapabilitiesComplete::build(this));
 }
 
diff --git a/linden/indra/newview/llviewertexteditor.cpp b/linden/indra/newview/llviewertexteditor.cpp
index 826c411..6a8d53e 100644
--- a/linden/indra/newview/llviewertexteditor.cpp
+++ b/linden/indra/newview/llviewertexteditor.cpp
@@ -1219,7 +1219,7 @@ BOOL LLViewerTextEditor::openEmbeddedItem(LLInventoryItem* item, BOOL saved)
                 return TRUE;
 
         case LLAssetType::AT_LANDMARK:
-                showLandmarkDialog( item );
+                openEmbeddedLandmark( item );
                 return TRUE;
                 
         case LLAssetType::AT_LSL_TEXT:
@@ -1273,35 +1273,28 @@ void LLViewerTextEditor::openEmbeddedSound( LLInventoryItem* item )
         showCopyToInvDialog( item );
 }
 
-/*
+
 void LLViewerTextEditor::openEmbeddedLandmark( LLInventoryItem* item )
 {
-        // See if we can bring an existing preview to the front
-        if( !LLPreview::show( item->getUUID() ) )
-        {
-                // There isn't one, so make a new preview
-                S32 left, top;
-                gFloaterView->getNewFloaterPosition(&left, &top);
-                LLRect rect = gSavedSettings.getRect("PreviewLandmarkRect");
-                rect.translate( left - rect.mLeft, top - rect.mTop );
-
-                LLPreviewLandmark* preview = new LLPreviewLandmark(
-                        "preview landmark",
-                        rect,
-                        item->getName(),
-                        item->getUUID());
-                preview->setAuxItem( item );
-                preview->addCopyToInvButton();
-                preview->open();
-        }
-}*/
+        open_landmark((LLViewerInventoryItem*)item, "   preview landmark", FALSE, item->getUUID(), TRUE);
+}
+
 
 void LLViewerTextEditor::openEmbeddedNotecard( LLInventoryItem* item, BOOL saved )
 {
         if (saved)
         {
-                // Copy to inventory
-                copyInventory(item);
+                // Pop-up the notecard floater.
+                // Note: Previously would copy to inventory and rely on autodisplay to view.
+                // Now that autodisplay can be turned off, we need to make this case display always. 
+                // besides, there's no point adding to inventory -MG
+                open_notecard(
+                        (LLViewerInventoryItem*)item,
+                        LLString("Embedded Note: ") + item->getName(), // title
+                        mObjectID,
+                        FALSE, // show_keep_discard
+                        LLUUID::null, // source_id
+                        TRUE); // take_focus
         }
         else
         {
@@ -1324,59 +1317,6 @@ void LLViewerTextEditor::onNotecardDialog( S32 option, void* userdata )
 }
 
 
-void LLViewerTextEditor::showLandmarkDialog( LLInventoryItem* item )
-{
-        LLNotecardCopyInfo *info = new LLNotecardCopyInfo(this, item);
-        gViewerWindow->alertXml("ConfirmLandmarkCopy",          
-                LLViewerTextEditor::onLandmarkDialog, (void*)info);
-}
-
-// static
-void LLViewerTextEditor::onLandmarkDialog( S32 option, void* userdata )
-{
-        LLNotecardCopyInfo *info = (LLNotecardCopyInfo *)userdata;
-        if( option == 0 )
-        {
-                // Copy to inventory
-                info->mTextEd->copyInventory(info->mItem);
-                /*
-                 * XXXPAM
-                 *
-                 * Yes, this is broken.  We don't show the map yet.
-                 *
-                LLInventoryItem* orig_item = (LLInventoryItem*)userdata;
-
-                // Copy to inventory
-                LLPointer<LLViewerInventoryItem> new_item = new LLViewerInventoryItem;
-                cloneInventoryItemToViewer(orig_item, new_item);
-                U32 flags = new_item->getFlags();
-                flags &= ~LLInventoryItem::II_FLAGS_LANDMARK_VISITED;
-                new_item->setFlags(flags);
-                new_item->updateServer(TRUE);
-                gInventory.updateItem(new_item);
-                gInventory.notifyObservers();
-
-                LLInventoryView* view = LLInventoryView::getActiveInventory();
-                if(view)
-                {
-                        view->getPanel()->setSelection(new_item->getUUID(), TAKE_FOCUS_NO);
-                }
-
-                if( (0 == option) && gFloaterWorldMap )
-                {
-                        // Note: there's a minor race condition here.
-                        // If the user immediately tries to teleport to the landmark, the dataserver may
-                        // not yet know that the user has the landmark in his inventory and so may 
-                        // disallow the teleport.  However, the user will need to be pretty fast to make
-                        // this happen, and, if it does, they haven't lost anything.  Once the dataserver
-                        // knows about the new item, the user will be able to teleport to it successfully.
-                        gFloaterWorldMap->trackLandmark(new_item->getUUID());
-                        LLFloaterWorldMap::show(NULL, TRUE);
-                }*/
-        }
-        delete info;
-}
-
 
 void LLViewerTextEditor::showCopyToInvDialog( LLInventoryItem* item )
 {
diff --git a/linden/indra/newview/llviewertexteditor.h b/linden/indra/newview/llviewertexteditor.h
index 6665203..1dbc7b6 100644
--- a/linden/indra/newview/llviewertexteditor.h
+++ b/linden/indra/newview/llviewertexteditor.h
@@ -109,14 +109,12 @@ protected:
 
         void                    openEmbeddedTexture( LLInventoryItem* item );
         void                    openEmbeddedSound( LLInventoryItem* item );
-        //void                  openEmbeddedLandmark( LLInventoryItem* item );
+        void                    openEmbeddedLandmark( LLInventoryItem* item );
         void                    openEmbeddedNotecard( LLInventoryItem* item, BOOL saved );
         void                    showCopyToInvDialog( LLInventoryItem* item );
-        void                    showLandmarkDialog( LLInventoryItem* item );
 
         static void             onCopyToInvDialog( S32 option, void* userdata );
         static void             onNotecardDialog( S32 option, void* userdata );
-        static void             onLandmarkDialog( S32 option, void* userdata );
         
 protected:
         LLPointer<LLInventoryItem> mDragItem;
diff --git a/linden/indra/newview/llviewerwindow.cpp b/linden/indra/newview/llviewerwindow.cpp
index c57c84a..0f5bffd 100644
--- a/linden/indra/newview/llviewerwindow.cpp
+++ b/linden/indra/newview/llviewerwindow.cpp
@@ -1579,8 +1579,6 @@ LLViewerWindow::LLViewerWindow(
         // Can't have spaces in settings.ini strings, so use underscores instead and convert them.
         LLString::replaceChar(mOverlayTitle, '_', ' ');
 
-        gAwayTimer.stop();
-
         LLAlertDialog::setDisplayCallback(alertCallback); // call this before calling any modal dialogs
 
         // sync the keyboard's setting with the saved setting
@@ -1877,6 +1875,7 @@ void LLViewerWindow::initWorldUI()
 
         gIMView = new LLIMView("gIMView", LLRect() );
         gIMView->setFollowsAll();
+        mRootView->addChild(gIMView);
 
         LLRect morph_view_rect = full_window;
         morph_view_rect.stretch( -STATUS_BAR_HEIGHT );
@@ -2400,7 +2399,17 @@ BOOL LLViewerWindow::handleKey(KEY key, MASK mask)
                                 case KEY_LEFT:
                                 case KEY_RIGHT:
                                 case KEY_UP:
+                                        // let CTRL UP through for chat line history
+                                        if( MASK_CONTROL & mask )
+                                        {
+                                                break;
+                                        }
                                 case KEY_DOWN:
+                                        // let CTRL DOWN through for chat line history
+                                        if( MASK_CONTROL & mask )
+                                        {
+                                                break;
+                                        }
                                 case KEY_PAGE_UP:
                                 case KEY_PAGE_DOWN:
                                 case KEY_HOME:
diff --git a/linden/indra/newview/llvoavatar.cpp b/linden/indra/newview/llvoavatar.cpp
index 37380a4..4de4e36 100644
--- a/linden/indra/newview/llvoavatar.cpp
+++ b/linden/indra/newview/llvoavatar.cpp
@@ -8033,7 +8033,7 @@ void LLVOAvatar::processAvatarAppearance( LLMessageSystem* mesgsys )
         }
         else
         {
-                llwarns << "AvatarAppearance msg received without any parameters" << llendl;
+                llwarns << "AvatarAppearance msg received without any parameters, object: " << getID() << llendl;
         }
 
         setCompositeUpdatesEnabled( TRUE );
diff --git a/linden/indra/newview/llvoclouds.h b/linden/indra/newview/llvoclouds.h
index 5d9fc72..172d622 100644
--- a/linden/indra/newview/llvoclouds.h
+++ b/linden/indra/newview/llvoclouds.h
@@ -43,7 +43,6 @@ class LLVOClouds : public LLAlphaObject
 {
 public:
         LLVOClouds(const LLUUID &id, const LLPCode pcode, LLViewerRegion *regionp );
-        virtual ~LLVOClouds();
 
         // Initialize data that's only inited once per class.
         static void initClass();
@@ -73,6 +72,8 @@ public:
 
         void setCloudGroup(LLCloudGroup *cgp)           { mCloudGroupp = cgp; }
 protected:
+        virtual ~LLVOClouds();
+
         LLCloudGroup *mCloudGroupp;
 };
 
diff --git a/linden/indra/newview/llvograss.h b/linden/indra/newview/llvograss.h
index 54f9cce..2349864 100644
--- a/linden/indra/newview/llvograss.h
+++ b/linden/indra/newview/llvograss.h
@@ -41,7 +41,6 @@ class LLVOGrass : public LLAlphaObject
 {
 public:
         LLVOGrass(const LLUUID &id, const LLPCode pcode, LLViewerRegion *regionp);
-        virtual ~LLVOGrass();
 
         // Initialize data that's only inited once per class.
         static void initClass();
@@ -104,6 +103,9 @@ public:
         F32                                       mBladeWindAngle;
         F32                                       mBWAOverlap;
 
+protected:
+        ~LLVOGrass();
+
 private:
         void updateSpecies();
         F32 mLastHeight;                // For cheap update hack
diff --git a/linden/indra/newview/llvoground.h b/linden/indra/newview/llvoground.h
index 2d73440..48212e5 100644
--- a/linden/indra/newview/llvoground.h
+++ b/linden/indra/newview/llvoground.h
@@ -38,9 +38,10 @@
 class LLVOGround : public LLStaticViewerObject
 {
 protected:
+        ~LLVOGround();
+
 public:
         LLVOGround(const LLUUID &id, const LLPCode pcode, LLViewerRegion *regionp);
-        virtual ~LLVOGround();
 
         /*virtual*/ BOOL idleUpdate(LLAgent &agent, LLWorld &world, const F64 &time);
         
diff --git a/linden/indra/newview/llvopartgroup.h b/linden/indra/newview/llvopartgroup.h
index ede249d..f3e10c5 100644
--- a/linden/indra/newview/llvopartgroup.h
+++ b/linden/indra/newview/llvopartgroup.h
@@ -50,8 +50,6 @@ public:
 
         LLVOPartGroup(const LLUUID &id, const LLPCode pcode, LLViewerRegion *regionp);
 
-        ~LLVOPartGroup();
-
         /*virtual*/ BOOL    isActive() const; // Whether this object needs to do an idleUpdate.
         BOOL idleUpdate(LLAgent &agent, LLWorld &world, const F64 &time);
         BOOL isParticle();
@@ -78,6 +76,8 @@ public:
         LLViewerPartGroup* getViewerPartGroup() { return mViewerPartGroupp; }
 
 protected:
+        ~LLVOPartGroup();
+
         LLViewerPartGroup *mViewerPartGroupp;
         LLVector3 mExtents[2];
         LLColor4 mDebugColor;
diff --git a/linden/indra/newview/llvosky.cpp b/linden/indra/newview/llvosky.cpp
index 68fee1a..2d31bf4 100644
--- a/linden/indra/newview/llvosky.cpp
+++ b/linden/indra/newview/llvosky.cpp
@@ -538,8 +538,6 @@ LLVOSky::LLVOSky(const LLUUID &id, const LLPCode pcode, LLViewerRegion *regionp)
         mSun.setIntensity(SUN_INTENSITY);
         mMoon.setIntensity(0.1f * SUN_INTENSITY);
 
-        mCubeMap = NULL;
-
         mSunTexturep = gImageList.getImage(gSunTextureID, TRUE, TRUE);
         mSunTexturep->setClamp(TRUE, TRUE);
         mMoonTexturep = gImageList.getImage(gMoonTextureID, TRUE, TRUE);
@@ -554,7 +552,6 @@ LLVOSky::~LLVOSky()
         // Don't delete images - it'll get deleted by gImageList on shutdown
         // This needs to be done for each texture
 
-        delete mCubeMap;
         mCubeMap = NULL;
 }
 
@@ -596,7 +593,7 @@ void LLVOSky::initCubeMap()
         {
                 images.push_back(mSkyTex[side].getImageRaw());
         }
-        if (mCubeMap != NULL)
+        if (mCubeMap)
         {
                 mCubeMap->init(images);
         }
diff --git a/linden/indra/newview/llvosky.h b/linden/indra/newview/llvosky.h
index 568e924..81c9bf5 100644
--- a/linden/indra/newview/llvosky.h
+++ b/linden/indra/newview/llvosky.h
@@ -524,7 +524,6 @@ public:
         };
         
         LLVOSky(const LLUUID &id, const LLPCode pcode, LLViewerRegion *regionp);
-        virtual ~LLVOSky();
 
         // Initialize/delete data that's only inited once per class.
         static void initClass();
@@ -687,6 +686,8 @@ public:
         LLFace                          *mFace[FACE_COUNT];
 
 protected:
+        ~LLVOSky();
+
         LLPointer<LLViewerImage> mSunTexturep;
         LLPointer<LLViewerImage> mMoonTexturep;
         LLPointer<LLViewerImage> mBloomTexturep;
@@ -736,7 +737,7 @@ protected:
         LLColor3                        mMoonDiffuse;
         LLColor4U                       mFadeColor;                                     // Color to fade in from        
 
-        LLCubeMap                       *mCubeMap;                                      // Cube map for the environment
+        LLPointer<LLCubeMap>    mCubeMap;                                       // Cube map for the environment
         S32                                     mDrawRefl;
 
         LLFrameTimer            mUpdateTimer;
diff --git a/linden/indra/newview/llvostars.h b/linden/indra/newview/llvostars.h
index cb71f5b..e2619ce 100644
--- a/linden/indra/newview/llvostars.h
+++ b/linden/indra/newview/llvostars.h
@@ -40,7 +40,6 @@ class LLVOStars : public LLStaticViewerObject
 {
 public:
         LLVOStars(const LLUUID &id, const LLPCode pcode, LLViewerRegion *regionp);
-        virtual ~LLVOStars();
 
         /*virtual*/ BOOL idleUpdate(LLAgent &agent, LLWorld &world, const F64 &time);
         /*virtual*/ LLDrawable* createDrawable(LLPipeline *pipeline);
@@ -49,6 +48,8 @@ public:
         LLColor4* getStarColors() { return mStarColors; }
 
 protected:
+        ~LLVOStars();
+
         void initStars();
         void updateStarColors();
         BOOL updateStarGeometry(LLDrawable *drawable);
diff --git a/linden/indra/newview/llvosurfacepatch.h b/linden/indra/newview/llvosurfacepatch.h
index ec26065..a21763d 100644
--- a/linden/indra/newview/llvosurfacepatch.h
+++ b/linden/indra/newview/llvosurfacepatch.h
@@ -50,7 +50,6 @@ public:
         eVertexDataMask;
 
         LLVOSurfacePatch(const LLUUID &id, const LLPCode pcode, LLViewerRegion *regionp);
-        virtual ~LLVOSurfacePatch();
 
         /*virtual*/ void markDead();
 
@@ -84,6 +83,8 @@ public:
 
         BOOL                    mDirtiedPatch;
 protected:
+        ~LLVOSurfacePatch();
+
         LLFacePool              *mPool;
         LLFacePool              *getPool();
         S32                             mBaseComp;
diff --git a/linden/indra/newview/llvotextbubble.h b/linden/indra/newview/llvotextbubble.h
index 2a2fa43..a05b6bc 100644
--- a/linden/indra/newview/llvotextbubble.h
+++ b/linden/indra/newview/llvotextbubble.h
@@ -36,7 +36,6 @@ class LLVOTextBubble : public LLAlphaObject
 {
 public:
         LLVOTextBubble(const LLUUID &id, const LLPCode pcode, LLViewerRegion *regionp);
-        virtual ~LLVOTextBubble();
 
         /*virtual*/ BOOL    isActive() const; // Whether this object needs to do an idleUpdate.
         /*virtual*/ BOOL idleUpdate(LLAgent &agent, LLWorld &world, const F64 &time);
@@ -59,7 +58,9 @@ public:
         LLColor4 mColor;
         S32 mLOD;
         BOOL mVolumeChanged;
+
 protected:
+        ~LLVOTextBubble();
         BOOL setVolume(const LLVolumeParams &volume_params);
         LLFrameTimer mUpdateTimer;
 };
diff --git a/linden/indra/newview/llvotree.h b/linden/indra/newview/llvotree.h
index 65a0797..4ec148d 100644
--- a/linden/indra/newview/llvotree.h
+++ b/linden/indra/newview/llvotree.h
@@ -39,6 +39,9 @@ class LLDrawPool;
 
 class LLVOTree : public LLViewerObject
 {
+protected:
+        ~LLVOTree();
+
 public:
         enum 
         {
@@ -49,7 +52,6 @@ public:
         eVertexDataMask;
 
         LLVOTree(const LLUUID &id, const LLPCode pcode, LLViewerRegion *regionp);
-        virtual ~LLVOTree();
 
         // Initialize data that's only inited once per class.
         static void initClass();
diff --git a/linden/indra/newview/llvovolume.h b/linden/indra/newview/llvovolume.h
index 14c640f..f5dfeb0 100644
--- a/linden/indra/newview/llvovolume.h
+++ b/linden/indra/newview/llvovolume.h
@@ -69,6 +69,9 @@ public:
 // Class which embodies all Volume objects (with pcode LL_PCODE_VOLUME)
 class LLVOVolume : public LLViewerObject
 {
+protected:
+        virtual                         ~LLVOVolume();
+
 public:
         static          void    initClass();
         static          void    preUpdateGeom();
@@ -85,7 +88,6 @@ public:
 
 public:
                                                 LLVOVolume(const LLUUID &id, const LLPCode pcode, LLViewerRegion *regionp);
-        virtual                         ~LLVOVolume();
 
         /*virtual*/ LLDrawable* createDrawable(LLPipeline *pipeline);
 
diff --git a/linden/indra/newview/llvowater.h b/linden/indra/newview/llvowater.h
index a0c85c0..8ed795c 100644
--- a/linden/indra/newview/llvowater.h
+++ b/linden/indra/newview/llvowater.h
@@ -56,7 +56,6 @@ public:
         eVertexDataMask;
 
         LLVOWater(const LLUUID &id, const LLPCode pcode, LLViewerRegion *regionp);
-        virtual ~LLVOWater() {}
 
         /*virtual*/ void markDead();
 
diff --git a/linden/indra/newview/pipeline.cpp b/linden/indra/newview/pipeline.cpp
index d030ac2..408be2e 100644
--- a/linden/indra/newview/pipeline.cpp
+++ b/linden/indra/newview/pipeline.cpp
@@ -174,7 +174,6 @@ BOOL	LLPipeline::sRenderGlow = FALSE;
 
 LLPipeline::LLPipeline() :
         mScreenTex(0),
-        mCubeBuffer(NULL),
         mGlowMap(0),
         mGlowBuffer(0),
         mVertexShadersEnabled(FALSE),
@@ -372,7 +371,6 @@ void LLPipeline::releaseGLBuffers()
 
         if (mCubeBuffer)
         {
-                delete mCubeBuffer;
                 mCubeBuffer = NULL;
         }
 
diff --git a/linden/indra/newview/pipeline.h b/linden/indra/newview/pipeline.h
index a8c92cc..a687e12 100644
--- a/linden/indra/newview/pipeline.h
+++ b/linden/indra/newview/pipeline.h
@@ -363,7 +363,7 @@ public:
         GLuint                                  mFramebuffer[2];
 
         //dynamic cube map scratch space
-        LLCubeMap*                              mCubeBuffer;
+        LLPointer<LLCubeMap>    mCubeBuffer;
 
         //frambuffer object for rendering dynamic cube maps
         GLuint                                  mCubeFrameBuffer;
diff --git a/linden/indra/newview/postbuild.bat b/linden/indra/newview/postbuild.bat
index f2fc069..f0d4a2d 100644
--- a/linden/indra/newview/postbuild.bat
+++ b/linden/indra/newview/postbuild.bat
@@ -11,20 +11,21 @@ goto end
 :debug
 echo copying debug files
 if exist .\debug\freebl3.dll goto end
-copy ..\..\libraries\i686-win32\lib_debug\gksvggdiplus.dll                      .\debug\ /y
-copy ..\..\libraries\i686-win32\lib_debug\js3250.dll                            .\debug\ /y
+copy ..\..\libraries\i686-win32\lib_debug\freebl3.dll                   .\debug\ /y
+copy ..\..\libraries\i686-win32\lib_debug\gksvggdiplus.dll              .\debug\ /y
+copy ..\..\libraries\i686-win32\lib_debug\js3250.dll                    .\debug\ /y
 copy ..\..\libraries\i686-win32\lib_debug\nspr4.dll                             .\debug\ /y
 copy ..\..\libraries\i686-win32\lib_debug\nss3.dll                              .\debug\ /y
-copy ..\..\libraries\i686-win32\lib_debug\nssckbi.dll                           .\debug\ /y
+copy ..\..\libraries\i686-win32\lib_debug\nssckbi.dll                   .\debug\ /y
 copy ..\..\libraries\i686-win32\lib_debug\plc4.dll                              .\debug\ /y
 copy ..\..\libraries\i686-win32\lib_debug\plds4.dll                             .\debug\ /y
-copy ..\..\libraries\i686-win32\lib_debug\smime3.dll                            .\debug\ /y
-copy ..\..\libraries\i686-win32\lib_debug\softokn3.dll                          .\debug\ /y
+copy ..\..\libraries\i686-win32\lib_debug\smime3.dll                    .\debug\ /y
+copy ..\..\libraries\i686-win32\lib_debug\softokn3.dll                  .\debug\ /y
 copy ..\..\libraries\i686-win32\lib_debug\ssl3.dll                              .\debug\ /y
 copy ..\..\libraries\i686-win32\lib_debug\xpcom.dll                             .\debug\ /y
 copy ..\..\libraries\i686-win32\lib_debug\xul.dll                               .\debug\ /y
 rem --- this is required for mozilla debug builds and displays the aborty/retry/ignore dialog on an assert - crashes without it ---
-copy ..\..\libraries\i686-win32\lib_debug\windbgdlg.exe                         .\debug\ /y
+copy ..\..\libraries\i686-win32\lib_debug\windbgdlg.exe                 .\debug\ /y
 
 @IF NOT EXIST ..\llkdu\Debug\llkdu.dll (
         @IF EXIST ..\..\libraries\i686-win32\lib_debug\llkdu.dll (
@@ -41,20 +42,22 @@ goto end
 :release
 echo copying release files
 if exist .\Release\freebl3.dll goto end
-copy ..\..\libraries\i686-win32\lib_release\gksvggdiplus.dll                    .\Release\ /y
-copy ..\..\libraries\i686-win32\lib_release\js3250.dll                          .\Release\ /y
-copy ..\..\libraries\i686-win32\lib_release\nspr4.dll                           .\Release\ /y
-copy ..\..\libraries\i686-win32\lib_release\nss3.dll                            .\Release\ /y
-copy ..\..\libraries\i686-win32\lib_release\nssckbi.dll                         .\Release\ /y
-copy ..\..\libraries\i686-win32\lib_release\plc4.dll                            .\Release\ /y
-copy ..\..\libraries\i686-win32\lib_release\plds4.dll                           .\Release\ /y
-copy ..\..\libraries\i686-win32\lib_release\smime3.dll                          .\Release\ /y
-copy ..\..\libraries\i686-win32\lib_release\softokn3.dll                        .\Release\ /y
-copy ..\..\libraries\i686-win32\lib_release\ssl3.dll                            .\Release\ /y
-copy ..\..\libraries\i686-win32\lib_release\xpcom.dll                           .\Release\ /y
+copy ..\..\libraries\i686-win32\lib_release\freebl3.dll                 .\Release\ /y
+copy ..\..\libraries\i686-win32\lib_release\gksvggdiplus.dll    .\Release\ /y
+copy ..\..\libraries\i686-win32\lib_release\js3250.dll                  .\Release\ /y
+copy ..\..\libraries\i686-win32\lib_release\nspr4.dll                   .\Release\ /y
+copy ..\..\libraries\i686-win32\lib_release\nss3.dll                    .\Release\ /y
+copy ..\..\libraries\i686-win32\lib_release\nssckbi.dll                 .\Release\ /y
+copy ..\..\libraries\i686-win32\lib_release\plc4.dll                    .\Release\ /y
+copy ..\..\libraries\i686-win32\lib_release\plds4.dll                   .\Release\ /y
+copy ..\..\libraries\i686-win32\lib_release\smime3.dll                  .\Release\ /y
+copy ..\..\libraries\i686-win32\lib_release\softokn3.dll                .\Release\ /y
+copy ..\..\libraries\i686-win32\lib_release\ssl3.dll                    .\Release\ /y
+copy ..\..\libraries\i686-win32\lib_release\xpcom.dll                   .\Release\ /y
 copy ..\..\libraries\i686-win32\lib_release\xul.dll                             .\Release\ /y
+
 @IF NOT EXIST ..\llkdu\Release\llkdu.dll (
-        copy ..\..\libraries\i686-win32\lib_release\llkdu.dll .\Release\ /y
+        copy ..\..\libraries\i686-win32\lib_release\llkdu.dll           .\Release\ /y
 ) ELSE (
         copy ..\llkdu\Release\llkdu.dll .\Release\ /y
 )
@@ -63,20 +66,22 @@ goto end
 :releasenoopt
 echo copying releasenoopt files
 if exist .\ReleaseNoOpt\freebl3.dll goto end
-copy ..\..\libraries\i686-win32\lib_release\gksvggdiplus.dll                    .\ReleaseNoOpt\ /y
-copy ..\..\libraries\i686-win32\lib_release\js3250.dll                          .\ReleaseNoOpt\ /y
-copy ..\..\libraries\i686-win32\lib_release\nspr4.dll                           .\ReleaseNoOpt\ /y
-copy ..\..\libraries\i686-win32\lib_release\nss3.dll                            .\ReleaseNoOpt\ /y
-copy ..\..\libraries\i686-win32\lib_release\nssckbi.dll                         .\ReleaseNoOpt\ /y
-copy ..\..\libraries\i686-win32\lib_release\plc4.dll                            .\ReleaseNoOpt\ /y
-copy ..\..\libraries\i686-win32\lib_release\plds4.dll                           .\ReleaseNoOpt\ /y
-copy ..\..\libraries\i686-win32\lib_release\smime3.dll                          .\ReleaseNoOpt\ /y
-copy ..\..\libraries\i686-win32\lib_release\softokn3.dll                        .\ReleaseNoOpt\ /y
-copy ..\..\libraries\i686-win32\lib_release\ssl3.dll                            .\ReleaseNoOpt\ /y
-copy ..\..\libraries\i686-win32\lib_release\xpcom.dll                           .\ReleaseNoOpt\ /y
+copy ..\..\libraries\i686-win32\lib_release\freebl3.dll                 .\ReleaseNoOpt\ /y
+copy ..\..\libraries\i686-win32\lib_release\gksvggdiplus.dll    .\ReleaseNoOpt\ /y
+copy ..\..\libraries\i686-win32\lib_release\js3250.dll                  .\ReleaseNoOpt\ /y
+copy ..\..\libraries\i686-win32\lib_release\nspr4.dll                   .\ReleaseNoOpt\ /y
+copy ..\..\libraries\i686-win32\lib_release\nss3.dll                    .\ReleaseNoOpt\ /y
+copy ..\..\libraries\i686-win32\lib_release\nssckbi.dll                 .\ReleaseNoOpt\ /y
+copy ..\..\libraries\i686-win32\lib_release\plc4.dll                    .\ReleaseNoOpt\ /y
+copy ..\..\libraries\i686-win32\lib_release\plds4.dll                   .\ReleaseNoOpt\ /y
+copy ..\..\libraries\i686-win32\lib_release\smime3.dll                  .\ReleaseNoOpt\ /y
+copy ..\..\libraries\i686-win32\lib_release\softokn3.dll                .\ReleaseNoOpt\ /y
+copy ..\..\libraries\i686-win32\lib_release\ssl3.dll                    .\ReleaseNoOpt\ /y
+copy ..\..\libraries\i686-win32\lib_release\xpcom.dll                   .\ReleaseNoOpt\ /y
 copy ..\..\libraries\i686-win32\lib_release\xul.dll                             .\ReleaseNoOpt\ /y
+
 @IF NOT EXIST ..\llkdu\ReleaseNoOpt\llkdu.dll (
-        copy ..\..\libraries\i686-win32\lib_release\llkdu.dll                           .\ReleaseNoOpt\ /y
+        copy ..\..\libraries\i686-win32\lib_release\llkdu.dll           .\ReleaseNoOpt\ /y
 ) ELSE (
         copy ..\llkdu\ReleaseNoOpt\llkdu.dll .\ReleaseNoOpt\ /y
 )
@@ -85,21 +90,21 @@ goto end
 :releasefordownload
 echo copying releasefordownload files
 if exist .\ReleaseForDownload\freebl3.dll goto end
-copy ..\..\libraries\i686-win32\lib_release\gksvggdiplus.dll                    .\ReleaseForDownload\ /y
-copy ..\..\libraries\i686-win32\lib_release\js3250.dll                          .\ReleaseForDownload\ /y
-copy ..\..\libraries\i686-win32\lib_release\nspr4.dll                           .\ReleaseForDownload\ /y
-copy ..\..\libraries\i686-win32\lib_release\nss3.dll                            .\ReleaseForDownload\ /y
-copy ..\..\libraries\i686-win32\lib_release\nssckbi.dll                         .\ReleaseForDownload\ /y
-copy ..\..\libraries\i686-win32\lib_release\plc4.dll                            .\ReleaseForDownload\ /y
-copy ..\..\libraries\i686-win32\lib_release\plds4.dll                           .\ReleaseForDownload\ /y
-copy ..\..\libraries\i686-win32\lib_release\smime3.dll                          .\ReleaseForDownload\ /y
-copy ..\..\libraries\i686-win32\lib_release\softokn3.dll                        .\ReleaseForDownload\ /y
-copy ..\..\libraries\i686-win32\lib_release\ssl3.dll                            .\ReleaseForDownload\ /y
-copy ..\..\libraries\i686-win32\lib_release\xpcom.dll                           .\ReleaseForDownload\ /y
+copy ..\..\libraries\i686-win32\lib_release\freebl3.dll                 .\ReleaseForDownload\ /y
+copy ..\..\libraries\i686-win32\lib_release\gksvggdiplus.dll    .\ReleaseForDownload\ /y
+copy ..\..\libraries\i686-win32\lib_release\js3250.dll                  .\ReleaseForDownload\ /y
+copy ..\..\libraries\i686-win32\lib_release\nspr4.dll                   .\ReleaseForDownload\ /y
+copy ..\..\libraries\i686-win32\lib_release\nss3.dll                    .\ReleaseForDownload\ /y
+copy ..\..\libraries\i686-win32\lib_release\nssckbi.dll                 .\ReleaseForDownload\ /y
+copy ..\..\libraries\i686-win32\lib_release\plc4.dll                    .\ReleaseForDownload\ /y
+copy ..\..\libraries\i686-win32\lib_release\plds4.dll                   .\ReleaseForDownload\ /y
+copy ..\..\libraries\i686-win32\lib_release\smime3.dll                  .\ReleaseForDownload\ /y
+copy ..\..\libraries\i686-win32\lib_release\softokn3.dll                .\ReleaseForDownload\ /y
+copy ..\..\libraries\i686-win32\lib_release\ssl3.dll                    .\ReleaseForDownload\ /y
+copy ..\..\libraries\i686-win32\lib_release\xpcom.dll                   .\ReleaseForDownload\ /y
 copy ..\..\libraries\i686-win32\lib_release\xul.dll                             .\ReleaseForDownload\ /y
-
 @IF NOT EXIST ..\llkdu\Release\llkdu.dll (
-        copy ..\..\libraries\i686-win32\lib_release\llkdu.dll                           .\ReleaseForDownload\ /y
+        copy ..\..\libraries\i686-win32\lib_release\llkdu.dll           .\ReleaseForDownload\ /y
 ) ELSE (
         copy ..\llkdu\Release\llkdu.dll .\ReleaseForDownload\ /y
 )
diff --git a/linden/indra/newview/releasenotes.txt b/linden/indra/newview/releasenotes.txt
index a223e08..2f7971c 100644
--- a/linden/indra/newview/releasenotes.txt
+++ b/linden/indra/newview/releasenotes.txt
@@ -1,3 +1,54 @@
+Release Notes for Second Life 1.17.0(12) June 13, 2007
+=====================================
+Changes:
+* Inventory transfers
+** Auto-accept inventory and auto-preview texture/notecard/landmark are now separate preferences.
+** Viewing an embedded notecard or landmark no longer adds it to your inventory.
+** Muting the sender of notecards, inventory, textures, etc., now removes all blue pop-ups in the upper right corner from that sender.
+** Offline inventory transfers and group invites now include the name of the item or group, along with group role, in the email.
+* Added "Clear Browser Cache" button to web prefs.
+** This only affects the embedded browser, not any other browsers installed on your system
+* Embedded Mozilla browser now supports cookies.
+* Preliminary support added to the Windows installer for selecting a language (English, Korean)
+* Closing a changed Classified now confirms changes
+
+Bug fixes:
+* Fixed a client crash while in startup
+* Fixed group chat reopening with one message and an error after closing group chat
+* Fixed "Stop All Animations" when stuck in an animation after teleporting
+* Fixed group messages to allow the use of UTF8 characters
+* Fixed "Show Owners" from automatically turning on again
+* Fixed an issue with "Release Controls" when an object is taken and rerezed.
+* Fixed an issue with texture picker not displaying any results unless inventory had been shown
+* Fixed chat history to not show muted resident chat
+* Fixed "Mute Resident" button, now opens the user picker
+* Fixed group ability settings for group owners in German language viewer
+* Fixed embedded Mozilla browser to work with HTTPS sites (affected Windows only)
+* Notecards no longer display the "Keep" and "Discard" buttons when opened from inventory
+* Acquired date is now set for items dragged from the contents of a container prim
+* VWR-1040: crash when opening several gestures quickly
+* VWR-966: Minor memory leak in llfloaterpreferences.cpp and a tiny leak in llstatup.cpp
+* VWR-908: Various memory leaks in the group dialog
+* VWR-871: More bad f00d: Two minor (or inconsequential) misses of initializing object members
+* VWR-870: Memory violation through uninitialized variable (invisible or unrendered flexis)
+* VWR-869: Possible hard-loop (endless, viewer-hang) in script editor
+* VWR-827: Toruses are borked after making/editing sculpted prims
+* VWR-823: Two unintialized variables in lltexturefetch.cpp
+* VWR-822: "Create new..." clothing buttons don't auto-wear items
+* VWR-810: Destructor forgets to delete mFloaterContros member in llui/llview.cpp
+* VWR-809: Destructor fails to clean up global menus in llviewermenu.cpp
+* VWR-808: Incorrect cleanup in message.cpp
+* VWR-807: Forgets to delete gToolInspect in lltoolmgr.cpp
+* VWR-804: Quirk in llviewerwindow.cpp
+* VWR-805: LLCurl not properly cleaned up
+* VWR-765: Cannot open embedded notecards in other notecards when Automatic preview of new notecards/textures/landmarks is off
+* VWR-409: New Feature -> UI -> Dialog -> Buy Copy/Contents -> Default Action -> Cancel
+* VWR-682: Text Editors should try to preserve X cursor position
+* VWR-671: Line editor history for recalling previously typed lines
+* VWR-648: Texture picker should highlight the texture in the swatch
+* VWR-412: Object editing arrows hidden but clickable on objects you can't edit.
+* VWR-364: Viewer memory leak
+
 Release Notes for Second Life 1.16.0(5) May 23, 2007 
 ===================================== 
 New Features:
@@ -43,7 +94,7 @@ Bug fixes:
 * SVC-138: Land sales search sorting doesn't work
 * MISC-37: Continued breakdowns in group notice popup functionality
 * Teleporting to Help Island no longer allows you to teleport back to Orientation Island
-* No-copy objects that fail to rez now reappear in inventory (may take up to one minute)
+* No-copy objects that fail to rez now reappear in inventory (may require a relog)
 * Scripted attachments work again correctly on group land
 * Fixed a bug where email sent by script with an empty subject would fail (valid per RFC2822)
 * Fixed several server-side memory leaks, and changed to new memory allocation library
diff --git a/linden/indra/newview/res/newViewRes.rc b/linden/indra/newview/res/newViewRes.rc
index 482f14e..0b4a5ba 100644
--- a/linden/indra/newview/res/newViewRes.rc
+++ b/linden/indra/newview/res/newViewRes.rc
@@ -227,8 +227,8 @@ TOOLPIPETTE             CURSOR                  "toolpipette.cur"
 //
 
 VS_VERSION_INFO VERSIONINFO
- FILEVERSION 1,16,0,5
- PRODUCTVERSION 1,16,0,5
+ FILEVERSION 1,17,0,12
+ PRODUCTVERSION 1,17,0,12
  FILEFLAGSMASK 0x3fL
 #ifdef _DEBUG
  FILEFLAGS 0x1L
@@ -245,12 +245,12 @@ BEGIN
         BEGIN
             VALUE "CompanyName", "Linden Lab"
             VALUE "FileDescription", "Second Life"
-            VALUE "FileVersion", "1.16.0.5"
+            VALUE "FileVersion", "1.17.0.12"
             VALUE "InternalName", "Second Life"
             VALUE "LegalCopyright", "Copyright © 2001-2007, Linden Research, Inc."
             VALUE "OriginalFilename", "SecondLife.exe"
             VALUE "ProductName", "Second Life"
-            VALUE "ProductVersion", "1.16.0.5"
+            VALUE "ProductVersion", "1.17.0.12"
         END
     END
     BLOCK "VarFileInfo"
diff --git a/linden/indra/newview/secondlife-i686.supp b/linden/indra/newview/secondlife-i686.supp
new file mode 100644
index 0000000..b1b30a4
--- /dev/null
+++ b/linden/indra/newview/secondlife-i686.supp
@@ -0,0 +1,175 @@
+# @file secondlife-i686.supp
+# @brief Valgrind suppressions for Linux i686 viewer.
+#
+# Copyright (c) 2000-$CurrentYear$, Linden Research, Inc.
+# $License$
+#
+# This is a Valgrind suppression file for use on the viewer.
+#
+# Hints for most successful use of valgrind:
+#
+# - If your distro comes with library packages that contain debug info
+#   (Fedora calls these debuginfo packages), install them.
+# - Inside the SConstruct script, disable linking against tcmalloc.
+#   Valgrind and tcmalloc don't get along.
+# - Delete the copy of libstdc++.so.6 that is bundled with the viewer
+#   (if you have one), so that the viewer will use the system's
+#   libstdc++.
+# - After you build the viewer, replace the stripped
+#   do-not-directly-run-secondlife-bin binary with an unstripped copy.
+
+# Mozilla noise.
+
+{
+   Cond:mozilla-runtime/*.so
+   Memcheck:Cond
+   obj:*/mozilla-runtime-*/*.so
+}
+
+{
+   Value4:mozilla-runtime/*.so
+   Memcheck:Value4
+   obj:*/mozilla-runtime-*/*.so
+}
+
+{
+   Cond:mozilla-runtime/*/*.so
+   Memcheck:Cond
+   obj:*/mozilla-runtime-*/*/*.so
+}
+
+{
+   Value4:mozilla-runtime/*/*.so
+   Memcheck:Value4
+   obj:*/mozilla-runtime-*/*/*.so
+}
+
+{
+   Cond:mozilla-runtime/libmozjs.so
+   Memcheck:Cond
+   obj:*/libmozjs.so
+}
+
+{
+   Cond:mozilla-runtime/libxul
+   Memcheck:Cond
+   obj:*/libxul.so
+}
+
+{
+   Value4:mozilla-runtime/libxul
+   Memcheck:Value4
+   obj:*/libxul.so
+}
+
+# libcurl badness.
+
+{
+   Cond:libcurl/inflate/Curl_unencode_gzip_write
+   Memcheck:Cond
+   fun:inflate
+   fun:inflate_stream
+   fun:Curl_unencode_gzip_write
+}
+{
+   Cond:libcurl/ares_mkquery/Curl_getaddrinfo
+   Memcheck:Cond
+   fun:ares_mkquery
+   fun:ares_query
+   fun:ares_search
+   fun:next_lookup
+   fun:Curl_getaddrinfo
+}
+
+# libdl business.
+
+{
+   Cond:libdl/_dl_relocate_object
+   Memcheck:Cond
+   fun:_dl_relocate_object
+}
+
+# X11 fun.
+
+{
+   Param:X11/_X11TransSocketWritev/writev/vector
+   Memcheck:Param
+   writev(vector[...])
+   fun:writev
+   fun:_X11TransSocketWritev
+}
+
+{
+   Param:X11/_X11TransWrite/write/buf
+   Memcheck:Param
+   write(buf)
+   obj:/lib/libc-2.6.so
+   fun:_X11TransWrite
+}
+
+# OpenSSL stuff.
+
+{
+   Value4:libcrypto
+   Memcheck:Value4
+   obj:*/libcrypto.so.0.9*
+}
+
+{
+   Cond:libcrypto
+   Memcheck:Cond
+   obj:*/libcrypto.so.0.9*
+}
+
+{
+   Value4:libssl
+   Memcheck:Value4
+   obj:*/libssl.so.0.9*
+}
+
+{
+   Cond:libcrypto
+   Memcheck:Cond
+   obj:*/libssl.so.0.9*
+}
+
+# NVIDIA driver brokenness.
+
+{
+   Addr4:NVIDIA/libGL
+   Memcheck:Addr4
+   obj:/usr/lib/libGL.so.1.0.*
+}
+
+{
+   Value4:NVIDIA/libGL
+   Memcheck:Value4
+   obj:/usr/lib/libGL.so.1.0.*
+}
+
+{
+   Cond:NVIDIA/libGL
+   Memcheck:Cond
+   obj:/usr/lib/libGL.so.1.0.*
+}
+
+{
+   Value4:NVIDIA/libGLcore
+   Memcheck:Value4
+   obj:/usr/lib/libGLcore.so.1.0.*
+}
+
+{
+   Cond:NVIDIA/libGLcore
+   Memcheck:Cond
+   obj:/usr/lib/libGLcore.so.1.0.*
+}
+
+{
+   Param:NVIDIA/ioctl
+   Memcheck:Param
+   ioctl(generic)
+   fun:ioctl
+   fun:_nv000130gl
+}
+
diff --git a/linden/indra/newview/skins/xui/en-us/alerts.xml b/linden/indra/newview/skins/xui/en-us/alerts.xml
index cac8dc4..d32b46a 100644
--- a/linden/indra/newview/skins/xui/en-us/alerts.xml
+++ b/linden/indra/newview/skins/xui/en-us/alerts.xml
@@ -249,7 +249,7 @@ Members cannot be removed from that role.
 The members must resign from the role themselves.
 Are you sure you want to continue?
                 </message>
-                <ignore>
+                <ignore name="ignore">
                         When adding group members to the owner role
                 </ignore>
                 <option name="Yes">
@@ -700,7 +700,7 @@ also appear higher when people search for keywords.
                 <option name="Cancel">
                         Cancel
                 </option>
-                <ignore>
+                <ignore name="ignore">
                         When adding a new Classified
                 </ignore>
         </alert>
@@ -716,6 +716,20 @@ There is no reimbursement for fees paid.
                         Cancel
                 </option>
         </alert>
+        <alert modal="true" name="ClassifiedSave">
+                <message name="message">
+                        Save changes to classified [NAME]?
+                </message>
+                <option name="Save">
+                        Save
+                </option>
+                <option name="Don&apos;tSave">
+                        Don&apos;t Save
+                </option>
+                <option name="Cancel">
+                        Cancel
+                </option>
+        </alert>
         <alert modal="true" name="DeleteAvatarPick">
                 <message name="message">
                         Delete pick [PICK]?
@@ -2696,7 +2710,7 @@ Download to your Applications folder?
                         Deeding this object will cause the group to:
 * Receive L$ paid into the object
                 </message>
-                <ignore>
+                <ignore name="ignore">
                         When deeding objects to groups
                 </ignore>
                 <option name="Deed">
@@ -2718,7 +2732,7 @@ You&apos;ll be asked for a price to pay when clicking Publish.
 Paying more makes your ad appear higher in the list, and
 also appear higher when people search for keywords.
                 </message>
-                <ignore>
+                <ignore name="ignore">
                         When adding a new Classified
                 </ignore>
                 <option name="OK">
@@ -2732,7 +2746,7 @@ also appear higher when people search for keywords.
                 <message name="message">
                         Go to www.secondlife.com to manage your account?
                 </message>
-                <ignore>
+                <ignore name="ignore">
                         When launching web browser to manage your account
                 </ignore>
                 <option name="OK">
@@ -2746,7 +2760,7 @@ also appear higher when people search for keywords.
                 <message name="message">
                         Visit the [SECOND_LIFE] Wiki and Learn how to Report Bugs Correctly.
                 </message>
-                <ignore>
+                <ignore name="ignore">
                         When launching web browser to view the Bug Reporting 101 Wiki
                 </ignore>
                 <option name="Gotopage">
@@ -2760,7 +2774,7 @@ also appear higher when people search for keywords.
                 <message name="message">
                         Visit the [SECOND_LIFE] Wiki for Details of How to Report a Security Issue.
                 </message>
-                <ignore>
+                <ignore name="ignore">
                         When launching web browser to view Security Issues Wiki
                 </ignore>
                 <option name="Gotopage">
@@ -2774,7 +2788,7 @@ also appear higher when people search for keywords.
                 <message name="message">
                         Visit the [SECOND_LIFE] Public Issue Tracker, Where you can Report Bugs and other Issues.
                 </message>
-                <ignore>
+                <ignore name="ignore">
                         When launching web browser to view the Public Issue Tracker
                 </ignore>
                 <option name="Gotopage">
@@ -2788,7 +2802,7 @@ also appear higher when people search for keywords.
                 <message name="message">
                         Visit the [SECOND_LIFE] Wiki for info on how to use the Public Issue Tracker.
                 </message>
-                <ignore>
+                <ignore name="ignore">
                         When launching web browser to view Public Issue Tracker Wiki
                 </ignore>
                 <option name="Gotopage">
@@ -2802,7 +2816,7 @@ also appear higher when people search for keywords.
                 <message name="message">
                         Search the [SECOND_LIFE] Knowledge Base for the latest tips and tricks.
                 </message>
-                <ignore>
+                <ignore name="ignore">
                         When launching web browser to view the knowledge base
                 </ignore>
                 <option name="Gotopage">
@@ -2816,7 +2830,7 @@ also appear higher when people search for keywords.
                 <message name="message">
                         Contact [SECOND_LIFE] Support.
                 </message>
-                <ignore>
+                <ignore name="ignore">
                         When launching web browser to contact support
                 </ignore>
                 <option name="Gotopage">
@@ -2830,7 +2844,7 @@ also appear higher when people search for keywords.
                 <message name="message">
                         Go to the Official Linden Blog, for the Latest News and Information.
                 </message>
-                <ignore>
+                <ignore name="ignore">
                         When launching web browser to view the blog
                 </ignore>
                 <option name="Gotopage">
@@ -2844,7 +2858,7 @@ also appear higher when people search for keywords.
                 <message name="message">
                         Go to the Scripting Guide for scripting help?
                 </message>
-                <ignore>
+                <ignore name="ignore">
                         When launching web browser to view the Scripting Guide
                 </ignore>
                 <option name="Gotopage">
@@ -2858,7 +2872,7 @@ also appear higher when people search for keywords.
                 <message name="message">
                         Go to the LSL Portal for scripting help?
                 </message>
-                <ignore>
+                <ignore name="ignore">
                         When launching web browser to view the LSL Portal
                 </ignore>
                 <option name="Gotopage">
@@ -2872,7 +2886,7 @@ also appear higher when people search for keywords.
                 <message name="message">
                         View the [SECOND_LIFE] Release Notes?.
                 </message>
-                <ignore>
+                <ignore name="ignore">
                         When launching web browser to view the Release Notes
                 </ignore>
                 <option name="Gotopage">
@@ -2890,7 +2904,7 @@ objects will be returned to their previous owners.
  
 *WARNING* No-transfer deeded objects will be deleted!
                 </message>
-                <ignore>
+                <ignore name="ignore">
                         When returning objects to their owners
                 </ignore>
                 <option name="Return">
@@ -2904,7 +2918,7 @@ objects will be returned to their previous owners.
                 <message name="message">
                         View the Second Life release notes?
                 </message>
-                <ignore>
+                <ignore name="ignore">
                         When viewing the release notes
                 </ignore>
                 <option name="Gotopage">
@@ -2942,6 +2956,12 @@ Leave Group?
                 <message name="message">
                         Do you REALLY want to kick all users off the grid?
                 </message>
+                <option name="Kick">
+                        Kick All Users
+                </option>
+                <option name="Cancel">
+                        Cancel
+                </option>
         </alert>
         <alert modal="true" name="MuteLinden">
                 <message name="message">
@@ -3025,7 +3045,7 @@ Chat and instant messages will be hidden. Instant
 messages will get your Busy mode response. All teleportation
 and inventory offers will be declined.
                 </message>
-                <ignore>
+                <ignore name="ignore">
                         When setting busy mode
                 </ignore>
                 <option name="OK">
@@ -3989,7 +4009,7 @@ These items will be moved to your inventory, not copied.
  
 Move the inventory item(s)?
                 </message>
-                <ignore>
+                <ignore name="ignore">
                         When moving no-copy inventory from objects
                 </ignore>
                 <option name="Move">
@@ -4009,7 +4029,7 @@ to your inventory may cause the script to malfunction.
  
 Move the inventory item(s)?
                 </message>
-                <ignore>
+                <ignore name="ignore">
                         When moving no-copy inventory from scripted objects
                 </ignore>
                 <option name="Move">
@@ -4024,7 +4044,7 @@ Move the inventory item(s)?
                         Warning: The Pay Object click action has been set, but it 
 will only work if a script is added with a money() event. 
                 </message>
-                <ignore>
+                <ignore name="ignore">
                         When Setting &apos;Pay&apos; on objects without money() events
                 </ignore>
         </alert>
@@ -4037,7 +4057,7 @@ will only work if a script is added with a money() event.
                 <message name="message">
                         Go to the Second Life web site to see your account history?
                 </message>
-                <ignore>
+                <ignore name="ignore">
                         When loading account history web page
                 </ignore>
                 <option name="Gotopage">
@@ -4218,7 +4238,7 @@ completing this transaction?
                         Are you sure you want to permanently remove
 the contents of your Trash folder?
                 </message>
-                <ignore>
+                <ignore name="ignore">
                         When emptying your inventory trash folder
                 </ignore>
                 <option default="true" name="Yes">
@@ -4228,12 +4248,36 @@ the contents of your Trash folder?
                         Cancel
                 </option>
         </alert>
+        <alert modal="true" name="ConfirmClearBrowserCache">
+                <message name="message">
+                        Are you sure you want to clear your
+browser cache?
+                </message>
+                <option default="true" name="Yes">
+                        Yes
+                </option>
+                <option name="No">
+                        Cancel
+                </option>
+        </alert>
+        <alert modal="true" name="ConfirmClearCookies">
+                <message name="message">
+                        Are you sure you want to clear 
+your cookies?
+                </message>
+                <option default="true" name="Yes">
+                        Yes
+                </option>
+                <option name="No">
+                        Cancel
+                </option>
+        </alert>
         <alert modal="true" name="ConfirmEmptyLostAndFound">
                 <message name="message">
                         Are you sure you want to permanently remove
 the contents of your Lost And Found folder?
                 </message>
-                <ignore>
+                <ignore name="ignore">
                         When emptying your inventory Lost And Found folder
                 </ignore>
                 <option default="true" name="Yes">
@@ -4252,7 +4296,7 @@ the contents of your Lost And Found folder?
                         Put it in a web page to give others easy access to this location or
                         try it out yourself by pasting it into the address bar of your web browser.
                 </message>
-                <ignore>
+                <ignore name="ignore">
                         When copying a SLURL to your clipboard
                 </ignore>
         </alert>
diff --git a/linden/indra/newview/skins/xui/en-us/floater_about.xml b/linden/indra/newview/skins/xui/en-us/floater_about.xml
index ea855d9..fbfebf0 100644
--- a/linden/indra/newview/skins/xui/en-us/floater_about.xml
+++ b/linden/indra/newview/skins/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"
              text_color="1, 1, 1, 1" text_readonly_color="1, 1, 1, 1" 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, 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 and many others.
+             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, 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 and many others.
 
-Thank you to the following residents for helping to ensure that this is the best version yet: shinmai Akebono, Evangeline Arcadia, Nargus Asturias, FireFox Bancroft, Verbuda Barragar, Logan Bauer, Freya Becquerel, phoenix Behemoth, Druida Biedermann, Bibi Book, Barney Boomslang, mckinnes1 Boyd, Ice Brodie, Darling Brody, seaone Bunyip, Hypatia Callisto, Upo Choche, Bell Clellon, pizzaguy Clutterbuck, Victor Cole, Patrice Cournoyer, Sherona DeGroot, Mecha Dinosaur, Shack Dougall, Drew Dwi, Bazzerbill Eccleston, Rosa Edelman, Gotobug Fairymeadow, Gianetti Ferlinghetti, Ante Flan, Mario Fonzarelli, Raudf Fox, Lor Gynoid, Moses Gyoza, Corax Homewood, Pietor Huygens, LampLighter Jacobus, Major Johnson, Itoku Kamachi, DaQbet Kish, Max Kleiber, Laurent Laborde, Lightfoot Lindman, Deira Llanfair, Domino Marama, Aminom Marvin, Liberty Mill, Walker Moore, Yumi Murakami, Usagi Musashi, Luciftias Neurocam, Destiny Niles, Alexandra Nino, Kinzo Nurmi, OmniCron Overlord, Julianna Pennyfeather, Coyote Pixie, Maya Remblai, Arenae Rosewood, Grey Ryder, Norm Schack, Funk Schnook, Singular Seoul, tickledgirl Shemesh, Rhyph Somme, Oz Spade, Argent Stonecutter, Eristic Strangelove, Samm Submariner, Seifert Surface, Dirk Talamasca, Ilyara Tardis, Mac Teazle, Winter Ventura, Amaranth Voss, Geri Watson, Will Webb, Patchouli Woollahra, TonyH Wrangler, malee Zhaoying.
+Thank you to the following residents for helping to ensure that this is the best version yet: Hypatia Callisto, Inigo Chamerberlin, Matti Deigan, Jasper Dogpatch, Able Forder, Evy Gardenvale, Bosco Gray, Torben Jensen, Claire Kanno, bebop Kohime, Michael Kyuzo, Sian Lumley, Chase McClure, Lisa McConnell, Alice Obscure, Stumbelina Ophelia, Arenae Rosewood, Joseph Rustamova, Norm Schack, Funk Schnook, Teleio Seferis, Ninnie Stradling, Darzus Strutt, Glory Takashi, Omei Turnbull, Craig Weiland, Johan Yugen, xsdenied Zucker.
 
 APR Copyright (C) 2000-2004 The Apache Software Foundation
 Cg Copyright (C) 2002, NVIDIA Corporationa.
@@ -30,7 +30,7 @@ zlib Copyright (C) 1995-2002 Jean-loup Gailly and Mark Adler.
 All rights reserved.  See licenses.txt for details.
 
 
-Kilroy 2.0 is here. Kilroy 2.0 is everywhere.</text_editor>
+Bananas are the new plywood cubes.</text_editor>
         <text_editor bg_readonly_color="0, 0, 0, 0" bottom_delta="174" embedded_items="false"
              follows="left|top|right|bottom" font="SansSerif" height="238" left="6"
              max_length="65536" mouse_opaque="true" name="support_editor"
diff --git a/linden/indra/newview/skins/xui/en-us/floater_instant_message.xml b/linden/indra/newview/skins/xui/en-us/floater_instant_message.xml
index d64452f..f5b11d6 100644
--- a/linden/indra/newview/skins/xui/en-us/floater_instant_message.xml
+++ b/linden/indra/newview/skins/xui/en-us/floater_instant_message.xml
@@ -32,10 +32,6 @@
              max_length="1022" mouse_opaque="true" name="chat_editor"
              select_all_on_focus_received="false" select_on_focus="false" tab_group="1"
              width="345" label="Click here to instant message" />
-        <button bottom="-295" enabled="false" follows="right|bottom" font="SansSerif"
-             halign="center" height="20" hidden="false" label="Teleport"
-             label_selected="Teleport" left="275" mouse_opaque="true"
-             name="teleport_btn" scale_image="true" width="75" />
         <button bottom="-295" enabled="true" follows="right|bottom" font="SansSerif"
              halign="center" height="20" hidden="false" label="Profile..."
              label_selected="Profile..." left="355" mouse_opaque="true"
diff --git a/linden/indra/newview/skins/xui/en-us/panel_preferences_general.xml b/linden/indra/newview/skins/xui/en-us/panel_preferences_general.xml
index 8297887..6792202 100644
--- a/linden/indra/newview/skins/xui/en-us/panel_preferences_general.xml
+++ b/linden/indra/newview/skins/xui/en-us/panel_preferences_general.xml
@@ -69,13 +69,7 @@
              label="Notify when Linden dollars (L$) spent or received" left="148"
              mouse_opaque="true" name="notify_money_change_checkbox" radio_style="false"
              width="256" />
-        <check_box bottom="-326" control_name="ShowNewInventory" enabled="true"
-             follows="left|top" font="SansSerifSmall" height="16" hidden="false"
-             initial_value="false" label="Automatic previews of new notecards/textures/landmarks"
-             left="148" mouse_opaque="true" name="show_new_inventory"
-             radio_style="false"
-             width="270" />
-        <check_box bottom="-344" control_name="UseDefaultColorPicker" enabled="true"
+        <check_box bottom="-326" control_name="UseDefaultColorPicker" enabled="true"
              follows="left|top" font="SansSerifSmall" height="16" hidden="false"
              initial_value="false" label="Use default system color picker" left="148"
              mouse_opaque="true" name="use_system_color_picker_checkbox"
diff --git a/linden/indra/newview/skins/xui/en-us/panel_preferences_popups.xml b/linden/indra/newview/skins/xui/en-us/panel_preferences_popups.xml
index 1b9acc6..24c3b19 100644
--- a/linden/indra/newview/skins/xui/en-us/panel_preferences_popups.xml
+++ b/linden/indra/newview/skins/xui/en-us/panel_preferences_popups.xml
@@ -1,34 +1,37 @@
 <?xml version="1.0" encoding="utf-8" standalone="yes" ?>
-<panel border="true" bottom="-409" enabled="true" follows="left|top|right|bottom"
-     height="408" hidden="false" label="Popups" left="102" mouse_opaque="true"
-     name="popups" width="517">
-        <text type="string" length="1" bg_visible="false" border_drop_shadow_visible="false" border_visible="false"
-             bottom="-20" drop_shadow_visible="true" enabled="true" follows="left|top"
-             font="SansSerifSmall" h_pad="0" halign="left" height="10" hidden="false"
-             left="12" mouse_opaque="false" name="text_box" v_pad="0" width="300">
+<panel border="true" bottom="0" height="500" label="Popups" left="0" name="popups"
+     title="Popups" width="400">
+        <text bottom="-20" follows="top|left" left="15" width="300">
                 Do not show popups:
         </text>
-        <scroll_list background_visible="true" bottom="-124" column_padding="5" draw_border="true"
-             draw_heading="false" draw_stripes="true" enabled="true" follows="left|top"
-             height="100" hidden="false" left="12" mouse_opaque="true"
-             multi_select="false" name="disabled_popups" width="480" />
-        <button bottom="-148" enabled="false" follows="left|top" font="SansSerif"
-             halign="center" height="20" hidden="false" label="Enable this popup"
-             label_selected="Enable this popup" left="12" mouse_opaque="true"
-             name="enable_popup" scale_image="true" width="150" />
+        <scroll_list follows="top|left" height="100" left="15" name="disabled_popups" width="480" />
+        <button follows="top|left" height="20" label="Enable this popup" left="15"
+             name="enable_popup" width="150" />
+        <text follows="top|left" left="15" width="128">
+                Show popups:
+        </text>
+        <scroll_list follows="top|left" height="100" left="15" name="enabled_popups" width="480" />
+             
         <text type="string" length="1" bg_visible="false" border_drop_shadow_visible="false" border_visible="false"
-             bottom="-162" drop_shadow_visible="true" enabled="true" follows="left|top"
+             bottom_delta="-30" drop_shadow_visible="true" enabled="true" follows="left|top"
              font="SansSerifSmall" h_pad="0" halign="left" height="10" hidden="false"
-             left="12" mouse_opaque="false" name="text_box2" v_pad="0" width="128">
-                Show popups:
+             left="15" mouse_opaque="false" name="text_box2" v_pad="0" width="270">
+                Offers of notecards, textures and landmarks:
         </text>
-        <scroll_list background_visible="true" bottom="-266" column_padding="5" draw_border="true"
-             draw_heading="false" draw_stripes="true" enabled="true" follows="left|top"
-             height="100" hidden="false" left="12" mouse_opaque="true"
-             multi_select="false" name="enabled_popups" width="480" />
-        <button bottom="-311" enabled="true" follows="left|top" font="SansSerif"
-             halign="center" height="20" hidden="false"
-             label="Reset &apos;Show next time&apos; Dialogs..."
-             label_selected="Reset &apos;Show next time&apos; Dialogs..." left="12"
-             mouse_opaque="true" name="reset_dialogs_btn" scale_image="true" width="210" />
+        <check_box bottom_delta="-25" control_name="AutoAcceptNewInventory" enabled="true"
+             follows="left|top" font="SansSerifSmall" height="16" hidden="false"
+             initial_value="false" label="Automatically accept"
+             left="40" mouse_opaque="true" name="accept_new_inventory"
+             radio_style="false"
+             width="270" />
+        <check_box bottom_delta="-20" control_name="ShowNewInventory" enabled="true"
+             follows="left|top" font="SansSerifSmall" height="16" hidden="false"
+             initial_value="true" label="Automatically view after accepting"
+             left="40" mouse_opaque="true" name="show_new_inventory"
+             radio_style="false"
+             width="270" />
+
+        <button bottom_delta="-35" follows="top|left" height="20"
+             label="Reset &apos;Show next time&apos; Dialogs..." left="15"
+             name="reset_dialogs_btn" width="210" />
 </panel>
diff --git a/linden/indra/newview/skins/xui/en-us/panel_preferences_web.xml b/linden/indra/newview/skins/xui/en-us/panel_preferences_web.xml
new file mode 100644
index 0000000..fa1fffd
--- /dev/null
+++ b/linden/indra/newview/skins/xui/en-us/panel_preferences_web.xml
@@ -0,0 +1,34 @@
+<?xml version="1.0" encoding="utf-8" standalone="yes" ?>
+<panel border="true" bottom="-409" enabled="true" follows="left|top|right|bottom"
+     height="408" hidden="false" label="Web" left="102" mouse_opaque="true"
+     name="web" width="517">
+        <text type="string" length="1" bg_visible="false" border_drop_shadow_visible="false" border_visible="false"
+             bottom="-20" drop_shadow_visible="true" enabled="true" follows="left|top"
+             font="SansSerifSmall" h_pad="0" halign="left" height="10" hidden="false"
+             left="12" mouse_opaque="false" name="cache_size_label_l" v_pad="0" width="128">
+                Browser cache:
+        </text>
+        <button bottom="-30" enabled="true" follows="left|bottom" font="SansSerif"
+             halign="center" height="22" hidden="false"
+             label="Clear Now" left="140" mouse_opaque="true"
+             name="clear_cache" scale_image="true" width="85" />
+
+        <text type="string" length="1" bg_visible="false" border_drop_shadow_visible="false" border_visible="false"
+             bottom="-60" drop_shadow_visible="true" enabled="true" follows="left|top"
+             font="SansSerifSmall" h_pad="0" halign="left" height="10" hidden="false"
+             left="12" mouse_opaque="false" name="cookie_label" v_pad="0" width="128">
+                Cookies:
+        </text>
+
+        <check_box bottom="-65" control_name="CookiesEnabled" enabled="true" follows="left|top" font="SansSerifSmall"
+             height="16" hidden="false" initial_value="false" label="Accept cookies from sites"
+             left="140" mouse_opaque="true" name="cookies_enabled" radio_style="false"
+             width="256" /> 
+             
+        <button bottom="-95" enabled="true" follows="left|bottom" font="SansSerif"
+             halign="center" height="22" hidden="false"
+             label="Clear Now" left="140" mouse_opaque="true"
+             name="clear_cookies" scale_image="true" width="85" />
+
+
+</panel>
diff --git a/linden/indra/newview/skins/xui/en-us/panel_settings_msgbox.xml b/linden/indra/newview/skins/xui/en-us/panel_settings_msgbox.xml
deleted file mode 100644
index d6f3967..0000000
--- a/linden/indra/newview/skins/xui/en-us/panel_settings_msgbox.xml
+++ /dev/null
@@ -1,17 +0,0 @@
-<?xml version="1.0" encoding="utf-8" standalone="yes" ?>
-<panel border="true" bottom="0" height="500" label="Popups" left="0" name="popups"
-     title="Popups" width="400">
-        <text bottom="-20" follows="top|left" left="12" width="300">
-                Do not show popups:
-        </text>
-        <scroll_list follows="top|left" height="100" left="12" name="disabled_popups" width="480" />
-        <button follows="top|left" height="20" label="Enable this popup" left="12"
-             name="enable_popup" width="150" />
-        <text follows="top|left" left="12" width="128">
-                Show popups:
-        </text>
-        <scroll_list follows="top|left" height="100" left="12" name="enabled_popups" width="480" />
-        <button bottom_delta="-45" follows="top|left" height="20"
-             label="Reset &apos;Show next time&apos; Dialogs..." left="12"
-             name="reset_dialogs_btn" width="210" />
-</panel>
diff --git a/linden/indra/newview/skins/xui/ko/alerts.xml b/linden/indra/newview/skins/xui/ko/alerts.xml
index 8c2d1c2..88df4f3 100644
--- a/linden/indra/newview/skins/xui/ko/alerts.xml
+++ b/linden/indra/newview/skins/xui/ko/alerts.xml
@@ -2,7 +2,7 @@
 <alerts>
         <alert name="MissingAlert">
                 <message name="message">
-                        [ALERT_NAME](�)를 alerts.xml�서 찾� 수 없습니다!
+                        alerts.xml� [ALERT_NAME]�(가) 없습니다.
                 </message>
                 <option name="OK">
                         확�
@@ -10,7 +10,7 @@
         </alert>
         <alert name="FloaterNotFound">
                 <message name="message">
-                        표류� 오류: 다� 제어를 찾� 수 없습니다:
+                        플러터 오류: 다� 제어를 찾� 수 없습니다:
  
 [CONTROLS]
                 </message>
@@ -25,12 +25,12 @@
         </alert>
         <alert name="GenericAlert">
                 <message name="message">
-                        [메시지]
+                        [MESSAGE]
                 </message>
         </alert>
         <alert name="GenericAlertYesCancel">
                 <message name="message">
-                        [메시지]
+                        [MESSAGE]
                 </message>
                 <option name="Yes">
                         예
@@ -41,15 +41,15 @@
         </alert>
         <alert name="GenericServerAlert">
                 <message name="message">
-                        [메시지]
+                        [MESSAGE]
                 </message>
         </alert>
         <alert name="ConnectTimeout">
                 <message name="message">
                         [SECOND_LIFE]� 연결하지 못했습니다.
-시스템� 다운�태� 수 있습니다.
-잠시 후 다시 시�하시거나, �움�� �릭하시면
-안내 � 시스템 �태 웹페�지로 가는 ��가 나옵니다.
+시스템� 다운� 수 있습니다.
+몇 초 후� 다시 시�하거나 �움�� �릭하여
+시스템 �태 웹 페�지� 대한 지� 정보 � ��를 확�하십시오.
                 </message>
                 <option name="OK">
                         확�
@@ -60,13 +60,13 @@
         </alert>
         <alert name="RemoveWearableSave">
                 <message name="message">
-                        현재 �류/신체 부분� 대한 변경 내용� 저장하시겠습니까?
+                        변경 사항� �복/신체 부위로 저장합니까?
                 </message>
                 <option name="Save">
                         저장
                 </option>
                 <option name="Don&apos;tSave">
-                        저장 금지
+                        저장 안 함
                 </option>
                 <option name="Cancel">
                         취소
@@ -74,13 +74,27 @@
         </alert>
         <alert name="SetWearableSave">
                 <message name="message">
-                        현재 �류/신체 부분� 대한 변경 내용� 저장하시겠습니까?
+                        변경 사항� �복/신체 부위로 저장합니까?
                 </message>
                 <option name="Save">
                         저장
                 </option>
                 <option name="Don&apos;tSave">
-                        저장 금지
+                        저장 안 함
+                </option>
+                <option name="Cancel">
+                        취소
+                </option>
+        </alert>
+        <alert name="WearableSave">
+                <message name="message">
+                        현재 내 모습� 저장 하시겠습니까?
+                </message>
+                <option name="Save">
+                        저장
+                </option>
+                <option name="Don&apos;tSave">
+                        저장하지 않�
                 </option>
                 <option name="Cancel">
                         취소
@@ -88,65 +102,79 @@
         </alert>
         <alert name="CompileQueueSaveText">
                 <message name="message">
-                        다�� �유로 �해 스�립트 �스트 업로드� 문제가 발�했습니다: [�유]. 잠시 후 다시 시�해 주십시오.
+                        다�� �유로 �해 스�립트용 �스트를 업로드하는 � 문제가 발�했습니다: [REASON]. 다시 시�해 주십시오.
                 </message>
         </alert>
         <alert name="CompileQueueSaveBytecode">
                 <message name="message">
-                        다�� �유로 �해 컴파�� 스�립트 업로드� 문제가 발�했습니다: [�유]. 잠시 후 다시 시�해 주십시오.
+                        다�� �유로 �해 컴파�� 스�립트를 업로드하는 � 문제가 발�했습니다: [REASON]. 다시 시�해 주십시오.
                 </message>
         </alert>
         <alert name="WriteAnimationFail">
                 <message name="message">
-                        애니메�션 ��터 쓰기� 실패했습니다.
+                        애니메�션 ��터를 �용하지 못했습니다.
                 </message>
         </alert>
         <alert name="UploadAuctionSnapshotFail">
                 <message name="message">
-                        다�� �유로 �해 경매 스냅샷 업로드� 문제가 발�했습니다: [�유]
+                        다�� �유로 �해 경매 스냅샷� 업로드하는 � 문제가 발�했습니다: [REASON]
                 </message>
         </alert>
         <alert name="UnableToViewContentsMoreThanOne">
                 <message name="message">
-                        한번� 2개 �� 항목� 컨�츠를 보는� 실패했습니다.
-1개� 사물만 선�한 후 다시 시�해 주십시오.
+                        한번� 2개 �� 항목� 컨�츠를 표시할 수 없습니다.
+1개� 오브�트만 선�한 후 다시 시�해 주십시오.
                 </message>
         </alert>
         <alert name="MustSupplyVoteProposal">
                 <message name="message">
-                        투표를 위한 제안서를 제공하셔야 합니다.
-그룹� 목표를 간략하게 입력하십시오.
+                        투표할 제안� 지정해야 합니다.
+그룹 용�� 대한 간략한 설명� 입력하십시오.
                 </message>
         </alert>
         <alert name="InsufficientFunds">
                 <message name="message">
-                        �금� 부족합니다.
+                        린든달러 부족.
                 </message>
         </alert>
         <alert name="CharacterSnapshotSaved">
                 <message name="message">
-                        �릭터� 스냅샷� 저장�었습니다.
+                        귀하� 아바타� 대한 스냅샷� 저장�었습니다.
  
-웹페�지 스튜디오 전시관으로 가시면 확�하실 수 있습니다.
+스냅샷� 보려면 Webpage Studio를 방문하십시오.
                 </message>
         </alert>
         <alert name="SaveClothingBodyChanges">
                 <message name="message">
-                        �류/신체 부분� 변경 내용� 모� 저장하시겠습니까?
+                        모든 변경 사항� �복/신체 부위로 저장합니까?
                 </message>
                 <option name="SaveAll">
-                        전체 저장
+                        모� 저장
                 </option>
                 <option name="Don&apos;tSave">
-                        저장 금지
+                        저장 안 함
                 </option>
                 <option name="Cancel">
                         취소
                 </option>
         </alert>
-        <alert name="AlterModifyRights">
+        <alert name="GrantModifyRights">
+                <message name="message">
+                        제3� 주민�게 수정 권한� 부여함으로�, 제3� 주민� 본�� 가지고 있는 오브�트 모�를 
+변경할 수 있습니다. 본 허가권� 취급 시 주� 
+하십시오.
+[FIRST_NAME] [LAST_NAME]님�게 수정 권한� 부여 하시겠습니까?
+                </message>
+                <option name="Yes">
+                        예
+                </option>
+                <option name="No">
+                        아니오
+                </option>
+        </alert>
+        <alert name="RevokeModifyRights">
                 <message name="message">
-                        [�름] [성] [방향] 수정 권리를 [�작]하시겠습니까 ?
+                        [FIRST_NAME] [LAST_NAME]님� 수정 권한� 취소하시겠습니까?
                 </message>
                 <option name="Yes">
                         예
@@ -157,7 +185,7 @@
         </alert>
         <alert name="RemoveFriend">
                 <message name="message">
-                        [�름] [성](�)를 친구 목��서 삭제하시겠습니까?
+                        [FIRST] [LAST]님� 친구�서 제거하시겠습니까?
                 </message>
                 <option name="Remove">
                         제거
@@ -168,13 +196,13 @@
         </alert>
         <alert name="GroupCreateSuccess">
                 <message name="message">
-                        그룹� 성공�으로 �성�었습니다.
+                        그룹� 성공�으로 만들어 졌습니다.
                 </message>
         </alert>
         <alert name="UnableToCreateGroup">
                 <message name="message">
-                        그룹 �성� 실패했습니다.
-[메시지]
+                        그룹� 만들 수 없습니다.
+[MESSAGE]
                 </message>
                 <option name="OK">
                         확�
@@ -197,12 +225,12 @@
         </alert>
         <alert name="CreateGroupCanAfford">
                 <message name="message">
-                        그룹 �성 비용� L$[COST]입니다.
+                        그룹� �성하려면 L$[COST]가 듭니다.
  
-그룹� 3� �� 유지하려면,
-멤버 수가 � 3� ���어야 합니다.
+그룹� 3� �� 유지하려면
+회� 수가 � 3� ��� �어야 합니다.
  
-그룹� �성하시겠습니까?
+그룹� �성 하시겠습니까?
                 </message>
                 <option name="Create">
                         만들기
@@ -213,24 +241,24 @@
         </alert>
         <alert name="CreateGroupCannotAfford">
                 <message name="message">
-                        그룹 �성 비용� L$[비용]입니다.
-� 그룹� �성하기�는 보유하고 계신 �� 충분치 않습니다.
+                        그룹� �성하려면 L$[COST]가 듭니다.
+�금� 부족하여 � 그룹� �성할 수 없습니다.
                 </message>
         </alert>
         <alert name="GroupNameTooShort">
                 <message name="message">
-                        그룹명� 최소 4글�로 �루어져야 합니다.
+                        그룹 �름� 최소 4 글� ��입니다.
                 </message>
         </alert>
         <alert name="GroupNameUsesReservedWord">
                 <message name="message">
-                        그룹명� 예약� 단어가 사용�었습니다. 다른
-�름� 선�해 주십시오.
+                        그룹 �름� 예약� 단어가 사용�고 있습니다. 다른
+�름� 선�하십시오.
                 </message>
         </alert>
         <alert name="MustSpecifyGroupNoticeSubject">
                 <message name="message">
-                        그룹 공지를 전송하려면 제목� 지정해야 합니다.
+                        그룹 공지를 전송하려면 제목� 입력해야 합니다.
                 </message>
                 <option name="OK">
                         확�
@@ -238,17 +266,20 @@
         </alert>
         <alert name="MustSupplyGroupCharter">
                 <message name="message">
-                        그룹� 설립 조항를 제공하셔야 합니다.
-그룹� 목표를 간략하게 입력하십시오.
+                        그룹� 대한 설립 조항� 지정해야 합니다.
+그룹 용�� 대한 간략한 설명� 입력하십시오.
                 </message>
         </alert>
         <alert name="AddGroupOwnerWarning">
                 <message name="message">
-                        그룹 멤버가 [ROLE_NAME] 역할� 추가�니다.
-멤버를 해당 역할�서 삭제할 수 없습니다.
-멤버는 역할 �체를 그만 �어야 합니다.
+                        그룹 회�� [ROLE_NAME] 역할� 추가�니다.
+회�� 해당 역할�서 삭제할 수 없습니다.
+회�� 역할 �체를 그만 �어야 합니다.
 정� 계�하시겠습니까?
                 </message>
+                <ignore name="ignore">
+                        그룹 회�� 소유주 역할� 추가할 때
+                </ignore>
                 <option name="Yes">
                         예
                 </option>
@@ -258,16 +289,17 @@
         </alert>
         <alert name="AssignDangerousActionWarning">
                 <message name="message">
-                        능력 &apos;[ACTION_NAME]&apos;�(가) 
-역할 &apos;[ROLE_NAME]&apos;� 추가�니다.
+                        권한 &apos;[ACTION_NAME]&apos;�(를) 역할 &apos;[ROLE_NAME]&apos;� 
+추가하려고 합니다.
  
  *경고*
- 역할� � 능력� 있는 멤버는 스스로 그만둘 수 있으며--
- 현재 능력보다 � 많� 능력� 가진 다른 멤버� 역할� 
- 소유주� 가까운 능력� 향�시킬 수 있습니다. � 능력� 할당하기 전� 현재
- �태� 대해 �해해야 합니다.
+ 역할� 본 권한� 있는 회�� 스스로를 비롯하여 다른 회��
+ 현재 권한보다 � 많� 권한� 가진 역할� 할당할 수 있으며
+ 소유주� 가까운 권한으로 등급�
+ 높� 수 있습니다. � 권한� 할당하기 전� 현재 �태� 대해
+ �해해야 합니다.
  
-� 능력� &apos;[ROLE_NAME]&apos;� 추가 하시겠습니까?
+� 권한� &apos;[ROLE_NAME]&apos;� 추가하시겠습니까?
                 </message>
                 <option name="Yes">
                         예
@@ -278,15 +310,15 @@
         </alert>
         <alert name="AssignDangerousAbilityWarning">
                 <message name="message">
-                        능력 &apos;[ACTION_NAME]&apos;�(가) 
-역할 &apos;[ROLE_NAME]&apos;� 추가�니다.
+                        권한 &apos;[ACTION_NAME]&apos;�(를) 역할 &apos;[ROLE_NAME]&apos;� 
+추가하려고 합니다.
  
  *경고*
- 역할� 본 능력� 있는 멤버는 스스로 그만둘 수 있으며--
- 모든 능력� 갖춘 다른 멤버는 소유주� 가까운
- 능력� 향�시킬 수 있습니다.
+ 역할� 본 권한� 있는 회�� 스스로를 비롯하여 다른 회��게
+ 모든 권한� 할당할 수 있으며 소유주� 가까운 권한� 가질 수 있��
+ 등급� 높� 수 있습니다.
  
-본 능력� &apos;[ROLE_NAME]&apos;� 추가하시겠습니까?
+� 권한� &apos;[ROLE_NAME]&apos;� 추가하시겠습니까?
                 </message>
                 <option name="Yes">
                         예
@@ -297,74 +329,92 @@
         </alert>
         <alert name="ClickPublishHelpGroup">
                 <message name="message">
-                        “웹� 게시� 옵션� 선�하면 [SECOND_LIFE] 웹사�트�
-그룹명, 휘장, 설립 조항, 타�틀, 설립� �름�
-게시할 수 있습니다. �기 내용 중 지역 사회 기준으로 볼 때
-성�용으로 간주� 수 있는 내용� 있� 경우 그 사실�
-표시할 �무가 있습니다.
+                        웹� 게시 옵션� 선�하면 
+[SECOND_LIFE] 
+ 웹 사�트� 그룹 �름, 로고, 설립 조항, 타�틀 � 설립� �름� 게시할 수 있습니다.�기 내용 중 지역 사회 기준으로 볼 때 
+ 성� 전용으로 간주� 수 있는 내용� 있� 경우 그 사실� 
+ 표시할 �무가 있습니다.
                 </message>
         </alert>
         <alert name="ClickPublishHelpLand">
                 <message name="message">
-                        “웹� 게시� 옵션� 선�하면 [SECOND_LIFE] 웹사�트�
-�름, 설명, 스냅샷, 구�� 위치를
-게시할 수 있습니다. �기 내용 중 지역 사회 기준으로 볼 때
-성�용으로 간주� 수 있는 내용� 있� 경우 그 사실�
-표시할 �무가 있습니다.
+                        웹� 게시 옵션� 선�하면 
+[SECOND_LIFE] 
+ 웹 사�트� � 구�� �름, 설명, 스냅샷 � 위치를 게시할 수 있습니다.�기 내용 중 지역 사회 기준으로 볼 때 
+ 성� 전용으로 간주� 수 있는 내용� 있� 경우 그 사실� 
+ 표시할 �무가 있습니다.
                 </message>
         </alert>
         <alert name="ClickPublishHelpPostcard">
                 <message name="message">
-                        웹� 게시
+                        웹� 게시 옵션� 선�하면 
+[SECOND_LIFE] 
+ 웹 사�트� 촬��� [SECOND_LIFE] �름, 제목, 위치, 메시지 � 스냅샷� 게시할 수 있습니다.�기 내용 중 지역 사회 기준으로 볼 때 
+ 성� 전용으로 간주� 수 있는 스냅샷 내용� 있� 경우 그 사실� 
+ 표시할 �무가 있습니다.
                 </message>
         </alert>
         <alert name="ClickPublishHelpAvatar">
                 <message name="message">
-                        “웹� 게시� 옵션� 선�하면 [SECOND_LIFE] 웹사�트�
-�름, �미지, ‘소개’ 글� 게시할 수 있습니다.
+                        웹� 게시 옵션� 선�하면 
+[SECOND_LIFE] 
+ 웹 사�트� 내 �름, �미지 �  ‘�기 소개’ �스트를 게시할 수 있습니다.
                 </message>
         </alert>
+        <alert name="ClickPartnerHelpAvatar">
+                <message name="message">
+                        [SECOND_LIFE] 웹사�트를 통해 다른 주민과� 파트너 관계� 제안하거나 기존 파트너 관계� 해제할 수 있습니다.
+
+파트너 관계� 대한 추가 정보를 보려면 세컨드��프 웹사�트로 ��하십시오.
+                </message>
+                <option name="GotoPage">
+                        페�지로 ��
+                </option>
+                <option name="Cancel">
+                        취소
+                </option>
+        </alert>
         <alert name="ClickWebProfileHelpAvatar">
                 <message name="message">
-                        If this resident has a web profile URL set then you can:
- * Click Load to load the page with the embedded web browser.
- * Click Open to view externally in your default web browser.
+                        웹 프로필 URL� 있으면 다�� 할 수 있�:
+ * 불러오기를 �릭하여 세컨드��프 �� 웹 브�우저�서 웹프로필� 불러옵니다.
+ *열기를 �릭하여 외부 웹 브�우저�서  웹 프로필� 볼 수 있습니다.
  
-When viewing your profile you can enter any URL as your Web Profile.
-Residents can visit the URL you specify when they view your profile.
+내 프로필� 볼 때는 웹 프로필과 같� URL� 입력할 수 있습니다.
+주민들� 내 프로필� 볼 경우내가 지정한 URL� 웹 프로필� 볼 수 있습니다.
                 </message>
         </alert>
         <alert name="ClickWebProfileNoWebHelpAvatar">
                 <message name="message">
-                        If this resident has a web profile URL set then you can:
- * Click Open to view externally in your default web browser.
+                        웹 프로필 URL� 있으면 다�� 할 수 있�:
+  *열기를 �릭하여 외부 웹 브�우저�서  웹 프로필� 볼 수 있습니다.
  
-When viewing your profile you can enter any URL as your Web Profile.
-Residents can visit the URL you specify when they view your profile.
+내 프로필� 볼 때는 웹 프로필과 같� URL� 입력할 수 있습니다.
+주민들� 내 프로필� 볼 경우내가 지정한 URL� 웹 프로필� 볼 수 있습니다.
                 </message>
         </alert>
         <alert name="ReputationMinGreaterThanMax">
                 <message name="message">
-                        명성 최저 한�가 최고 한�보다 �니다.
-최저 한�를 낮추거나 최고 한�를 올려주십시오.
+                        최소 ��� 최대 ��보다 �니다.
+최소를 낮추거나 최대를 올립니다.
                 </message>
         </alert>
         <alert name="MoneyMinGreaterThanMax">
                 <message name="message">
-                        �금 최소 한�가 최대 한�보다 �니다.
-최소 한�를 낮추거나 최대 한�를 올려주십시오.
+                        최소 금액� 최대 금액보다 �니다.
+최소를 낮추거나 최대를 올립니다.
                 </message>
         </alert>
         <alert name="OfficerTitleTooLong">
                 <message name="message">
-                        간부 �위는 최대 20글�까지 허용�니다.
-� 짧� �위를 선�해 주십시오.
+                        운�진 타�틀� 최대 20 글�수입니다.
+� 짧� 타�틀� 정하세요.
                 </message>
         </alert>
         <alert name="MemberTitleTooLong">
                 <message name="message">
-                        멤버 �위는 최대 20글�까지 허용�니다.
-� 짧� �위를 선�해 주십시오.
+                        회� 타�틀� 최대 20 글�수입니다.
+� 짧� 타�틀� 정하십시오.
                 </message>
         </alert>
         <alert name="RunningLocally">
@@ -378,7 +428,7 @@ Residents can visit the URL you specify when they view your profile.
         </alert>
         <alert name="EjectNoMemberSelected">
                 <message name="message">
-                        축출할 멤버가 선��지 않았습니다.
+                        추방할 선� 회� 없�.
                 </message>
                 <option name="OK">
                         확�
@@ -386,8 +436,8 @@ Residents can visit the URL you specify when they view your profile.
         </alert>
         <alert name="ConfirmEject">
                 <message name="message">
-                        �대로 실행하시면 그룹�서 [멤버명](�)가 축출�니다.
-그대로 실행하시겠습니까?
+                        그룹�서 [MEMBER]�(가) 축출 �니다.
+계� 하시겠습니까?
                 </message>
                 <option name="Eject">
                         축출
@@ -398,11 +448,11 @@ Residents can visit the URL you specify when they view your profile.
         </alert>
         <alert name="JoinGroupCanAfford">
                 <message name="message">
-                        � 그룹 가입 비용� L$[비용]입니다.
-가입하시겠습니까?
+                        � 그룹 가입 비용� L$[COST]입니다.
+계�하겠습니까?
                 </message>
                 <option name="Join">
-                        참여
+                        가입
                 </option>
                 <option name="Cancel">
                         취소
@@ -410,14 +460,14 @@ Residents can visit the URL you specify when they view your profile.
         </alert>
         <alert name="JoinGroupCannotAfford">
                 <message name="message">
-                        � 그룹 가입 비용� L$[비용]입니다.
-� 그룹� 가입하기�는 보유하고 계신 �� 충분치 않습니다.
+                        � 그룹 가입 비용� L$[COST]입니다.
+� 그룹� 가입하기 위한 잔액� 부족합니다.
                 </message>
         </alert>
         <alert name="LandBuyPass">
                 <message name="message">
-                        L$[비용](�)를 내시면 � 토지(&apos;[PARCEL_NAME]&apos;)�
-[시간] 시간 �안 들어가실 수 있습니다.  패스를 구입하시겠습니까?
+                        L$[COST]로 � 토지(&apos;[PARCEL_NAME]&apos;)� [TIME]시간�안 머무를 수 있습니다.
+패스를 구매합니까?
                 </message>
                 <option name="OK">
                         확�
@@ -428,23 +478,23 @@ Residents can visit the URL you specify when they view your profile.
         </alert>
         <alert name="CannotStartAuctionAlreadyForSale">
                 <message name="message">
-                        �미 매물로 설정� 구���서는 경매를
-시작하실 수 없습니다. 정� 경매 시작� �하시는 경우,
-먼저 토지 매물 설정� 취소하십시오.
+                        �미 매매용으로 설정� 구�� 대해 경매를
+시작할 수 없습니다. 경매를 시작하려면 토지 �매를
+비활성화하십시오.
                 </message>
         </alert>
         <alert name="SalePriceRestriction">
                 <message name="message">
-                        누군가�게 �매하는 경우 �매가는 &gt; L$0으로 설정�어야 합니다.
-L$0� �매할 경우 �매 대� 개�� 선�하십시오.
+                        �매하는 경우, �매 가격� &gt; L$0(으)로 설정�어야 함.
+L$0로 �매하는 경우, 팔 사람� 선�하십시오.
                 </message>
         </alert>
         <alert name="ConfirmLandSaleChange">
                 <message name="message">
-                        선�하신 [LAND_SIZE] �방 미터� 토지는 매물로 설정�니다.
-귀하� �매가는 L$[SALE_PRICE]가 � 것�며, [�름](�)가 �매를 대행하게 �니다.
+                        선�� [LAND_SIZE] �방 미터� 토지가 �매용으로 설정�었습니다.
+�매 가격� L$[SALE_PRICE]�고 [NAME]�게 �매가 승��니다.
  
-� 변경 내용� 그대로 실행하시겠습니까?
+� 변경 사항� 계� �용하시겠습니까?
                 </message>
                 <option name="Continue">
                         계�
@@ -455,14 +505,14 @@ L$0� �매할 경우 �매 대� 개�� 선�하십시오.
         </alert>
         <alert name="ReturnObjectsDeededToGroup">
                 <message name="message">
-                        � 토지 구역 내�서 그룹 &apos;[NAME]&apos;�(가)  공유하는
-모든 아�템� �전 소유주� 소유함� 다시
-반환하시겠습니까?
+                        � 토지 구� 내�서 그룹 &apos;[NAME]&apos;과(와) 공유하는
+모든 오브�트를 �전 소유주�
+�벤토리� 반환 하시겠습니까?
  
-*경고* �로 �해 그룹� 양�� 양�가 불가능한 아�템�
-삭제�니다
+*경고* �로 �해 그룹� 양�� 양� 불가능 오브�트는
+삭제 �니다.
  
-사물: [N]
+오브�트: [N]
                 </message>
                 <option name="Return">
                         반환
@@ -473,11 +523,11 @@ L$0� �매할 경우 �매 대� 개�� 선�하십시오.
         </alert>
         <alert name="ReturnObjectsOwnedByUser">
                 <message name="message">
-                        � 토지 구역 내�서 주민 &apos;[NAME]&apos;�(가) 소유한
-모든 아�템� 주민� 보관함� 다시
-반환하시겠습니까?
+                        � 토지 구�� 있는 주민 &apos;[NAME]&apos; 소유� 오브�트를
+모� 오브�트 �벤토리�
+반환 하시겠습니까?
  
-사물: [N]
+오브�트: [N]
                 </message>
                 <option name="Return">
                         반환
@@ -488,11 +538,11 @@ L$0� �매할 경우 �매 대� 개�� 선�하십시오.
         </alert>
         <alert name="ReturnObjectsOwnedBySelf">
                 <message name="message">
-                        � 토지 구역 내�서 귀하가 소유한
-모든 아�템� �신� 보관함� 다시
-반환하시겠습니까?
+                        � 토지 구�� 있는 귀하 소유� 모든
+오브�트를 귀하� �벤토리�
+반환 하시겠습니까?
  
-사물: [N]
+오브�트: [N]
                 </message>
                 <option name="Return">
                         반환
@@ -503,14 +553,15 @@ L$0� �매할 경우 �매 대� 개�� 선�하십시오.
         </alert>
         <alert name="ReturnObjectsNotOwnedBySelf">
                 <message name="message">
-                        � 토지 구역 내�서 귀하가 소유하지 않는 모든 아�템�
-소유주� 보관함� 다시 반환하시겠습니까?
-그룹� 양�� 양� 가능 아�템�
-�전 소유주�게 반환� 것입니다.
+                        � 토지 구�� 있는 귀하� 소유가 아닌 오브�트를
+모� 오브�트 소유�� �벤토리� 반환 하시겠습니까?
+그룹� 양�� 양� 가능 오브�트는
+�전 소유주�게 반환 �니다.
  
-*경고* �로 �해 그룹� 양�� 양�가 불가능한 아�템� 삭제�니다
+*경고* �로 �해 그룹� 양�� 양� 불가능 오브�트가
+삭제 �니다.
  
-사물: [N]
+오브�트: [N]
                 </message>
                 <option name="Return">
                         반환
@@ -521,15 +572,15 @@ L$0� �매할 경우 �매 대� 개�� 선�하십시오.
         </alert>
         <alert name="ReturnObjectsNotOwnedByUser">
                 <message name="message">
-                        정� � 토지 구�내� 있는 [�름](�)가 소유�가 아닌
-모든 사물� 해당 소유� 저장고로 반환하시겠습니까?
-그룹� 양�� 양� 가능한 사물�
-�전 소유��게 반환�니다.
+                        � 토지 구�� 있는 [NAME]� 소유가 아닌 오브�트를
+모� 오브�트 소유�� �벤토리� 반환 하시겠습니까?
+그룹�게 양�� 양� 가능 오브�트는
+�전 소유주�게 반환 �니다.
  
-*경고* � 경우 그룹� 양�� 비양�성 사물�
-모� 삭제�니다!
+*경고* �로 �해 그룹� 양�� 양� 불가능 오브�트는
+삭제�니다.
  
-사물: [개수]
+오브�트: [N]
                 </message>
                 <option name="Return">
                         반환
@@ -540,8 +591,8 @@ L$0� �매할 경우 �매 대� 개�� 선�하십시오.
         </alert>
         <alert name="ReturnAllTopObjects">
                 <message name="message">
-                        Are you sure you want to return all objects
-in this region back to their owner&apos;s inventory?
+                        � 지역 내� 모든 오브�트를 �전
+소유주� �벤토리� 반환 하시겠습니까?
                 </message>
                 <option name="Return">
                         반환
@@ -552,10 +603,10 @@ in this region back to their owner&apos;s inventory?
         </alert>
         <alert name="DisableAllTopObjects">
                 <message name="message">
-                        Are you sure you want to disable all objects in this region?
+                        � 지역� 오브�트를 모� 비활성화 하시겠습니까?
                 </message>
                 <option name="Disable">
-                        �기
+                        비활성
                 </option>
                 <option name="Cancel">
                         취소
@@ -563,11 +614,10 @@ in this region back to their owner&apos;s inventory?
         </alert>
         <alert name="ReturnObjectsNotOwnedByGroup">
                 <message name="message">
-                        그룹 [NAME]와(과) 공유하지 않는
-� 구�내 아�템� 해당 소유주�게
-반환하시겠습니까?
+                        그룹[NAME](와)과 공유하지 않는 
+ 토지 구�� 오브�트를 그 소유�들�게 반환합니까?
  
-사물: [N]
+오브�트: [N]
                 </message>
                 <option name="Return">
                         반환
@@ -578,71 +628,90 @@ in this region back to their owner&apos;s inventory?
         </alert>
         <alert name="UnableToDisableOutsideScripts">
                 <message name="message">
-                        외부 스�립트 �기� 실패했습니다.
-� 지역 전체� 대해 안정� 켜져있습니다(안전하지 않습니다).
-스�립트는 작� 전� �기 사용� 허가해야 합니다.
+                        외부 스�립트를 비활성화할 수 없습니다.
+� 전체 지역� 활성 �태입니다(안전하지 않�).
+스�립트는 �� 작�할 수 있�� 실행�어야 합니다.
                 </message>
         </alert>
         <alert name="MustBeInParcel">
                 <message name="message">
-                        토지 구�� 착륙 지�� 설정하려면
-해당 구� 내부� 서있어야 합니다.
+                        텔레�트 �착지를 설정하려면 토지 구� 내�
+있어야 합니다.
                 </message>
         </alert>
         <alert name="PromptRecipientEmail">
                 <message name="message">
-                        수신�� �메� 주소를 입력해 주십시오.
+                        수신�� �메� 주소를 입력하세요.
                 </message>
         </alert>
         <alert name="PromptSelfEmail">
                 <message name="message">
-                        본�� �메� 주소를 입력해 주십시오.
+                        내 �메� 주소를 입력합니다.
                 </message>
         </alert>
         <alert name="ErrorProcessingSnapshot">
                 <message name="message">
-                        스냅샷 ��터 처리 오류!
+                        스냅샷 ��터 처리 중 오류가 발�했습니다.
+                </message>
+        </alert>
+        <alert name="ClassifiedSave">
+                <message name="message">
+                        [NAME]광고� 저장 하시겠습니까?
+                </message>
+                <option name="Save">
+                        저장
+                </option>
+                <option name="Don&apos;tSave">
+                        저장하지 않�
+                </option>
+                <option name="Cancel">
+                        취소
+                </option>
+        </alert>
+        <alert name="DisplaySettingsNoShaders">
+                <message name="message">
+                        그래픽 드��버 ��중 오류가 발�했습니다. �반�� 드��버 오류를 피하기 위해 ���는 ��으로 비활성 � 것 입니다. �것� �부 그래픽 관련 효과를 비활성 시킬 것 입니다.그래픽 카드나 드�아버� 업��트를 권유합니다. ���는 환경설정&gt;그래픽 디테� �서 다시 활성화 시킬 수 있습니다.
                 </message>
         </alert>
         <alert name="ErrorEncodingSnapshot">
                 <message name="message">
-                        스냅샷 암호화 오류!
+                        스냅샷 �코딩 중 오류가 발�했습니다.
                 </message>
         </alert>
         <alert name="ErrorUploadingPostcard">
                 <message name="message">
-                        다�� �유로 �해 엽서 업로드� 문제가 발�했습니다: [�유]
+                        다�� �유로 �해 �스트카드를 업로드하는 � 문제가 발�했습니다: [REASON]
                 </message>
         </alert>
         <alert name="ErrorUploadingReportScreenshot">
                 <message name="message">
-                        다�� �유로 �해 보고서 업로드� 문제가 발�했습니다: [�유]
+                        다�� �유로 �해 보고서를 업로드하는 � 문제가 발�했습니다: [REASON]
                 </message>
         </alert>
         <alert name="MustAgreeToLogIn">
                 <message name="message">
-                        [SECOND_LIFE]� 계� 로그�하시려면 서비스 계약� ��하셔야 합니다.
+                        [SECOND_LIFE]� 로그�하려면 �용 약관� ��해야 합니다.
                 </message>
         </alert>
         <alert name="CouldNotPutOnOutfit">
                 <message name="message">
-                        복장� 착용하지 못했습니다.
-복장 �� 안� �류, 신체 부분 �는 부착물� 없습니다.
+                        복장� 착용할 수 없습니다.
+복장 ��� 옷, 신체 부위 �는 부착물� 없습니다.
                 </message>
         </alert>
         <alert name="CannotWearTrash">
                 <message name="message">
-                        휴지통� 들어 있는 �류 �는 신체 부분� 착용할 수 없습니다
+                        옷� 착용할 수 없거나 신체부위가 휴지통� 있습니다.
                 </message>
         </alert>
         <alert name="CannotWearInfoNotComplete">
                 <message name="message">
-                        아� 완전한 정보가 갖추어지지 않았기 때문� 해당 아�템� 착용할 수 없습니다. 잠시 후 다시 시�해 주십시오.
+                        전체 정보가 설정�지 않아 � 아�템� 착용할 수 없습니다. 잠시 후� 다시 시�해 주십시오.
                 </message>
         </alert>
         <alert name="MustHaveAccountToLogInNoLinks">
                 <message name="message">
-                        [SECOND_LIFE]� 연결하려면 계정� 보유하고 있어야 합니다.
+                        [SECOND_LIFE]� 연결하려면 계정� 갖고 있어야 합니다.
                 </message>
                 <option name="OK">
                         확�
@@ -653,9 +722,9 @@ in this region back to their owner&apos;s inventory?
         </alert>
         <alert name="MustHaveAccountToLogIn">
                 <message name="message">
-                        [SECOND_LIFE]� 연결하려면 계정� 보유하고 있어야 합니다.
+                        [SECOND_LIFE]� 연결하려면 계정� 갖고 있어야 합니다.
  
-www.secondlife.com으로 ��해 새로 계정� 만드시겠습니까?
+www.secondlife.com으로 ��하여 새로운 계정� 만드시겠습니까?
                 </message>
                 <option name="OK">
                         확�
@@ -666,15 +735,15 @@ www.secondlife.com으로 ��해 새로 계정� 만드시겠습니까?
         </alert>
         <alert name="AddClassified">
                 <message name="message">
-                        분류� 광고가 1주� �안� 검색 디렉토리�
-’분류’ 섹션� 나타납니다.
+                        광고가 1주� �안 검색 디렉토리� &apos;광고&apos; 섹션�
+나타납니다.
  
-광고를 작성한 후 &apos;게시...&apos;를 �릭하여
-디렉토리� 추가합니다.
+광고를 작성한 후 &apos;게시하기...&apos;를 �릭하여 디렉토리�
+추가합니다.
  
-발행� �릭하면 값� 지불할 것�지 물어봅니다.
-� 높� 가격� 지불할수� � 높� 위치� 게재�고
-키워드 검색시 결과� � 우선�으로 표시�니다.
+게시하기를 �릭하면 지불할 가격� 묻는 메시지가 나타납니다.
+높� 가격� 지불할수� 광고가 목��서 � 높� 위치� 게재�고
+키워드 검색 결과�서 � 우선�으로 표시�니다.
                 </message>
                 <option name="OK">
                         확�
@@ -682,11 +751,14 @@ www.secondlife.com으로 ��해 새로 계정� 만드시겠습니까?
                 <option name="Cancel">
                         취소
                 </option>
+                <ignore name="ignore">
+                        새 광고를 추가할 때
+                </ignore>
         </alert>
         <alert name="DeleteClassified">
                 <message name="message">
-                        광고 &apos;[�름]&apos;(�)를 삭제하시겠습니까?
-지불하신 수수료는 환불�지 않습니다.
+                        광고 &apos;[NAME]&apos;�(를) 삭제 하시겠습니까?
+지불한 수수료는 환불하지 않습니다.
                 </message>
                 <option name="Delete">
                         삭제
@@ -697,7 +769,7 @@ www.secondlife.com으로 ��해 새로 계정� 만드시겠습니까?
         </alert>
         <alert name="DeleteAvatarPick">
                 <message name="message">
-                        [선�] 선�� 삭제하시겠습니까?
+                        관심장소 [PICK]�(를) 삭제 하시겠습니까?
                 </message>
                 <option name="Delete">
                         삭제
@@ -708,14 +780,14 @@ www.secondlife.com으로 ��해 새로 계정� 만드시겠습니까?
         </alert>
         <alert name="DisplayChangeRestart">
                 <message name="message">
-                        선�하신 화면 표시 변경 내용중 �부를 위해서는
-[SECOND_LIFE]�(를) 즉시 종료해야 하며, � 경우
-현재 진행중� �체� 작업� �실�니다.
+                        �부 디스플레� 변경 사항� �용하려면
+[SECOND_LIFE]를 즉시 종료해야 합니다.
+그렇지 않으면 진행 중� 모든 작업� �실�니다.
  
-변경 사항� �용하고 종료합니다
+해당 변경 사항� �용한 후 종료하십시오.
                 </message>
                 <option name="ApplyandQuit">
-                        �용 후 종료
+                        �용 � 종료
                 </option>
                 <option name="Cancel">
                         취소
@@ -723,7 +795,7 @@ www.secondlife.com으로 ��해 새로 계정� 만드시겠습니까?
         </alert>
         <alert name="PromptGoToEventsPage">
                 <message name="message">
-                        [SECOND_LIFE] �벤트 웹페�지로 ��하시겠습니까?
+                        [SECOND_LIFE]�벤트 웹 사�트로 갑니까?
                 </message>
                 <option name="GotoPage">
                         페�지로 ��
@@ -734,27 +806,27 @@ www.secondlife.com으로 ��해 새로 계정� 만드시겠습니까?
         </alert>
         <alert name="MustSelectCandidate">
                 <message name="message">
-                        투표하시려면 후보�를 선�해야 합니다.
+                        투표할 후보를 선�해야 합니다.
                 </message>
         </alert>
         <alert name="SelectItemToView">
                 <message name="message">
-                        보기할 항목� 선�해 주십시오.
+                        보려는 항목� 선�하십시오.
                 </message>
         </alert>
         <alert name="SelectProposalToView">
                 <message name="message">
-                        열람하려는 제안� 선�해 주십시오.
+                        보려는 제안� 선�하십시오.
                 </message>
         </alert>
         <alert name="SelectHistoryItemToView">
                 <message name="message">
-                        보기할 기� 항목� 선�해 주십시오.
+                        보려는 기�� 선�하십시오.
                 </message>
         </alert>
         <alert name="ResetShowNextTimeDialogs">
                 <message name="message">
-                        &apos;다�� 표시&apos; 대화를 모� 재설정하시겠습니까?
+                        나중� 알림&apos; 초기화
                 </message>
                 <option name="OK">
                         확�
@@ -765,13 +837,23 @@ www.secondlife.com으로 ��해 새로 계정� 만드시겠습니까?
         </alert>
         <alert name="CacheWillClear">
                 <message name="message">
-                        �시는 [SECOND_LIFE]�(를) 재시작한 후� 비워집니다.
+                        [SECOND_LIFE]를 다시 시작하면 �시가 비워 집니다.
+                </message>
+        </alert>
+        <alert name="CacheWillBeMoved">
+                <message name="message">
+                        [SECOND_LIFE]를 다시 시작하면 �시가 ��합니다.
+참고: � 작업� �시를 비�니다.
+                </message>
+        </alert>
+        <alert name="ChangeConnectionPort">
+                <message name="message">
+                        �트 설정� [SECOND_LIFE]를 다시 시작한 후 유효합니다.
                 </message>
         </alert>
         <alert name="GoToAuctionPage">
                 <message name="message">
-                        [SECOND_LIFE] 웹페�지로 ��해 경매 세부 사항� 보거나
-입찰� 참여하시겠습니까?
+                        경매 세부사항� 보거나, 경매를 하려면[SECOND_LIFE]웹 페�지로 갑니다.
                 </message>
                 <option name="GotoPage">
                         페�지로 ��
@@ -782,13 +864,13 @@ www.secondlife.com으로 ��해 새로 계정� 만드시겠습니까?
         </alert>
         <alert name="SaveChanges">
                 <message name="message">
-                        변경 내용� 저장하시겠습니까?
+                        변경 사항� 저장합니까?
                 </message>
                 <option name="Save">
                         저장
                 </option>
                 <option name="Don&apos;tSave">
-                        저장 금지
+                        저장 안 함
                 </option>
                 <option name="Cancel">
                         취소
@@ -797,42 +879,42 @@ www.secondlife.com으로 ��해 새로 계정� 만드시겠습니까?
         <alert name="GestureSaveFailedTooManySteps">
                 <message name="message">
                         제스처 저장� 실패했습니다.
-� 제스처�는 단계가 너무 많습니다.
-�부 단계를 제거하신 후 다시 저장해 주십시오.
+� 제스처는 단계가 너무 많습니다.
+불필요한 단계를 제거후 다시 저장 하십�오.
                 </message>
         </alert>
         <alert name="GestureSaveFailedTryAgain">
                 <message name="message">
-                        제스처 저장� 실패했습니다.  잠시 후 다시 시�해 주십시오.
+                        제스처 저장� 실패했습니다. 잠시 후 다시 시�하십시오
                 </message>
         </alert>
         <alert name="GestureSaveFailedObjectNotFound">
                 <message name="message">
-                        해당 사물 �는 연관� 사물 저장고를 찾� 수 없어 제스처를 저장하지 못했습니다.
-해당 사물� 범위 밖� 있거나 삭제�었� 수 있습니다.
+                        오브�트 �는 관련 오브�트 �벤토리를 찾� 수 없어 제스처를 저장할 수 없습니다.
+오브�트가 해당 범위 밖� 있거나 삭제 �었� 수 있습니다.
                 </message>
         </alert>
         <alert name="GestureSaveFailedReason">
                 <message name="message">
-                        다�� �유로 �해 제스처 저장� 문제가 발�했습니다: [�유].  잠시 후 제스처 저장� 다시 시�해 주십시오.
+                        다�� �유로 �해 제스처를 저장하는 � 문제가 발�했습니다: [REASON]. 제스처를 나중� 다시 저장해보십시오.
                 </message>
         </alert>
         <alert name="SaveNotecardFailObjectNotFound">
                 <message name="message">
-                        해당 사물 �는 연관� 사물 저장고를 찾� 수 없어 노트카드를 저장하지 못했습니다.
-해당 사물� 범위 밖� 있거나 삭제�었� 수 있습니다.
+                        오브�트 �는 관련 오브�트 �벤토리를 찾� 수 없어 노트카드를 저장할 수 없습니다.
+오브�트가 해당 범위 밖� 있거나 삭제 �었� 수 있습니다.
                 </message>
         </alert>
         <alert name="SaveNotecardFailReason">
                 <message name="message">
-                        다�� �유로 �해 노트카드 저장� 문제가 발�했습니다: [�유].  잠시 후 노트카드 저장� 다시 시�해 주십시오.
+                        다�� �유로 �해 참고카드를 저장하는 � 문제가 발�했습니다: [REASON]. 참고카드를 나중� 다시 저장해보십시오.
                 </message>
         </alert>
         <alert name="ScriptCannotUndo">
                 <message name="message">
-                        귀하� 스�립트 버전� 대한 변경 사항� 모� 취소하지 못했습니다.
-서버� 저장� 최신 버전� 로딩하시겠습니까?
-(참고: � 로딩� 취소할 수 없습니다.)
+                        스�립트 버전� 대한 모든 변경 사항� 취소할 수 없습니다.
+서버� 저장� 최신 버전� 로드 하시겠습니까?
+(참고: � 작업� 취소할 수 없습니다.)
                 </message>
                 <option name="Yes">
                         예
@@ -843,50 +925,50 @@ www.secondlife.com으로 ��해 새로 계정� 만드시겠습니까?
         </alert>
         <alert name="SaveScriptFailReason">
                 <message name="message">
-                        다�� �유로 �해 스�립트 저장� 문제가 발�했습니다: [�유].  잠시 후 스�립트 저장� 다시 시�해 주십시오.
+                        다�� �유로 �해 스�립트를 저장하는 � 문제가 발�했습니다: [REASON]. 스�립트를 나중� 다시 저장해보십시오.
                 </message>
         </alert>
         <alert name="SaveScriptFailObjectNotFound">
                 <message name="message">
-                        해당 사물� 찾� 수 없어 스�립트를 저장하지 못했습니다.
-해당 사물� 범위 밖� 있거나 삭제�었� 수 있습니다.
+                        스�립트가 위치한 오브�트를 찾� 수 없어 스�립트를 저장할 수 없습니다.
+오브�트가 해당 범위 밖� 있거나 삭제 �었� 수 있습니다.
                 </message>
         </alert>
         <alert name="SaveBytecodeFailReason">
                 <message name="message">
-                        다�� �유로 �해 컴파�� 스�립트 저장� 문제가 발�했습니다: [�유].  잠시 후 스�립트 저장� 다시 시�해 주십시오.
+                        다�� �유로 �해 컴파�� 스�립트를 저장하는 � 문제가 발�했습니다: [REASON]. 스�립트를 나중� 다시 저장해보십시오.
                 </message>
         </alert>
         <alert name="CouldNotStartStopScript">
                 <message name="message">
-                        해당 사물� 찾� 수 없어 스�립트를 시작 �는 정지시키지 못했습니다.
-해당 사물� 범위 밖� 있거나 삭제�었� 수 있습니다.
+                        스�립트가 위치한 오브�트를 찾� 수 없어 스�립트를 시작 �는 중지할 수 없습니다.
+오브�트가 해당 범위 밖� 있거나 삭제�었� 수 있습니다.
                 </message>
         </alert>
         <alert name="CannotDownloadFile">
                 <message name="message">
-                        파� 다운로드 실패
+                        파�� 다운로드할 수 없습니다.
                 </message>
         </alert>
         <alert name="CannotWriteEncode">
                 <message name="message">
-                        파� [[파�명]] 암호화 실패
+                        파� [[FILE]]�(를) �코딩할 수 없습니다.
                 </message>
         </alert>
         <alert name="CannotWriteFile">
                 <message name="message">
-                        파� [[파�명]] 쓰기� 실패했습니다.
+                        파� [[FILE]]�(를) 쓸 수 없습니다.
                 </message>
         </alert>
         <alert name="CannotLoadWearable">
                 <message name="message">
-                        죄송합니다. 착용품� 로딩하지 못했습니다.
+                        죄송합니다. 착용물� 로드할 수 없습니다.
                 </message>
         </alert>
         <alert name="ConfirmDeleteComplicated">
                 <message name="message">
-                        최소 1개 사물� 잠긴 �태거나, 복사가 불가능하거나, 다른 사람� 소유주입니다.
-정� � 사물들� 삭제하시겠습니까?
+                        1개 ��� 선� 오브�트가 잠겨 있거나, 복사할 수 없거나, 다른 사용�가 소유하고 있습니다.
+� 아�템� 삭제하시겠습니까?
                 </message>
                 <option name="Yes">
                         예
@@ -897,14 +979,14 @@ www.secondlife.com으로 ��해 새로 계정� 만드시겠습니까?
         </alert>
         <alert name="DisplaySettingsSafe">
                 <message name="message">
-                        안전 옵션� 선�하셨기 때문�
-화면 설정� 안전 레벨로 설정�었습니다.
+                        귀하가 지정한 안전 옵션� 따� 디스플레� 설정�
+안전 수준으로 설정�었습니다.
                 </message>
         </alert>
         <alert name="DisplaySettingsRecommended">
                 <message name="message">
-                        당신� 시스템 구성� 바탕으로 디스플레� 설정�
-권장 수준으로 설정하였습니다.
+                        귀하� 시스템 구성� 바탕으로 디스플레� 설정�
+권장 수준으로 설정�었습니다.
                 </message>
                 <option name="OK">
                         확�
@@ -913,17 +995,17 @@ www.secondlife.com으로 ��해 새로 계정� 만드시겠습니까?
         <alert name="CannotRequestDomain">
                 <message name="message">
                         서버� 연결하지 못했습니다.
-다� �메�명� 요청할 수 없습니다: [호스트명]
+다� �메� �름� 요청할 수 없습니다: [HOST]
                 </message>
         </alert>
         <alert name="CannotFindDomain">
                 <message name="message">
-                        서버 �메� �름� 찾지 못했습니다.
-네트워� 연결� 해제�었거나 서버 문제가
-��� 수 있습니다.
+                        서버 �메� �름� 찾� 수 없습니다.
+�로 �해 네트워� 연결� �실�거나 서버 문제가
+발�할 수 있습니다.
  
-잠시 후 다시 시�하시거나, �움�� �릭하시면
-안내 � 시스템 �태 웹페�지로 가는 ��가 나옵니다.
+몇 초 후� 다시 시�하거나 �움�� �릭하여
+시스템 �태 웹 페�지� 대한 지� 정보 � ��를 확�하십시오.
                 </message>
                 <option name="OK">
                         확�
@@ -934,37 +1016,37 @@ www.secondlife.com으로 ��해 새로 계정� 만드시겠습니까?
         </alert>
         <alert name="PromptSelectServer">
                 <message name="message">
-                        서버를 선�해 주십시오.
-[SERVER]� 연결하지 못했습니다.
+                        서버를 선�하십시오.
+[SERVER](으)로 연결할 수 없�
                 </message>
         </alert>
         <alert name="CannotConnectDNSError">
                 <message name="message">
                         [SECOND_LIFE]� 연결하지 못했습니다.
-DNS가 호스트명� 해�하는� 실패했습니다.
-www.secondlife.com 웹사�트� 연결� 가능한지 확�해
-보십시오.  연결� �지만 같� 오류가 반복� 경우
-Support 섹션� � 문제를 신고하십시오.
+DNS가 호스트 �름� 확�할 수 없습니다.
+www.secondlife.com 웹사�트� 연결할 수 있는지 여부를
+확�하십시오.  연결� �었지만 � 오류가 계� 발�하는 경우
+지� 섹션으로 ��하여 � 문제를 신고해 주십시오.
                 </message>
         </alert>
         <alert name="CannotConnectSecurityError">
                 <message name="message">
-                        로그� 서버� 안전하게 연결하는� 실패했습니다.
-�는 컴퓨터� 시계가 정확하게 맞춰져 있지 않� 경우 발�하는 문제입니다.
-제어�으로 가서 시간과 날짜가 정확히 설정�어 있는지
+                        로그� 서버� 대한 보안 연결� 설정할 수 없습니다.
+종종 � 문제는 컴퓨터 시계가 잘못 설정� 것� �미합니다.
+제어�으로 ��하여 시간과 날짜가 올바르게 설정�었는지
 확�하십시오.
  
-같� 오류가 반복� 경우,
-SecondLife.com 웹사�트� Support 섹션�서
+� 오류가 계�해서 발�하는 경우�는
+SecondLife.com 웹사�트� Support 섹션으로 ��한 후
 문제를 신고해 주십시오.
                 </message>
         </alert>
         <alert name="CannotConnectVerificationError">
                 <message name="message">
                         [SECOND_LIFE]� 연결하지 못했습니다.
-로그� 서버가 SSL� 통해서 ��� 받지 못했습니다.
-같� 오류가 반복� 경우,
-SecondLife.com 웹사�트� Support 섹션�서
+SSL� 통해 로그� 서버가 확��지 않습니다.
+� 오류가 계�해서 발�하는 경우�는
+SecondLife.com 웹사�트� Support 섹션으로 ��한 다�
 문제를 신고해 주십시오.
                 </message>
         </alert>
@@ -973,8 +1055,9 @@ SecondLife.com 웹사�트� Support 섹션�서
                         [SECOND_LIFE]� 연결하지 못했습니다.
 최선� 노력�� 불구하고 예�치 못한 문제가 발�했습니다.
 SecondLife.com 웹사�트� Support 섹션�서
-문제를 신고해 주십시오.  가능하면 C:\Documents and Settings\(name)\Application Data\SecondLife\logs
-� 있는 귀하� SecondLife.log 파�� 함께 보내주십시오.
+문제를 신고해 주십시오.  가능하면 C:\Documents and Settings\(name)\Application Data\SecondLife\logs�
+있는 귀하� SecondLife.log 파�� 함께 보내주십시오.
+�사합니다.
                 </message>
         </alert>
         <alert name="CannotConnectUnknownErrorDarwin">
@@ -982,27 +1065,26 @@ SecondLife.com 웹사�트� Support 섹션�서
                         [SECOND_LIFE]� 연결하지 못했습니다.
 최선� 노력�� 불구하고 예�치 못한 문제가 발�했습니다.
 SecondLife.com 웹사�트� Support 섹션�서
-문제를 신고해 주십시오.  가능하면
-~/Library/Application Support/SecondLife/logs� 있는 귀하� SecondLife.log 파�� 함께 보내주십시오.
+문제를 신고해 주십시오.  가능하면 ~/Library/Application Support/SecondLife/logs�
+있는 귀하� SecondLife.log 파�� 함께 보내주십시오.
 �사합니다.
                 </message>
         </alert>
         <alert name="CannotResolveLoginToken">
                 <message name="message">
-                        로그� �� 토� 해�� 문제가
-발�했습니다. 다시 로그�해
-주십시오. 같� 오류가 반복� 경우
-SecondLife.com 웹사�트�
-Support 섹션� 참고하십시오.
+                        로그� ��� 확�하는 중 문제가
+발�했습니다. 로그�� 다시 시�해
+보시� 오류가 계�해서 발�하는 경우�는
+SecondLife.com 웹사�트� Support 섹션�서 관련정보를 참고 하십시오.
                 </message>
         </alert>
         <alert name="CannotConnectNoMessage">
                 <message name="message">
-                        연결 시�중� 알 수 없는 문제가 발�했습니다.
-(서버로부터 빈 오류 메시지를 받았습니다.)
+                        연결� 시�하는 중 알 수 없는 문제가 발�했습니다.
+(서버� 공백 오류 메시지)
  
-잠시 후 다시 시�하시거나, �움�� �릭하시면
-안내 � 시스템 �태 웹페�지로 가는 ��가 나옵니다.
+몇 초 후� 다시 시�하거나 �움�� �릭하여
+시스템 �태 웹 페�지� 대한 지� 정보 � ��를 확�하십시오.
                 </message>
                 <option name="OK">
                         확�
@@ -1013,10 +1095,10 @@ Support 섹션� 참고하십시오.
         </alert>
         <alert name="CannotConnectNoReplyFromLogin">
                 <message name="message">
-                        연결� 실패했습니다.  로그� ��터베�스�서 �답� 받지 못했습니다.
+                        연결할 수 없습니다.  로그� ��터베�스�서 �답� 없습니다.
  
-잠시 후 다시 시�하시거나, �움�� �릭하시면
-안내 � 시스템 �태 웹페�지로 가는 ��가 나옵니다.
+몇 초 후� 다시 시�하거나 �움�� �릭하여
+시스템 �태 웹 페�지� 대한 지� 정보 � ��를 확�하십시오.
                 </message>
                 <option name="OK">
                         확�
@@ -1027,20 +1109,20 @@ Support 섹션� 참고하십시오.
         </alert>
         <alert name="CannotConnectLoginTimeout">
                 <message name="message">
-                        세계내 귀하� 위치를 기다리는 중� 로그� 타임아웃� 발�했습니다.  다시 시�해 주십시오.
+                        본� 위치로 로그� 시간 초과.  다시 시�해 주십시오.
                 </message>
         </alert>
         <alert name="FirstRunDialog">
                 <message name="message">
                         [SECOND_LIFE] 설치가 완료�었습니다.
  
-[SECOND_LIFE]�(를) 처� 사용하시는 경우, 로그�하시기 전�
-새로 계정� 만드셔야 합니다.
+[SECOND_LIFE]를 처� 사용하시는 경우 먼저 계정� 만들어야
+로그�할 수 있습니다.
  
-www.secondlife.com으로 �아가 새로 계정� 만드시겠습니까?
+www.secondlife.com으로 �아가 신규 계정� 만드시겠습니까?
                 </message>
                 <option name="NewAccount...">
-                        신규 계정...
+                        신규 계정…
                 </option>
                 <option name="Continue">
                         계�
@@ -1048,25 +1130,25 @@ www.secondlife.com으로 �아가 새로 계정� 만드시겠습니까?
         </alert>
         <alert name="ClothingStillDownloading">
                 <message name="message">
-                        귀하� �복� 아� 다운로드 중입니다.
-세계를 정��으로 사용할 수 있으며, 다른 사용�들�
-귀하를 올바로 보게 �니다.
+                        ��� 다운로드하는 중입니다.
+�반�으로 세컨드��프를 사용할 수 있으며 다른 사용��게
+귀하� 모습� 제대로 표시� 것입니다.
                 </message>
         </alert>
         <alert name="CannotResolveDomain">
                 <message name="message">
                         서버� 연결하지 못했습니다.
-다� �메�명� 해�할 수 없습니다: [�메�명]
-네트워� 연결� 확�해 주십시오.
+다� �메� �름� 확�할 수 없습니다: [DOMAIN]
+네트워� 연결� 확�하십시오.
                 </message>
         </alert>
         <alert name="CannotConnectLoginPacket">
                 <message name="message">
-                        연결� 실패했습니다.  로그� 서버가 로그� 패킷�
-받지 못했습니다.
+                        연결할 수 없습니다.  로그� 서버�서 로그� 패킷�
+수신�지 않았습니다.
  
-잠시 후 다시 시�하시거나, �움�� �릭하시면
-안내 � 시스템 �태 웹페�지로 가는 ��가 나옵니다.
+몇 초 후� 다시 시�하거나 �움�� �릭하여
+시스템 �태 웹 페�지� 대한 지� 정보 � ��를 확�하십시오.
                 </message>
                 <option name="OK">
                         확�
@@ -1079,10 +1161,10 @@ www.secondlife.com으로 �아가 새로 계정� 만드시겠습니까?
                 <message name="message">
                         [SECOND_LIFE]� 오신 것� 환�합니다! 
  
-화살표 키를 �용하면 걸� 수 있습니다.
+화살표 키를 �용하여 걸� 수 있습니다.
  
 남성 �는 여성 �릭터를 선�해 주십시오. 
-나중� 변경� 가능합니다.
+차후� 변경� 가능합니다.
                 </message>
                 <option name="Male">
                         남성
@@ -1095,7 +1177,7 @@ www.secondlife.com으로 �아가 새로 계정� 만드시겠습니까?
                 <message name="message">
                         [SECOND_LIFE]� 오신 것� 환�합니다! 
  
-화살표 키를 �용하면 걸� 수 있습니다.
+화살표 키를 �용하여 걸� 수 있습니다.
  
 남성 �는 여성 �릭터를 선�해 주십시오.
                 </message>
@@ -1108,7 +1190,7 @@ www.secondlife.com으로 �아가 새로 계정� 만드시겠습니까?
         </alert>
         <alert name="ConfirmQuit">
                 <message name="message">
-                        정� 종료하시겠습니까?
+                        종료 하시겠습니까?
                 </message>
                 <option name="Yes">
                         예
@@ -1119,17 +1201,17 @@ www.secondlife.com으로 �아가 새로 계정� 만드시겠습니까?
         </alert>
         <alert name="RegionNoTerraforming">
                 <message name="message">
-                        지역 [지역명]�서는 테��� 허용�지 않습니다.
-테�� 하시려면 세계� 다른 부분�서 토지를
-매입하셔야 합니다.
+                        지역 [REGION]�(는) 지형 변경� 허용�지 않습니다.
+� 지역� 지형� 변경하려면 다른 토지를
+매입해야 합니다.
                 </message>
         </alert>
         <alert name="CannotCopyWarning">
                 <message name="message">
-                        귀하는 � 아�템� 복사할 권한� 없으며
-� 아�템� 주어버리면 해당 아�템�
-귀하� 저장소�서 사�지게 �니다. 정�
-� 아�템� 제공하시겠습니까?
+                        � 아�템� 복사할 수 있는 권한�
+없으며 무료로 배�할 경우 �벤토리�서
+아�템� 잃게 �니다. � 아�템�
+배�하시겠습니까?
                 </message>
                 <option name="Yes">
                         예
@@ -1140,7 +1222,7 @@ www.secondlife.com으로 �아가 새로 계정� 만드시겠습니까?
         </alert>
         <alert name="CannotGiveItem">
                 <message name="message">
-                        저장소 아�템 부여� 실패했습니다.
+                        아�템� 제공할 수 없습니다.
                 </message>
         </alert>
         <alert name="TransactionCancelled">
@@ -1150,20 +1232,20 @@ www.secondlife.com으로 �아가 새로 계정� 만드시겠습니까?
         </alert>
         <alert name="TooManyItems">
                 <message name="message">
-                        1차례� 저장고 �전�서 그렇게 많� 아�템� 전달할 수 없습니다.
+                        �만� 많� 아�템� 한번� �벤토리 전송으로 보낼 수 없습니다.
                 </message>
         </alert>
         <alert name="NoItems">
                 <message name="message">
-                        줄 수 있는 아�템� 없습니다.
+                        제공할 아�템 없�.
                 </message>
         </alert>
         <alert name="CannotCopyCountItems">
                 <message name="message">
-                        귀하는 선�하신 아�템 [개수]개를 복사할
-권한� 없습니다. 해당 아�템들� 귀하�
-저장소�서 사�지게 �니다.
-정� � 아�템들� 제공하시겠습니까?
+                        선�한 아�템� 대해 [COUNT]개� 사본� 만들 수 있는
+권한� 없습니다. �벤토리�서 �러한 아�템�
+잃게 �니다.
+�러한 아�템� 배�하시겠습니까?
                 </message>
                 <option name="Yes">
                         예
@@ -1174,20 +1256,20 @@ www.secondlife.com으로 �아가 새로 계정� 만드시겠습니까?
         </alert>
         <alert name="CannotGiveCategory">
                 <message name="message">
-                        저장소 카테고리 부여� 실패했습니다.
+                        아�템 카테고리를 제공할 수 없습니다.
                 </message>
         </alert>
         <alert name="FreezeAvatar">
                 <message name="message">
-                        � 아바타를 �결하시겠습니까?
-해당 아바타는 �시�으로 움��거나, 채팅 �는
-세계와 서로 작용하지 못하게 �니다.
+                        � 아바타를 �결 시킵니까?
+�시�으로 움��지 못하고,
+채팅�나 �호작용� 할 수 없습니다.
                 </message>
                 <option name="Freeze">
-                        �결
+                        ì „ì²´
                 </option>
                 <option name="Unfreeze">
-                        �결 해제
+                        고정 해제
                 </option>
                 <option name="Cancel">
                         취소
@@ -1195,13 +1277,13 @@ www.secondlife.com으로 �아가 새로 계정� 만드시겠습니까?
         </alert>
         <alert name="EjectAvatar">
                 <message name="message">
-                        � 아바타를 귀하� 토지�서 축출하시겠습니까?
+                        � 아바타를 귀하� 토지�서 강퇴시키시겠습니까?
                 </message>
                 <option name="Eject">
                         축출
                 </option>
                 <option name="EjectandBan">
-                        축출 후 금지
+                        축출 � 차단
                 </option>
                 <option name="Cancel">
                         취소
@@ -1209,30 +1291,30 @@ www.secondlife.com으로 �아가 새로 계정� 만드시겠습니까?
         </alert>
         <alert name="InvalidUUID">
                 <message name="message">
-                        유효한 uuid가 아닙니다
+                        올바른uuid가 아님
                 </message>
         </alert>
         <alert name="AcquireErrorTooManyObjects">
                 <message name="message">
-                        �� 오류: 선�� 사물� 너무 많습니다.
+                        가져오기 오류: 선�한 오브�트가 너무 많습니다.
                 </message>
         </alert>
         <alert name="AcquireErrorObjectSpan">
                 <message name="message">
-                        �� 오류: 사물� 범위가 1개 지역� 벗어납니다.
-�� 지역�서 ��할 수 있�� 모든 사물�
+                        가져오기 오류: 오브�트는 1개� 지역 ��� 걸� 존재합니다.
+가져오려는 모든 오브�트를 �� 지역으로
 ��하십시오.
                 </message>
         </alert>
         <alert name="TakeLockedOrNotOwnedBy">
                 <message name="message">
-                        최소 1개 사물� 잠긴 �태거나 귀하가 소유주가 아닙니다.
-귀하가 소유�가 아닌 사물� 차지할 경우, 
-해당 사물� 다� 소유� 권한� �용�어
-귀하가 해당 사물� 수정 �는 복사하는� 제한�
-받� 수 있습니다.
-그러나 현재 선�한 사물� 차지하는 것� 가능합니다.
-정� � 사물들� 차지하시겠습니까?
+                        1개 ��� 오브�트가 잠겨 있거나 귀하� 소유가 아닙니다.
+귀하� 소유가 아닌 오브�트를 귀하가 가지면 
+� 오브�트� 다� 소유� 권한� �용�어
+�후� 귀하가 수정하거나 복사할 권한� 제한� 수
+있습니다.
+하지만 현재 �하는 아�템� 선�할 수 있습니다.
+� 아�템� 소유 하시겠습니까?
                 </message>
                 <option name="Yes">
                         예
@@ -1243,10 +1325,10 @@ www.secondlife.com으로 �아가 새로 계정� 만드시겠습니까?
         </alert>
         <alert name="PromptGoToCurrencyPage">
                 <message name="message">
-                        [기타]
+                        [EXTRA]
  
  
-[URL](으)로 가서 구매 화�� 대한 정보를 얻으시겠습니까?
+린든달러(L$) 구매 정보를 보기 위해 [URL](으)로 ��하시겠습니까?
                 </message>
                 <option name="GotoPage">
                         페�지로 ��
@@ -1257,40 +1339,40 @@ www.secondlife.com으로 �아가 새로 계정� 만드시겠습니까?
         </alert>
         <alert name="UnableToLinkObjects">
                 <message name="message">
-                        � 아�템 [COUNT]� 연결하지 못했습니다.
-최대 [MAX]개� 사물� 연결할 수 있습니다.
-� �� 수� 사물� 선�해 주십시오.
+                        [COUNT]개 오브�트를 연결할 수 없습니다.
+최대 [MAX]개� 오브�트를 연결할 수 있습니다.
+� �� 수� 오브�트를 선�해 주십시오.
                 </message>
         </alert>
         <alert name="CannotLinkIncompleteSet">
                 <message name="message">
-                        사물� 완전한 세트로 갖춰진 경우�만 연결할 수 있으며
-2개 ��� 사물� 선�하셔야 합니다.
+                        완전한 오브�트들만 연결할 수 있으며
+둘 ��� 오브�트를 선�해야 합니다.
                 </message>
         </alert>
         <alert name="CannotLinkModify">
                 <message name="message">
-                        모든 사물� 대한 수정 권한� 없기 때문� ��� 연결하지
-못했습니다.  잠긴 �태� 사물� 없고, 모든 사물� 대한 소유권�
-가지고 있는지 확�하십시오.
+                        모든 오브�트� 대한 수정 권한� 없으므로
+연결할 수 없습니다.  잠겨 있는 오브�트가 없는지, 모든 오브�트를 소유하고 있는지
+여부를 확�하십시오.
                 </message>
         </alert>
         <alert name="CannotLinkDifferentOwners">
                 <message name="message">
-                        사물� 소유주가 전부 같지 않아 연결�
-실패했습니다. 본�� 소유한 사물만 선�해 주십시오.
+                        모든 오브�트가 ��한 소유�를 갖고 있지
+않으므로 연결할 수 없습니다. 선�한 모든 오브�트를 소유하고 있는지 확�하십시오.
                 </message>
         </alert>
         <alert name="NoFileExtension">
                 <message name="message">
-                        파�� 해당하는 확장�가 없습니다: &apos;[파�명]&apos;
-파�� 올바른 파� 확장�를 부여해 주십시오
+                        파� 확장� 없�: &apos;[FILE]&apos;
+파� 확장�가 올바른 지 확�하세요.
                 </message>
         </alert>
         <alert name="InvalidFileExtension">
                 <message name="message">
-                        유효하지 않� 확장�[확장�명]입니다
-올바른 �름� [유효한 값]입니다
+                        유효하지 않� 파� 확장�[EXTENSION]
+예� [VALIDS]
                 </message>
                 <option name="OK">
                         확�
@@ -1298,234 +1380,234 @@ www.secondlife.com으로 �아가 새로 계정� 만드시겠습니까?
         </alert>
         <alert name="CannotUploadSoundFile">
                 <message name="message">
-                        �기를 위해 업로드 압축 사운드 파�� 열지 못했습니다:
-[파�명]
+                        �기를 수행할 업로드 사운드 파�� 열 수 없습니다:
+[FILE]
                 </message>
         </alert>
         <alert name="SoundFileNotRIFF">
                 <message name="message">
-                        파�� RIFF WAVE 오디오 파�� 아닌 것으로 �단�니다: 
-[파�명]
+                        파�� RIFF WAVE 파�� 아닌 것 같습니다: 
+[FILE]
                 </message>
         </alert>
         <alert name="SoundFileNotPCM">
                 <message name="message">
-                        파�� PCM WAVE 오디오 파�� 아닌 것으로 �단�니다: 
-[파�명]
+                        파�� PCM WAVE 오디오 파�� 아닌 것 같습니다: 
+[FILE]
                 </message>
         </alert>
         <alert name="SoundFileInvalidChannelCount">
                 <message name="message">
-                        파�� 유효하지 않� 수� 채�� 있습니다(모노 �는 스테레오여야 함): 
-[파�명]
+                        파�� 채� 개수가 유효하지 않습니다(모노 �는 스테레오 유효): 
+[FILE]
                 </message>
         </alert>
         <alert name="SoundFileInvalidSampleRate">
                 <message name="message">
-                        파�� 지��는 샘플율(44.1k여야 함)� 아닌 것으로 �단�니다: 
-[파�명]
+                        파�� 비트율� 지��지 않는 것 같습니다(44.1k�어야 함): 
+[FILE]
                 </message>
         </alert>
         <alert name="SoundFileInvalidWordSize">
                 <message name="message">
-                        파�� 지��는 단어 �기(8 �는 16비트여야 함)가 아닌 것으로 �단�니다: 
-[파�명]
+                        파�� 단어 �기가 지��지 않는 것 같습니다(8비트나 16비트여야 함): 
+[FILE]
                 </message>
         </alert>
         <alert name="SoundFileInvalidHeader">
                 <message name="message">
-                        WAV 헤��서 &apos;��터&apos; 묶�� 찾� 수 없습니다: 
-[파�명]
+                        WAV 헤��서 &apos;��터&apos; 를 찾� 수 없습니다: 
+[FILE]
                 </message>
         </alert>
         <alert name="SoundFileInvalidTooLong">
                 <message name="message">
-                        오디오 파� 길�가 너무 �니다(최대 10초): 
-[파�명]
+                        오디오 파�� 너무 �니다(최대 10초): 
+[FILE]
                 </message>
         </alert>
         <alert name="ProblemWithFile">
                 <message name="message">
-                        파� [파�명]� 문제가 있습니다:
+                        [FILE]� 문제�:
  
-[오류]
+[ERROR]
                 </message>
         </alert>
         <alert name="CannotOpenTemporarySoundFile">
                 <message name="message">
-                        쓰기를 위해 임시 압축 사운드 파�� 열지 못했습니다: [파�명]
+                        쓰기를 실행할 임시 압축 사운드 파�� 열 수 없습니다: [FILE]
                 </message>
         </alert>
         <alert name="UnknownVorbisEncodeFailure">
                 <message name="message">
-                        다� 파�� 알 수 없는 보비스 암호화 오류가 발�했습니다: [파�명]
+                        알 수 없는 vorbis �코딩 오류: [FILE]
                 </message>
         </alert>
         <alert name="CorruptResourceFile">
                 <message name="message">
-                        ��� 리소스 파�입니다: [파�명]
+                        ��� 리소스 파�: [FILE]
                 </message>
         </alert>
         <alert name="UnknownResourceFileVersion">
                 <message name="message">
-                        파� 내� 알려지지 않� 린든 파� 버전� 있습니다: [파�명]
+                        파�� 알 수 없는 린든 리소스 파� 버전� 있습니다: [FILE]
                 </message>
         </alert>
         <alert name="UnableToCreateOutputFile">
                 <message name="message">
-                        출력 파� �성 실패: [파�명]
+                        출력 파�� 만들 수 없습니다: [FILE]
                 </message>
         </alert>
         <alert name="DoNotSupportBulkAnimationUpload">
                 <message name="message">
-                        현재 애니메�션 파�� 벌� 업로드는 지�하지 않습니다
+                        현재 애니메�션 파�� �괄 업로드는 지��지 않습니다.
                 </message>
         </alert>
         <alert name="CannotAccessOutputFile">
                 <message name="message">
-                        출력 파�� 액세스하지 못했습니다: [파�명]
+                        출력 파�� 접근할 수 없습니다: [FILE]
                 </message>
         </alert>
         <alert name="InsufficientFundsToUploadFile">
                 <message name="message">
-                        �금� 부족해 파� 업로드를 완료할 수 없습니다: 비용� L$[비용]�며, 현재 잔액� L$[잔액]입니다
+                        파�� 업로드하는 � 린든달러가 부족함: 비용� L$[COST]�고, 잔액� L$[BALANCE]임
                 </message>
         </alert>
         <alert name="InsufficientFundsToFinishUpload">
                 <message name="message">
-                        �금� 부족해 [파�명] 업로드를 완료할 수 없습니다: 비용� L$[비용]�며, 현재 잔액� L$[잔액]입니다
+                        [FILE] (�)를 업로드하는 � 린든달러가 부족함: 비용� L$[COST]�고, 잔액� L$[BALANCE]임
                 </message>
         </alert>
         <alert name="CannotUploadReason">
                 <message name="message">
-                        다�� �유로 �해 [파�명] 업로드� 실패했습니다: [�유]
-잠시 후 다시 시�해 주십시오.
+                        다� �유로 �해 [FILE]�(를) 업로드할 수 없습니다: [REASON]
+다시 시�해 주십시오.
                 </message>
         </alert>
         <alert name="CannotCreateLandmarkNotOwner">
                 <message name="message">
-                        � 토지� 소유주가 허용하지 않기 때문� 여기는
-토지 경계를 �성하실 수 없습니다.
-우선 몇 미터 ��해보십시오.
+                        토지� 소유주가 허용하지 않으므로 여기�
+랜드마�를 작성할 수 없습니다.
+먼저 몇 m � ��해 보십시오.
                 </message>
         </alert>
         <alert name="CannotRecompileSelectObjectsNoScripts">
                 <message name="message">
-                        재컴파�� 수행할 수 없습니다.
-유효한 스�립트 사물�
-선�해 주십시오.
+                        리컴파��� 수행할 수 없�.
+올바른 
+ 스�립트� 오브�트틀 선�합니다.
                 </message>
         </alert>
         <alert name="CannotRecompileSelectObjectsNoPermission">
                 <message name="message">
-                        재컴파�� 수행할 수 없습니다.
-본��게 수정할 권한� 있는 스�립트
-사물� 선�해 주십시오.
+                        리컴파��� 수행할 수 없�.
+내가 수정할 권한� 있는 
+ 스�립트� 오브�트틀 선�합니다.
                 </message>
         </alert>
         <alert name="CannotResetSelectObjectsNoScripts">
                 <message name="message">
-                        재설정� 수행할 수 없습니다.
-본��게 수정할 권한� 있는 스�립트
-사물� 선�해 주십시오.
+                        초기화를 수행할 수 없�.
+올바른 
+ 스�립트� 오브�트틀 선�합니다..
                 </message>
         </alert>
         <alert name="CannotResetSelectObjectsNoPermission">
                 <message name="message">
-                        재설정� 수행할 수 없습니다.
-본��게 수정할 권한� 있는 스�립트
-사물� 선�해 주십시오.
+                        초기화를 수행할 수 없�.
+내가 수정할 권한� 있는 
+ 스�립트� 오브�트틀 선�합니다.
                 </message>
         </alert>
         <alert name="CannotSetRunningSelectObjectsNoScripts">
                 <message name="message">
-                        스�립트를 �체 작�함으로 설정할 수 없습니다.
-유효한 스�립트 사물�
-선�해 주십시오.
+                        스�립트를 실행 함으로 설정할 수 없�.
+올바른 
+ 스�립트� 오브�트틀 선�합니다.
                 </message>
         </alert>
         <alert name="CannotSetRunningSelectObjectsNoPermission">
                 <message name="message">
-                        스�립트를 �체 작�함으로 설정할 수 없습니다.
-본��게 수정할 권한� 있는 스�립트
-사물� 선�해 주십시오.
+                        스�립트를 실행 함으로 설정할 수 없�.
+내가 수정할 권한� 있는 
+ 스�립트� 오브�트틀 선�합니다.
                 </message>
         </alert>
         <alert name="CannotSetRunningNotSelectObjectsNoScripts">
                 <message name="message">
-                        스�립트를 �체 작� 안함으로 설정할 수 없습니다.
-유효한 스�립트 
-사물� 선�해 주십시오.
+                        스�립트를 실행 안 함으로 설정할 수 없�.
+올바른 
+ 스�립트� 오브�트틀 선�합니다.
                 </message>
         </alert>
         <alert name="CannotSetRunningNotSelectObjectsNoPermission">
                 <message name="message">
-                        스�립트를 �체 작� 안함으로 설정할 수 없습니다.
-본��게 수정할 권한� 있는 스�립트
-사물� 선�해 주십시오.
+                        스�립트를 실행 안 함으로 설정할 수 없�.
+내가 수정할 권한� 있는 
+ 스�립트� 오브�트틀 선�합니다.
                 </message>
         </alert>
         <alert name="NoFrontmostFloater">
                 <message name="message">
-                        구출할 최전방 표류�가 없습니다
+                        맨 앞� 플러터 저장 안함
                 </message>
         </alert>
         <alert name="ColladaExportFailedUnknownServerError">
                 <message name="message">
-                        콜�다 내보내기 실패: 알려지지 않� 서버 오류입니다.
+                        Collada 내보내기 실패: 알 수 없는 서버 오류입니다.
                 </message>
         </alert>
         <alert name="ColladaExportFailedInvalidPermissions">
                 <message name="message">
-                        콜�다 내보내기 실패: 유효하지 않� 권한�거나 사물� 잠긴 �태입니다!
+                        Collada 내보내기 실패: 권한� 유효하지 않거나 오브�트가 잠겨 있습니다.
                 </message>
         </alert>
         <alert name="ColladaExportFailedUnknownError">
                 <message name="message">
-                        콜�다 내보내기 실패: 알려지지 않� 오류입니다.
+                        Collada 내보내기 실패: 알 수 없는 오류입니다.
                 </message>
         </alert>
         <alert name="ObjectImportFailedTransfer">
                 <message name="message">
-                        사물 가져오기� 실패했습니다. 파�� 전송하지 못했습니다.
+                        오브�트 가져오기� 실패함. 파�� 전송할 수 없�.
                 </message>
         </alert>
         <alert name="ObjectImportFailedBadFormat">
                 <message name="message">
-                        사물 가져오기� 실패했습니다. 파�� 수용 가능한 SLObject 형�� 아닙니다.
+                        오브�트 가져오기� 실패함. 파�� �합한SLObject 형�� 아님.
                 </message>
         </alert>
         <alert name="ObjectImportFailedUnknownError">
                 <message name="message">
-                        사물 가져오기� 실패했습니다. 알려지지 않� 오류입니다.
+                        오브�트 가져오기� 실패함. 알 수 없는 오류.
                 </message>
         </alert>
         <alert name="CouldNotTeleportReason">
                 <message name="message">
-                        텔리�트하지 못했습니다.
-[�유]
+                        텔레�트할 수 없습니다.
+[REASON]
                 </message>
         </alert>
         <alert name="CannotSetLandOwnerNothingSelected">
                 <message name="message">
-                        토지 소유주를 설정하지 못했습니다:
-아무것� 선��지 않았습니다.
+                        토지 소유주를 설정할 수 없습니다:
+선�한 항목� 없습니다.
                 </message>
         </alert>
         <alert name="CannotSetLandOwnerMultipleRegions">
                 <message name="message">
-                        선�� 여러개� 지역� 걸�있어 토지 소유권�
-강제하지 못했습니다. 작� 면�� 선�하신 후 다시 시�해 주십시오.
+                        선� 항목� 여러 지역� 분산�어 있기 때문� 토지 소유권� 강제로
+지정할 수 없습니다. � 작� �역� 선�한 후 다시 시�해 주십시오.
                 </message>
         </alert>
         <alert name="ForceOwnerAuctionWarning">
                 <message name="message">
-                        � 구�� 경매 매물입니다. 소유권� 강제할 경우
-경매가 취소�고, �단 입찰� 시작�면 �부 주민들�
-불만� 살 수 있습니다. 소유권� 강제하시겠습니까?
+                        � 구�� 경매 �태입니다. 소유권� 강제로 지정하면
+경매가 취소�고 입찰� 시작� 경우 잠재�으로 �부 주민�게
+불��� 갈 수 있습니다. 소유권� 강제로 지정하시겠습니까?
                 </message>
                 <option name="Force">
-                        강제
+                        �스
                 </option>
                 <option name="Cancel">
                         취소
@@ -1533,20 +1615,20 @@ www.secondlife.com으로 �아가 새로 계정� 만드시겠습니까?
         </alert>
         <alert name="CannotContentifyNothingSelected">
                 <message name="message">
-                        내용 표시� 실패했습니다.
-아무것� 선��지 않았습니다.
+                        컨�츠를 확�할 수 없습니다:
+선�한 항목� 없습니다.
                 </message>
         </alert>
         <alert name="CannotContentifyNoRegion">
                 <message name="message">
-                        내용 표시� 실패했습니다.
-해당 지역� 없습니다.
+                        컨�츠를 확�할 수 없습니다:
+지역� 없습니다.
                 </message>
         </alert>
         <alert name="CannotReleaseLandNothingSelected">
                 <message name="message">
                         토지를 �기하지 못했습니다:
-아무것� 선��지 않았습니다.
+선�한 항목� 없습니다.
                 </message>
         </alert>
         <alert name="CannotReleaseLandNoRegion">
@@ -1557,178 +1639,178 @@ www.secondlife.com으로 �아가 새로 계정� 만드시겠습니까?
         </alert>
         <alert name="CannotBuyLandNothingSelected">
                 <message name="message">
-                        토지를 매입하지 못했습니다:
-아무것� 선��지 않았습니다.
+                        토지를 구매하지 못했습니다:
+선�한 항목� 없습니다.
                 </message>
         </alert>
         <alert name="CannotBuyLandNoRegion">
                 <message name="message">
-                        토지를 매입하지 못했습니다:
+                        토지를 구매하지 못했습니다:
 � 토지가 소�� 지역� 찾� 수 없습니다.
                 </message>
         </alert>
         <alert name="CannotDeedLandNothingSelected">
                 <message name="message">
                         토지를 양�하지 못했습니다:
-아무것� 선��지 않았습니다.
+선�한 항목� 없습니다.
                 </message>
         </alert>
         <alert name="CannotDeedLandNoGroup">
                 <message name="message">
                         토지를 양�하지 못했습니다:
-해당 그룹� 없습니다.
+그룹� 없습니다.
                 </message>
         </alert>
         <alert name="CannotDeedLandNoRegion">
                 <message name="message">
                         토지를 양�하지 못했습니다:
 � 토지가 소�� 지역� 찾� 수 없습니다.
-�움�-&gt; 버그 신고를 사용해 신고하�� 하십시오.
+�구 -&gt; 버그 신고�서 신고하십시오.
                 </message>
         </alert>
         <alert name="CannotSetLandOwnerNothingSelected">
                 <message name="message">
-                        토지 소유주를 설정하지 못했습니다:
-아무것� 선��지 않았습니다.
+                        토지 소유주를 설정할 수 없습니다:
+선�한 항목� 없습니다.
                 </message>
         </alert>
         <alert name="CannotBuyLandMultipleRegions">
                 <message name="message">
-                        선�� 여러개� 지역� 걸�있어 토지를 매입하지 못했습니다.
-작� 면�� 선�하신 후 다시 시�해 주십시오.
+                        선� 항목� 여러 지역� 분산�어 있기 때문� 토지를 매입할 수 없습니다.
+� 작� �역� 선�한 후 다시 시�해 주십시오.
                 </message>
         </alert>
         <alert name="CannotBuyLandMultipleSelected">
                 <message name="message">
-                        토지를 매입하지 못했습니다:
-여러개� �기 다른 구�� 선��었습니다.
-� 작� 면�� 선�해 주십시오.
+                        토지를 구매하지 못했습니다:
+여러 개� �기 다른 구�� 선��었습니다.
+� 작� �역� 선�해 주십시오.
                 </message>
         </alert>
         <alert name="CannotDeedLandMultipleSelected">
                 <message name="message">
                         토지를 양�하지 못했습니다:
-여러개� �기 다른 구�� 선��었습니다.
-� 작� 면�� 선�해 주십시오.
+여러 개� �기 다른 구�� 선��었습니다.
+� 작� �역� 선�해 주십시오.
                 </message>
         </alert>
         <alert name="RegionNotFound">
                 <message name="message">
-                        지역� 찾� 수 없습니다.
+                        지역� 발견할 수 없�
                 </message>
         </alert>
         <alert name="ParcelCanPlayMusic">
                 <message name="message">
-                        � 장소�서는 스트리� �악 재�� 가능합니다. 
+                        � 지역�서는 스트리� �악� 재�할 수 있습니다. 
  
-�악� �터넷 연결 ��가 768 kbps
-���어야 가능합니다.
+�악� 재� 하려면 768 kbps ���
+�터넷 연결� 필요합니다.
  
-가능한 경우 �악� 재�하시겠습니까?
+�악 유효시 재� 하시겠습니까?
                 </message>
                 <option name="PlayMusic">
                         �악 재�
                 </option>
                 <option name="Disable">
-                        �기
+                        비활성
                 </option>
         </alert>
         <alert name="ParcelCanPlayMedia">
                 <message name="message">
-                        � 장소�서는 스트리� �� 재�� 가능합니다. 
+                        � 지역�서는 스트리� 비디오를 재�할 수 있습니다. 
  
-��� �터넷 연결 ��가 768 kbps
-���어야 가능합니다.
+스트리� 비디오를 재�하려면 768 kbps ��� 
+�터넷 연결� 필요합니다.
  
-가능한 경우 ��� 재�하시겠습니까?
+스트리� 비디오 유효시 재� 하시겠습니까?
  
-(환경 설정 &gt; 오디오 &amp; 비디오로 가시면 
-옵션� 변경하실 수 있습니다.)
+(환경 설정 &gt;사운드/ 비디오 �서 
+옵션� 변경할 수 있습니다.)
                 </message>
                 <option name="PlayMedia">
                         미디어 재�
                 </option>
                 <option name="Disable">
-                        �기
+                        비활성
                 </option>
         </alert>
         <alert name="CannotBuyLandWaitingForServer">
                 <message name="message">
-                        토지를 매입하지 못했습니다:
-서버가 비용� 보고하기를 기다리고 있습니다.
-잠시 후 다시 시�해 주십시오.
+                        토지를 구매하지 못했습니다:
+서버가 비용� 보고할 때까지 기다리는 중입니다.
+몇 초 후 다시 시�해 주십시오.
                 </message>
         </alert>
         <alert name="CannotDeedLandWaitingForServer">
                 <message name="message">
                         토지를 양�하지 못했습니다:
-서버가 소유권� 보고하기를 기다리고 있습니다.
-잠시 후 다시 시�해 주십시오.
+서버가 소유권� 보고할 때까지 기다리는 중입니다.
+몇 초 후 다시 시�해 주십시오.
                 </message>
         </alert>
         <alert name="CannotBuyLandNoPublic">
                 <message name="message">
-                        토지를 매입하지 못했습니다:
-선�한 내용� 공공 토지가 전혀 �함�어 있지 않습니다.
+                        토지를 구매하지 못했습니다:
+선�한 �역�는 공공 토지가 없습니다.
                 </message>
         </alert>
         <alert name="CannotBuyLandLandOwned">
                 <message name="message">
-                        토지를 매입하지 못했습니다:
-다른 사용�가 소유한 토지가 선��었습니다.
-� 작� 면�� 선�해 주십시오.
+                        토지를 구매하지 못했습니다:
+다른 사용� 소유� 토지가 선��었습니다.
+� 작� �역� 선�해 주십시오.
                 </message>
         </alert>
         <alert name="CannotButLandRegionNotFound">
                 <message name="message">
-                        토지를 매입하지 못했습니다:
+                        토지를 구매하지 못했습니다:
 � 토지가 소�� 지역� 찾� 수 없습니다.
-�움�-&gt; 버그 신고를 사용해 신고해 주십시오.
+�구 -&gt; 버그 신고 �서 신고하십시오.
                 </message>
         </alert>
         <alert name="CannotBuyLandNoTransfer">
                 <message name="message">
-                        토지를 매입하지 못했습니다:
-지역 [지역명]�서는 토지 양�가 허용�지 않습니다.
+                        토지를 구매하지 못했습니다:
+지역 [REGION]�(는) 토지 양�가 허용�지 않습니다.
                 </message>
         </alert>
         <alert name="CannotDeedLandNoTransfer">
                 <message name="message">
                         토지를 양�하지 못했습니다:
-지역 [지역명]�서는 토지 양�가 허용�지 않습니다.
+지역 [REGION]�(는) 토지 양�가 허용�지 않습니다.
                 </message>
         </alert>
         <alert name="CannotBuyLandForGroupNotOfficer">
                 <message name="message">
                         그룹� 대신해 토지를 매입하지 못했습니다:
-귀하는 현재 소� 그룹� 간부가 아닙니다.
-편집 -&gt; 그룹...� �용하여 다른 그룹� 활성화화십시오.
+귀하는 현재 그룹�서 간부가 아닙니다.
+편집 -&gt; 그룹...� �용하여 다른 그룹� 활성화하십시오.
                 </message>
         </alert>
         <alert name="CannotBuyLandInsufficientFunds">
                 <message name="message">
-                        � [면�] �방 미터� 토지를 구매하는 비용� L$[가격]입니다.
-귀하� 잔고는 L$[잔고]�(가) 전부입니다.
+                        � 토지 [AREA]제곱미터를 구매 하려면 L$[PRICE]가 듭니다.
+귀하� 잔고는 L$[BALANCE]�입니다.
                 </message>
         </alert>
         <alert name="CannotReleaseLandNothingSelected">
                 <message name="message">
                         토지를 �기하지 못했습니다:
-아무것� 선��지 않았습니다.
+선�한 항목� 없습니다.
                 </message>
         </alert>
         <alert name="CannotReleaseLandWatingForServer">
                 <message name="message">
                         토지를 �기하지 못했습니다:
-서버가 비용� 보고하기를 기다리고 있습니다.
-잠시 후 다시 시�해 주십시오.
+서버가 비용� 보고할 때까지 기다리는 중입니다.
+몇 초 후 다시 시�해 주십시오.
                 </message>
         </alert>
         <alert name="CannotReleaseLandSelected">
                 <message name="message">
                         토지를 �기하지 못했습니다:
-여러개� �기 다른 구�� 선��었습니다.
-� 작� 면�� 선�해 주십시오.
+여러 개� �기 다른 구�� 선��었습니다.
+� 작� �역� 선�해 주십시오.
                 </message>
         </alert>
         <alert name="CannotReleaseLandDontOwn">
@@ -1742,33 +1824,33 @@ www.secondlife.com으로 �아가 새로 계정� 만드시겠습니까?
                 <message name="message">
                         토지를 �기하지 못했습니다:
 � 토지가 소�� 지역� 찾� 수 없습니다.
-�움�-&gt; 버그 신고를 사용해 신고해 주십시오.
+�구 -&gt; 버그 신고 �서 신고하십시오.
                 </message>
         </alert>
         <alert name="CannotReleaseLandNoTransfer">
                 <message name="message">
                         토지를 �기하지 못했습니다:
-지역 [지역명]�서는 토지 양�가 허용�지 않습니다.
+지역 [REGION]�(는) 토지 양�가 허용�지 않습니다.
                 </message>
         </alert>
         <alert name="CannotReleaseLandPartialSelection">
                 <message name="message">
                         토지를 �기하지 못했습니다:
 토지를 방출하려면 전체 구�� 선�해야 합니다.
-�블�릭해 전체 구�� 선�하시거나
-먼저 해당 구�� 분할하십시오.
+전체 구�� 선�하려면 �블 �릭하거나 
+먼저 구�� 분할해 보십시오.
                 </message>
         </alert>
         <alert name="ReleaseLandWarning">
                 <message name="message">
-                        귀하는 지금 [면�] �방 미터� 토지를 방출하려고 합니다.
-� 구�� 방출하면 귀하� 소유지�서
-삭제�지만 L$ 대가는 없습니다.
+                        귀하께서는 토지� [AREA] �방 미터를 방출하려고 합니다.
+� 구�� 방출하면 소유한 토지�서 제거�지만
+토지� 대한 신용(L$)� �립�지 않습니다.
  
 � 토지를 방출하시겠습니까?
                 </message>
                 <option name="Release">
-                        방출
+                        해제
                 </option>
                 <option name="Cancel">
                         취소
@@ -1777,22 +1859,22 @@ www.secondlife.com으로 �아가 새로 계정� 만드시겠습니까?
         <alert name="CannotDivideLandNothingSelected">
                 <message name="message">
                         토지를 분할하지 못했습니다:
-아무것� 선��지 않았습니다.
+선�한 항목� 없습니다.
                 </message>
         </alert>
         <alert name="CannotDivideLandPartialSelection">
                 <message name="message">
                         토지를 분할하지 못했습니다:
-전체 구�� 선��었습니다.
-�릭-앤-드래그를 사용해 � 작� 면��
+전체 구�� 선�하셨습니다.
+�역� �릭하고 드래그하여 � 작� �역�
 선�해 주십시오.
                 </message>
         </alert>
         <alert name="LandDivideWarning">
                 <message name="message">
-                        � 토지를 분할할 경우 � 구�� 둘로 나눠지며
-��� 구�� 별�로 설정� 가능합니다. �부 설정�
-실행 후 기본 설정값으로 재설정�니다.
+                        � 토지를 분할하면 � 구�� 둘로 나뉘어 �
+구�� 고유한 설정� 가질 수 있습니다. � 작업
+후�는 �부 설정� 기본값으로 초기화�니다.
  
 토지를 분할하시겠습니까?
                 </message>
@@ -1807,50 +1889,60 @@ www.secondlife.com으로 �아가 새로 계정� 만드시겠습니까?
                 <message name="message">
                         토지를 분할하지 못했습니다:
 � 토지가 소�� 지역� 찾� 수 없습니다.
-�움�-&gt; 버그 신고를 사용해 신고하�� 하십시오.
+�구 -&gt; 버그 신고 �서 신고하십시오.
                 </message>
         </alert>
         <alert name="CannotJoinLandNoRegion">
                 <message name="message">
                         토지를 결합하지 못했습니다:
 � 토지가 소�� 지역� 찾� 수 없습니다.
-�움� -&gt; 버그 신고 �서 신고하십시오.
+&apos;�구 -&gt; 오류보고&apos;�서 신고하십시오.
                 </message>
         </alert>
         <alert name="CannotJoinLandNothingSelected">
                 <message name="message">
                         토지를 결합하지 못했습니다:
-아무것� 선��지 않았습니다.
+선�한 항목� 없습니다.
                 </message>
         </alert>
         <alert name="CannotJoinLandEntireParcelSelected">
                 <message name="message">
                         토지를 결합하지 못했습니다:
-전체 구�� 선��었습니다.
-�릭-앤-드래그를 사용해 � � 면��
+전체 구�� 선�하셨습니다.
+�역� �릭하고 드래그하여 � � �역�
 선�해 주십시오.
                 </message>
         </alert>
         <alert name="CannotJoinLandSelection">
                 <message name="message">
                         토지를 결합하지 못했습니다:
-2개 ��� 구�� 선�하셔야 합니다.
-�릭-앤-드래그를 사용해 � � 면��
+둘 ��� 구�� 선�해야 합니다.
+�역� �릭하고 드래그하여 � � �역�
 선�해 주십시오.
                 </message>
         </alert>
         <alert name="JoinLandWarning">
                 <message name="message">
-                        � 토지와 결합시키면 선�� 사�형� 가로지르는 
-�체� 구�� �용해 하나� � 구�� 만들어집니다. 
+                        � 토지� 결합� 선�한 사�형과 �차하는 모든 구�들로 하나� � 구�� 만듭니다.
  
-새 구�� �름 � 옵션� 재설정
-하셔야 합니다. 
+새로운 
+구�� �름과 옵션� 재설정해야 합니다. 
  
-토지를 결합시키시겠습니까?
+토지를 결합 하시겠습니까?
                 </message>
                 <option name="Join">
-                        참여
+                        가입
+                </option>
+                <option name="Cancel">
+                        취소
+                </option>
+        </alert>
+        <alert name="ConfirmNotecardSave">
+                <message name="message">
+                        � 노트 카드를 저장해야 해당 항목� 복사 �는 열람할 수 있습니다. 노트 카드를 저장하시겠습니까?
+                </message>
+                <option name="Save">
+                        저장
                 </option>
                 <option name="Cancel">
                         취소
@@ -1858,7 +1950,7 @@ www.secondlife.com으로 �아가 새로 계정� 만드시겠습니까?
         </alert>
         <alert name="ConfirmLandmarkCopy">
                 <message name="message">
-                        � 아�템� 저장고� 복사하시겠습니까?
+                        � 항목� 귀하� �벤토리로 복사 하시겠습니까?
                 </message>
                 <option name="Copy">
                         복사
@@ -1869,7 +1961,7 @@ www.secondlife.com으로 �아가 새로 계정� 만드시겠습니까?
         </alert>
         <alert name="ConfirmItemCopy">
                 <message name="message">
-                        � 아�템� 저장고� 복사하시겠습니까?
+                        � 항목� 귀하� �벤토리로 복사 하시겠습니까?
                 </message>
                 <option name="Copy">
                         복사
@@ -1880,76 +1972,84 @@ www.secondlife.com으로 �아가 새로 계정� 만드시겠습니까?
         </alert>
         <alert name="ResolutionSwitchFail">
                 <message name="message">
-                        해��를 [해�� X] x [해�� Y](으)로 변경하는� 실패했습니다.
+                        [RESX]x[RESY]� 해��로 전환하지 못했습니다.
                 </message>
         </alert>
         <alert name="ErrorUndefinedGrasses">
                 <message name="message">
-                        오류: 정��지 않� 풀: [종]
+                        오류: 정��지 않� 잔디: [SPECIES]
                 </message>
         </alert>
         <alert name="ErrorUndefinedTrees">
                 <message name="message">
-                        오류: 정��지 않� 나무: [종]
+                        오류: 정��지 않� 나무: [SPECIES]
                 </message>
         </alert>
         <alert name="CannotSaveWearableOutOfSpace">
                 <message name="message">
-                        &apos;[�름]&apos;(�)를 착용물 파�� 저장하는� 실패했습니다.  컴퓨터� 공간�
-� 확보하신 후
-다시 착용물� 저장하십시오.
+                        &apos;[NAME]&apos;�(를) 착용물 파�� 저장할 수 없습니다.  컴퓨터�서
+�부 공간� 확보하고 착용물�
+다시 저장하십시오.
                 </message>
         </alert>
         <alert name="CannotSaveToAssetStore">
                 <message name="message">
-                        [�름](�)를 중앙 �산 매장� 저장하는� 실패했습니다.
-보통 �시�� 문제입니다. 맞춤화한 후
-잠시 후 착용물� 다시.
-저장하십시오. 같� 문제가 계�� 경우
-&apos;�움� | 버그 신고&apos; 풀다운 메뉴를 �릭한 후
-네트워� 설정� 대한 �세한 내용� 입력하십시오.
+                        [NAME](�)를 중앙 �산 매장� 저장하는� 실패했습니다.
+보통 �시� 장애입니다. 착용물�
+맞춤화한 후 다시 저장해보십시오. 같� 문제가 계�� 경우
+�구 &gt; 오류보고 풀다운 메뉴를 �릭하고
+네트워� 설정� 관한 세부 사항� 입력하십시오.
                 </message>
         </alert>
         <alert name="AppEarlyExit">
                 <message name="message">
-                        [메시지]
+                        [MESSAGE]
  
-� 문제를 회복하는� 실패했습니다. 다시 시�하기
-전� 프로그램� 제거 후 다시 설치하십시오. 같� 문제가
-계��면, 다� ��� 기술 지� FAQ를 참고하십시오:
-www.secondlife.com/support.
+� 문제를 복구할 수 없습니다. 설치
+제거후 다시 설치한 다� 시�해 주시기 바�니다. 문제가
+계��면 www.secondlife.com/support�서
+기술 지� FAQ를 참조하십시오.
                 </message>
                 <option name="Quit">
-                        �내기
+                        종료
                 </option>
         </alert>
         <alert name="YouHaveBeenLoggedOut">
                 <message name="message">
-                        [SECOND_LIFE]�서 로그아웃 하셨습니다:
+                        [SECOND_LIFE]�서 로그아웃하셨습니다:
  
-[메시지]
+[MESSAGE]
  
-계�� �릭하시면 기존 메신저 � 채팅� 보실 수 있습니다.
-�체� 다른 작업� 수행하실 수 없습니다.
-[SECOND_LIFE]�(를) 바로 종료하시려면 �내기를 �릭하십시오.
+기존� 메신저와 채팅� 보려면 &apos;계�&apos;� �릭하십시오.
+다른 작업� 수행할 수 없습니다.
+[SECOND_LIFE]를 즉시 �내려면 &apos;종료&apos;를 �릭하십시오.
                 </message>
                 <option name="Continue">
                         계�
                 </option>
                 <option name="Quit">
-                        �내기
+                        종료
+                </option>
+        </alert>
+        <alert name="SelectSingleRate">
+                <message name="message">
+                        �가할 오브�트 선�
+                </message>
+                <option name="OK">
+                        확�
                 </option>
         </alert>
         <alert name="OnlyOfficerCanBuyLand">
                 <message name="message">
                         그룹� 대신해 토지를 매입하지 못했습니다:
 활� 중� 그룹� 위해 토지를 매입할 권한� 없습니다.
-편집 -&gt; 그룹...� �용하여 다른 그룹� 활성화 하십시오.
+편집 -&gt; 그룹...� �용하여 다른 그룹� 활성화하십시오.
                 </message>
         </alert>
         <alert name="AddFriend" title="친구 추가">
                 <message name="message">
-                        친구들� 지��서 서로 추�할 수 있으며 
+                        친구들� 
+지��서 서로 추�할 수 있으며  
 온�� �태 업��트� 받� 수 있습니다. 
  
 [NAME]�게 우정� 제공하겠습니까?
@@ -1963,7 +2063,18 @@ www.secondlife.com/support.
         </alert>
         <alert name="RemoveFromFriends">
                 <message name="message">
-                        [FIRST_NAME] [LAST_NAME](�)를 친구 목��서 삭제하시겠습니까?
+                        [FIRST_NAME] [LAST_NAME]님� 친구�서 제거하시겠습니까?
+                </message>
+                <option name="Remove">
+                        제거
+                </option>
+                <option name="Cancel">
+                        취소
+                </option>
+        </alert>
+        <alert name="RemoveMultipleFromFriends">
+                <message name="message">
+                        친구 목��서 여러 명� 친구를 제거하시겠습니까?
                 </message>
                 <option name="Remove">
                         제거
@@ -1974,12 +2085,11 @@ www.secondlife.com/support.
         </alert>
         <alert name="GodDeleteAllScriptedPublicObjectsByUser">
                 <message name="message">
-                        � 시뮬레�터� 있는 다른 모든 토지�서
-
+                        � 시뮬레�션 내 모든 타� 토지�서 스�립트 오브�트(소유�:
  
 ** [AVATAR_NAME] **
  
-�(가) 소유하는 모든 스�립트 아�템� 삭제하시겠습니까?
+)를 모� 삭제하시겠습니까?
                 </message>
                 <option name="DELETE!!">
                         삭제!!
@@ -1990,15 +2100,14 @@ www.secondlife.com/support.
         </alert>
         <alert name="GodDeleteAllScriptedObjectsByUser">
                 <message name="message">
-                        � 시뮬레�터� 있는 모든 토지�서
-
+                        � 시뮬레�션 내 모든 토지� 모든 스�립트 오브�트(소유�:
  
 ** [AVATAR_NAME] **
  
-�(가) 소유하는 모든 스�립트 아�템� 삭제하시겠습니까?
+)를 삭제하시겠습니까?
                 </message>
                 <option name="!!DELETEALL!!">
-                        !!전체 삭제!!
+                        !!모� 삭제!!
                 </option>
                 <option name="Cancel">
                         취소
@@ -2006,15 +2115,15 @@ www.secondlife.com/support.
         </alert>
         <alert name="GodDeleteAllObjectsByUser">
                 <message name="message">
-                        � 시뮬레�터� 있는 모든 토지�서
-
+                        � 시뮬레�션 내 모든 토지� 오브�트를 모� 삭제하시겠습니까?
+소유�:
  
 ** [AVATAR_NAME] **
  
-�(가) 소유하는 모든 아�템(스�립트 여부과 관계 없�)� 삭제하시겠습니까?
+(스�립트 오브�트 여부 무관)
                 </message>
                 <option name="!!DELETEALL!!">
-                        !!전체 삭제!!
+                        !!모� 삭제!!
                 </option>
                 <option name="Cancel">
                         취소
@@ -2022,40 +2131,40 @@ www.secondlife.com/support.
         </alert>
         <alert name="PublishGroupInfoToWeb">
                 <message name="message">
-                        “웹� 게시� 옵션� 선�하면 [SECOND_LIFE] 웹사�트�
-그룹명, 휘장, 설립 조항, 타�틀, 설립� �름�
-게시할 수 있습니다. �기 내용 중 지역 사회 기준으로 볼 때
-성�용으로 간주� 수 있는 내용� 있� 경우 그 사실�
-표시할 �무가 있습니다.
+                        웹� 게시 옵션� 선�하면 
+[SECOND_LIFE] 
+ 웹 사�트� 그룹 �름, 로고, 설립 조항, 타�틀 � 설립� �름� 게시할 수 있습니다.�기 내용 중 지역 사회 기준으로 볼 때 
+ 성� 전용으로 간주� 수 있는 내용� 있� 경우 그 사실� 
+ 표시할 �무가 있습니다.
                 </message>
         </alert>
         <alert name="ErrorEncodingSnapshot">
                 <message name="message">
-                        스냅샷 암호화 오류!
+                        스냅샷 �코딩 중 오류가 발�했습니다.
                 </message>
         </alert>
         <alert name="BlankClassifiedName">
                 <message name="message">
-                        광고를 위해 빈칸� 아닌 �름� 입력하셔야 합니다.
+                        광고� 대해 �름� 입력해야 합니다.
                 </message>
         </alert>
         <alert name="MinClassifiedPrice">
                 <message name="message">
-                        게재 비용� 최소 L$[MIN_PRICE]�어야 합니다.
+                        게재 비용� 최소 L$ [MIN_PRICE]�어야 합니다.
  
 � 높� 액수를 입력해 주십시오.
                 </message>
         </alert>
         <alert name="CantLoadVertexShaders">
                 <message name="message">
-                        베르�스 셰�� 로딩� 실패했습니다.
+                        버�스 ��� 로드� 실패했습니다.
                 </message>
         </alert>
         <alert name="ConfirmObjectDeleteLock">
                 <message name="message">
-                        최소 1개 사물� 잠긴 �태입니다.
-그러나 현재 선�한 사물� 삭제하는 것� 가능합니다.
-정� � 사물들� 삭제하시겠습니까?
+                        1개 ��� 오브�트가 잠겨 있습니다.
+하지만 현재 선� 아�템� 삭제할 수 있습니다.
+� 아�템� 삭제하시겠습니까?
                 </message>
                 <option name="Yes">
                         예
@@ -2066,9 +2175,9 @@ www.secondlife.com/support.
         </alert>
         <alert name="ConfirmObjectDeleteNoCopy">
                 <message name="message">
-                        최소 1개 사물� 복사가 불가능합니다.
-그러나 현재 선�한 사물� 삭제하는 것� 가능합니다.
-정� � 사물들� 삭제하시겠습니까?
+                        1개 ��� 오브�트를 복사할 수 없습니다.
+하지만 현재 선� 아�템� 삭제할 수 있습니다.
+� 아�템� 삭제하시겠습니까?
                 </message>
                 <option name="Yes">
                         예
@@ -2079,9 +2188,9 @@ www.secondlife.com/support.
         </alert>
         <alert name="ConfirmObjectDeleteNoOwn">
                 <message name="message">
-                        최소 1개 사물� 귀하 소유가 아닙니다.
-그러나 현재 선�한 사물� 삭제하는 것� 가능합니다.
-정� � 사물들� 삭제하시겠습니까?
+                        최소 하나 ��� 오브�트를 소유하고 있지 않습니다.
+하지만 현재 선� 항목� 삭제할 수 있습니다.
+�러한 아�템� 삭제하시겠습니까?
                 </message>
                 <option name="Yes">
                         예
@@ -2092,10 +2201,10 @@ www.secondlife.com/support.
         </alert>
         <alert name="ConfirmObjectDeleteLockNoCopy">
                 <message name="message">
-                        최소 1개 사물� 잠긴 �태입니다.
-최소 1개 사물� 복사가 불가능합니다.
-그러나 현재 선�한 사물� 삭제하는 것� 가능합니다.
-정� � 사물들� 삭제하시겠습니까?
+                        1개 ��� 오브�트가 잠겨 있습니다.
+1개 ��� 오브�트를 복사할 수 없습니다.
+하지만 현재 선� 아�템� 삭제할 수 있습니다.
+� 아�템� 삭제 하시겠습니까?
                 </message>
                 <option name="Yes">
                         예
@@ -2106,7 +2215,10 @@ www.secondlife.com/support.
         </alert>
         <alert name="ConfirmObjectDeleteLockNoOwn">
                 <message name="message">
-                        최소 하나� 아�템� 잠겨 있습니다. 당신� 최소 하나� 아�템� 소유하고 있지 않습니다. 그렇지만 지금 선�� 삭제 할 수 있습니다. 아�템들� 삭제 하시겠습니까?
+                        1개 ��� 오브�트가 잠겨 있습니다.
+1개 ��� 오브�트가 귀하� 소유가 아닙니다.
+하지만 현재 선� 아�템� 삭제할 수 있습니다.
+� 아�템� 삭제하시겠습니까?
                 </message>
                 <option name="Yes">
                         예
@@ -2117,10 +2229,10 @@ www.secondlife.com/support.
         </alert>
         <alert name="ConfirmObjectDeleteNoCopyNoOwn">
                 <message name="message">
-                        최소 1개 사물� 복사가 불가능합니다.
-최소 1개 사물� 귀하 소유가 아닙니다.
-그러나 현재 선�한 사물� 삭제하는 것� 가능합니다.
-정� � 사물들� 삭제하시겠습니까?
+                        1개 ��� 오브�트를 복사할 수 없습니다.
+1개 ��� 오브�트가 귀하� 소유가 아닙니다.
+하지만 현재 선� 아�템� 삭제할 수 있습니다.
+� 아�템� 삭제하시겠습니까?
                 </message>
                 <option name="Yes">
                         예
@@ -2131,11 +2243,11 @@ www.secondlife.com/support.
         </alert>
         <alert name="ConfirmObjectDeleteLockNoCopyNoOwn">
                 <message name="message">
-                        최소 1개 사물� 잠긴 �태입니다.
-최소 1개 사물� 복사가 불가능합니다.
-최소 1개 사물� 귀하 소유가 아닙니다.
-그러나 현재 선�한 사물� 삭제하는 것� 가능합니다.
-정� � 사물들� 삭제하시겠습니까?
+                        1개 ��� 오브�트가 잠겨 있습니다.
+1개 ��� 오브�트를 복사할 수 없습니다.
+1개 ��� 오브�트가 귀하� 소유가 아닙니다.
+하지만 현재 선� 아�템� 삭제할 수 있습니다.
+� 아�템� 삭제 하시겠습니까?
                 </message>
                 <option name="Yes">
                         예
@@ -2146,9 +2258,9 @@ www.secondlife.com/support.
         </alert>
         <alert name="ConfirmObjectTakeLock">
                 <message name="message">
-                        최소 1개 사물� 잠긴 �태입니다.
-그러나 현재 선�한 사물� 차지하는 것� 가능합니다.
-정� � 사물들� 차지하시겠습니까?
+                        1개 ��� 오브�트가 잠겨 있습니다.
+하지만 현재 �하는 아�템� 선�할 수 있습니다.
+� 아�템� 소유 하시겠습니까?
                 </message>
                 <option name="Yes">
                         예
@@ -2159,12 +2271,12 @@ www.secondlife.com/support.
         </alert>
         <alert name="ConfirmObjectTakeNoOwn">
                 <message name="message">
-                        차지하려는 사물 중 귀하 소유가 아닌 것� 있습니다.
-계�할 경우, 다� 소유� 권한�
-해당 사물� �용�어 해당 사물� 대한 귀하�
-수정 �는 복사를 제한할 수 있습니다.
-그러나 현재 선�한 사물� 차지하는 것� 가능합니다.
-정� � 사물들� 차지하시겠습니까?
+                        가져오려는 모든 오브�트를 소유하고 있지 않습니다.
+계�하면 � 오브�트� 다� 소유주 권한�
+�용�고 나중� 오브�트를 수정 �는 복사하는 � 필요한
+귀하� 권한� 제한� 수 있습니다.
+하지만 현재 선�한 항목� 가져올 수 있습니다.
+�러한 아�템� 가져오시겠습니까?
                 </message>
                 <option name="Yes">
                         예
@@ -2175,10 +2287,13 @@ www.secondlife.com/support.
         </alert>
         <alert name="ConfirmObjectTakeLockNoOwn">
                 <message name="message">
-                        최소 1개 사물� 잠긴 �태입니다.
-차지하려는 사물� 모� 귀하 소유는 아닙니다.
-계�할 경우, 다� 소유� 권한�
-해당 사물� �용�어 해당 사물� 대한 귀하�
+                        1개 ��� 오브�트가 잠겨 있습니다.
+가지려는 오브�트 중 �부가 귀하� 소유가 아닙니다.
+계�하면 오브�트� 다� 소유� 권한�
+�용�어 �후� 귀하가 수정하거나 복사할
+권한� 제한� 수 있습니다.
+하지만 현재 �하는 아�템� 선�할 수 있습니다.
+� 아�템� 소유 하시겠습니까?
                 </message>
                 <option name="Yes">
                         예
@@ -2189,21 +2304,21 @@ www.secondlife.com/support.
         </alert>
         <alert name="CantBuyLandAcrossMultipleRegions">
                 <message name="message">
-                        선�� 여러개� 지역� 걸�있어 토지를 매입하지 못했습니다.
-작� 면�� 선�하신 후 다시 시�해 주십시오.
+                        선� 항목� 여러 지역� 분산�어 있기 때문� 토지를 매입할 수 없습니다.
+� 작� �역� 선�한 후 다시 시�해 주십시오.
                 </message>
         </alert>
         <alert name="DeedLandToGroup">
                 <message name="message">
-                        � 구�� 양�할 경우, 해당 그룹� 충분한
-토지 사용 신용� 보유-유지해야 합니다.
+                        � 구�� 양�하는 � 있어서 � 그룹� 토지 사용�
+위한 충분한 신용� 있어야 합니다.
  
-해당 토지� 구매 비용� 소유��게 환불�지.
-않습니다. 양� 구�� �매� 경우, 해당 �매 수��
-그룹 멤버들 사�� �등하게 배분�니다.
+토지 구매 가격� 소유주�게 환불�지
+않습니다. 양�� 구�� �매�는 경우 �매
+가격� 그룹 회��게 균등하게 분배�니다.
  
-� [면�] �방 미터� 토지를
-&apos;[GROUP_NAME]&apos;� 양�하시겠습니까?
+[AREA]제곱미터� � 토지를 다� 그룹�게 양� 하시겠습니까?
+&apos;[GROUP_NAME]&apos;
                 </message>
                 <option name="Deed">
                         양�
@@ -2214,18 +2329,18 @@ www.secondlife.com/support.
         </alert>
         <alert name="DeedLandToGroupWithContribution">
                 <message name="message">
-                        � 구�� 양�할 경우, 해당 그룹� 충분한
-토지 사용 신용� 보유-유지해야 합니다.
+                        � 구�� 양�하는 � 있어서 � 그룹� 토지 사용�
+위한 충분한 신용� 있어야 합니다.
  
-양��는 &apos;[FIRST_NAME] [LAST_NAME]&apos;�(가) 해당 그룹�
-전달한 �시 기부 토지가 �함�니다.
+양��는 &apos;[FIRST_NAME] [LAST_NAME]&apos;�(가)
+그룹�게 행하는 �시 토지 기부 행위가 �함�니다.
  
-해당 토지� 구매 비용� 소유��게 환불�지.
-않습니다. 양� 구�� �매� 경우, 해당 �매 수��
-그룹 멤버들 사�� �등하게 배분�니다.
+토지 구매 가격� 소유주�게 환불�지
+않습니다. 양�� 구�� �매�는 경우 �매
+가격� 그룹 회��게 균등하게 분배�니다.
  
-� [면�] �방 미터� 토지를
-&apos;[GROUP_NAME]&apos;� 양�하시겠습니까?
+[AREA]제곱미터� � 토지를 다� 그룹�게 양� 하시겠습니까?
+&apos;[GROUP_NAME]&apos;
                 </message>
                 <option name="Deed">
                         양�
@@ -2236,30 +2351,30 @@ www.secondlife.com/support.
         </alert>
         <alert name="DisplaySetToSafe">
                 <message name="message">
-                        안전 옵션� 선�하셨기 때문�
-화면 설정� 안전 레벨로 설정�었습니다.
+                        귀하가 지정한 안전 옵션� 따� 디스플레� 설정�
+안전 수준으로 설정�었습니다.
                 </message>
         </alert>
         <alert name="DisplaySetToRecommended">
                 <message name="message">
-                        당신� 시스템 구성� 바탕으로 디스플레� 설정�
-권장 수준으로 설정하였습니다.
+                        귀하� 시스템 구성� 바탕으로 디스플레� 설정�
+권장 수준으로 설정�었습니다.
                 </message>
         </alert>
         <alert name="UnableToConnect">
                 <message name="message">
                         서버� 연결하지 못했습니다.
-다� �메�명� 요청할 수 없습니다: [HOST_NAME]
+다� �메� �름� 요청할 수 없습니다: [HOST_NAME]
                 </message>
         </alert>
         <alert name="CanNotFindServer">
                 <message name="message">
-                        서버 �메� �름� 찾지 못했습니다.
-네트워� 연결� 해제�었거나 서버 문제가
-��� 수 있습니다.
+                        서버 �메� �름� 찾� 수 없습니다.
+�로 �해 네트워� 연결� �실�거나 서버 문제가
+발�할 수 있습니다.
  
-잠시 후 다시 시�하시거나, �움�� �릭하시면
-안내 � 시스템 �태 웹페�지로 가는 ��가 나옵니다.
+몇 초 후� 다시 시�하거나 �움�� �릭하여
+시스템 �태 웹 페�지� 대한 지� 정보 � ��를 확�하십시오.
                 </message>
                 <option name="OK">
                         확�
@@ -2270,16 +2385,16 @@ www.secondlife.com/support.
         </alert>
         <alert name="PleaseSelectServer">
                 <message name="message">
-                        서버를 선�해 주십시오.
-[IP_ADDRESS]� 연결하지 못했습니다
+                        서버를 선�하십시오.
+[IP_ADDRESS](으)로 연결할 수 없�
                 </message>
         </alert>
         <alert name="SystemMayBeDown">
                 <message name="message">
                         [SECOND_LIFE]� 연결하지 못했습니다.
-시스템� 다운�태� 수 있습니다.
-잠시 후 다시 시�하시거나, �움�� �릭하시면
-안내 � 시스템 �태 웹페�지로 가는 ��가 나옵니다.
+시스템� 다운� 수 있습니다.
+몇 초 후� 다시 시�하거나 �움�� �릭하여
+시스템 �태 웹 페�지� 대한 지� 정보 � ��를 확�하십시오.
                 </message>
                 <option name="OK">
                         확�
@@ -2295,29 +2410,29 @@ www.secondlife.com/support.
         </alert>
         <alert name="AvatarMoved">
                 <message name="message">
-                        Your [TYPE] location is not currently available.
+                        현재 [TYPE] 위치를 사용할 수 없습니다.
 [HELP] 
-You have been moved into a nearby region.
+귀하는 주변� 지역으로 옮겨졌습니다.
                 </message>
         </alert>
         <alert name="ClothingLoading">
                 <message name="message">
-                        귀하� �복� 아� 다운로드 중입니다.
-세계를 정��으로 사용할 수 있으며, 다른 사용�들�
-귀하를 올바로 보게 �니다.
+                        ��� 다운로드하는 중입니다.
+�반�으로 세컨드��프를 사용할 수 있으며 다른 사용��게
+귀하� 모습� 제대로 표시� 것입니다.
                 </message>
         </alert>
         <alert name="FirstRun">
                 <message name="message">
                         [SECOND_LIFE] 설치가 완료�었습니다.
  
-[SECOND_LIFE]�(를) 처� 사용하시는 경우, 로그�하시기 전�
-새로 계정� 만드셔야 합니다.
+[SECOND_LIFE]를 처� 사용하시는 경우 먼저 계정� 만들어야
+로그�할 수 있습니다.
  
-www.secondlife.com으로 �아가 새로 계정� 만드시겠습니까?
+www.secondlife.com으로 �아가 신규 계정� 만드시겠습니까?
                 </message>
                 <option name="NewAccount...">
-                        신규 계정...
+                        신규 계정…
                 </option>
                 <option name="Continue">
                         계�
@@ -2326,17 +2441,17 @@ www.secondlife.com으로 �아가 새로 계정� 만드시겠습니까?
         <alert name="SetByHostFail">
                 <message name="message">
                         서버� 연결하지 못했습니다.
-다� �메�명� 해�할 수 없습니다: [HOST_NAME]
-네트워� 연결� 확�해 주십시오.
+다� �메� �름� 확�할 수 없습니다: [HOST_NAME]
+네트워� 연결� 확�하십시오.
                 </message>
         </alert>
         <alert name="LoginPacketNeverReceived">
                 <message name="message">
-                        연결� 실패했습니다.  로그� 서버가 로그� 패킷�
-받지 못했습니다.
+                        연결할 수 없습니다.  로그� 서버�서 로그� 패킷�
+수신�지 않았습니다.
  
-잠시 후 다시 시�하시거나, �움�� �릭하시면
-안내 � 시스템 �태 웹페�지로 가는 ��가 나옵니다.
+몇 초 후� 다시 시�하거나 �움�� �릭하여
+시스템 �태 웹 페�지� 대한 지� 정보 � ��를 확�하십시오.
                 </message>
                 <option name="OK">
                         확�
@@ -2351,8 +2466,8 @@ www.secondlife.com으로 �아가 새로 계정� 만드시겠습니까?
  
 화살표 키를 �용하여 걸� 수 있습니다.
  
-�움�� 필요하시거나 [SECOND-LIFE]�
-대한 � �세한 내용� 필요하시면 F1 키를 누르십시오.
+F1 키를 눌러 �움�� 보거나 
+[SECOND_LIFE]를 �세히 배울 수 있습니다.
                 </message>
         </alert>
         <alert name="WelcomeChooseSex">
@@ -2361,8 +2476,8 @@ www.secondlife.com으로 �아가 새로 계정� 만드시겠습니까?
  
 화살표 키를 �용하여 걸� 수 있습니다.
  
-�움�� 필요하시거나 [SECOND-LIFE]�
-대한 � �세한 내용� 필요하시면 F1 키를 누르십시오. 
+F1 키를 눌러 �움�� 보거나 
+[SECOND_LIFE]를 �세히 배울 수 있습니다.
  
 남성 �는 여성 �릭터를 선�해 주십시오.
 차후� 변경� 가능합니다.
@@ -2376,34 +2491,22 @@ www.secondlife.com으로 �아가 새로 계정� 만드시겠습니까?
         </alert>
         <alert name="NotEnoughCurrency">
                 <message name="message">
-                        [�름] L$ [가격] 가지고 계신 �� 충분치 않습니다.
+                        [NAME]님 L$ [PRICE] 보유. 린든달러(L$)가 부족하여 �를 수행할 수 없습니다.
                 </message>
         </alert>
-        <alert name="GrantModRights">
+        <alert name="GrantedModifyRights">
                 <message name="message">
-                        [FIRST_NAME] [LAST_NAME]� 수정 권리를 부여하시겠습니까 ?
+                        [FIRST_NAME] [LAST_NAME]� 오브�트 수정 권한� 부여받았습니다.
                 </message>
-                <option name="Yes">
-                        예
-                </option>
-                <option name="No">
-                        아니오
-                </option>
         </alert>
-        <alert name="RevokeModRights">
+        <alert name="RevokedModifyRights">
                 <message name="message">
-                        [FIRST_NAME] [LAST_NAME](으)로부터 수정 권리를 철회하시겠습니까 ?
+                        [LAST_NAME][FIRST_NAME]� 오브�트 수정 권한� 취소�었습니다.
                 </message>
-                <option name="Yes">
-                        예
-                </option>
-                <option name="No">
-                        아니오
-                </option>
         </alert>
         <alert name="FlushMapVisibilityCaches">
                 <message name="message">
-                        실행하실 경우 � 지역� 지� �시가 삭제�니다.
+                        � 지역� 지� �시가 삭제�니다.
  
 � 작업� 버그 제거�만 사용�니다. 
  
@@ -2420,12 +2523,18 @@ www.secondlife.com으로 �아가 새로 계정� 만드시겠습니까?
         <alert name="OnlyCopyContentsOfSingleItem">
                 <message name="message">
                         한번� 2개 �� 항목� 컨�츠를 복사하지 못했습니다.
-1개� 아�템만 선�한 후 다시 시�해 주십시오.
+1개� 오브�트만 선�한 후 다시 시�해 주십시오.
                 </message>
+                <option name="OK">
+                        확�
+                </option>
+                <option name="Cancel">
+                        취소
+                </option>
         </alert>
         <alert name="KickUsersFromRegion">
                 <message name="message">
-                        � 지역내 모든 사용�들� 집으로 텔리�트하시겠습니까?
+                        � 지역 내 모든 사용�를 홈으로 텔리�트 하시겠습니까?
                 </message>
                 <option name="OK">
                         확�
@@ -2438,7 +2547,7 @@ www.secondlife.com으로 �아가 새로 계정� 만드시겠습니까?
                 <message name="message">
                         사용�� 토지를 제외한 모든 토지�서
 ** [USER_NAME] **
-�(가) 소유하는 모든 스�립트 아�템� 반환하시겠습니까?
+소유� 모든 스�립트 오브�트를 반환 하시겠습니까?
                 </message>
                 <option name="Return">
                         반환
@@ -2449,9 +2558,9 @@ www.secondlife.com으로 �아가 새로 계정� 만드시겠습니까?
         </alert>
         <alert name="ReturnScriptedOnAllLand">
                 <message name="message">
-                        � 지역� 있는 모든 토지�서
+                        � 지역 내 모든 토지�서
 ** [USER_NAME] **
-�(가) 소유하는 모든 스�립트 아�템� 반환하시겠습니까?
+소유� 모든 스�립트 오브�트를 반환하시겠습니까?
                 </message>
                 <option name="Return">
                         반환
@@ -2460,67 +2569,37 @@ www.secondlife.com으로 �아가 새로 계정� 만드시겠습니까?
                         취소
                 </option>
         </alert>
-        <alert name="InvalidTerrainBitDepthSmall">
+        <alert name="InvalidTerrainBitDepth">
                 <message name="message">
-                        지역 �스처 설정� 실패했습니다: 
+                        지역 �스처를 설정할 수 없습니다: 
  
-기본 �스처[TEXTURE_NUM]� 비트 깊�가 [TEXTURE_BIT_DEPTH](으)로 유효하지 않습니다. 
+지형 �스처 [TEXTURE_NUM]� 비트 수준 [TEXTURE_BIT_DEPTH]�(가) 유효하지 않습니다.
  
-기본 �스처 [TEXTURE_NUM](�)를 128x128 24 비트 �미지로 �체한 후, 
-&quot;설정&quot;� 다시 �릭합니다.
+�스처 [TEXTURE_NUM]�(를) 24비트� 512x512(�는 � 작�) �미지로 �체하고
+&quot;설정&quot;� 다시 �릭하십시오.
                 </message>
         </alert>
-        <alert name="InvalidTerrainSizeSmall">
+        <alert name="InvalidTerrainSize">
                 <message name="message">
-                        지역 �스처 설정� 실패했습니다: 
+                        지역 �스처를 설정할 수 없습니다: 
  
-기본 �스처 [TEXTURE_NUM]� �기가 [TEXTURE_SIZE_X]x[TEXTURE_SIZE_Y](으)로 유효하지 않습니다. 
+지형 �스처 [TEXTURE_NUM]�(가) 너무 �니다([TEXTURE_SIZE_X]x[TEXTURE_SIZE_Y]). 
  
-기본 �스처 [TEXTURE_NUM](�)를 128x128 24비트 �미지로 �체한 후, 
-&quot;설정&quot;� 다시 �릭합니다.
-                </message>
-        </alert>
-        <alert name="InvalidTerrainBitDepthLarge">
-                <message name="message">
-                        지역 �스처 설정� 실패했습니다: 
- 
-기본 �스처[TEXTURE_NUM]� 비트 깊�가 [TEXTURE_BIT_DEPTH](으)로 유효하지 않습니다. 
- 
-기본 �스처 [TEXTURE_NUM](�)를 512x512보다 작� 24비트 �미지로 �체한 후, 
-&quot;설정&quot;� 다시 �릭합니다.
-                </message>
-        </alert>
-        <alert name="InvalidTerrainWidthLarge">
-                <message name="message">
-                        지역 �스처 설정� 실패했습니다: 
- 
-기본 �스처[TEXTURE_NUM]� �기가 [TEXTURE_SIZE_X]x[TEXTURE_SIZE_Y]로 넓습니다. 
- 
-기본 �스처 [TEXTURE_NUM](�)를 512x512보다 작� 24비트 �미지로 �체한 후, 
-&quot;설정&quot;� 다시 �릭합니다.
-                </message>
-        </alert>
-        <alert name="InvalidTerrainHeightLarge">
-                <message name="message">
-                        지역 �스처 설정� 실패했습니다: 
- 
-기본 �스처[TEXTURE_NUM]� �기가 [TEXTURE_SIZE_X]x[TEXTURE_SIZE_Y](으)로 너무 높습니다. 
- 
-기본 �스처 [TEXTURE_NUM](�)를 512x512보다 작� 24비트 �미지로 �체한 후, 
-&quot;설정&quot;� 다시 �릭합니다.
+�스처 [TEXTURE_NUM]�(를) 24비트� 512x512(�는 � 작�) �미지로 �체하고
+&quot;설정&quot;� 다시 �릭하십시오.
                 </message>
         </alert>
         <alert name="RawUploadStarted">
                 <message name="message">
-                        업로드가 시작�었습니다. 연결 ��� 따� 최대, 
+                        업로드가 시작�었습니다. 연결 ��� 따� 최대 
 2분까지 소요� 수 있습니다.
                 </message>
         </alert>
         <alert name="ConfirmBakeTerrain">
                 <message name="message">
-                        현재 지형� 저장해, 
-지형 올리기/낮추기 한계� 중심�으로 정하고 
-&apos;��리기&apos; �구� 기본설정으로 하시겠습니까?
+                        현재 지형� 저장하여 지형 높�/깊� 제한� 
+중심�으로 정하고 &apos;취소&apos; �구� 
+기본 설정으로 하시겠습니까?
                 </message>
                 <option name="Bake">
                         저장
@@ -2531,13 +2610,19 @@ www.secondlife.com으로 �아가 새로 계정� 만드시겠습니까?
         </alert>
         <alert name="MaxAllowedAgentOnRegion">
                 <message name="message">
-                        귀하� 최대 허용 주민 수는 [MAX_AGENTS]입니다.
+                        귀하�게 허용�는 최대 주민 수는 [MAX_AGENTS]입니다.
                 </message>
         </alert>
         <alert name="MaxAllowedGroupsOnRegion">
                 <message name="message">
-                        귀하� 최대 허용 그룹 수는 [MAX_GROUPS]입니다.
+                        귀하�게 허용�는 최대 그룹 수는 [MAX_GROUPS]입니다.
                 </message>
+                <option name="Bake">
+                        저장
+                </option>
+                <option name="Cancel">
+                        취소
+                </option>
         </alert>
         <alert name="MaxBannedAgentsOnRegion">
                 <message name="message">
@@ -2551,12 +2636,12 @@ www.secondlife.com으로 �아가 새로 계정� 만드시겠습니까?
         </alert>
         <alert name="OwnerCanNotBeDenied">
                 <message name="message">
-                        소유지� 소유주는 소유지� 액세스 거부 목�� 추가할 수 없습니다.
+                        사유지 소유�는 사유지� &apos;출입 거부&apos; 목�� 추가� 수 없습니다.
                 </message>
         </alert>
         <alert name="CanNotChangeAppearanceUntilLoaded">
                 <message name="message">
-                        �복 � 형�� 로딩� 완료� 때까지는 외양� 바꿀 수 없습니다.
+                        옷과 외형� 로딩� 완료� 때까지는 내 모습� 바꿀 수 없습니다.
                 </message>
         </alert>
         <alert name="ClassifiedMustBeAlphanumeric">
@@ -2567,8 +2652,8 @@ www.secondlife.com으로 �아가 새로 계정� 만드시겠습니까?
         </alert>
         <alert name="CantSetBuyObject">
                 <message name="message">
-                        해당 아�템� 매물� 아니기 때문� 아�템 구매를 설정할 수 없습니다. 
-해당 아�템� 대해 매물 설정� 한 후 다시 시�해 주십시오.
+                        오브�트가 매물� 아니므로 오브�트 구매를 설정할 수 없습니다. 
+오브�트를 매물로 설정한 후 다시 시�해 주십시오.
                 </message>
         </alert>
         <alert name="FinishedRawDownload">
@@ -2582,21 +2667,21 @@ www.secondlife.com으로 �아가 새로 계정� 만드시겠습니까?
                         [SECOND_LIFE] 새 버전� 출시�었습니다.
 [MESSAGE]
  
-시스템� 사용하려면 � 업��트를 다운로드하셔야 합니다.
+시스템� 사용하려면 � 업��트를 다운로드해야 합니다.
                 </message>
                 <option name="Download">
                         다운로드
                 </option>
                 <option name="Quit">
-                        �내기
+                        종료
                 </option>
         </alert>
         <alert name="DownloadWindows">
                 <message name="message">
-                        [SECOND_LIFE] 업��트 버전� 나왔습니다.
+                        [SECOND_LIFE] 업��트 버전� 출시�었습니다.
 [MESSAGE]
  
-본 업��트는 필수 사항� 아니나 성능 � 안전성 향�� 위해 설치를 권장합니다..
+본 업��트는 필수 사항� 아니나 성능 � 안전성 향�� 위해 설치를 권장합니다.
                 </message>
                 <option name="Download">
                         다운로드
@@ -2607,10 +2692,10 @@ www.secondlife.com으로 �아가 새로 계정� 만드시겠습니까?
         </alert>
         <alert name="DownloadWindowsReleaseForDownload">
                 <message name="message">
-                        [SECOND_LIFE] 업��트 버전� 나왔습니다.
+                        [SECOND_LIFE] 업��트 버전� 출시�었습니다.
 [MESSAGE]
  
-본 업��트는 필수 사항� 아니나 성능 � 안전성 향�� 위해 설치를 권장합니다..
+본 업��트는 필수 사항� 아니나 성능 � 안전성 향�� 위해 설치를 권장합니다.
                 </message>
                 <option name="Download">
                         다운로드
@@ -2623,24 +2708,24 @@ www.secondlife.com으로 �아가 새로 계정� 만드시겠습니까?
                 <message name="message">
                         [SECOND_LIFE] 새 버전� 출시�었습니다.
 [MESSAGE]
+
+시스템� 사용하려면 � 업��트를 다운로드해야 합니다.
  
-시스템� 사용하려면 � 업��트를 다운로드하셔야 합니다.
- 
-애플리케�션 ��� 다운로드하시겠습니까?
+Applications ��� 다운로드하시겠습니까?
                 </message>
                 <option name="Download">
                         다운로드
                 </option>
                 <option name="Quit">
-                        �내기
+                        종료
                 </option>
         </alert>
         <alert name="DownloadMac">
                 <message name="message">
-                        [SECOND_LIFE] 업��트 버전� 나왔습니다.
+                        [SECOND_LIFE] 업��트 버전� 출시�었습니다.
 [MESSAGE]
  
-본 업��트는 필수 사항� 아니나 성능 � 안전성 향�� 위해 설치를 권장합니다..
+본 업��트는 필수 사항� 아니나 성능 � 안전성 향�� 위해 설치를 권장합니다.
  
 애플리케�션 ��� 다운로드하시겠습니까?
                 </message>
@@ -2653,10 +2738,10 @@ www.secondlife.com으로 �아가 새로 계정� 만드시겠습니까?
         </alert>
         <alert name="DownloadMacReleaseForDownload">
                 <message name="message">
-                        [SECOND_LIFE] 업��트 버전� 나왔습니다.
+                        [SECOND_LIFE] 업��트 버전� 출시�었습니다.
 [MESSAGE]
  
-본 업��트는 필수 사항� 아니나 성능 � 안전성 향�� 위해 설치를 권장합니다..
+본 업��트는 필수 사항� 아니나 성능 � 안전성 향�� 위해 설치를 권장합니다.
  
 애플리케�션 ��� 다운로드하시겠습니까?
                 </message>
@@ -2669,9 +2754,12 @@ www.secondlife.com으로 �아가 새로 계정� 만드시겠습니까?
         </alert>
         <alert name="DeedObjectToGroup">
                 <message name="message">
-                        � 사물� 양�할 경우, 해당 그룹� 해당 사물� 대해
-* 지불� 금액� 수령하게�니다
+                        � 오브�트 양� 시 그룹�게 발�하는 결과:
+* 오브�트� 대한 지불금� 수령함
                 </message>
+                <ignore name="ignore">
+                        오브�트를 그룹으로 양�할 때
+                </ignore>
                 <option name="Deed">
                         양�
                 </option>
@@ -2681,16 +2769,19 @@ www.secondlife.com으로 �아가 새로 계정� 만드시겠습니까?
         </alert>
         <alert name="AddClassified">
                 <message name="message">
-                        광고는 찾기 목�� &apos;광고&apos;
-섹션� 1주간 게재�니다.
+                        광고가 1주� �안 찾기 디렉토리� &apos;광고&apos; 섹션�
+나타납니다.
  
-광고를 작성한 후 &apos;게시...&apos;를 �릭하면
-목�� 추가�니다.
+광고를 작성한 후 &apos;게시하기...&apos;를 �릭하여 디렉토리�
+추가합니다.
  
-게시를 �릭하면 값� 지불할 것�지 물어봅니다.
-� 높� 가격� 지불할수� � 높� 위치� 게재�고
-키워드 검색시 결과� � 우선�으로 표시�니다.
+게시하기를 �릭하면 지불할 가격� 묻는 메시지가 나타납니다.
+높� 가격� 지불 할수� 광고가 목��서 � 높� 위치� 게시�고
+키워드 검색 결과�서 � 우선�으로 표시�니다.
                 </message>
+                <ignore name="ignore">
+                        새 광고를 추가할 때
+                </ignore>
                 <option name="OK">
                         확�
                 </option>
@@ -2698,57 +2789,70 @@ www.secondlife.com으로 �아가 새로 계정� 만드시겠습니까?
                         취소
                 </option>
         </alert>
-        <alert name="WebLaunchGraphicsDriver">
+        <alert name="WebLaunchJoinNow">
                 <message name="message">
-                        � 컴퓨터� 장착� [VENDOR_LABLE] [CARD_NAME] 그래픽 드��버는 구버젼 입니다.
- 
-� 드��버는 그래픽 카드를 제어하는 소프트웨어입니다.
-구버젼 드��버를 사용할 경우 [SECOND_LIFE]과(와) 같� 3D 그래픽 프로그램� 실행 ��가 떨어지거나 ��� 수 있습니다.
- 
-[VENDOR_LABLE]�서 무료로 다운로드받으실 수 있는 [DRIVER_NAME] 드��버로 업그레�드하실 것� 권장합니다.
- 
-[SECOND_LIFE] 드��버 웹페�지로 �� 하시겠습니까?&quot;
+                        계정� 관리 하기 위해www.secondlife.com으로 갑니까?
+                </message>
+                <ignore name="ignore">
+                        계정� 관리하기 위해 웹 브�우저를 시작할 때
+                </ignore>
+                <option name="OK">
+                        확�
+                </option>
+                <option name="Cancel">
+                        취소
+                </option>
+        </alert>
+        <alert name="WebLaunchBugReport101">
+                <message name="message">
+                        세컨드��프 위키�서 버그신고� 대해 보기
                 </message>
+                <ignore name="ignore">
+                        버그신고 101 위키를 웹 브�우저�서 볼때
+                </ignore>
                 <option name="Gotopage">
-                        페�지로 ��
+                        확�
                 </option>
                 <option name="Cancel">
                         취소
                 </option>
         </alert>
-        <alert name="WebLaunchGraphicsDriverIntelExtreme">
+        <alert name="WebLaunchSecurityIssues">
                 <message name="message">
-                        � 컴퓨터� 장착� �텔 �스트림 그래픽 드��버는 오래� 것입니다.
- 
-� 드��버는 그래픽 카드를 제어하는 소프트웨어입니다.
-오래� 드��버를 사용할 경우 [SECOND_LIFE]과(와) 같� 3D 그래픽 프로그램� 실행 ��가 떨어지거나 ��� 수 있습니다.
- 
-�텔�서 무료로 다운로드받으실 수 있는 최신 드��버로 업그레�드하실 것� 강력히 권장합니다.
- 
-[SECOND_LIFE] 드��버 웹페�지로 ��하시겠습니까?
+                        세컨드��프 위키�서 보안 관련 신고� 대해 보기
                 </message>
+                <ignore name="ignore">
+                        보안 관련 위키를 웹 브�우저�서 볼때
+                </ignore>
                 <option name="Gotopage">
-                        페�지로 ��
+                        확�
                 </option>
                 <option name="Cancel">
                         취소
                 </option>
         </alert>
-        <alert name="RunningInPCI">
+        <alert name="WebLaunchPublicIssue">
                 <message name="message">
-                        GL� � 시스템�� 그래픽 드��버가 ��가 �린 그래픽 작성
-방�� PCI 모드로 작�하고 있다고 나타내고 있습니다.  PCI 비디오 카드를 사용하고 계신 경우
-� 메시지는 무시하십시오.  AGP 비디오 카드를 사용하고 계신 경우, 마�보드 드��브를
-업��트하셔야 � 프로그램 � 아니� 다른 3D �용 프로그램� 성능�
-향�시키실 수 있습니다.  PCI Express 그래픽 카드를 사용하고 계신 경우
-[SECOND_LIFE]� 환경 설정으로 가셔서 옵션�서 AGP 그래픽 가�(AGP Graphics Acceleration)� 선�하실 수 있습니다.
+                        �슈 트랙�서 버그 � 보안 관련 신고 보기
                 </message>
+                <ignore name="ignore">
+                        �슈 트랙� 웹 브�우저�서 볼때
+                </ignore>
+                <option name="Gotopage">
+                        확�
+                </option>
+                <option name="Cancel">
+                        취소
+                </option>
         </alert>
-        <alert name="WebLaunchJoinNow">
+        <alert name="WebLaunchPublicIssueHelp">
                 <message name="message">
-                        www.secondlife.com으로 ��해 계정� 관리하시겠습니까?
+                        세컨드��프 위키�서 �슈 트랙� 대해 보기
                 </message>
-                <option name="OK">
+                <ignore name="ignore">
+                        �슈 트랙 관련 위키를 웹 브�우저�서 볼때
+                </ignore>
+                <option name="Gotopage">
                         확�
                 </option>
                 <option name="Cancel">
@@ -2757,8 +2861,25 @@ www.secondlife.com으로 �아가 새로 계정� 만드시겠습니까?
         </alert>
         <alert name="WebLaunchForums">
                 <message name="message">
-                        최신 � � 트릭� [SECOND_LIFE] 기술 �료를 검색합니다.
+                        최신 � � 트릭� [SECOND_LIFE] 지� 창고를 검색합니다.
+                </message>
+                <ignore name="ignore">
+                        지�창고를 보려고 웹 브�우저를 시작할 때
+                </ignore>
+                <option name="Gotopage">
+                        페�지로 ��
+                </option>
+                <option name="Cancel">
+                        취소
+                </option>
+        </alert>
+        <alert name="WebLaunchSupport">
+                <message name="message">
+                        [SECOND_LIFE] 고�지�� 문� 하십시오.
                 </message>
+                <ignore name="ignore">
+                        지� 요청하기 위해 웹 브�우저를 시작할 때
+                </ignore>
                 <option name="Gotopage">
                         페�지로 ��
                 </option>
@@ -2770,6 +2891,9 @@ www.secondlife.com으로 �아가 새로 계정� 만드시겠습니까?
                 <message name="message">
                         공� 린든 블로그�서 최신 뉴스 � 정보를 확�하십시오.
                 </message>
+                <ignore name="ignore">
+                        블로그를 보려고 웹 브�우저를 시작할 때
+                </ignore>
                 <option name="Gotopage">
                         페�지로 ��
                 </option>
@@ -2779,8 +2903,11 @@ www.secondlife.com으로 �아가 새로 계정� 만드시겠습니까?
         </alert>
         <alert name="WebLaunchLSLGuide">
                 <message name="message">
-                        LSL 가�드로 ��해 스�립팅 �움� 얻으시겠습니까?
+                        스�립팅 �움�� 위해 LSL 가�드로 갑니까?
                 </message>
+                <ignore name="ignore">
+                        LSL 가�드를 보려고 웹 브�우저를 시작할 때
+                </ignore>
                 <option name="Gotopage">
                         페�지로 ��
                 </option>
@@ -2790,8 +2917,11 @@ www.secondlife.com으로 �아가 새로 계정� 만드시겠습니까?
         </alert>
         <alert name="WebLaunchLSLWiki">
                 <message name="message">
-                        LSL 위키로 ��해 스�립팅 �움� 얻으시겠습니까?
+                        스�립팅 �움�� 위해 LSL �탈로 갑니까?
                 </message>
+                <ignore name="ignore">
+                        LSL �털� 보려고 웹 브�우저를 시작할 때
+                </ignore>
                 <option name="Gotopage">
                         페�지로 ��
                 </option>
@@ -2801,8 +2931,11 @@ www.secondlife.com으로 �아가 새로 계정� 만드시겠습니까?
         </alert>
         <alert name="WebLaunchReleaseNotes">
                 <message name="message">
-                        [SECOND_LIFE] 출시 정보를 보시겠습니까?.
+                        [SECOND_LIFE] 출시 정보를 보시겠습니까?
                 </message>
+                <ignore name="ignore">
+                        출시 정보를 보려고 웹 브�우저를 시작할 때
+                </ignore>
                 <option name="Gotopage">
                         페�지로 ��
                 </option>
@@ -2812,13 +2945,16 @@ www.secondlife.com으로 �아가 새로 계정� 만드시겠습니까?
         </alert>
         <alert name="ReturnToOwner">
                 <message name="message">
-                        정� � 토지 구�내� 있는 선��
-사물� 해당 소유��게 반환하시겠습니까? 양� 가능한 양��
-사물들� �� �전 소유��게 반환�니다.
-(반환�는 �체� 사물� ��� 최종 소재 ��로 반환�니다.)
+                        선�한 오브�트를 소유주�게
+반환 하시겠습니까? 양��
+양� 가능 오브�트가 �전 소유��게 반환�니다.
+(반환�는 모든 오브�트는 최종 소� ��로 반환�니다.)
  
-*경고* 양�� 비양�성 사물� 삭제�니다!
+*경고* 양�� 양� 불가능 오브�트는 삭제�니다.
                 </message>
+                <ignore name="ignore">
+                        오브�트를 � 소유주�게 반환할 때
+                </ignore>
                 <option name="Return">
                         반환
                 </option>
@@ -2828,8 +2964,11 @@ www.secondlife.com으로 �아가 새로 계정� 만드시겠습니까?
         </alert>
         <alert name="ViewReleaseNotes">
                 <message name="message">
-                        Second Life 출시 정보를 보시겠습니까?
+                        세컨드��프 출시 정보를 보시겠습니까?
                 </message>
+                <ignore name="ignore">
+                        출시 정보를 볼 때
+                </ignore>
                 <option name="Gotopage">
                         페�지로 ��
                 </option>
@@ -2839,11 +2978,11 @@ www.secondlife.com으로 �아가 새로 계정� 만드시겠습니까?
         </alert>
         <alert name="GroupLeaveConfirmOfficer">
                 <message name="message">
-                        귀하는 현재 그룹 [그룹명]� 간부입니다.
-그룹� 탈퇴하시겠습니까?
+                        귀하께서는 현재 그룹 [GROUP]� 운�진입니다.
+그룹�서 탈퇴하시겠습니까?
                 </message>
                 <option name="Leave">
-                        떠나기
+                        탈퇴
                 </option>
                 <option name="Cancel">
                         취소
@@ -2851,11 +2990,11 @@ www.secondlife.com으로 �아가 새로 계정� 만드시겠습니까?
         </alert>
         <alert name="GroupLeaveConfirmMember">
                 <message name="message">
-                        귀하는 현재 그룹 [그룹명]� 멤버입니다.
-그룹� 탈퇴하시겠습니까?
+                        귀하께서는 현재 그룹 [GROUP]� 회�입니다.
+그룹�서 탈퇴하시겠습니까?
                 </message>
                 <option name="Leave">
-                        떠나기
+                        탈퇴
                 </option>
                 <option name="Cancel">
                         취소
@@ -2863,24 +3002,30 @@ www.secondlife.com으로 �아가 새로 계정� 만드시겠습니까?
         </alert>
         <alert name="ConfirmKick">
                 <message name="message">
-                        정� 사용�들� 모� 그리드�서 쫓아내시겠습니까?
+                        모든 사용�를 그리드 밖으로 내보내겠습니까?
                 </message>
+                <option name="Kick">
+                        추방하기
+                </option>
+                <option name="Cancel">
+                        취소
+                </option>
         </alert>
         <alert name="MuteLinden">
                 <message name="message">
-                        죄송합니다. 린든� �소거하실 수 없습니다.
+                        죄송합니다. Linden� �소거할 수 없습니다.
                 </message>
                 <option name="OK">
                         확�
                 </option>
         </alert>
-        <alert name="MuteByName" title="�름별 아�템 �소거">
+        <alert name="MuteByName" title="차단할 오브�트">
                 <message name="message">
-                        �름별 �소거는 사물 채팅과 IM�만 �향� 주며 사운드�는 �향� 주지 않습니다. 
-아�템� �름� 정확하게 입력해야 합니다.
+                        �름별 차단� 오브�트 채팅과 메신저�만 �향� 주며 �소거는 하지 않습니다. 
+오브�트� �름� 정확하게 입력해야 합니다.
                 </message>
                 <editline>
-                        아�템 �름
+                        오브�트 �름
                 </editline>
                 <option name="OK">
                         확�
@@ -2889,9 +3034,9 @@ www.secondlife.com으로 �아가 새로 계정� 만드시겠습니까?
                         취소
                 </option>
         </alert>
-        <alert name="MuteByNameFailed" title="�름별 아�템 �소거 실패">
+        <alert name="MuteByNameFailed" title="오브�트 차단 실패">
                 <message name="message">
-                        � 게임� �미 �소거�었습니다.
+                        � �름� �미 �소거했습니다.
                 </message>
                 <option name="OK">
                         확�
@@ -2899,8 +3044,8 @@ www.secondlife.com으로 �아가 새로 계정� 만드시겠습니까?
         </alert>
         <alert name="RemoveItemWarn">
                 <message name="message">
-                        허용�긴 했으나, 저장물� 삭제할 경우
-사물� ��� 수 있습니다. 저장물� 삭제하시겠습니까?
+                        허용� 경우 �벤토리를 삭제하면 오브�트가 ��� 수
+있습니다. 아�템� 삭제하시겠습니까?
                 </message>
                 <option name="Yes">
                         예
@@ -2911,7 +3056,7 @@ www.secondlife.com으로 �아가 새로 계정� 만드시겠습니까?
         </alert>
         <alert name="CantRateOwnedByGroup">
                 <message name="message">
-                        � 사물� 소유�를 �가할 수 없습니다. 사물� 소유�가 그룹입니다.
+                        � 오브�트� 소유주를 �가할 수 없습니다. 오브�트가 그룹 소유입니다.
                 </message>
                 <option name="OK">
                         확�
@@ -2919,7 +3064,7 @@ www.secondlife.com으로 �아가 새로 계정� 만드시겠습니까?
         </alert>
         <alert name="CantOfferCallingCard">
                 <message name="message">
-                        현재 전화 카드를 제공할 수 없습니다. 잠시 후 다시 시�해 주십시오.
+                        지금� 프로필� 제공할 수 없습니다. 잠시 후� 다시 시�해 주십시오.
                 </message>
                 <option name="OK">
                         확�
@@ -2927,7 +3072,7 @@ www.secondlife.com으로 �아가 새로 계정� 만드시겠습니까?
         </alert>
         <alert name="CantOfferFriendship">
                 <message name="message">
-                        현재 우정� 제공할 수 없습니다. 잠시 후 다시 시�해 주십시오.
+                        지금� 우정� 제공할 수 없습니다. 잠시 후� 다시 시�해 주십시오.
                 </message>
                 <option name="OK">
                         확�
@@ -2935,8 +3080,8 @@ www.secondlife.com으로 �아가 새로 계정� 만드시겠습니까?
         </alert>
         <alert name="CantSetHome">
                 <message name="message">
-                        �곳� 집으로 설정할 수 없습니다.
-집� 귀하 본� �는 귀하 소� 그룹� 소유 토지�� 위치해야 합니다.
+                        � 곳� 홈으로 설정할 수 없습니다.
+홈� 귀하나 귀하� 그룹� 소유한 토지� 있어야 합니다.
                 </message>
                 <option name="OK">
                         확�
@@ -2944,18 +3089,20 @@ www.secondlife.com으로 �아가 새로 계정� 만드시겠습니까?
         </alert>
         <alert name="BusyModeSet">
                 <message name="message">
-                        다른 용무 중 모드 설정
-채팅 � 메신저를 숨�니다. 메신저
-메시지는 다른 용무 중 �답� 받게�니다. 모든 텔리�트
-� 저장고 제안� 거절�니다.
+                        다른 용무 중 모드가 설정�었습니다.
+채팅 � 메신저가 숨겨집니다. 메신저를
+받으면 귀하� 다른 용무 중 �답� 답변 �니다. 모든 텔리�트 � 아�템 제공� 거부�니다.
                 </message>
+                <ignore name="ignore">
+                        부재중 모드를 설정할 때
+                </ignore>
                 <option name="OK">
                         확�
                 </option>
         </alert>
         <alert name="NoPVPDetected">
                 <message name="message">
-                        플레�어대 플레�어(PvP) 악용� �지�지 않았습니다
+                        player vs. player (PvP) 악용� �지�지 않�
                 </message>
                 <option name="OK">
                         확�
@@ -2963,8 +3110,8 @@ www.secondlife.com으로 �아가 새로 계정� 만드시겠습니까?
         </alert>
         <alert name="NotecardAttachPermFail">
                 <message name="message">
-                        노트카드�는 제한� 없는 &apos;다� 소유주&apos; 권한� 갖는
-아�템만 첨부� 수 있습니다.
+                        제한� 없는 ‘다� 소유�’ 권한 내� 한 아�템만� 
+ 노트카드� 첨부� 수 있습니다.
                 </message>
                 <option name="OK">
                         확�
@@ -2972,44 +3119,52 @@ www.secondlife.com으로 �아가 새로 계정� 만드시겠습니까?
         </alert>
         <alert name="JoinedTooManyGroupsMember">
                 <message name="message">
-                        �미 너무 많� 그룹� 가입하였기 때문� � ��
-그룹� 가입할 수 없습니다. � 그룹� 가입하기 전� 최소 1개 그룹�
-탈퇴하거나 � 제안� 거절하셔야 합니다.
+                        귀하께서는 너무 많� 그룹�
+중복해서 가입�어 있습니다. � 그룹� 가입하기 전� 최소
+하나 ��� 그룹�서 탈퇴하거나 � 그룹 가입 제공� 취소 하십시오.
 그룹�서 탈퇴하려면 &apos;편집&apos; 메뉴�서
-&apos;내 그룹...&apos; 옵션� 선�하십시오.
-[�름](�)가 귀하를 멤버로 가입 초청했습니다.
-[초청]
+&apos;내 그룹&apos; 옵션� 선�하십시오.
+[NAME]�(가) 귀하가 회�으로 그룹� 참여하�� 초대했습니다.
+[INVITE]
                 </message>
                 <option name="Join">
-                        참여
+                        가입
                 </option>
                 <option name="Decline">
-                        ê±°ì ˆ
+                        거부
                 </option>
         </alert>
         <alert name="JoinedTooManyGroupsOfficer">
                 <message name="message">
-                        �미 너무 많� 그룹� 가입하였기 때문� � ��
-그룹� 가입할 수 없습니다. � 그룹� 가입하기 전� 최소 1개 그룹�
-탈퇴하거나 � 제안� 거절하셔야 합니다.
+                        귀하께서는 너무 많� 그룹�
+중복해서 가입�어 있습니다. � 그룹� 가입하기 전� 최소
+하나 ��� 그룹�서 탈퇴하거나 � 그룹 가입 제공� 취소 하십시오.
 그룹�서 탈퇴하려면 &apos;편집&apos; 메뉴�서
-&apos;내 그룹...&apos; 옵션� 선�하십시오.
-[�름](�)가 귀하를 멤버로 가입 초청했습니다.
-[초청]
+&apos;내 그룹&apos; 옵션� 선�하십시오.
+[NAME]�(가) 귀하가 운�진으로서 그룹� 참여하�� 초대했습니다.
+[INVITE]
                 </message>
                 <option name="Join">
-                        참여
+                        가입
                 </option>
                 <option name="Decline">
-                        ê±°ì ˆ
+                        거부
+                </option>
+        </alert>
+        <alert name="HandleRateOwner">
+                <message name="message">
+                        � 오브�트� 소유주를 �가할 수 없습니다. 오브�트가 그룹 소유입니다.
+                </message>
+                <option name="OK">
+                        확�
                 </option>
         </alert>
         <alert name="KickUser">
                 <message name="message">
-                        � 사용�를 어떤 메시지로 쫓아내시겠습니까?
+                        어떤 메시지로 � 사용�를 추방합니까?
                 </message>
                 <editline>
-                        관리�가 대신 로그 아웃하였습니다.
+                        관리�� �해 로그오프�었습니다.
                 </editline>
                 <option name="OK">
                         확�
@@ -3020,10 +3175,10 @@ www.secondlife.com으로 �아가 새로 계정� 만드시겠습니까?
         </alert>
         <alert name="KickAllUsers">
                 <message name="message">
-                        현재 그리드�� 있는 모든 사람� 어떤 메시지로 쫓아내시겠습니까?
+                        그리드� 지금 메시지가 있는 모든 사람들� 추방합니까?
                 </message>
                 <editline>
-                        관리�가 대신 로그 아웃하였습니다.
+                        관리�� �해 로그오프�었습니다.
                 </editline>
                 <option name="OK">
                         확�
@@ -3034,10 +3189,10 @@ www.secondlife.com으로 �아가 새로 계정� 만드시겠습니까?
         </alert>
         <alert name="FreezeUser">
                 <message name="message">
-                        � 사용�를 어떤 메시지로 �결하시겠습니까?
+                        어떤 메시지로 � 사용�를 �결 시킵니까?
                 </message>
                 <editline>
-                        �결 �태가 �었습니다. 움��거나 채팅하실 수 없습니다. 관리�가 메신저를 통해 연�드릴 것입니다.
+                        귀하는 정지� �태�므로 ��하거나 대화를 나눌 수 없습니다. 관리�가 메신저를 통해 연�� 취할 것입니다.
                 </editline>
                 <option name="OK">
                         확�
@@ -3048,10 +3203,10 @@ www.secondlife.com으로 �아가 새로 계정� 만드시겠습니까?
         </alert>
         <alert name="UnFreezeUser">
                 <message name="message">
-                        � 사용�를 어떤 메시지로 �결 해제하시겠습니까?
+                        어떤 메시지를 사용하여 � 사용�� �결 �태를 해제하시겠습니까?
                 </message>
                 <editline>
-                        �결 �태가 해제�었습니다.
+                        � �� 정지 모드� 있지 않습니다.
                 </editline>
                 <option name="OK">
                         확�
@@ -3062,7 +3217,7 @@ www.secondlife.com으로 �아가 새로 계정� 만드시겠습니까?
         </alert>
         <alert name="ExpungeUser">
                 <message name="message">
-                        축출하고� 하는 사용�� ��전트 ID를 입력하십시오.
+                        삭제할 사용�� ��전트 ID를 입력하십시오.
                 </message>
                 <option name="OK">
                         확�
@@ -3073,10 +3228,10 @@ www.secondlife.com으로 �아가 새로 계정� 만드시겠습니까?
         </alert>
         <alert name="OfferTeleport">
                 <message name="message">
-                        다� 메시지와 함께 귀하� 위치로 텔리�트를 제공하시겠습니까?
+                        다� 메시지가 있는 내 위치로 텔레�팅� 제공합니까?
                 </message>
                 <editline>
-                        [지역명]� 들어가겠습니다
+                        [REGION]� 가입하기
                 </editline>
                 <option name="OK">
                         확�
@@ -3087,10 +3242,10 @@ www.secondlife.com으로 �아가 새로 계정� 만드시겠습니까?
         </alert>
         <alert name="OfferTeleportFromGod">
                 <message name="message">
-                        사용�를 귀하� 위치로 소환하시겠습니까?
+                        사용�를 귀하� 위치로 불러옵니까?
                 </message>
                 <editline>
-                        [지역명]� 들어가겠습니다
+                        [REGION]� 가입하기
                 </editline>
                 <option name="OK">
                         확�
@@ -3099,11 +3254,10 @@ www.secondlife.com으로 �아가 새로 계정� 만드시겠습니까?
                         취소
                 </option>
         </alert>
-        <alert name="MessageEstate"
-             title="귀하� 소유지내� 모든 사람�게 전달">
+        <alert name="MessageEstate" title="내 사유지내� 모든 사람�게 전달">
                 <message name="message">
-                        현재 소유지내� 있는 모든 사람�게 보낼
-짧� 전달문� 입력하십시오.
+                        사유지 내� 모든 사람들�게 전달할
+간략한 공지를 입력합니다.
                 </message>
                 <option name="OK">
                         확�
@@ -3112,177 +3266,177 @@ www.secondlife.com으로 �아가 새로 계정� 만드시겠습니까?
                         취소
                 </option>
         </alert>
-        <alert name="ChangeLindenEstate" title="린든 소유지 변경">
+        <alert name="ChangeLindenEstate" title="린든 사유지 변경">
                 <message name="message">
-                        귀하는 지금 린든 소유 소유지(본토, 틴 그리드, 오리엔테�션 등)를 
+                        귀하께서는 린든 소유� 사유지(메�랜드, 틴 그리드, 오리엔테�션 등)를 
 변경하려고 합니다. 
  
-사용� 경험� 근본�� �향� 미칠 수 있기 때문� �는
-극히 위험한 행�입니다.  본토�서는 수천개� 지역� 변경� 것�며 
-스페�스서버� 히컵(hiccup)� 발�할 것입니다.
+�렇게 하면 기본�으로 사용�가 게임� �기는 � �향� 
+줄 수 있으므로 매우 위험합니다.  �한 메�랜드�서 수천가지� 지역� 변경�고 
+공간 서버가 �시�으로 중단� 수� 있습니다.
  
-실행하시겠습니까?
+계�하시겠습니까?
                 </message>
                 <option name="ChangeEstate">
-                        소유지 변경
+                        사유지 변경
                 </option>
                 <option name="Cancel">
                         취소
                 </option>
         </alert>
-        <alert name="ChangeLindenAccess" title="린든 소유지 액세스 변경">
+        <alert name="ChangeLindenAccess" title="린든 사유지 액세스 변경">
                 <message name="message">
-                        귀하는 지금 린든 소유 소유지(본토, 틴 그리드, 오리엔테�션 등)� 대한 
-액세스 목�� 변경하려고 합니다. 
+                        귀하께서는 린든 소유� 사유지(메�랜드, 틴 그리드, 오리엔테�션 등)� 대한 
+접근 목�� 변경하려고 합니다. 
  
-�는 위험한 행��며 사물/�� 그리드 안/밖으로 전송��� 
-핵� 호출할 경우�만
-사용해야 합니다.
+�는 위험한 작업�며 오브�트/금액� 그리드�서 송수신할 수 있�� 
+핵� 불러내는 경우�만 수행할 수 
+있습니다. 
  
-수천개� 지역� 변경�고, 스페�스서버�
-히컵(hiccup)� 발�할 것입니다. 
+�렇게 하면 수천가지� 지역� 변경�고 
+공간 서버가 �시�으로 중단� 수� 있습니다. 
  
-실행하시겠습니까?
+계�하시겠습니까?
                 </message>
                 <option name="ChangeEstate">
-                        소유지 변경
+                        사유지 변경
                 </option>
                 <option name="Cancel">
                         취소
                 </option>
         </alert>
-        <alert name="EstateAllowedAgentAdd" title="소유지 선�">
+        <alert name="EstateAllowedAgentAdd" title="사유지 선�">
                 <message name="message">
-                        [ALL_ESTATES]� 대해, 아니면 � 소유지� 대해서만 허용 목�� 추가하시겠습니까 ?
+                        � 사유지� 대해서만 �는 [ALL_ESTATES]� 대해 허용� 목�� 추가하시겠습니까?
                 </message>
                 <option name="ThisEstate">
-                        � 소유지
+                        사유지
                 </option>
                 <option name="AllEstates">
-                        전체 소유지
+                        모든 사유지
                 </option>
                 <option name="Cancel">
                         취소
                 </option>
         </alert>
-        <alert name="EstateAllowedAgentRemove" title="소유지 선�">
+        <alert name="EstateAllowedAgentRemove" title="사유지 선�">
                 <message name="message">
-                        [ALL_ESTATES]� 대해, 아니면 � 소유지만 허용 목��서 삭제하시겠습니까 ?
+                        � 사유지만 �는 [ALL_ESTATES]사유지 관리�를 제거합니까?
                 </message>
                 <option name="ThisEstate">
-                        � 소유지
+                        사유지
                 </option>
                 <option name="AllEstates">
-                        전체 소유지
+                        모든 사유지
                 </option>
                 <option name="Cancel">
                         취소
                 </option>
         </alert>
-        <alert name="EstateAllowedGroupAdd" title="소유지 선�">
+        <alert name="EstateAllowedGroupAdd" title="사유지 선�">
                 <message name="message">
-                        [ALL_ESTATES]� 대해, 아니면 � 소유지� 대해서만 그룹 허용 목�� 추가하시겠습니까?
+                        � 사유지� 대해서만 �는 [ALL_ESTATES]� 대해 그룹� 허용한 목�� 추가하시겠습니까?
                 </message>
                 <option name="ThisEstate">
-                        � 소유지
+                        사유지
                 </option>
                 <option name="AllEstates">
-                        전체 소유지
+                        모든 사유지
                 </option>
                 <option name="Cancel">
                         취소
                 </option>
         </alert>
-        <alert name="EstateAllowedGroupRemove" title="소유지 선�">
+        <alert name="EstateAllowedGroupRemove" title="사유지 선�">
                 <message name="message">
-                        [ALL_ESTATES]� 대해, 아니면 � 소유지만 그룹 허용 목��서 삭제하시겠습니까 ?
+                        � 사유지만 �는 [ALL_ESTATES]사유지를 위한 그룹 허용 리스트로 부터 제거합니까?
                 </message>
                 <option name="ThisEstate">
-                        � 소유지
+                        사유지
                 </option>
                 <option name="AllEstates">
-                        전체 소유지
+                        모든 사유지
                 </option>
                 <option name="Cancel">
                         취소
                 </option>
         </alert>
-        <alert name="EstateBannedAgentAdd" title="소유지 선�">
+        <alert name="EstateBannedAgentAdd" title="사유지 선�">
                 <message name="message">
-                        [ALL_ESTATES]� 대해, 아니면 � 소유지� 대해서만 액세스를 거부하시겠습니까?
+                        � 사유지� 대해서만 �는 [ALL_ESTATES]� 대해 출입� 거부 하시겠습니까?
                 </message>
                 <option name="ThisEstate">
-                        � 소유지
+                        사유지
                 </option>
                 <option name="AllEstates">
-                        전체 소유지
+                        모든 사유지
                 </option>
                 <option name="Cancel">
                         취소
                 </option>
         </alert>
-        <alert name="EstateBannedAgentRemove" title="소유지 선�">
+        <alert name="EstateBannedAgentRemove" title="사유지 선�">
                 <message name="message">
-                        [ALL_ESTATES]� 대해, 아니면 � 소유지� 대해서만 액세스 거부를 종료하시겠습니까?
+                        � 소유지� 대해서만 �는 [ALL_ESTATES]� 대한 접근 거부를 중단하시겠습니까?
                 </message>
                 <option name="ThisEstate">
-                        � 소유지
+                        사유지
                 </option>
                 <option name="AllEstates">
-                        전체 소유지
+                        모든 사유지
                 </option>
                 <option name="Cancel">
                         취소
                 </option>
         </alert>
-        <alert name="EstateManagerAdd" title="소유지 선�">
+        <alert name="EstateManagerAdd" title="사유지 선�">
                 <message name="message">
-                        전체 소유지� 대해, 아니면 � 소유지� 대해서만 소유지 관리�를 추가하시겠습니까?
+                        � 사유지� 대해서만 �는 모든 사유지� 대해 사유지 관리�를 추가하시겠습니까?
                 </message>
                 <option name="ThisEstate">
-                        � 소유지
+                        사유지
                 </option>
                 <option name="AllEstates">
-                        전체 소유지
+                        모든 사유지
                 </option>
                 <option name="Cancel">
                         취소
                 </option>
         </alert>
-        <alert name="EstateManagerRemove" title="소유지 선�">
+        <alert name="EstateManagerRemove" title="사유지 선�">
                 <message name="message">
-                        전체 소유지� 대해, 아니면 � 소유지� 대해서만 소유지 관리�를 삭제하시겠습니까?
+                        � 사유지만 �는 내 모든 사유지 관리�를 제거합니까?
                 </message>
                 <option name="ThisEstate">
-                        � 소유지
+                        사유지
                 </option>
                 <option name="AllEstates">
-                        전체 소유지
+                        모든 사유지
                 </option>
                 <option name="Cancel">
                         취소
                 </option>
         </alert>
-        <alert name="EstateCovenantChange" title="소유지 선�">
+        <alert name="EstateCovenantChange" title="사유지 선�">
                 <message name="message">
-                        [ALL_ESTATES]� 대해, 아니면 � 소유지� 대해서만 계약 조항 메시지를 변경하시겠습니까?&quot;
+                        � 사유지� 대해서만 �는 [ALL_ESTATES]� 대해 시행 규칙 내용� 변경 하시겠습니까?
                 </message>
                 <option name="ThisEstate">
-                        � 소유지
+                        사유지
                 </option>
                 <option name="AllEstates">
-                        전체 소유지
+                        모든 사유지
                 </option>
                 <option name="Cancel">
                         취소
                 </option>
         </alert>
-        <alert name="EstateKickUser" title="쫓아내기 확�">
+        <alert name="EstateKickUser" title="추방하기 확�">
                 <message name="message">
-                        [EVIL_USER](�)를 본 소유지�서 쫓아내시겠습니까?
+                        [EVIL_USER](�)를 추방합니까?
                 </message>
                 <option name="Kick">
-                        쫓아내기
+                        추방하기
                 </option>
                 <option name="Cancel">
                         취소
@@ -3290,7 +3444,7 @@ www.secondlife.com으로 �아가 새로 계정� 만드시겠습니까?
         </alert>
         <alert name="EstateChangeCovenant">
                 <message name="message">
-                        소유지 계약 조항� 변경하시겠습니까?
+                        사유지 계약 조항� 변경하시겠습니까?
                 </message>
                 <option name="Change">
                         변경
@@ -3301,7 +3455,7 @@ www.secondlife.com으로 �아가 새로 계정� 만드시겠습니까?
         </alert>
         <alert name="ProblemImportingEstateCovenant">
                 <message name="message">
-                        소유지 계약 조항 호출� 문제가 발�했습니다.
+                        사유지 계약 조항 호출� 문제가 발�했습니다.
                 </message>
                 <option name="OK">
                         확�
@@ -3309,7 +3463,7 @@ www.secondlife.com으로 �아가 새로 계정� 만드시겠습니까?
         </alert>
         <alert name="UnableToLoadNotecard">
                 <message name="message">
-                        노트카드 제공� 로딩� 실패했습니다.
+                        참고카드 �산� 로드할 수 없습니다.
                 </message>
                 <option name="OK">
                         확�
@@ -3317,7 +3471,7 @@ www.secondlife.com으로 �아가 새로 계정� 만드시겠습니까?
         </alert>
         <alert name="NotAllowedToViewNotecard">
                 <message name="message">
-                        요청한 �산 ID와 관련� 노트카드를 볼 수 있는 권한� 없습니다.
+                        요청한 �산 ID와 관련� 노트카드를 볼 수 있는 권한� 부족합니다.
                 </message>
                 <option name="OK">
                         확�
@@ -3333,12 +3487,12 @@ www.secondlife.com으로 �아가 새로 계정� 만드시겠습니까?
         </alert>
         <alert name="PublishClassified">
                 <message name="message">
-                        잊지 마십시오: 광고 수수료는 환불� �지 않습니다.
+                        잊지 � 것: 광고 수수료는 환불 �지 않�.
  
-L$[AMOUNT]�(를) 지불하고 광고를 게재 하시겠습니까?
+광고를 L$[AMOUNT] 지금 게재 하시겠습니까?
                 </message>
                 <option name="Publish">
-                        게시
+                        게시하기
                 </option>
                 <option name="Cancel">
                         취소
@@ -3346,7 +3500,7 @@ L$[AMOUNT]�(를) 지불하고 광고를 게재 하시겠습니까?
         </alert>
         <alert name="ConfirmRestart" title="재시작 확�">
                 <message name="message">
-                        정� 2분 후� � 지역� 재시작하시겠습니까?
+                        2분 후 � 지역� 재시작 하시겠습니까?
                 </message>
                 <option name="Restart">
                         재시작
@@ -3357,8 +3511,8 @@ L$[AMOUNT]�(를) 지불하고 광고를 게재 하시겠습니까?
         </alert>
         <alert name="MessageRegion" title="� 지역� 모든 사람�게 전달">
                 <message name="message">
-                        현재 � 지역내� 있는 모든 사람�게 보낼
-짧� 전달문� 입력하십시오.
+                        � 지역 내� 모든 사람들�게 전달할
+간략한 공지를 입력합니다.
                 </message>
                 <option name="OK">
                         확�
@@ -3367,59 +3521,64 @@ L$[AMOUNT]�(를) 지불하고 광고를 게재 하시겠습니까?
                         취소
                 </option>
         </alert>
-        <alert name="HelpRegionBlockTerraform" title="테�� 금지">
+        <alert name="HelpRegionBlockTerraform" title="지형 변경 금지">
                 <message name="message">
-                        � ��� 체� 표시가 �어있는 경우, 토지 소유주들� � 구�� &apos;지형 편집&apos; 설정� 관계 없� �신� 토지를 테��할 수 없게 �니다.
+                        체�가 �었� 경우, 토지 소유주들� � 구�� &apos;지형 편집&apos; 설정� 관계 없� �신� 토지를 테��할 수 없습니다.
  
 기본 설정: 꺼�
                 </message>
         </alert>
         <alert name="HelpRegionBlockFly" title="비행 금지">
                 <message name="message">
-                        � ��� 체� 표시가 �어있는 경우, 구�별 &apos;비행&apos;
-설정� 관계 없� � 지역으로 비행할 수 없습니다.
+                        체�가 �었� 경우, 주민들� 구� 당 ‘비행’ 설정� 관계없� � 지역�서 비행할 수 없습니다.
  
 기본 설정: 꺼�
                 </message>
         </alert>
-        <alert name="HelpRegionAllowDamage" title="�해 �수">
+        <alert name="HelpRegionAllowDamage" title="�미지 허용">
                 <message name="message">
-                        � ��를 체� 표시할 경우, 개별 구� 설정� 관계 없�
-전체 구�� 대해 안정 시스템� 활성화합니다. � ��� 체� 표시를 하지 않� 경우
-� 구� 소유�들� �� 소유 구�� 대해
-개별�으로 안정 시스템� 활성화할 수 있습니다.
+                        � ��를 선�하면 개별 구� 설정과 관계없� 모든 구��
+보건 시스템� 활성화 �니다. � ��가 선� 해제�
+경우�는 개별 구� 소유주가 �신� 구� 보건 시스템� 
+활성화할 수 있습니다.
  
 기본 설정: 꺼�
                 </message>
         </alert>
         <alert name="HelpRegionAgentLimit" title="��전트 제한">
                 <message name="message">
-                        � 지역내� 허용�는 아바타� 최대 숫�를 설정합니다.
-한 지역내� 아바타� 숫�가 많� 수� 성능�
-�소� 수 있습니다.
+                        � 지역� 허용�는 최대 아바타 수를 설정합니다.
+한 지역� 아바타 수가 많�수� 
+성능� 저하�다는 �� 유�하십시오.
  
 기본 설정: 30
                 </message>
         </alert>
-        <alert name="HelpRegionObjectBonus" title="사물 보너스">
+        <alert name="HelpRegionObjectBonus" title="오브�트 보너스">
                 <message name="message">
-                        아�템 보너스는 주어진 구�� 허�� 초기세팅� 따� �가 합니다. 허�� 범위는 1부터 10 까지�며, 1� 512m2 구�당 117개� 아�템� 허� 하며 2는 512m2 구�당 234개� 아�템� 허�합니다.
- 지역당 허용�는 최고 숫�� 아�템� 아�템 보너스� 숫치� �관없� 15,000개로 한정 �니다. 한번 � 셋팅� �루어지면 현제 구�� 있는 아�템들� 반환하거나 삭제하기 전까지 낮춰 지지 않습니다. 
-
-기본설정: 1.0
+                        오브�트 보너스는 특정 구�� 허�� 프림� 대해 배로
+�가합니다. 허용 범위는 1�서 10입니다. &apos;1&apos;로 설정했� 때 � 512m2 구��
+허용�는 오브�트는 117개입니다. &apos;2&apos;로 설정하면 � 512m2 구�� 허용�는
+오브�트가 � 배� 234개로 �니다. 지역당 허용�는
+오브�트� 최대 개수는 오브�트 보너스� 대해 설정� 값과 �관없�
+15,000개입니다. � 값� 설정한 후�는, 값 변경으로 �해
+현재 구� 내� 오브�트가 반환�거나 삭제� 것� 확실하기 전까지는
+� 값� 낮추면 안�니다.
+ 
+기본 설정: 1.0
                 </message>
         </alert>
-        <alert name="HelpRegionMaturity" title="만기�">
+        <alert name="HelpRegionMaturity" title="성�용">
                 <message name="message">
-                        화면� 우측 �단 코너 � 지�� �업 �� 표시� 대로
-지역� 성�용 여부를 설정합니다.  �한, 성�용 설정�
-검색 결과�� �향� 미칩니다. 주민들� 성�용 지역 내용�
-검색 대��서 제외하�� 선�할 수 있습니다.
+                        화면 우측 �단 코너와 지�� �업 �� 표시� 대로
+성�용 지역� 설정합니다.  성�용�
+검색 결과� �향� 줄 수 있으며 주민들� 성�용 지역� 컨�츠를 찾지 못하��
+선�할 수 있습니다.
  
-시스템� 지� 정보를 주기�으로 업��트하기 때문�
-지��� �업 �� 5분간 변경�지 않습니다. 
+시스템� 주기�으로 지� 정보만 업��트하기 때문� 
+지�� �업 �� 5분 �안 변경�지 않습니다. 
  
-기본 설정: PG(보호� 지� 필요)
+기본 설정: PG
                 </message>
         </alert>
         <alert name="HelpRegionRestrictPushObject" title="밀기 한정">
@@ -3435,189 +3594,199 @@ L$[AMOUNT]�(를) 지불하고 광고를 게재 하시겠습니까?
         </alert>
         <alert name="HelpParcelChanges" title="구� 결합/세분">
                 <message name="message">
-                        토지 소유주가 소유하지 않� 구�� 대해 
-결합�거나 세분� 수 있는지를 설정합니다. 
-� 옵션� 체��지 않았� 경우:
- * 소유주 �는 매니저만 구�� 결합하거나 세분할 수 있습니다. 
- * �들� 소유주나 그룹� 소유하는 구�만 결합하거나 세분할 수 있으며, 
-       �절한 그룹 능력� 가지고 있습니다.
-� 옵션� 체�� 경우:
- * 모든 구� 소유주는 �신� 소유한 구�� 결합 �는 세분할 수 있습니다. 
- * 그룹� 소유한 구�� 경우 �절한 그룹 능력� 있는 것만
-       구�� 결합하거나 세분할 수 있습니다.
+                        사유지 소유�� 소유가 아닌 구�� 결합하거나 세분할 수 있는지
+여부를 설정합니다. 
+� 옵션� 선��지 않� 경우:
+ * 사유지 소유주 �는 관리�만� 구�� 결합하거나 세분할 수 있습니다. 
+ * �들� 소유주가 가진 구� �는 그룹 소유� 구�� 경우 �절한 
+       그룹 권한� 있는 경우�만 결합하거나 세분할 수 있습니다.
+� 옵션� 선�� 경우:
+ * 모든 구� 소유주는 �신� 소유한 구�� 결합하거나 세분할 수 있습니다. 
+ * 그룹 소유� 구�� 경우 �절한 그룹 권한� 있는 경우 구��
+       결합하거나 세분할 수 있습니다.
  
-기본 설정: 체��
+기본 설정: 선��
                 </message>
         </alert>
         <alert name="RegionMaturityChange" title="변경� 지역 만기�">
                 <message name="message">
-                        � 지역� 성�용 등급 설정� 업��트�었습니다. 
+                        � �역� 대한 성�용 등급� 업��트�었습니다. 
  
-하지만 시스템� 지� 정보를 정기�으로 업��트하기 때문�
-세계 지�는 약 5분 뒤� 업��트
-�니다.
+시스템� 주기�으로 지� 정보만 업��트하기 때문� 
+월드 지�를 업��트하려면 약 5분 정� 
+소요�니다.
                 </message>
         </alert>
         <alert name="HelpRegionLandResell" title="토지 재�매">
                 <message name="message">
-                        소유지 소유�와 관리�는 소유지 소유�가 소유하는 모든 토지를 �매할 수 있습니다. 
-� 옵션� 체� 표시를 지우면 구매�가 � 지역�서 토지를 재�매할 수 없습니다. 
-� 옵션� 체� 표시를 하면 구매�가 � 지역�서 토지를 재�매할 수 있습니다. 
+                        사유지 소유�와 관리�는 사유지 소유�가 가진 모든 토지를 �매할 수 있습니다. 
+� 옵션� 선� 해제�어 있으면 구매�가 � 지역�서 토지를 재�매할 수 없습니다. 
+� 옵션� 선��어 있으면 구매�가 � 지역�서 토지를 재�매할 수 있습니다. 
  
 기본 설정: 불허
                 </message>
         </alert>
-        <alert name="HelpEstateCovenantID" title="계약 조항 �산 ID">
+        <alert name="HelpEstateCovenantID" title="시행 규칙 �산 ID">
                 <message name="message">
-                        소유지 계약 조항� 대한 노트카드 �산 ID를 �
-소유지로 설정합니다. 
+                        사유지 계약 조항� 대한 참고카드 �산 ID를 � 사유지로
+설정합니다. 
  
 기본 설정: 00000000-0000-0000-0000-000000000000 �는 없�
                 </message>
         </alert>
         <alert name="HelpRegionDisableScripts" title="스�립트 �기">
                 <message name="message">
-                        Simulation 성능� 저조할 경우 스�립트� 문제가 있� 수 있습니다. 통계 표시줄(Ctrl-Shift-1)�서 Simulator Physics FPS를 확�해 보십시요, 만약 45보다 낮� 경우 통계 표시줄 하단� &apos;시간&apos; 윈�우를 여십시요. 만약 스�립트 시간� 25ms나 그 ��� 수치� 경우, &apos;탑 스�립&apos; 버튼� �릭 하십시요. 저조한 성능� 스�립트� �름과 위치가 주어질 것입니다. 
-
-&apos;스�립트 비활성&apos; � 체�하고 &apos;�용&apos;� 누르게 �면 �시�으로 본 지역�모든 스�립트들� 비활성 �태가 �니다. 모든 스�립트� 비활성 �태�서 &apos;탑 스�립트&apos;� 표시� 지역으로 �� 후 그곳 스�립트� 문제를 파악 할 수 있습니다. 
-�접 스�립트를 삭제하거나 반환 �는 스�립트� 소유��게 연�� 할 수 있습니다.  &apos;스�립트 비활성&apos; 체�를 해제하고 &apos;�용&apos;� 누르시면 다시 모든 스�립트를 활성화 시킬수 있습니다.
-
-기본설정: off
+                        시뮬레�션 성능� 저조할 경우 스�립트� 문제가 있� 수 있습니다. Ctrl-Shift-1�
+눌러 통계보기를 엽니다. Simulator Physics FPS를 확�하십시오.
+45 미만� 경우 통계보기 하단� 있는 &apos;시간&apos; 윈�우를 
+여십시오. 스�립트 시간� 25밀리초 ��� 경우�는 
+&apos;대용량 스�립트 보기&apos; 버튼� �릭하십시오. 성능� 저조한 ��� �는 스�립트� 
+�름과 위치가 표시�니다.
+ 
+&apos;스�립트 �기&apos; ��를 선�한 후 &apos;�용&apos; 버튼� 누르면 
+� 지역 내� 모든 스�립트가 �시�으로 비활성화�니다. 표시�는 
+&apos;대용량 스�립트&apos;� 위치로 ��하기 위해 � 작업� 수행해야 할 수� 
+있습니다. 해당 위치로 ��하면 스�립트를 검사하여 스�립트가 
+문제를 야기하는지 여부를 확�하십시오. 스�립트 
+소유��게 문�하거나 오브�트를 삭제 �는 반환할 수 있습니다. 
+&apos;스�립트 �기&apos; ��를 선� 해제한 후 &apos;�용&apos;� �릭하면 
+지역� 스�립트가 다시 활성화�니다.
+ 
+기본 설정: 꺼�
                 </message>
         </alert>
         <alert name="HelpRegionDisableCollisions" title="충� �기">
                 <message name="message">
-                        시뮬레�터� 성능� 떨어질 경우 물리� 사물� ��� 수 있습니다. 
-통계바(Ctrl-Shift-1)를 열고 시뮬레�터 물리 FPS를
-살펴봅니다.  45보다 낮으면, 통계바 밑� 있는 &apos;시간(Time)&apos; 패��
-엽니다. 시뮬레�터 시간(물리)� 
-20ms ���면 &apos;탑 컬��� 가져오기&apos; 버튼� �릭합니다. 
-성능 저하� ��� 수 있는 물리� 사물� 
-�름과 위치가 표시�니다.
- 
-&apos;충� �기&apos; ��� 체� 표시를 하고, &apos;�용&apos;� 
-누르면 �시�으로 � 지역내� 모든 사물대 사물 충�� 비활성화�니다. 표시� &apos;탑 컬���&apos;�
-위치로 ��하려면 �같� 비활성화가 필요할 수
-있습니다. �단 해당 위치� �착하면, 해당 사물�
-다른 사물들과 �임없� 충�하는지를 조사합니다. 해당 사물� 소유주�게
-연�하거나 해당 사물� 삭제 �는 반환해야 할 필요가 있� 수 있습니다. 
-&apos;충� �기&apos; ��� 체� 표시를 지우고 &apos;�용&apos;� 누르면
-해당 지역� 충�� 다시 활성화�니다.
+                        시뮬레�션 성능� 저조할 경우 물리 엔진� 문제가 있� 수 있습니다. 
+Ctrl-Shift-1� 눌러 통계보기를 엽니다. Simulator Physics FPS를 
+확�하십시오.  45 미만� 경우 통계보기 하단� 있는 &apos;시간&apos; 
+윈�우를 여십시오. 시뮬레�션 시간(물리)� 
+20밀리초 ��� 경우�는 &apos;대용량 콜��� 보기&apos; 버튼� �릭하십시오. 
+성능� 저조한 ��� �는 물리 엔진� �름과 
+위치가 표시�니다.
+ 
+&apos;충� �기&apos; ��를 선�한 후 &apos;�용&apos;버튼� 누르면 
+오브�트 간� 모든 충�� �시�으로 비활성화�니다. &apos;대용량 콜���&apos;� 
+위치로 ��하기 위해 � 작업� 수행해야 할 수� 
+있습니다. 해당 위치로 ��하면 오브�트를 검사하여 오브�트가 
+계��으로 다른 오브�트와 충�하는지 여부를 확�하십시오. 오브�트 
+소유주�게 문�하거나 오브�트를 삭제 �는 반환할 수 있습니다. 
+&apos;충� �기&apos; ��를 선� 해제한 후 &apos;�용&apos;� �릭하면 
+지역 내 충�� 다시 활성화�니다.
  
 기본 설정: 꺼�
                 </message>
         </alert>
-        <alert name="HelpRegionDisablePhysics" title="물리 �기">
+        <alert name="HelpRegionDisablePhysics" title="물리엔진 �기">
                 <message name="message">
-                        물리 �기는 충� �기와 유사합니다. 다만
-물리 시뮬레�션� 꺼진다는 �� 다릅니다.  �는 사물� 충�� 멈출 � 아니�
-아바타들� 움�� 수 없�� �미합니다. 
+                        물리엔진 �기는 물리엔진 시뮬레�션� 비활성 �다는 �� 
+제외하면 충� �기와 유사합니다.  다시 �해서, 오브�트가 충�� 
+중지시킬 �만 아니� 아바타� 움�� 수 없게 �니다. 
  
-� 옵션� 충� �기를 사용했� 경우 물리 문제 �는 
-&apos;탑 컬���&apos;를 조사하는� 필요한 충분한 성능�
-해당 지역� �려주지 못할 경우�만 사용하셔야 합니다.
+그러므로 물리엔진 �기는 충� �기 성능� 부족하여 
+해당 지역�서 물리 문제나 &apos;대용량 콜���&apos;를 조사할 수 
+없� 때�만 사용해야 합니다.
  
-필요한 �황� 종료�면 물리를 다시 켜�� 하십시오. 그렇지 않� 경우
-아바타들� 움��지 못하는 �태가 계��니다. 
+� 기능� 사용한 후�는 물리엔진� 다시 활성화 해야 합니다. 
+그렇지 않으면 아바타가 계�해서 움��지 않습니다. 
  
 기본 설정: 꺼�
                 </message>
         </alert>
-        <alert name="HelpRegionTopColliders" title="탑 컬���">
+        <alert name="HelpRegionTopColliders" title="대용량 콜���">
                 <message name="message">
-                        사물대 사물 충�� 가능 횟수가 가장 � 사물�
-목�� 표시합니다.  �같� 사물들�
-시뮬레�터 성능� 저하시킬 수 있습니다.  통계바 &gt;보기를 선�한 다�
-시뮬레�터&gt; 시간 &gt; 시뮬레�션 시간(물리) 항목�서
-물리� 20ms ��� 사용�고 있는지 확�하십시오.
+                        오브�트 간� 최고 수준� 충� 가능성� 경험하는 
+오브�트 목�� 표시합니다.  �러한 오브�트로 �해 
+Simulation 성능� �려질 수 있습니다.  물리�으로 20 ms �� 사용�었는지 여부를 확�하려면 
+&apos;보기 &gt; 통계보기&apos;를 선�하고 &apos;시뮬레�터 &gt; 
+시간 &gt; Simulation 시간(Physics)&apos;� 확�하십시오.
                 </message>
         </alert>
-        <alert name="HelpRegionTopScripts" title="탑 스�립트">
+        <alert name="HelpRegionTopScripts" title="대용량 스�립트">
                 <message name="message">
-                        LSL 스�립트 실행� 가장 많� 시간� 소요하고 있는
-사물� 목�� 표시합니다  �같� 사물들� 시뮬레�션 성능� 저하시킬 수 있습니다. 
-통계바 &gt;보기를 선�한 다�
-시뮬레�터&gt; 시간 &gt; 시뮬레�션 시간(물리) 항목�서
-스�립트� 25ms ��� 사용�고 있는지 확�하십시오.
+                        LSL 스�립트 실행� 가장 많� 시간� 소모하는 오브�트� 목�� 
+표시합니다.  �러한 오브�트는 Simulation 성능� 저하시킬 수 있습니다. 
+스�립트�서 25 ms �� 사용�었는지 여부를 확�하려면 
+&apos;보기 &gt; 통계보기&apos;를 선�하고 &apos;시뮬레�터 &gt; 
+시간 &gt; 스�립트 시간&apos;� 확�하십시오.
                 </message>
         </alert>
         <alert name="HelpRegionRestart" title="지역 재시작">
                 <message name="message">
-                        2분간� 경고 뒤� � 지역� 실행하는 서버 프로세스를
-재시작합니다.  � 지역� 전 주민� 연결�
-해제�니다.  지역 정보는 저장�고, 90초 �내� 다시
-정� 운�� 재개�니다. 
+                        잠시 기다린 후 � 지역� 실행하는 서버 처리를 재시작 합니다.지역� 모든 주민들� 
+ 연결 해제�니다.지역� 해당 지역 ��터를 저장하고 
+ 90 초 �내� �아 와야 합니다.
  
-지역 재시작� 대부분� 성능 문제를 해결하지 못하며
-보통 지시가 있� 경우�만 사용하셔야 합니다.
+지역� 재시작하면 대부분� 실행 
+ 문제들� 고칠 수 없고 지시 받는 경우�만 보통 �용� 수 있습니다.
                 </message>
         </alert>
         <alert name="HelpRegionWaterHeight" title="수면 높�">
                 <message name="message">
-                        물� 나타나는 장소를 미터 단위� 높�로 나타낸 것입니다. � 설정값� 
-20� 아닌 수�고, 세계� 가장�리� 근접한 곳� 
-물 �는 &apos;틈새&apos; 물� 있는 경우, 
-그곳�는 눈� �는 갭� 있습니다. 
+                        �것� 수면� 높�(m)를 나타냅니다. 
  
 기본 설정: 20
                 </message>
         </alert>
         <alert name="HelpRegionTerrainRaise" title="지형 높�기">
                 <message name="message">
-                        구� 소유주들� �신들� 지형�
-&apos;저장�&apos; 지형 기본 높� 위로 높� 수 있는
-거리입니다.
+                        �것� 저장� 지형� 기준 높� 
+��으로 지형� 낮출 수 있는 거리를 
+나타냅니다. 
  
 기본 설정: 4
                 </message>
         </alert>
         <alert name="HelpRegionTerrainLower" title="지형 낮추기">
                 <message name="message">
-                        구� 소유주들� �신들� 지형�
-&apos;저장�&apos; 지형 기본 높� 아래로 낮출 수 있는
-거리입니다.
+                        �것� 저장� 지형� 기준 높� 
+미만으로 지형� 낮출 수 있는 거리를 
+나타냅니다. 
  
 기본 설정: -4
                 </message>
         </alert>
         <alert name="HelpRegionUploadRaw" title="RAW 지형 업로드">
                 <message name="message">
-                        � 버튼� 본�� 현제 있는 지역� .RAW 파�� 업로드 합니다. 업로드 하고� 하는 파�� RGB컬러� 256X256� 13 체��여야 합니다. 지형 형성� 위한 파�� 만들기 위한 최선� 방법� 현존하는 RAW파�� 다운받는 방법�며 다운로드 받� 파��서 지형� 최고�� 해당�는 첫번째 체�� 수정해 업로드 하는 것입니다.
-
-업로드는 약 45초정�가 소요 �니다. 업로드하는 지형 파�� 토지�� 아�템들� 위치�는 �향� 없으며 단지 지형과 구�� 관련� �미션�만 �향� 있습니다. � 새로운 지형�용으로 고정� 아�템들� 위치는 지하� 위치� 수 있습니다. 
-
-지형 수정� 대해서 좀� �세한 사항� 다��서:
-http://secondlife.com/tiki/tiki-index.php?page=RawTerrainFile
+                        � 버튼� .RAW 파�� 귀하가 위치한 지역� 업로드합니다. 
+업로드하고� 하는 파�� 256X256 �기�, RGB 컬러�며, 
+13개� 채�� 갖추어야 합니다.  지형 파�� 작성할 때는 
+기존 RAW 파�� 다운로드하는 것� 가장 좋습니다.  먼저 
+첫 번째 채�(토지 높�)� 수정하여 
+업로드합니다. 
+ 
+업로드�는 최대 45초 정�가 소요�니다. 지형 파�� 
+업로드해� 토지� 있는 오브�트가 ��하지는 *않습니다*. 
+단지 지형 �체 � 구� 관련 권한만� 
+��합니다.  오브�트들� 지하로 ��할 수 있습니다. 
+ 
+지역 높� 필드 편집� 대한 �세한 내용� 
+http://secondlife.com/tiki/tiki-index.php?page=RawTerrainFile�서 참조하십시오.
                 </message>
         </alert>
-        <alert name="HelpRegionDownloadRaw" title="RAW 지형 다운로드.">
+        <alert name="HelpRegionDownloadRaw" title="RAW 지형 다운로드">
                 <message name="message">
-                        � 버튼� 누르시면 � 지역� 높� 항목 ��터, 구� �기,
-구� 매물 여부, �부 구� 권한 등� �함하는 파��
-다운로드�니다.
-
-                        
-
-                        
- RGB, 256x256, 13개 채�. � 지형 파�� 다른 방�으로는
+                        � 버튼� 사용하면 해당 지역� 대한 높� 필드 ��터, 구� �기, 
+�매용 구� �태, �부 구� 권한 등� �함� 파�� 다운로드할 
+수 있습니다. Photoshop과 같� 프로그램�서 파�� 열 때 
+문서� �기를  RGB, 256x256(13채� �함)으로 
+지정해야 합니다. � 지형 파�� 다른 방�으로 
 열 수 없습니다. 
  
-지역 높� 항목 편집� 관한 �세한 내용� 다� ��를 참고하십시오: 
+지역 높� 필드 편집� 대한 �세한 사항� 다�으로 ��하십시오: 
 http://secondlife.com/tiki/tiki-index.php?page=RawTerrainFile
                 </message>
         </alert>
-        <alert name="HelpRegionUseEstateSun" title="소유지 태양 사용">
+        <alert name="HelpRegionUseEstateSun" title="사유지 전용 태양 사용">
                 <message name="message">
-                        � 체�박스는 � 지역� 태양� 나머지 소유지�서
-태양� 위치와 ��하게 만듭니다. 
+                        선�시 � 지역� 태양 위치가 나머지 사유지� 태양 위치와 ��하게 설정�니다. 
  
 기본 설정: 켜�
                 </message>
         </alert>
-        <alert name="HelpRegionFixedSun" title="고정 태양">
+        <alert name="HelpRegionFixedSun" title="태양 고정">
                 <message name="message">
-                        � 체�박스는 태양� 위치를 단계 슬���내
-위치로 설정한 후 � �� 움��지 않�� 만듭니다. 
+                        슬���로 태양� 위치를 설정하고 태양� ��하지 않�� 고정시킵니다.
  
 기본 설정: 꺼�
                 </message>
@@ -3625,137 +3794,122 @@ http://secondlife.com/tiki/tiki-index.php?page=RawTerrainFile
         <alert name="HelpRegionBakeTerrain" title="지형 저장">
                 <message name="message">
                         � 버튼� 누르면 현재 지형 모습� 지역� 새로운 
-기본 지형으로 저장�니다. �단 저장�고 나면 귀하 �는 다른 사람� 
-토지 편집 복구 옵션/�구를 사용할 때마다
-저장한 모습� ��릴 수 있습니다 . �한 저장� 지형� 지형 높�기 � 낮추기 
-한계� 대한 중간 지��기� 합니다.
+기본 지형으로 저장�니다. 저장�후 본� �는 다른 사람� 
+토지 편집시 &apos;복구&apos; 버튼� �릭해 저장� 모습� ��릴 수있으며, �한 저장� 지형� 지형 높�기 � 낮추기 
+한계� 대한 기준 지�� �니다.
                 </message>
         </alert>
-        <alert name="HelpEstateEstateManager" title="소유지 관리�">
+        <alert name="HelpEstateEstateManager" title="사유지 관리�">
                 <message name="message">
-                        소유지 관리�는 지역 � 소유지 설정 제어를
-위임받� 주민입니다.  소유지 관리�는
-업로딩, 다운로딩 � 지형 저장� 제외한 본 패�내� 모든 설정�
-변경할 수 있는 권한� 가집니다.  특히, 소유지 관리�는
-주민� 소유지내� 거주할 것� 허용 �는 금지할 수 있습니다.  
+                        사유지 관리�는 지역 � 사유지 설정� 제어할 수 있�� 
+본�� 위임하는 주민입니다.  사유지 관리�는 
+지형 업로드, 다운로드 � 저장� 제외한 모든 설정� 
+� 윈�우�서 변경할 수 있습니다.  사유지 관리�는 특히, 
+사유지� 주민 진입� 허용하거나 금지할 수 있습니다.  
  
-소유지 관리�는 해당 소유지� 소유�� �해서만 추가-제거� 수 있으며
-관리�들�리는 추가-제거할 수 없습니다.  신뢰할 수 있는 주민만
-소유지 관리�로 임명하십시오. 결국 관리�� 행�� 대한 책임�
-소유�가 지게 �니다.
+사유지� 소유�만� 사유지 관리�를 추가하거나 제거할 수 있으며 
+사유지 관리�는 다른 관리�를 추가하거나 제거할 수 없습니다. 사유지 관리�� 행�� 
+대한 책임� 전�으로 그 지역� 소유�가 지므로 신뢰하는 
+주민� 사유지 관리�로 선�해야 합니다.
                 </message>
         </alert>
-        <alert name="HelpEstateUseGlobalTime" title="세계 시간 사용">
+        <alert name="HelpEstateUseGlobalTime" title="표준시� 사용">
                 <message name="message">
-                        � 체�박스는 소유지� 태양� 린든 소유�
-&apos;본토&apos; 소유지 태양과 같� 위치를 따르��
-합니다. 
+                        선�시 사유지� 태양� 린든 소유 
+&apos;메�랜드&apos; � 태양 위치� ��하게 
+설정�니다. 
  
 기본 설정: 켜�
                 </message>
         </alert>
-        <alert name="HelpEstateFixedSun" title="고정 태양">
+        <alert name="HelpEstateFixedSun" title="태양 고정">
                 <message name="message">
-                        � 체�박스는 태양� 위치를 단계 슬���내
-위치로 설정한 후 � �� 움��지 않�� 만듭니다.
+                        슬���로 태양� 위치를 설정하고 태양� ��하지 않�� 고정시킵니다.
                 </message>
         </alert>
-        <alert name="HelpEstateMainlandVisible" title="여기서 본토는 가시권내">
+        <alert name="HelpEstateExternallyVisible" title="�반 공개">
                 <message name="message">
-                        � 소유지� 주민들� 세계 지���서 린든 소유�
-&apos;본토&apos; 소유지를 볼 수 있는지 여부를 설정합니다. 
+                        다른 사유지 내� 있는 주민들�
+    접근 권한 리스트� 올�있지 않아� � 사유지� 들어갈 수 있는지 여부를 설정합니다.
  
 기본 설정: 켜�
                 </message>
         </alert>
-        <alert name="HelpEstateExternallyVisible" title="본토�서 가시권내">
+        <alert name="HelpEstateAllowDirectTeleport" title="�접 텔레�트 허용">
                 <message name="message">
-                        린든 소유 &apos;본토&apos; 소유지내� 있는 주민들�
-세계 지���서 귀하� 소유지를 볼 수 있는지 여부를 설정합니다. 
- 
-기본 설정: 켜�
-                </message>
-        </alert>
-        <alert name="HelpEstateAllowDirectTeleport" title="�접 텔리�트 허용">
-                <message name="message">
-                        체� 표시하면, 주민들� 귀하� 소유지 어� 지�으로든 
-�접 텔리�트가 가능해집니다.  체� 표시를 지우면, 주민들� 가장 가까운 
-텔리허브로 텔리�트하게 �니다. 
+                        � 옵션� 선�하면 주민� 사용� 사유지� 모든 지�으로 
+�접 텔레�트할 수 있습니다.  � 옵션� 선�� 취소하면 주민� 가장 가까운 
+텔레허브로 텔레�트합니다. 
  
 기본 설정: 꺼�
                 </message>
         </alert>
         <alert name="HelpEstateAllowResident" title="액세스 허용">
                 <message name="message">
-                        � 목�� 주민� �함�어 있는 경우, 소유지� 대한 액세스는
-목��� 주민 � 아래 열거� 그룹� 한정�니다. 
+                        사유지 사용권한� 목�� 있는 주민들과 아래 목��  그룹들로 제한�니다.
  
-(해당 소유지가 본토� 가시권내� 있는 경우, 액세스는
-목��� 그룹 �는 주민� 한정� 수 없으며, �같� 통제권�
-비활성화�니다.  &apos;액세스 금지&apos; 목�만 사용�니다.)
+(사유지를 메�랜드�서 확�할 수 있는 경우, 사용권한� 주민 �는 목��� 그룹으로 제한� 수 없고, �러한 제어는 비활성화 �니다. ‘접근 거부’ 목�만 사용�).
                 </message>
         </alert>
         <alert name="HelpEstateAllowGroup" title="그룹 액세스 허용">
                 <message name="message">
-                        � 목�� 그룹� �함�어 있는 경우, 소유지� 대한
-액세스는 해당 그룹, 그리고 위� 구체�으로 지정�
-주민� 한정�니다. 
+                        사유지 사용권한� 목��� 그룹들과 위� 특별히 허�� 주민들로 제한�니다. 
  
-(해당 소유지가 본토� 가시권내� 있는 경우, 액세스는
-목��� 그룹 �는 주민� 한정� 수 없으며, �같� 통제권�
-비활성화�니다.  &apos;액세스 금지&apos; 목�만 사용�니다.)
+(사유지를 메�랜드�서 확�할 수 있는 경우, 사용권한� 주민 �는 목��� 그룹으로 제한� 수 없고, �러한 제어는 비활성화 �니다. ‘접근 거부’ 목�만 사용�).
                 </message>
         </alert>
         <alert name="HelpEstateBanResident" title="액세스 거부">
                 <message name="message">
-                        � 목�� 있는 주민들� 위� 허용 � 그룹 설정� 관계 없�
-귀하� 소유지 출입� 금지�니다. 
+                        � 목�� 있는 주민들� 
+ 위� 허가와 그룹 설정� 관계없� 내 사유지 사용 권한� 거부�었습니다.
  
-� 목�� 주민� 추가할 경우, 해당 주민� 허용 목��서
-삭제�니다.
+� 목�으로 주민� 추가하면 
+ 허가 목��서 해당 주민� 제거�니다.
                 </message>
         </alert>
-        <alert name="HelpEstateCovenant" title="소유지 계약 조항">
+        <alert name="HelpEstateCovenant" title="사유지 시행 규칙">
                 <message name="message">
-                        소유지 계약 조항� 설정하면 해당 소유지 내�서
-구�� �매할 수 있습니다. 계약 조항� 설정�지 않� 경우 
-토지를 �매할 수 없습니다. 계약조항� 노트카드는 구매�가 토지 구입 전 
-토지와 관련� 어떤한 내용 �나  규칙� �용하지 않으려는 경우 
-공백� 수 있습니다. 
+                        사유지 시행 규칙� 설정하면 해당 사유지 내� 구�� 
+�매할 수 있습니다. 시행 규칙� 설정하지 않으면 토지를 
+�매할 수 없습니다. 규칙� �용하지 않으려는 경우 �는 구매�가 
+토지를 구매하기 전� 토지 관련 사항� 알리고 싶� 경우�는 
+시행 규칙� 대한 노트카드를 비워둘 수 있습니다. 
  
-계약조항� 규칙, 지침, 문화� 정보� 대한것 �거나, 
-향후� 구매�� 대한 기대� 수 있습니다. 여기�는 구역 결정, 규정 제정, 지불 옵션 �는
-구매하기 전� 확�하거나 ��하기 위해 중요하다고 ���는 
-기타 정보가 �함�니다. 
+시행 규칙� 사용하여 규칙, 가�드, 문화 관련 정보 
+�는 본�� 기대 사항 등� 구매 예정��게 
+알릴 수 있습니다. 여기�는 구역 설정, 규정 제정, 지불 옵션 
+�는 구매 예정�가 구매하기 전� 확�하고 
+��해야 한다고 ���는 기타 정보가 
+�함�니다. 
  
-구매�는 구매� 완료하기 전� 확�란� �릭하여 
-계약조항� ��해야 합니다. 소유지 
-계약 조항� 모든 구�� 대한 토지 정보 대화�서 
+구매�는 구매를 완료하기 전� 확�란� �릭하여 
+시행 규칙� ��해야 합니다. 사용�가 
+설정한 구�� 대한 사유지 시행 규칙� 토지 소개 대화 ���서 
 언제든지 확�할 수 있습니다.
                 </message>
         </alert>
-        <alert name="BuyObjectOneOnly" title="아�템� 구매할 수 없습니다">
+        <alert name="BuyObjectOneOnly" title="오브�트를 구매할 수 없습니다.">
                 <message name="message">
-                        한번� 사물 1개만 구매할 수 있습니다. 
-1개� 사물만 선�한 후 다시 시�해 주십시오.
+                        한번� 둘 ��� 오브�트를 구입할 수 없습니다. 
+1개� 오브�트만 선�한 후 다시 시�해 주십시오.
                 </message>
         </alert>
-        <alert name="BuyObjectOneOwner" title="아�템� 구매할 수 없습니다">
+        <alert name="BuyObjectOneOwner" title="오브�트를 구매할 수 없습니다.">
                 <message name="message">
-                        �시� 다른 여러 소유주로부터 사물� 구입할 수 없습니다. 
-1개� 사물만 선�한 후 다시 시�해 주십시오.
+                        �시� 다른 여러 소유주로 부터 오브�트를 구입할 수 없습니다. 
+1개� 오브�트만 선�한 후 다시 시�해 주십시오.
                 </message>
         </alert>
-        <alert name="BuyContentsOneOnly" title="컨�츠를 구매할 수 없습니다">
+        <alert name="BuyContentsOneOnly" title="컨�츠를 구매할 수 없습니다.">
                 <message name="message">
-                        한번� 1개 사물� 컨�츠만 구매할 수 있습니다. 
-1개� 사물만 선�한 후 다시 시�해 주십시오.
+                        한번� 2개 �� 오브�트� 컨�츠를 구입할 수 없습니다. 
+1개� 오브�트만 선�한 후 다시 시�해 주십시오.
                 </message>
         </alert>
-        <alert name="BuyContentsOneOwner" title="컨�츠를 구매할 수 없습니다">
+        <alert name="BuyContentsOneOwner" title="컨�츠를 구매할 수 없습니다.">
                 <message name="message">
-                        �시� 다른 여러 소유주로부터 사물� 구입할 수 없습니다. 
-1개� 사물만 선�한 후 다시 시�해 주십시오.
+                        �시� 다른 여러 소유주로 부터 오브�트를 구입할 수 없습니다. 
+1개� 오브�트만 선�한 후 다시 시�해 주십시오.
                 </message>
         </alert>
         <alert name="PermYes">
@@ -3770,8 +3924,8 @@ http://secondlife.com/tiki/tiki-index.php?page=RawTerrainFile
         </alert>
         <alert name="BuyOriginal">
                 <message name="message">
-                        L$[PRICE]� [OWNER](으)로부터 �본 아�템� 구매하시겠습니까?
-귀하는 � 아�템� 소유주가 � 것입니다.
+                        L$[PRICE]� [OWNER](으)로부터 �본 오브�트를 구매 하시겠습니까?
+귀하는 � 오브�트� 소유주가 �니다.
 다�� 수행할 수 있습니다:
  수정: [MODIFYPERM]
  복사: [COPYPERM]
@@ -3786,9 +3940,9 @@ http://secondlife.com/tiki/tiki-index.php?page=RawTerrainFile
         </alert>
         <alert name="BuyOriginalNoOwner">
                 <message name="message">
-                        L$[PRICE]� �본 아�템� 구매하시겠습니까?
-귀하는 � 아�템� 소유주가 � 것입니다.
-다� 작업� 수행할 수 있습니다:
+                        L$[PRICE]� �본 오브�트를 구매 하시겠습니까?
+귀하는 � 오브�트� 소유주가 �니다.
+다�� 수행할 수 있습니다:
  수정: [MODIFYPERM]
  복사: [COPYPERM]
  재�매 �는 무료 배�: [RESELLPERM]
@@ -3802,9 +3956,9 @@ http://secondlife.com/tiki/tiki-index.php?page=RawTerrainFile
         </alert>
         <alert name="BuyCopy">
                 <message name="message">
-                        L$[PRICE]� [OWNER](으)로부터 복사본� 구매하시겠습니까?
-사물� 사용�� 보관함으로 복사�니다.
-다�� 할 수 있습니다:
+                        L$[PRICE]� [OWNER](으)로부터 복사본� 구매 하시겠습니까?
+오브�트는 사용�� �벤토리로 복사�니다.
+다�� 수행할 수 있습니다:
  수정: [MODIFYPERM]
  복사: [COPYPERM]
  재�매 �는 무료 배�: [RESELLPERM]
@@ -3818,9 +3972,9 @@ http://secondlife.com/tiki/tiki-index.php?page=RawTerrainFile
         </alert>
         <alert name="BuyCopyNoOwner">
                 <message name="message">
-                        L$[PRICE]� 복사본� 구매하시겠습니까?
-아�템� 사용�� 저장고로 복사�니다.
-다� 작업� 수행할 수 있습니다:
+                        L$[PRICE]� 복사본� 구매 하시겠습니까?
+오브�트는 사용�� �벤토리로 복사�니다.
+다�� 수행할 수 있습니다:
  수정: [MODIFYPERM]
  복사: [COPYPERM]
  재�매 �는 무료 배�: [RESELLPERM]
@@ -3834,8 +3988,8 @@ http://secondlife.com/tiki/tiki-index.php?page=RawTerrainFile
         </alert>
         <alert name="BuyContents">
                 <message name="message">
-                        L$[PRICE]� [OWNER](으)로부터 컨�츠를 구매하시겠습니까?
-컨�츠는 사용�� 보관함으로 복사�니다.
+                        L$[PRICE]� [OWNER](으)로부터 컨�츠를 구매 하시겠습니까?
+컨�츠는 사용�� �벤토리로 복사�니다.
                 </message>
                 <option name="Buy">
                         구매
@@ -3847,7 +4001,7 @@ http://secondlife.com/tiki/tiki-index.php?page=RawTerrainFile
         <alert name="BuyContentsNoOwner">
                 <message name="message">
                         L$[PRICE]� 컨�츠를 구매하시겠습니까?
-컨�츠는 사용�� 보관함으로 복사�니다.
+컨�츠는 사용�� �벤토리로 복사�니다.
                 </message>
                 <option name="Buy">
                         구매
@@ -3858,11 +4012,11 @@ http://secondlife.com/tiki/tiki-index.php?page=RawTerrainFile
         </alert>
         <alert name="ConfirmPurchase">
                 <message name="message">
-                        � 거래는:
+                        거래는 다�과 같습니다:
  
-[행�]
+[ACTION]
  
-정� � 거래를 진행하시겠습니까?
+구매를 진행 하시겠습니까?
                 </message>
                 <option name="Confirm">
                         확�
@@ -3873,12 +4027,12 @@ http://secondlife.com/tiki/tiki-index.php?page=RawTerrainFile
         </alert>
         <alert name="ConfirmPurchasePassword">
                 <message name="message">
-                        � 거래는:
+                        거래는 다�과 같습니다:
  
-[행�]
+[ACTION]
  
-정� � 거래를 진행하시겠습니까?
-암호를 재입력하고 확�� �릭해 주십시오.
+구매를 진행하시겠습니까?
+암호를 다시 입력하고 &apos;확�&apos;� �릭하십시오.
                 </message>
                 <option name="ConfirmPurchase">
                         구매 확�
@@ -3890,9 +4044,9 @@ http://secondlife.com/tiki/tiki-index.php?page=RawTerrainFile
         <alert name="SetPickLocation">
                 <message name="message">
                         참고:
-� 선� 위치는 업��트
-완료�었으나 다른 세부 사항�
-본래 값� 유지�니다.
+� 선� 위치는 
+ 업��트 완료�었으나 다른 세부 사항� 
+ 본래 값� 유지�니다.
                 </message>
                 <option name="OK">
                         확�
@@ -3900,185 +4054,341 @@ http://secondlife.com/tiki/tiki-index.php?page=RawTerrainFile
         </alert>
         <alert name="MoveInventoryFromObject">
                 <message name="message">
-                        &apos;무복사&apos; 저장고 아�템� 선�하셨습니다.
-� 아�템들� 귀하� 저장고로 복사�는 것� 아니� 옮겨지게 �니다.
+                        복사 불가 &apos; �벤토리 아�템� 선�하셨습니다.
+�러한 아�템� �벤토리�서 제거�며 복사할 수 없습니다.
  
-해당 아�템(들)� 저장고로 옮기시겠습니까?
+아�템� 옮기시겠습니까?
                 </message>
+                <ignore name="ignore">
+                        오브�트�서 복사불가 아�템� ��할 때
+                </ignore>
                 <option name="Move">
                         ��
                 </option>
                 <option name="Don&apos;tMove">
-                        �� 금지
+                        �� 안 함
                 </option>
         </alert>
         <alert name="MoveInventoryFromScriptedObject">
                 <message name="message">
-                        &apos;무복사&apos; 저장고 아�템� 선�하셨습니다.  � 아�템들� 
-귀하� 저장고로 복사�는 것� 아니� 옮겨지게 �니다.
+                        복사 불가&apos; �벤토리 아�템� 선�하셨습니다.  �러한 아�템� 
+�벤토리�서 제거�며 복사할 수 없습니다.
  
-� 사물� 스�립트�어있기 때문�, � 아�템들� 
-저장고로 옮길 경우 스�립트� 오작�� 발�할 수 있습니다. 
+�러한 오브�트는 스�립트�었기 때문� � 아�템� 
+�벤토리로 ��하면 스�립트� 문제가 발�할 수 있습니다. 
  
-해당 아�템(들)� 저장고로 옮기시겠습니까?
+아�템� 옮기시겠습니까?
                 </message>
+                <ignore name="ignore">
+                        스�립트 오브�트�서 복사불가 아�템� ��할 때
+                </ignore>
                 <option name="Move">
                         ��
                 </option>
                 <option name="Don&apos;tMove">
-                        �� 금지
+                        �� 안 함
                 </option>
         </alert>
         <alert name="ClickActionNotPayable">
                 <message name="message">
-                        경고: Pay Object �릭 �작� 설정�었지만, 스�립트가 
-money() �벤트� 추가� 경우�만 작�합니다. 
-그 �유는 �반�으로 주민들� �� 지불�면 
-사물� 어떤 방�으로든 반�할 것으로 기대하기 때문입니다.
+                        경고: 오브�트 지불 �릭 행�� 설정�었지만 
+스�립트가 money() �벤트와 함께 추가� 경우�만 작�합니다. 
+�는 주민들� �반�으로 오브�트� 비용� 지불� 때 
+오브�트가 반�할 것��고 예�하기 때문입니다.
                 </message>
+                <ignore name="ignore">
+                        money() �벤트 없� 오브�트� &apos;지불&apos; 설정할 때
+                </ignore>
         </alert>
         <alert name="OpenObjectCannotCopy">
                 <message name="message">
-                        � 아�템�는 복사가 허용� 항목� 없습니다.
+                        � 오브�트�는 복사가 허용� 아�템� 없습니다.
                 </message>
         </alert>
-        <alert name="LoadAccountTransactions">
+        <alert name="WebLaunchAccountHistory">
                 <message name="message">
-                        [URL](으)로 ��해
-거래 세부 내역� 확�하시겠습니까?
+                        계정 기�� 보기 위해 세컨드��프 웹 사�트로 갑니까?
                 </message>
-                <option name="OK">
-                        확�
+                <ignore name="ignore">
+                        계정 기� 웹 페�지를 로드할 때
+                </ignore>
+                <option name="Gotopage">
+                        페�지로 ��
                 </option>
                 <option name="Cancel">
                         취소
                 </option>
         </alert>
-        <alert name="HelpReportAbuse">
+        <alert name="HelpReportAbuseEmailLL">
                 <message name="message">
-                        Use this tool to report violations of the Terms of Service and Community Standards. See: 
-http://secondlife.com/corporate/tos.php 
-http://secondlife.com/corporate/cs.php 
- 
-All reported abuses of the Terms of Service and Community Standards 
-are investigated and resolved. You will receive an email informing you
-of the resolution when it occurs. 
-You can also view the incident resolution on the Police Blotter at: 
- 
-http://secondlife.com/community/blotter.php
+                        � �구를 사용하여 서비스 약관과 커뮤니티 표준� 위반 사항� 
+보고합니다. 다�� 참조하십시오. 
+-
+http://secondlife.com/community/support.php 
+http://secondlife.com/community/support.php 
+-
+보고� 서비스 조항과 커뮤니티 표준� 남용 사례는 모�  
+조사해서 해결합니다. 사건� 해결�면 신고��게는 사건해결�
+알리는 메�� 발송�니다. 사건 해결� 다� 주소� 있는 
+경찰 사건 기�부�서� 확�하실 수 있습니다.
+- 
+http://secondlife.com/community/support.php
+                </message>
+        </alert>
+        <alert name="HelpReportAbuseEmailEO">
+                <message name="message">
+                        주요 사항: � 보고서는 린든랩� 아닌 현재 
+사용�가 �해 있는 지역 소유��게 발송�니다.
+-
+주민과 방문�� 대한 서비스� �환으로 사용�가 �해 있는 
+지역� 소유�가 그 지역�서 발�한 보고서를 모� 수신하고 
+해결하�� 하였습니다. 린든랩� 
+� 위치�서 사용�가 제기한 보고서를 조사하지 않습니다. 
+사유지 시행 규칙�서 간략히 나타난 바와 같�, 지역 소유�가 해당 지방 
+법규를 근거로 하여 보고서를 해결합니다. 
+(시행 규칙� 열람하려면 월드 메뉴�서 토지 소개를 
+선�하십시오.)
+-
+� 보고서� 해결� � 지역�서만 �용�며, 세컨드��프내�
+기타 지역� 대한 주민들� 접근 권한� � 보고서� 결과� 
+�향� 받지 않습니다. 오� 린든랩만� 
+세컨드��프 전체� 접근 권한� 제한할 수 있습니다.
                 </message>
         </alert>
         <alert name="HelpReportBug">
                 <message name="message">
-                        Use this tool to report technical features that do not perform 
-as described or expected. All bug reports are investigated and 
-resolved. No email response will be sent, you may reply to the 
-auto-response email to add more details to your report. 
-If you are having a technical difficulty, please contact Support at: 
- 
+                        � �구를 사용하여 설명과 예�대로 수행하지 않� 기능� *오�* 보고만 하십시오.
+가능한 한 �세히 보고하십시오. �� �답
+�메�� 답하여 보고서� �세 내역� �붙여� �니다.
+모든 버그 보고서는 조사 후 �가�니다.  어떠한 �메�� 발송�지 않습니다.
+-
+기술�� 어려움� 발�할 경우, 고� 지� 센터로 문�하십시오. 
 http://secondlife.com/community/support.php
+-
+참고: 불완전한 보고서는 조사 대��서 제외�니다
                 </message>
         </alert>
         <alert name="HelpReportAbuseSelectCategory">
                 <message name="message">
                         � 악용 신고� 대한 카테고리를 선�하십시오.
  
-카테고리를 선�하면 악용 신고를 파��하고 처리하는 � �움� �니다.
+카테고리를 선�하면 악용 신고를 제출하고 처리하는 � �움� �니다.
                 </message>
         </alert>
         <alert name="HelpReportBugSelectCategory">
                 <message name="message">
-                        � 문제� 대한 카테고리를 설정해 주십시오. 파��나 진행�� 문제� 대한 카테고리 설정� 부� 드립니다.
+                        � 버그� 대한 카테고리를 선�하십시오.
+ 
+카테고리를 선�하면 버그 신고를 제출하고 처리하는 � �움� �니다.
                 </message>
         </alert>
         <alert name="HelpReportAbuseAbuserNameEmpty">
                 <message name="message">
                         악용�� �름� 입력하십시오.
  
-정확한 값� 입력하면 악용 신고를 파��하고 처리하는 � �움� �니다.
+정확한 값� 입력하면 악용 신고를 제출하고 처리하는 � �움� �니다.
                 </message>
         </alert>
         <alert name="HelpReportAbuseAbuserLocationEmpty">
                 <message name="message">
-                        악용� 사용� 위치를 입력하십시오.
+                        악용� 발�� 위치를 입력하십시오.
  
-정확한 값� 입력하면 악용 신고를 파��하고 처리하는 � �움� �니다.
+정확한 값� 입력하면 악용 신고를 제출하고 처리하는 � �움� �니다.
                 </message>
         </alert>
         <alert name="HelpReportAbuseSummaryEmpty">
                 <message name="message">
-                        사용� 악용� 대한 요약� 입력하십시오.
+                        발�� 악용� 대한 요약 사항� 입력하십시오.
  
-정확한 요약� 입력하면 악용 신고를 파��하고 처리하는 � �움� �니다.
+정확한 요약 사항� 입력하면 악용 신고를 제출하고 처리하는 � �움� �니다.
                 </message>
         </alert>
         <alert name="HelpReportBugSummaryEmpty">
                 <message name="message">
-                        문제� 대한 간략한 요약� 부� 드립니다. 파��나 진행�� 문제� 대해 �세한 설명� 부� 드립니다.
+                        버그� 대한 요약 사항� 입력하세요.
+ 
+정확한 요약 사항� 입력하면 악용 신고를 제출하고 처리하는 � �움� �니다.
                 </message>
         </alert>
         <alert name="HelpReportAbuseDetailsEmpty">
                 <message name="message">
-                        사용� 악용� 대해 �세한 설명� 입력하십시오.
-구체�으로 �어 주시고 관련� �름 � 신고 사건�
-세부 내용� �어 주십시오.
+                        발�한 악용� 대해 �세한 설명� 입력하십시오.
+구체�으로 �어 주시고 관련� �름 � 신고 사건� 
+ 세부 내용� �어 주십시오.
  
-정확한 설명� 입력하면 악용 신고를 파��하고 처리하는 � �움� �니다.
+정확한 설명� 입력하면 악용 신고를 제출하고 처리하는 � �움� �니다.
                 </message>
         </alert>
         <alert name="HelpReportBugDetailsEmpty">
                 <message name="message">
-                        문제� 대한 �세한 설명� 부�드림�다. 가능한 문제가 발��기까지� 모든 과정� �세하게 �씀해 주시길 바�니다. 파��나 진행�� 문제� 대해 �세한 설명� 부� 드립니다.
+                        버그� 대한 �세한 설명� 입력하세요.
+구체�으로 �어 주시고 
+ 가능하면 버그 재� 단계� �어 주십시오.
+ 
+정확한 설명� 입력하면 악용 신고를 제출하고 처리하는 � �움� �니다.
                 </message>
         </alert>
         <alert name="HelpReportAbuseContainsCopyright">
                 <message name="message">
-                        주민 여러분,
+                        주민 여러분께,
  
-저작권 침해� 대한 신고는
-http://secondlife.com/corporate/dmca.php� 설명� 따�서만 제출할 수 있습니다.
+저작권 침해� 대한 신고는 http://secondlife.com/corporate/dmca.php�
+설명� 따� 제출해 주셔야 합니다.
  
-저작권 침해� 대한 신고는 ‘악용 신고’ 기능� 통해
-제출�는 경우 ��으로 �기�니다. 신고하신 내용� 저작권 침해와 관련� 없다면,
-� 창� 닫고 신고 제출� 종료하셔� �니다.
+저작권 침해� 대한 신고가 &apos;악용 신고&apos;
+기능� 통해 제출�는 경우 ��으로
+�기�니다. 신고하시는 내용� 저작권 침해와 관련� 없다면
+� 창� 닫아 신고를 종료하실 수 있습니다.
  
 �사합니다.
  
-Linden Lab
+린든랩 드림
                 </message>
         </alert>
         <alert name="FailedRequirementsCheck">
                 <message name="message">
-                        [표류�]�서 아래� 필수 구성 요소가 발견�지 않습니다:
-[구성요소]
+                        다�� 필수 구성 요소가 [FLOATER]� 없습니다:
+[COMPONENTS]
                 </message>
         </alert>
-        <alert name="ReplaceAttachment" title="기존 부착물 �체">
+        <alert name="ReplaceAttachment" title="기존 착용물 대체">
                 <message name="message">
-                        본�� 신체�� ��부위� �미 부착� 아�템� 있습니다.
-기존 아�템� 선�� 아�템으로 �체하시겠습니까?
+                        신체� ��부위� �미 착용� 오브�트가 있습니다.
+기존 오브�트를 선�� 오브�트로 �체하시겠습니까?
                 </message>
+                <ignore name="ignore">
+                        기존 착용물� �체할 때
+                </ignore>
                 <option ignore="�� 대체" name="Yes">
                         예
                 </option>
-                <option ignore="대체 절대 금지" name="No">
+                <option ignore="대체 금지" name="No">
                         아니오
                 </option>
         </alert>
-        <alert name="BusyModePay" title="다른 용무 중 경고">
+        <alert name="BusyModePay" title="다른 용무 중 모드 경고">
                 <message name="message">
-                        귀하는 현재 다른 용무 주 모드� 있으며 따�서 대금
-지급� 대한 대가로 �체 아�템� 받� 수
+                        귀하께서는 다른 용무 중 모드� 있으므로
+� 결제� 대한 어떠한 아�템� 수령할 수
 없습니다.
  
-� 거래를 완료하기 전� 다른 용무 중 모드를
-종료하시겠습니까?
+� 거래를 완료하기 전� 다른 용무 중 모드�서
+나오시겠습니까?
+                </message>
+                <ignore name="ignore">
+                        부재중 모드�서 사람 �는 오브�트를 지불할 때
+                </ignore>
+                <option ignore="다른 용무 중 모드 항� 해제" name="Yes">
+                        예
+                </option>
+                <option ignore="다른 용무 모드 사용 안함" name="No">
+                        아니오
+                </option>
+        </alert>
+        <alert name="ConfirmEmptyTrash">
+                <message name="message">
+                        휴지통 ��� 내용� �구�으로
+제거 하시겠습니까?
                 </message>
-                <option ignore="항� 다른 용무 중 모드로" name="Yes">
+                <ignore name="ignore">
+                        �벤토리� 휴지통 ��를 비울 때
+                </ignore>
+                <option name="Yes">
                         예
                 </option>
-                <option ignore="다른 용무 중 모드 �기" name="No">
+                <option name="No">
                         아니오
                 </option>
         </alert>
+        <alert name="ConfirmClearBrowserCache">
+                <message name="message">
+                        브�우저� �쉬를 전부 삭제 하시겠습니까?
+                </message>
+                <option name="Yes">
+                        확�
+                </option>
+                <option name="No">
+                        취소
+                </option>
+        </alert>
+        <alert name="ConfirmClearCookies">
+                <message name="message">
+                        쿠키를 전부 삭제 하시겠습니까?
+                </message>
+                <option name="Yes">
+                        확�
+                </option>
+                <option name="No">
+                        취소
+                </option>
+        </alert>
+        <alert name="ConfirmEmptyLostAndFound">
+                <message name="message">
+                        분실물 보관소 ��� 내용�
+�구�으로 제거 하시겠습니까?
+                </message>
+                <ignore name="ignore">
+                        �벤토리� 분실 � 발견 ��를 비울 때
+                </ignore>
+                <option name="Yes">
+                        예
+                </option>
+                <option name="No">
+                        아니오
+                </option>
+        </alert>
+        <alert name="CopySLURL">
+                <message name="message">
+                        �립보드� 다�과 같� SLURL� 복사�었습니다.
+   
+                        [SLURL] 
+   
+                        웹 페�지� 올려서 타�들� � 위치� 쉽게 접근하�� 하거나
+                        웹 브�우저� 주소창� 붙여넣기 해서 �접 시험해보십시오.
+                </message>
+                <ignore name="ignore">
+                        SLURL� �릭보드로 복사할 때
+                </ignore>
+        </alert>
+        <alert name="IMSessionStartError">
+                <message name="message">
+                        [RECIPIENT]� 대한 새 메신저 세션 시작 중 오류가 발�했습니다.
+                        [REASON]
+                </message>
+                <option name="OK">
+                        확�
+                </option>
+        </alert>
+        <alert name="IMSessionStartNotVerified">
+                <message name="message">
+                        [RECIPIENT]� 대한 새 메신저 세션 시작 중 오류가 발�했습니다.
+                        [REASON]
+                </message>
+                <option name="OK">
+                        확�
+                </option>
+        </alert>
+        <alert name="IMSessionEventError">
+                <message name="message">
+                        오류:  [EVENT] [RECIPIENT].
+                        [REASON]
+                </message>
+                <option name="OK">
+                        확�
+                </option>
+        </alert>
+        <alert name="ForceCloseIMSession">
+                <message name="messsage">
+                        [NAME](과)와� 메신저 세션� 종료해야 합니다.
+            [REASON]
+                </message>
+                <option name="OK">
+                        확�
+                </option>
+        </alert>
+        <alert name="Cannot_Purchase_an_Attachment">
+                <message name="message">
+                        착용중� 아�템� 구매 불가능 합니다.
+                </message>
+        </alert>
 </alerts>
diff --git a/linden/indra/newview/skins/xui/ko/floater_about.xml b/linden/indra/newview/skins/xui/ko/floater_about.xml
index d2651c4..ec0e1a4 100644
--- a/linden/indra/newview/skins/xui/ko/floater_about.xml
+++ b/linden/indra/newview/skins/xui/ko/floater_about.xml
@@ -1,9 +1,9 @@
 <?xml version="1.0" encoding="utf-8" standalone="yes" ?>
-<floater name="floater_about" title="Second Life 소개">
+<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, DongYunYoum, 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 그외� 많� 분들� 수고해 주셨습니다.
+                Second Life 제작�: a2, Aaron, Abishai, adrian, Alberto, Alex, Alexei, Alfred, Alice, Altruima, Amber, Anastasia, Andrea, Andrew, Andy, Annette, Anthony, Aura, Avi, Babbage, Beast, beez, Belinda, Ben, Benjamin, Benny, Betsy, Bill, Blue, Bo, Bob, Brad, Branka, Brent, Brian, Bruce, Bub, Bucky, Bunny, Burgess, Buttercup, Callum, Casino, Cat, Catherine, Chadrick, Char, Charity, Charlie, Chiyo, Chris, Christopher, Civic, Claudia, Cleopetra, Cole, ColeD, Colin, Colleen, Cornelius, Cory, Cube, Cupid, Cyan, Cyn, Dan, DanceStar, Daniel, Data, Dave, David, David2, Deana, Debra, Dee, Dek, Del, Dez, Don, Donovan, DongYun Youm, Doug, drunkensufi, Dummy, dustin, Eddie, Eileen, Elena, Elle, Emily, Eric, erika, Erin, Ethan, Evan, Eve, Everett, Firefly, Flashpoint, Fordak, Frank, Fred, Fritz, Frontier, Garry, George, Gia, Ginsu, Glenn, Gulliver, Guy, Hamlet, Haney, Harmony, Harry, Helen, Hello, Henrik, Heretic, Hermia, Holly, Hungry, Hunter, Ian, Icculus, Irfan, Iris, Isaac, Isabel, IsThat, Ivy, Izzy, Jack, Jacqui, Jake, James, Jane, Janet, Jaron, Jay, Jean, Jed, Jeff, Jennifer, Jeremy, Jeska, JeskaTest, Jesse, Jill, Jim, Jimbo, Joe, John, Jon, Jonathan, Joon Hyuck Lee, Jose, Joshua, Jp, June, Justin, Karen, Kari, Karinelson, Kelly, Kelvin, Ken, Kenny, Kent, Kevin, Kona, Kyle, LaughingMan, Lauren, Lawrence, Lee, Leopard, Leprechaun, Leviathania, Lexie, Leyla, Liana, Libby, Lightfoot, Lizzie, Lock, Logan, Loki, Louie, Lucy, Luke, Madhavi, Magellan, Magenta, Makiko, Marius, Mark, Martin, Matthew, Maurice, Mayor, Melanie, Meta, Mia, Michael, MichaelFrancis, Mick, Migyeong, Mikeb, MikeT, Milo, Mitch, Mogura, Monkey, Monroe, Morpheus, Natria, Neo, Nicolas, Nicole, Nigel, Noel, Nora, Nova, Otakon, Page, Pathfinder, Patsy, Paul, Peter, Philip, Phoenix, PierreLuc, Pilouk, Pony, Professor, Qarl, Rachelle, Ramzi, Ray, Realestate, Red, Rejean, Reuben, Rheya, Richard, Rika, Rob, Robin, Roosevelt, Ross, Runitai, Ruth, Ryan, Sabin, Sally, Sam, Sarah, Satoko, Sean, Secret, Sejong, Senator, Seth, Showme, Siobhan, Sky, Sleepy, Spike, Stefan, Stephanie, Stephany, Stephen, Steve, Stryfe, sturm, Sudhi, Sunil, Swiss, Sylvain, Tanya, Tbone, Teeny, Teeple, Teresa, Tesla, Tess, Tessa, Thomas, Thrax, Thumper, Tim, Tobin, Todd, Tofu, Tom, Torley, Tracy, Uncle, Varas, Vasudha, Vektor, Ventrella, Video, Viola, Walker, Warren, Wendy, Which, Xan, Xander, Xenon, Xtreme, Yedwab, Yohan, Yool, Yoz, Yuko, Zach, Zee, Zero �외�� 많� 분들� 수고해 주셨습니다.
 
-현 버젼� 최고 버전� � 수 있�� �와주신 주민들께 �사드립니다: 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 그 외 많� 분들� 수고해 주셨습니다.
+현재 버전� 최고 버전� � 수 있�� �와주신 주민들께 �사 드립니다: AlexandriaS Aabye, devilite Aabye, Dynamqting Aabye, hellebore Aabye, Maddog Aabye, Urru Aabye, mabare Abattoir, Didi Abdallah, Elwood Abernathy, Jake Abramovich, Schort Achterbahn, Divily Ackland, JadeCharlet Ackland, Kevin Acorn, Binvis Acronym, Robert Adelaide, Atte Aderdeen, KiVanyel Adria, Krillian Adria, Mandi Adria, Butch Adzebills, Beccaboo Aero, Akasha Aferdita, Nicole Aferdita, Nero Agnomen, Hay Ah, Oxoc Ah, Sironl Ah, evokue Ahn, nycbadboy Ahn, Taan Ahn, Cyres Aida, TalNova Aji, Illusion Akula, Xen Akula, Jessa Alba, Alba Albert, kernowed Albert, Blaine Albion, AnneMarie Alcott, Bo Alcott, Cindie Alcott, Cunundrum Alcott, fighter Alcott, Jarad Alcott, Marcello Aldwych, Xenia Alemany, CellMaster Alexander, Molly Alexander, Aerotisma Alexandre, Ghostofgoat Alexandre, Took Alexandre, Ty Alexandre, Christophe Perrin / Krisp Alexandre, Adec Alexandria, Kiwi Alfa, Rowr Aliev, aivlys Allen, asclepius Allen, Aveyond06 Allen, Calvin Allen, gayfrench Allen, gender Allen, Grayson Allen, Jak Allen, Jerdog Allen, MariahMarie Allen, Metzyn Allen, Misty26 Allen, moshetzi Allen, nayara Allen, NH Allen, Pegi Allen, Ponesco Allen, Rap4rag Allen, Safer Allen, sobroke Allen, Bethann Allstar, Sloan Almendros, Ogro Almodovar, Raymondo Alonzo, Rebeca Alonzo, Omega Alphabeta, Elirien Alturas, Rick Alvarado, Golam Amadeus, Kea Amarula, Ariella Amat, Popas Amat, xxjojxx Amat, Jamie Amdahl, Helyos Ames, julies Ames, Keisha Ames, Javz Amsterdam, Kathy Amsterdam, Twistaspliff Amsterdam, darian Anabuki, Dnali Anabuki, Wes Anaconda, Serra Anansi, Britney Anatine, pax Anatine, Ranya Anatine, sientaya Anatine, Siowen Anatine, Padu Andalso, Chanel Anderson, Donna Andrews, Trixie Angel, Macphisto Angelus, meQal Anna, Aznxer Antfarm, Karlo Antonelli, Maksimilian Antonelli, Vala Antonelli, Athoni Antonioni, klement Antwerp, lildeadgirl Antwerp, GeordieJohn Anubis, KatanaBlade Anubis, Diag Anzac, Lunarlie Anzac, Picker Apogee, Azuby Apparatchik, brianica Appin, SwedenArtSheepdogs Aquacade, CaSimone Aquitaine, Dexter Aquitaine, Pericat Aquitaine, Sunshine Araw, Bino Arbuckle, Evangeline Arcadia, Niles Argus, pe Argus, BenneDJezzerette Ariantho, Karmaticdragon Ariantho, Teren Aridian, Garcia Ariel, Ina Arkin, alva Arliss, Noriyoko Arliss, Harle Armistice, Avi Arrow, Ming Arrow, Rox Arten, Razitra Artizar, Mandy Asano, Ty Asano, Kristoff Asbrink, Skye Asbrink, Threasher Asbrink, Daniel Ash, Dion Ashby, Eva Ashby, Ravenal Ashby, TOPDIME Ashby, danielluh Ashton, Deb Ashton, ach Asp, cokeser Asp, lastping Asp, Posrednik Asp, Notypewell Astro, Nargus Asturias, SiRiS Asturias, yol Asturias, ZATZAi Asturias, Animus Asylum, Sang Asylum, SomethingReal Atkey, Dakota Atlanta, Irie Atlantis, Matt Attenborough, Nirva Attenborough, CaptJosh Au, Goren Auer, Jackamo Auer, Jonathan Auer, Tisdi Auer, Chris Auk, Raven Axon, Shawn Ay, TJ Ay, ares Ayres, Cazz Ayres, Eon Ayres, Laura Ayres, zoeba Ayres, Naomi Babcock, Eldrich Babeli, Adrianna Babenco, She Babenco, sterick Babenco, corto Babii, Dia Babii, EvilCutz Babii, Flooxx Babii, Girl Babii, Imraanos Babii, Iv Babii, Lizthebabe Babii, Torrence Babii, Chrystal Babii, Sara Bachman, dzb0 Bade, Doug Bagration, Hobbit Bagration, Abert Bailey, Bambi Bailey, EveNice Bailey, Kaliya Bailey, Kriz Bailey, Leen Bailey, Leonine Bailey, Minke Bailey, Nightjaxs Bailey, Peyton Bailey, Shan Bailey, Stevo Bailey, Tariv Bailey, cream Bailly, Ezekiel Bailly, Gianna Bailly, Hells Bain, Briauna Bainbridge, AnaSofia Bakalava, Jonas Bakalava, Micki Baker, Anita Balczo, Naomi Balczo, Nathan Balder, Bibi Balhaus, Sponz Balhaus, Ainsleigh Ballinger, Dimitry Ballinger, Miriam Ballinger, Rik Ballinger, Trey Ballinger, Zagor Ballinger, Zek Ballinger, Kilara Balnarring, Maya Balut, Franz Bamaisin, Manolo Bamboo, Yuki Bamboo, Oliver Bandit, Pirate Bandit, Outy Banjo, winkler Banjo, SabreWulf Banshee, Akeela Banting, Elke Banting, Arkesh Baral, Barber Barbarossa, Samantha Barbee, Aruk Barbosa, Ayahuasca Barbosa, Bastill Barbosa, Corleone Barbosa, Padrig Barbosa, Samakh Barbosa, seat Barbosa, Topper Barbosa, Thery Bardeen, Bridgitte Bardot, Nici Barley, Annie Barnard, Josse Barnard, DB Barnes, Kitty Barnett, Threshin Barnett, Amy Barnett, Scott Baron, Jeremy Barracuda, Verbuda Barragar, Daphne Barrett, Fenleab Barrett, Lindsey Barrett, Smiley Barry, Denise Barrymore, Manuela Barrymore, Nell Barrymore, Sensation Barrymore, BraadWorst Barth, XxRevelationxX Barthelmess, Fleur Bartlett, Marina Bartlett, Lucius Bartz, Mack Bartz, Astley Bascom, dolomite Bascom, Dags Basevi, Lena Basevi, crystal Basiat, SuezanneC Baskerville, Sweetheart Baskerville, Demi Bates, Demon Bates, kane Bates, Will Bates, ShadixBear Bathgate, Carlotta Batra, Bruce Batz, Silentborn Batz, Dominik Bauer, Logan Bauer, Boz Baxter, Camryn Baxter, diesus Baxter, Drett Baxter, Gazmanjones Baxter, Kiley Baxter, Schwenny Baxter, Shimboo Baxter, Stoffe Baxter, Diamond Baxter, Gruntos Baxter, BC Bayliss, Bibi Bayliss, Backly Beam, BigFoot Beam, JuJu Beam, nati Beam, Pelgrim Beam, ELLiebob Bean, LeatherElf1 Beat, Nikky Beat, Carl Beattie, Fe Beattie, sonoma Beatty, Henri Beauchamp, TimTam Beauchamp, Conrad Beaumont, Dieudonnee Beaumont, Kitten Beaumont, Lucilla Beaumont, Odina Beaumont, PCBRANDY Beaumont, PLASTOK Beaumont, Sheree Beaumont, Sweet Beaumont, Olivier Beaumont, Busybee Beaver, Chiheb Bechir, Caspian Beck, GoldenGamer Beck, icar Beck, Jigoes Beck, Matsumoto Beck, Millie Beck, Rhino Beck, Ronor Beck, ropland Beck, wai Beck, laurionna Beckenbauer, Jeffery Beckersted, Dominick Beckham, Druu Becloud, Holger Becloud, Duce Bedlam, Beach Beebe, Manicexpression Beebe, Nicolette Beebe, Feril Beeks, BillyJoe Beerbaum, Lola Beerbaum, Pimppdog Beerbaum, Baylee Beery, DrathnotT Behemoth, Malarthi Behemoth, phoenix Behemoth, Trinity Bekkers, Dioana Bellah, KissesRhawt Bellambi, Bream Bellman, Hazel Bellow, Milo Bellow, Corvette Beltran, Lefty Belvedere, Jaden Benavente, Bianca Bender, Jeremy Bender, Mercedes Benedek, Albert Benelli, Dodi Benelli, Emili Benelli, laurette Benelli, ninake Benelli, Evazion Benelli, Elaine Bennett, Izabella Bentham, Carol Bentley, Deedrick Benton, Joel Berblinger, Lord Berchot, Pele Berchot, Marimar Berchot, Melody Beresford, Brielle Bergbahn, chrissie Bergson, Kody Bergson, Bit Berjis, Kevin Bernal, Dorie Bernstein, mystic Berry, Razza Berry, Bella Bertone, Taylor Berzin, liz Bessie, Kekken Biberman, Nicolas Biddle, Halbert Bienenstich, terrycrow Bigwig, Jasmine Bijoux, Kala Bijoux, Dano Bikcin, enzo Bikcin, Angle Binder, Cuffs Binder, Roxtor Binder, Tom Binder, Agamemnon Bing, Chalander Bing, Gigi Bing, runeking3007 Bing, Monsieur Bingyi, Angelica Biondetti, Melissa Birge, reeneebob Birmingham, Anubis Bishop, Danica Bishop, Mowesy Bisiani, Marteas Biziou, Karla Bjornson, Roxie Bjornson, Travis Bjornson, Atlwolf Blabbermouth, Rice Black, Nathan Black, Amanda Blackmountain, Disstraction Blackthorne, Miriya Blackthorne, Teagan Blackthorne, Orko Blanchard, Neural Blankes, Random Blankes, Shaura Blazer, Nethermind Bliss, dayanne Boa, Denideny Boa, lecosutre Boa, naholc Boa, NITR0US Boa, Prana Boa, RS Boa, penelope Bobak, Bad Bobbysocks, Ryuujin Boccara, Joey Bock, Elkissa Bode, Annika Boehm, Babyblues Boffin, Snodude101101 Bogan, Dirk Bogart, Jily Bogart, Pompo Bombacci, Ascanio Bonetto, Bony Bonetto, Casanova Bonetto, Cuncittina Bonetto, Frede Bonetto, Ervee Bonne, Jolanda Bonne, Poppy Bonne, Becky Book, Bibi Book, Barney Boomslang, Sam Boomslang, Steeven Boorman, Rogue Borgnine, Summer Borgnine, Rafe Borrelly, Equitus Bosch, Peter van den Bosch, tessa Bosshart, Hermione Bossy, Mr Bossy, Rhiannon Bossy, Aspen Bossy, Marisela Bouchard, Tony Bouchard, Annita Boucher, Aster Boucher, Katy Boucher, Lisae Boucher, Router Boucher, Sneaky1 Boucher, Varak Boucher, DarkAlpha Bourne, Hastings Bournemouth, bend Bowie, Lucy Bowie, Casper Box, coolbimbo Box, Kittenna Box, Metaphor Box, Nemesis Box, Bell Boyd, Kelley Boyd, Sylar Boyd, WendyCat Boyd, Denis Boyle, Jennifer Boyle, melmuse Boyle, Alycia Bradley, jayne Bradley, Airie Braendle, Glitch Braess, Su Brando, Tybalt Brando, IntLibber Brautigan, Dante Breck, Carbon Breed, WitchFire Breed, Bella Brennan, erika Brenner, gaby Brenner, Talthybius Brevity, KitKat Brewster, Lindsey Breyer, Artemis Bright, Brigitte Bright, Donnie Bright, Lucas Bright, Oya Bright, Prentice Bright, Risa Bright, Starfire Bright, Beebo Brink, Marcus Brink, Emi Brissot, Ice Brodie, Luth Brodie, Sam Brodie, Chromal Brodsky, Tydomus Brodsky, Cage Brody, Darling Brody, Kurston Brody, Mike1A Brody, UserJesse Brody, Reese Brody, Faith Broek, Happy Broek, ShadowHunter Brokken, Jacey Brooks, Shake Brooks, Shary Brooks, Sigurd Brooks, Tate Brooks, Vanleen Brooks, BruTuS Broome, PastorD Broome, Sarita Broome, October Brotherhood, Elroy Brouwer, Neophyte Brouwer, Jebediah Brown, linda Brown, Schwartz Bruder, lupu Brule, Joshua Brynner, Linda Brynner, Southy Buckenburger, drifterr Bugaboo, Michelle Bumbo, Trixie Bumbo, Paul Bumi, Jitar Bunin, Kerian Bunin, Crystalmom Bunnyhug, Embrace Bunnyhug, Zues Burali, GiGi Burgess, Keith Burgess, Shawna Burgess, Bain Buridan, Sean Buridan, Chiccorosso Burke, Count Burks, Hinamori Burleigh, Atom Burma, Jasper Burma, Aleshanee Burnett, Dottie Burns, Ebro Burns, Skipper Burns, John Burns, Haroldthe Burrel, Big Burt, dubureau Burt, Keisha Burt, phill Burt, Janloo Burton, Madd Burton, Bowlalot Bury, Dreklore Bury, Jarek Bury, Jenni Bury, Lou Bury, Orlando Bury, Angel Butuzova, dodi Byrd, Enchtris Byrd, Tleva Caballero, Gayle Cabaret, Monique Cabaret, Adele Cagney, Cralyn Cagney, Caribbean Cahill, Darien Caldwell, Lily Caldwell, CFire Caldwell, Ciara Calhern, Karl Calhern, Cecil Calhoun, Tizzy Calliope, Hypatia Callisto, Raven Callisto, Fred Cameron, Meliana Cameron, Antonius Camus, Maddie Camus, Raskella Canadeo, Exotica Canadeo, Vessus Candour, Alexis Canetti, Silvio Canetti, Talia Canetti, bragan Canning, Charenthia Canning, Reeda Canning, Vannesh Cannoli, Changurr Cao, Chilli Cao, Dorian Cao, RosyLee Cao, steve319 Cao, Contamina Capalini, Cougard Capalini, Kirsti Capalini, Lindichka Capalini, Lyla Capalini, JohnMAC Carbenell, snake Carbenell, Capri Carbetta, Sophia Carducci, Kid Cardway, Icould Careless, Aurore Carlberg, Brumia Carlberg, Bruni Carlberg, Brandie Carlos, Jenny Carlos, Avalon Carmona, Moana Carmona, Ashelia Carnell, Rain Carnell, CJ Carnot, Madison Carnot, Julie Carpathea, HALOCAT Carr, coolmaria Carroll, karyme Carroll, Leila Carroll, Crisii Carter, cyrielle Carter, isidore Carter, Missi Carter, Shatara Carter, Tristan Carthage, Aemilia Case, Baby Case, Jenn Cassady, Kittygloom Cassady, Charlotte Cassavetes, Holly Cassavetes, Anthony Cassini, Supertell Cassini, Wietse Cassini, Just Cattaneo, Mandy Cattaneo, Aleicester Catteneo, arthuraleksandravicius Cavan, Maximus Cazalet, Quellin Ceawlin, dMetria Cela, Spidey Cela, Arcadia Ceres, wanderer Cerveau, Aaron Cerveau, Marky Chaffe, Stefani Chaffe, The Chaffe, Becca Chambers, Lexis Chambers, Inigo Chamerberlin, Shion Chandrayaan, Ibrisse Chantilly, MaryAnne Chantilly, Cool Chaparral, guy2 Chaplin, Iadwen Chaplin, Lillyann Chaplin, wllmn Chaplin, Marsha Chapman, Caspar Chapman, Dominique Charles, Chilly Charlton, Pammie Charming, Total Chastity, Arohee Chatnoir, Papillon Chatnoir, Barry Cheeky, coldFuSion Cheeky, Nyla Cheeky, Ryan Cheeky, Aggressor Cheetah, Ronald Cheevers, Michelle Chernov, Maggy Chestnut, Cam Chevalier, Eleonore Chevalier, Kelly Chevalier, Mauries Chevalier, Ozzy Chevalier, Rayvendell Chevalier, Swampy Chevalier, Cheesemuncher Chickenwing, Kaltezar Chickenwing, milespeed Chihuly, Coolkama Childs, Michelle Childs, Nicole Childs, SimonRaven Chippewa, Albert Choche, Annetha Christensen, Jennifer Christensen, Zell Christensen, Herman Christiansen, Haifeng Chu, Francis Chung, tyana Chung, Sundance Churchill, Anubis Cioc, Corpierro Cioc, Dwayne Cioc, Knibbel Cioc, Slowhand Citylights, PonygirlSarah Clapper, Jim Clark, Jacob Clark, Jo A Clark, Angelos Clary, Biffle Clary, lilly733 Clary, Rui Clary, William Clary, Otto Clave, Arahan Claveau, Neil Claxton, Mimi Claymore, Pete Claymore, Sam Clayton, Blank Cleanslate, Deckheard Cleanslate, Electron Cleanslate, Spirit Cleanslate, Willow Cleanslate, Kovu Cleaver, Bell Clellon, Covisha Clift, EBCY Clift, Iumi Cline, pizzaguy Clutterbuck, knightrider Clymer, Exia Coage, Brenda Coakes, Lindsay Coakes, Lyndka Cochrane, Ceinwen Coen, Oneil Coen, Mahogony Coffee, Mark Coffee, Lisbeth Cohen, Melayna Colasanti, holly Coldstream, Moon Cole, Shiden Coledale, Castalia Collingwood, JUNKIE Colman, Silver Colman, Stahi Columbia, SweetAbe Columbia, CC Columbo, Charity Colville, Isabeau Conacher, Deb Cone, emili0 Congrejo, MarioDaniel Congrejo, Jazzy Connell, Jenika Connolly, Cooper Conover, Garn Conover, Mara Conover, Myles Cooper, Angelina Coorara, Valentine Coppens, psyco Coppola, Tremleh Coppola, Venus Coppola, Chiana Cordeaux, Sensuality Cordeaux, Clarissa Cordoso, Methos Corinthian, Tylerferland Cork, Caleb Corleone, Montana Corleone, Sparkey Corleone, Zoey Corleone, Achtai Coronet, Count Coronet, Dweedle Coronet, jjccc Coronet, Ron Coronet, Caterina Cortes, Letitia Cortes, Marcella Cortes, Martinelli Cortes, Raven Cortes, Soopafly Cortes, Grazel Cosmo, Athena Cosmos, Cally Cosmos, Annyssa Cosmos, Bunny Costello, Zelitor Costello, Lionel Cournoyer, Sasha Cowen, Carl Crabe, Lyssa Craig, micke Craig, Mel Cramer, Tee Cramer, Avil Creeggan, Bunch Creeggan, CronoCloud Creeggan, NewYorkCityDJ Cremorne, Shalori Cremorne, Artik Crimson, Bliss Crimson, Daffodil Crimson, Raul Crimson, Shaoti Crimson, Trevor Crimson, Rex Cronon, Ace Crosby, Linnrenate Crosby, DaRealNeo Crossing, Wark Cruyff, Silver Csak, Eulalia Cuddihy, Lauralynne Cuddihy, Rammstig Cummings, Rita Cummings, Fremont Cunningham, Jinger Curie, RICX Curie, Betty Curry, Marissa Curtis, Mercurion Curtiss, Juan Cusack, Sanderman Cyclone, Marek Czervik, Alreania DaSilva, Dnel DaSilva, Seph DaSilva, Kelly Dabney, dorothyann07 Dae, Frax Dae, Frost Dae, Syryne Dae, Oddy Dae, 1Time Daehlie, Sinead Daehlie, TRACI Daehlie, Dante Daffodil, Limey Daffodil, stripey Daffodil, Atomik Dagger, Bloodsoaked Dagger, Coca Dagger, Colera Dagger, J4ck Dagger, Jaune Dagger, leigha Dagger, Silver1 Dagger, Alexander Dagmar, Simeon Dagmar, Dweezle Dagostino, Ginoo7 Dagostino, Joka Dagostino, Rachid Dagostino, Sinatra Dagostino, DR Dahlgren, Alexandra Daikon, Devious Dailey, Natalie Dailey, Sukit Dailey, Zoya Dailey, Nad Dal, Rudra Dal, Robert Dale, Coventina Dalgleish, Salvador Dalgleish, Anya Daligdig, Nyterious Daligdig, yvette Daligdig, Kylie Dallin, Angel Damask, Phantom Damask, QatanI Damdin, Bekka Damone, Pashin Damone, Vaekraun Damone, Zoraya Damone, elmoono Dana, Mary Dana, ml Dana, Rezzer Dancer, Shrug Dangle, Guttstein, Daniel, Bubba Daniels, Dinky Daniels, Kiana Daniels, marcel Daniels, Rosey Daniels, Sara Daniels, VictoriaRose Daniels, Ignacio Dannunzio, SlimD Dannunzio, williamae Dannunzio, Chriss Darkes, Digit Darkes, Tanooki Darkes, Bree Darling, Chasity Darling, Darra Darling, Val Darracq, Diana Darragh, Ryan Darragh, Bane Darrow, Bree Darrow, Ivy Darrow, cuddles Dassin, Leeloo Dassin, Dachine Daviau, Gyllian Daviau, Leben Daviau, Serioto Daviau, Willow Daviau, Allison David, JamieZel David, Todd David, Casey Davidson, LaNikki Davis, Whispering Dawn, Lady Dawson, Helen Dayton, Ryan Dayton, Ooh Dazy, Woopsy Dazy, Brighid DeCuir, eZekiel DeCuir, Link DeCuir, nath DeCuir, Rhys DeCuir, siliconegirl DeCuir, spring DeCuir, Iron DeCuir, Escort DeFarge, Archangelo DeSantis, Aubrey DeSantis, Gustav DeSantis, Hippy DeSantis, Ilana DeSantis, Sutara DeSantis, Undina DeSantis, Axienne DeVaux, Dana DeVaux, Kitty DeVaux, Mindy DeVaux, Krystal DeVinna, Krystalynn DeVinna, Magenta DeVinna, Manuela DeVinna, Spike Deakins, Debbes Dean, Korben Dean, Dogbert Debevec, Savannah Debs, emily Decatur, Heiko Decatur, Zorena Deckard, Andrea Decosta, Dolly Decosta, Esperenza Decosta, Kruppen Decosta, larrykin Decosta, PhoenixRose Decosta, Sophy Decosta, Twinsen Decosta, Vladimir Decosta, Duxster Deere, Maxim Deharo, Summerbreeze Deharo, Matti Deigan, DeeAnn Dejavu, Gina Dejavu, Shai Delacroix, alexis Delcon, Ashly Delcon, Kane Delcon, Dante Deledda, Lady Deledda, Jega Delgado, Alicia Delphin, Darek Deluca, Lestat Demain, Nuka Demain, Allissa Demar, Lilyanah Demar, Aeleen Demina, Blowing Demina, Kalm Demina, Sarias Demina, Skeddles Demina, Sweet Demina, Alida Demontrond, Redux Dengaku, J. Derby, Cristell Deschanel, Ivey Deschanel, SinaMaria Deschanel, Elisabeth Desideri, Monique Desideri, Bartiloux Desmoulins, Hazel Desmoulins, Isis Desmoulins, Phoenix Desmoulins, Jon Desmoulins, Dino Despres, Samantha Despres, Snowflake Despres, Bones Detritus, Neo Devoix, Bre Dharma, Showshawna Dharma, Mike DiPrima, Winter DiPrima, Gongree Diage, Azure Diamond, Styles Diamond, Maike Dibou, Klaus Dieffenbach, Xavier Dieffenbach, Lordfly Digeridoo, Selkit Diller, Tari Dilley, Kelly Dilweg, Werewolf Dingo, Darkharmony Dingson, Knud Dingson, Jewel Dinkin, Mecha Dinosaur, Savonna Dinova, Amina Diplomat, FuZzY Diqui, Crimson Divine, Lizbeth Divine, Cryptid Divisadero, Destiny Divisadero, Montsho Division, Gryphon Dix, Kittybird Dix, Hope Dixon, CadiWolf Dobbs, Darling Doboy, Nicole Docherty, Ralph Doctorow, Odo Dod, nik385 Doesburg, sam Doigts, Elea Dollinger, Miche Dollinger, Severina Dollinger, Eric Domela, Krysta Domela, Franky Donaldo, Duntroon Donburi, Tricia Donovan, Sabrina Doolittle, DeDe Doowangle, Dinghy Doowangle, Phoebe Doowangle, Ratzfatz Dorado, Jessalicious Dorance, RJaNator Dorance, Kalemika Dougall, Fi Douglas, Norelyn Douglas, Aerrett Dovgal, Wendy Dovgal, Alex Drago, MAGWolf Drago, Lupo Drake, Palanth Drake, Aryanna Draken, Drinkin Draken, Kaylan Draken, Maddy Draken, nixkuroi Draken, Thornpaw Draken, Sinjo Drakes, James001 Dryke, Nameless Dryke, Roberta Ducatillon, Helke Duettmann, Moni Duettmann, Kyla Duke, Esence Dulce, Manuella Dulce, Ric Dulce, Shannel Dulce, Xander Dumont, Lionna Dumouriez, Marko Duncan, Duncan, Lyre Dunia, Cyndari Dunn, Garth Dunn, Sugababe Duport, Taylorholic Durant, Vixie Durant, Julie Durant, Drew Dwi, Ribbon Dye, Michelle Dzieciol, shngy Dzieciol, Jeffrey Earp, Umbrella Ebi, Adi Eccleston, Bazzerbill Eccleston, Dragon Eccleston, chawna Eclipse, Minolin Eclipse, Valkyrie Eclipse, Joi Edelman, Alx Edman, Daniella Edman, Saskia Edman, Storm Edman, Cory Edo, Tommy Ehrler, Stephe Ehrler, Edred Einarmige, Hope Eldrich, Kai Eldrich, Winter Eldrich, Thunder Electric, Ezmerelda Electricteeth, Hostile Electricteeth, Kris Electricteeth, Loki Eliot, rudy2zday Eliot, Shaydin Eliot, Iris Ellison, Enigma Elswit, Tim Ely, Darkling Elytis, Delu Elytis, Happy Elytis, Jessica Elytis, Bernd Emmons, Kellie Emmons, Robbert Emmons, Bean Emoto, dick Encore, Andy Enfield, Fuzionor Engawa, Hethr Engel, RH Engel, Digital Enigma, Kahlest Enoch, Lex Enoch, Oran Enoch, Ryal Enoch, Wobmongle Enoch, Wyatt Enoch, Pea Enzyme, Antony Epin, Sapphire Epin, DBDigital Epsilon, Shoshana Epsilon, FallenAngel Erato, Renton Eretz, Mo Eriksen, 64Y80Y Eros, tommy Eros, Nicola Escher, Zak Escher, Salvatore Esposito, Quinevere Essex, Zed Essex, Fabian Etchegaray, Psyche Etoile, Byanex Etzel, CrimsonWings Eun, Deckard Eun, Arwen Eusebio, Anastacia Evans, buttonlynn Evans, Rose Evans, Romeo Evelyn, Sephiroth Everidge, Patriiick Ewing, Trey Ewing, Vivian Ewing, Xwing Ewing, Zha Ewry, SirZarath Excelsior, Zorrita Express, Hierophant Extraordinaire, Blanche Fabre, Annie Fackler, Wolfgang Fackler, Amy Faddoul, Shukran Fahid, Garth FairChang, Brooke Fairplay, TOmmy Fairplay, Vixen Fairplay, Bobby Fairweather, Darlean Fairymeadow, Gotobug Fairymeadow, Heathie Fairymeadow, Meleni Fairymeadow, Moon Fairymeadow, Odysseus Fairymeadow, rob Fairymeadow, Taylkusha Fairymeadow, Crystal Falcon, WhiteAngel Falcon, VetteMan Falken, Evilpony Fallon, Fernand Fapp, Sasuke Fapp, Roen Fardel, Dariush Fargis, Jenn Fargis, Mandy Farina, Kokoro Fasching, Madison Fasching, Ben Fassbinder, Leo Fastback, Rikky Faulds, STEEL Faulds, Equino Faulkland, Flynn Faulkland, High Faulkland, Arda Fauna, Elvis Faust, Benelli Federal, Forest Federko, Belle Fegte, Danny Feingold, Luc Feingold, Bing Fell, Darky Fellini, Jaze Fellini, Sacha Fellini, paulie Femto, Ynot Fenua, Fau Ferdinand, Soren Ferlinghetti, Meri Fermi, Boxter Ferraris, Danamea Ferraris, Duilho Ferraris, Fred33 Ferraris, LeekySean Ferraris, Letizia Ferraris, Marlowe Ferraris, Wanted Ferraris, Xavier Ferraris, Feff Ferrer, Thomas Ferris, Nakala Fetisov, Astrin Few, Chosen Few, Ahh Fiddlesticks, Chantal Fielding, Caleb Fierrens, Patrice Fierrens, sam Fieseler, NutZ Figaro, summer Figaro, Leumia Figgis, Mae Figtree, Maldavius Figtree, Ravovich Figtree, Morgana Fillion, Brett Finsbury, sofia Finsbury, Jazmina Firefly, sasha Fischer, william Fish, Nadia Fisher, StevenSDF Fisher, Carol A . Fisher, Dimitri Fisseux, Manni Fitzgerald, Freddie Fitzroy, Phineas Flagstaff, Ante Flan, Braden Flanagan, BrettEbay Flanagan, Echo Flanagan, Knute Flanagan, Kristjan Flanagan, LilyRose Flanagan, Meril Flanagan, Lulu Flasheart, Jolie Fleury, Clitoria Flint, Fifi Flintlock, Frostie Flora, Kitto Flora, Chriss Florio, Arlen Flossberg, Angel Fluffy, Emilyuk Fluffy, Frurry Fluno, Faedra Flytrap, Brieg Foden, Annette Fonda, Katina Fonda, Raymond Fonda, Marcos Fonzarelli, Yuri Fonzarelli, CrystalShard Foo, etoile16 Food, Kim Food, Kode Forager, Vodka Forager, Wendy Forager, Lucien Forcella, Maela Forcella, Olli Forcella, Violet Forcella, Clarissa Forder, darkdog Forder, Hans Forder, Jango3234 Forder, Olli Forder, Naryu Forester, FaustTiger Forte, Richie Forte, BMFC Forwzy, Erick Forwzy, SusNy Foss, Sanford Foulon, Iwana Fouquet, Kae Fox, Raudf Fox, Wolfie Fox, Phli Foxchase, Kityn Foxley, MollyBrown Foxley, Qua Frampton, Ice Franchini, Nicolas Franchini, Soizie Franciosa, Samson Francis, Nequam Frangilli, Andreas Frankfurter, PreWired Frankfurter, Diane Franklin, Cappy Frantisek, Romano Frascati, DeMits Frederix, Mel Fredriksson, Sune Fredriksson, Tina Fredriksson, Fastfreddy Freeloader, Sammar Freeman, Kitty Freund, Jorgen Friis, Zorin Frobozz, mdbobbitt Frobozz, Chris Frontenac, Foolish Frost, Asriazh Frye, Patti Frye, Phish Frye, Nobody Fugazi, Simba Fuhr, Snugglebunny Fuhr, fallendream Furse, Jamie Furst, Cherise Gagliano, Laura Gagliano, Gammy Gainey, Gazz Galatea, Govindira Galatea, Rizpah Galatea, Amber Galbraith, Mandy Galileo, william Galileo, David Gall, LoLa Galland, Zach Ganache, Casey Gandini, Edgar Gantenbein, Jonx Gao, Soso Gao, Madison Gardner, Silver Garfield, Michelle Garrigus, Nerdmaster Garrigus, Jarik Garsztka, Svoboda Garsztka, Salkin Gascoigne, Roger Gaspara, Buttlock Gasser, Pud Gasser, Zina Gasser, Prince Gausman, livingdead Ge, Josh Geesink, Tolly Geest, Georgina Geewhiz, Chris Geiger, Sabine Geiger, Samuel Geiger, Tristessa Geiger, Joe Gemini, Mielle Gemini, Misty Gentil, Sanna Georgette, Phoenix Gerhadsen, Mic Ghia, Salores Ghia, Loskobosko Giacomin, Susanne Giffen, Lazarus Giha, Micah Giha, Merry Gildea, Summer Gildea, Brittany Giles, Rayy Giles, sevron Giles, Gattz Gilman, Rori Gilmour, SunQueen Ginsberg, Rockwell Ginsberg, Intolerable Ginsburg, Junie Ginsburg, Enrico Giove, Krystal Giove, Annie Giovinazzo, Cat Gisel, Constantine Giugiaro, Io Giugiaro, Persimmon Gjellerup, Lorna Gladstone, Toby Gladstone, Dale Glass, Gellan Glenelg, EmmaBella Glimmer, louise Glimmer, Gianna Glitter, Melyissa Glitterbuck, Victoria Glushenko, Wolf Goalpost, Chris Gobo, Xerses Goff, Sturdus Goldblatt, Nigel Goldflake, Major Golding, Master Goldkey, Zho Golem, Stylez Gomez, Carlos Gomez, Alecydoss Gontermann, Skyler Goode, Valentine Goode, Odd Goodfellow, Dragyn Goodliffe, Hank Goodliffe, Livinda Goodliffe, Robertt Goodliffe, Daphne Goodnight, Sean Gorham, Ledje Gorky, Emma Gould, Amaze Grace, Lagerstone Graff, Harper Grainger, Andy Grant, Carrie Grant, LauraLOral Granville, AlphaOmega Graves, Ebon Graves, Kyrii Graves, Leeloo Graves, Bosco Gray, Dez Gray, Renegade Gray, Summer Gray, Aries Graysmark, Edian Graysmark, Scotty Grayson, Mantis Grebe, Kelly Green, cara Greene, Kimber Greene, Mystical Greene, Raven Greene, Soilent Greene, Matthew Greene, Soilent Greene, Roberta Greenfield, ShayLee Greenspan, Dax Greer, Angel Gregg, Kyleigh Gregg, Sophie Greggan, Deanna Gregoire, StylynProfylyn Gretzky, Farallon Greyskin, Kraal Griffith, Xavier Griffith, Jacomo Grigg, Sylvie Grizot, bodyman72 Grot, Damian Grot, MarieCaroline Grumiaux, Mozo Grumiaux, Oceane Grumiaux, Jadem Gruppman, Gracie Grut, Jennie Grut, Mhaijik Guillaume, Frog Gulick, RacerX Gullwing, Enktan Gully, Gilly Gully, Woozie Gumshoe, Teddy Gumsing, Stephane Gunawan, Alienbear Gupte, Boroondas Gupte, mcgeeb Gupte, Elise Guyot, Jamal Guyot, Lawyer Guyot, Thiago Guyot, Arwen Gymnast, denniswo1993 Gymnast, Lukes Gymnast, Miki Gymnast, Sizoark Gynoid, Markiss Haas, Pepper Haas, Arkanys Hadlee, Apollo Haight, Lord Haight, Fawn Hailey, Kaelin Hailey, Gaelle Halasy, ISIS Halberd, Meg Halberd, Zander Halberd, Arnold Halderman, Malarwen Hall, Ken Hall, Jonah2cd Hallard, Saii Hallard, Trixie Hallard, Doris Haller, Destina Halley, Susiee Hamilton, IBMTapeGuy Hammerer, Lighten Hammerer, VEVER Hammerer, Alison Hamsun, Fawn Hana, leah Hana, Darknite Hand, Emperors Hand, nefertiti71 Handrick, Rodney Handrick, Delerium Hannibal, leanhaumshee Hannya, jingle Hansen, Mattie Hansen, Terry Hansen, Vox Hansen, Filo Hapmouche, Gustavus Hapmouche, Nounouch Hapmouche, Adrian Harbinger, Kami Harbinger, StormCrow Harbinger, CherryBomb Hare, Den Hare, Omegasun Harford, ricky Harford, ricky Harford, Harley, Jenna Harley, Kristina Harley, Natasha Harlow, Hummer Harmison, Allen Harrington, Tessa Harrington, Joker Harris, Shanti Harris, Dagon Harrison, J0NATHAN Harrop, Kerinauu Hartunian, Kyentay Hartunian, Rav Hartunian, Ski Harvey, Tuesday Harvey, Xylo Hasp, Betina Hatfield, Gina Hatfield, Calamity Hathaway, Dorian Hathaway, Duncan Hathaway, Xavier Hathaway, Jack Hathor, Kamilah Hauptmann, Pam Havercamp, swift Havercamp, Griselda Hawes, kwanita Hawks, Ravenis Hawks, BenG Hax, el33t Hax, Juicy Hax, Macx Hax, Meta Hax, Mikka Hax, Mokona512 Hax, Mr8ball Hax, Prophet Hax, Rina Hax, Slober Hax, Starbuck Hax, Takehiro4 Hax, Kyle Hayashi, Ashrilyn Hayashida, Eriko Hayashida, August Hayek, Milton Hayek, Ronnie Hayes, Max Hazlehurst, Sorsaran Hazlehurst, Grath Hazlitt, Violet Hazlitt, April Heaney, Aquela Hearn, jefferey Heart, Kalyrra Heart, Marissa Heart, Taina Heart, TLC Heart, Tori Heart, Dana Hebert, Trimzi Hedges, AmazedBlue Hegel, Dagmar Heideman, r0bin Helsinki, Moira Henley, Ursa Henley, Joharr Hennah, Daviana Hennesy, GJ Hennesy, jens Hennesy, Karl Herber, mistydawn Herbst, Donatella Hermano, Robins Hermano, Ekib Hern, Greves Heron, Jagged Heron, Christel Herzbrun, le Herzog, Reverend Herzog, Elektra Hesse, SweetDesire Heston, Cotton Hicks, Zack Hicks, Kevyn Hienke, Tristan Hienzman, Devin Hill, Wendy Hill, Tensai Hilra, Valek Hin, Adolph Hinkle, Timothy Hinkle, YoCo Hird, Amber Hirvi, Dagon Hitchcock, Heather Hitchcock, Noah Hitchcock, Sianna Hock, Dominique Hofmann, Holly Hofmann, Ganador Holgado, Brookston Holiday, Davidd Holmer, Sam Holyoke, Alexander Homewood, atory Homewood, dabadguy Homewood, Ed Homewood, Huge Homewood, Meesha Homewood, tilstad Homewood, Cremi Honey, Laura Honey, Sandling Honey, Honey, Haos Honua, Vudu Hoodoo, Dallas Horsefly, Lucy Horton, SJ Horton, Homer Horwitz, naty Hotaling, Traceysvideos Hotger, DaQueenB Houston, Natasha Houston, Tia Houston, Hughes Howard, Meg Howe, Edward Howton, Falllen Howton, Pepto Hoyer, Sabrina Hoyer, LadyAbigail Hubbard, Kristopher Hudson, Nikita Hudson, Titus Hudson, XLR8RRICK Hudson, Holly Huffhines, Bella Hugo, Haole Hula, Sard Huldschinsky, Neran Hull, Anastasia Humphrey, October Hush, Silent Hush, Ctarr Huszar, ac14 Hutson, Dex Hutton, Fox Hwasung, Johanna Hyacinth, White Hyacinth, Adrianna Hyde, DJ Hyde, Ty Hyland, Adeline Hynes, Cathy Hynes, DeepSweet Hynes, Psykeeper Hynes, Sexy Hynes, Ares Hyun, Emperor Hyun, melodie Hyun, slayer Hyun, Puck Ida, Weary Ida, Anne Idler, Ruby Idora, Bryan Idziak, Six Igaly, elfi Independent, Spike Independent, Veilofunknown Independent, Bryndi Ingersoll, Ingrid Ingersoll, Noelyci Ingmann, Andrew Ingrassia, Dale Innis, Foxy Innis, Vern Innis, 111Mc Innis, Cloud Insoo, MEtoo Insoo, Quinn Iredell, Rebekah Iredell, Lucien Ireton, Maggie Ireton, Austin Ironclad, DavidJames Irwin, Roy Irwin, Xavier Irwin, Esmee Isbell, Miyu Ishii, Billy Islander, Misa Itamae, Magnum Iuga, Akasha Ivory, Juliana Ivory, WHITEMAGIC Ivory, Gazometr Ivory, Indigo Izumi, Kami Izumi, Salazar Jack, Gunslinger Jackalope, Sutton Jacks, Casandra Jackson, Dernard Jackson, Dougal Jacobs, Lone Jacobs, Sydney Jacobs, jefftlse Jacobus, jose007 Jacobus, justine Jacobus, LampLighter Jacobus, Micha Jacobus, Jadge Jacobus, Enchant Jacques, Victoria Jacques, Dreamweaver Jae, Gregoire James, Kizza James, Vienna James, Barry Jannings, Bianca Jannings, Gwen Jannings, Juappa Jannings, Paisley Jannings, Coos Jansma, Fernandinho Jansma, Griffioen Jansma, Jiire Jansma, IsisLynn Janus, Theobaise Janus, Conway Jarrico, DylanJr Jarrico, Quest Jarrico, erba Jarvis, Jeagerman Javelin, Alan Jay, Lopp Jay, harpo Jedburgh, Craig Jeffries, Alexis Jenns, Bimbie Jenns, XanXan Jervil, Alexander Jessop, Gelenas Jessop, RodneyLee Jessop, Tataniya Jessop, Amethyst Jetaime, Kooky Jetaime, Sapphire Jetaime, Tempest Jewel, Vampirella Jewel, Elia Jewell, Josey Jewell, Shaolin Jewell, Sheeba Jewell, Stefu Jewell, Uma Jewell, Rosslin Jiang, alex Jimenez, Forest Joffe, John Jogiches, Dyani Johin, Musashi Johin, Major Johnson, Dean Johnson, Peter Johnson, Thomas Carson Johnson, Janet Jones, Jason Jones, Bedo Jonze, Elaine Jorgensen, Osiloa Jorgensen, Mariah Jubilee, Sam Jubilee, Ada Jun, Chenak Jun, Ferris Jun, kelyane Jun, Takeshi Jun, Tommi Jun, Phoebe Juneau, Grace Juniper, icandi Juno, Kimo Junot, isha Juran, Orchid Juran, Torsten Juran, Krzywol Kaczmarek, Sakura Kagekiyo, Meni Kaiousei, Fritz Kakapo, Esdrael Kamachi, Kathy Kamenev, Darsuky Kaminski, Rebecca Kaminski, Digital Kaos, Kappa Kappa, Leah Kappa, Gapple Kappler, Cristalle Karami, Toledo Karas, Tina Karlfeldt, Angelina Karura, Samara Kasshiki, Kitty Katscher, Lonetree Katscher, Goldie Katsu, Shamir Katsu, Lacey Kavanagh, Scrooge Kavanagh, Faye Kawabata, Ninja Kawabata, Onimusho Kawaguichi, Brad Kazakov, Ida Keen, Jeff Kelley, Kyle Kelley, An Kellner, Cindy Kellner, Kean Kelly, Tony Kembla, KaliCat Kennedy, Fred Kenorland, Sharon Kent, Nils Kenzo, Rase Kenzo, Tammy Kenzo, Tyci Kenzo, chica Keon, Benja Kepler, Gust Kepler, KittyKatt Kerensky, anton Keynes, Ipenda Keynes, Malevolyn Keynes, Ayumi Khorana, Hoshi Kiama, Nekorina Kiama, Aurillius Kidd, Bare Kidd, Billboard Kidd, Blurple Kidd, Cade Kidd, Ekerilar Kidd, FFS Kidd, Lazarus Kidd, Lea Kidd, MidnightRush Kidd, Mittens Kidd, Morliona Kidd, Neilly Kidd, Kim Kienzle, RJ Kikuchiyo, Gail Kilara, Fish Kilby, zeelee Kindley, Montez King, Dax Kirkorian, Myoukitsune Kirkorian, Szandor Kirkorian, Cmtccmoi Kish, Kia Kish, DaQbet Kish, Coca Kit, Developer Kit, pronto Kit, Sunshine Kit, ssjkriccolo Kitchensink, Reisuki Kitsune, Tengu Kitsune, AngelEyes Kittinger, Devilish Kitty, Kitty, Panther Kitty, Daaneth Kivioq, Praseodymium Kivioq, Sonya Kivioq, Emily Kleene, Buejien Klees, Princess Klees, SaltySugar Klees, Parrish Kline, ProfessorKindly Kline, Chelsay Knibber, Victoria Knight, Raspitomaru Knopfli, Cocoanut Koala, Akiko Koba, Bryan Koba, dawood Koba, Izen Koba, Nebur Koba, Taran Koba, Pamela Koenig, Neo Koga, BlackOut Kohime, Jazzie Kohime, Naa Kohime, Seriuskid Kohime, Wandale Kohime, Zana Kohime, Zerosix Kohime, Maucat Koi, Dagmar Kojishi, Chroma Kolache, Icey Kolache, Kornscope Komachi, Bri Koolhaas, KamaSutra Koolhaas, Katya Koolhaas, Trylle Korda, Corrine Korobase, Navajo Korvin, Pasha Korvin, David Kostolany, quintin Kostolany, Tasha Kostolany, Amy Kotobide, Zaphod Kotobide, KYWLDCT Kovacs, LillyEliska Kralomoc, Joseph Krams, Fumon Kubo, LudwigVan Kubrick, Anagras Kuhn, Selina Kuhn, Tal Kuhn, Finora Kuncoro, Maya Kupferberg, Jana Kurelek, Shika Kuri, Yo0gy Kuri, Endo Kurosawa, Tatsuki Kurosawa, MrBill Kurri, Albert Kwak, Kwakkelde Kwak, Duckling Kwak, Kasey Kyger, Kaimi Kyomoon, Stelard Kyomoon, Kyo Kyong, Emm Laa, Keera Laasonen, Delvendez Laborde, Raban Laborde, Amodeus Labrada, Louisa Labrada, Sweeten Lacey, Fiachra Lach, Eliv Lachman, Flykiwi Lachman, Charlie Laffer, LarryS Laffer, Sasha Lafleur, OxLukexO Lagan, Shadow Lagan, Tilianna Lagan, Jaye Lahtoh, Davoid Lake, Fairlight Lake, Thomas Lake, Veronique Lalonde, Leticia Lambeau, Maleia Lambeau, Cross Lament, Drakon Lameth, Misch Lameth, Caeleigh Lamington, Nedrick Lamont, essayn Lamont, Dwayne Lancaster, Hiram Lancaster, Carlton Lane, Christo83 Lane, DOO Lane, Niket Lane, Roughtoe Lane, Taylor Lane, Ami Lang, Emily Lang, Ruadh Langwarrin, Sasha Lapointe, Garrett Laramide, TBA Lardner, Beverly Larkin, Marcoh Larsen, Vanessa Larsen, bjf25 Larsson, curL Larsson, Garsson Larsson, Jondolarr Larsson, Justicar Larsson, Quinn Larsson, redshoedave Larsson, Tod Larsson, lea Laryukov, Renate Laryukov, Benny Lassally, Khristen Lassard, Josh Latrell, Lacey Latrell, Shari Latrell, Casper Laughton, Kory Laughton, Lisa Launay, Sasha Launay, Areyn Laurasia, Crystaleen Laval, Moirae Laval, Sascha Laval, Slasha Laval, Tiberius Laval, Shadow Laviolette, Velarissa Laviolette, Zeus Laws, Snaptick Laxness, wtf Laxness, Carrie Laysan, Norton Lazarno, Candide LeMay, Dustin LeMay, Shelly LeMay, Antionette LeShelle, Hayden LeShelle, Kristian LeShelle, Monika LeShelle, Mysti LeShelle, Shaklin LeShelle, Shavaii LeShelle, Lord Leafblower, Kinjry Legend, UniqueRose Legend, Jonny Legien, Lillia Lehane, Renae Leigh, KeiAira Leigh, Casper Leinhardt, MiaLily Lelouch, Adriana Lemieux, Keiki Lemieux, Ginger Lemmon, Heather Lemmon, JohnnyMac Lemmon, Lenni Lemuria, Bubba Leonard, Spyder Leroy, Aral Levitt, DarionMonkee Levitt, Quiana Levitt, Angharad Lewellen, AngelEyes Lewis, Cookie Lewis, JonnyImpala Lewis, Ekka Li, Jesa Li, Anark Liebknecht, KUieTSToRm Lightcloud, Lincoln Lightfoot, Nicola Lightfoot, Shaman Lightstone, Nika Lightworker, April Lilliehook, Joi Lilliehook, Kimi Lilliehook, LAPDHOLLYWOOD2000 Lilliehook, Lindy Lilliehook, Shayne Lilliehook, Skywil Lilliehook, Neo Linden, Amber Linden, Guy Linden, Teeple Linden, Marck Lindman, NoSpy Lindman, Rahduhlac Lineker, Evangeline Ling, Kailani Ling, Karyll Ling, Lexus Ling, moon Ling, Wai Ling, Samantha Lingiuan, CyberonX Link, Laynie Link, SLurl Link, Aphrodisiack Lisle, Petunia Liveoak, Eithnie Llanfair, Jennifer Llanfair, Pami Llewelyn, Gwyneth Llewelyn, Kiten Lobo, Paul Lobo, Khrome Lock, Brett Logan, Dragger Lok, Pavig Lok, Sera Lok, May Loll, Lola Lollipop, SweetTasting Lollipop, Nikee London, Trinity London, Dogan Lonergan, Rod Longcloth, Excalibur Longstaff, Apolonique Loon, Austyn Loon, Danyhael Loon, Goreki Loon, Huligo Loon, Jaffred Loon, LouisS Loon, Luke Loon, mahee Loon, Ruthless Loon, Melina Loonie, rasta Lopez, Lydiah Lorentz, Stellar Losangeles, Blackie Lotus, Misha Lotus, Alysia Loudon, Grace Loudon, grumble Loudon, Kate Loudon, kimmie Loveless, LadyMacbrat Loveless, Ally Lovell, Dixii Lovell, Darb2rad Lowe, Lozzie Lowe, Trip Lowe, Andrek Lowell, Jaraziah Lowell, Lissa Lowell, Stryfe Lowell, Leland Lowell, Leonardo Lowey, Stagger Lowey, Strabo Lowey, Raen Lu, Laurie Lubezki, MissJean Lubezki, Lucia Lucero, Lee Ludd, Franchises Lulu, Jayden Lulu, Kitten Lulu, mona Lumet, Alienor Lumiere, Michi Lumin, Wolf Lumin, Grumpy Lumley, Sian Lumley, HamSuiJe Lumpen, Laguna Luna, Starbella Luna, Ashley Lundquist, Theosta Lunt, Cliothe Luo, Lincoln Lupino, Bronwyn Lurra, Mineki Lurra, MYMistress Lusch, Linnae Lusso, Natalie Lustre, Rose Luxemburg, Helena Lycia, AG Lykin, Lhlilith Lykin, Niko Lykin, Logan Lyne, Jacques Lytton, Kianeira MacDiarmid, Apple MacKay, Melissa MacKay, Bailey Mackenzie, Maxx Mackenzie, Rose Mackie, Ee Maculate, Gaetan Maculate, Ravarian Maculate, Adrian Maddaloni, yearning Maddaloni, Ava Maddux, Flezix Maddux, Karamel Madison, Allure Madonna, Mannie Madonna, Sitearm Madonna, Mario Madsen, Mitzy Madsen, Ben Maersk, Lillian Maertens, Turk Maertens, Stephanie Magnolia, Lonique Magojiro, WarKirby Magojiro, Loki Mahana, Vinny Mahana, Semiramis Mahina, Shadow Mahoney, Rissa Maidstone, Tynana Maidstone, Angel Majestic, Jeremy Majestic, StarFire Majestic, Tiara Majestic, One Maktoum, Lana Maladay, Marzipan Maladay, Missy Malaprop, Ordinal Malaprop, Void Malaprop, Natasha Malibu, Rygel Malick, Ali Maltz, Leena Maltz, Cage Mandala, Synthalor Mandelbrot, Zeppelin Mandelbrot, Esteban Manen, Kawaii Manga, Mailee Manga, Nathalie Manga, Yinato Manga, Mya Mantis, Madame Maracas, Maisa Maracas, Domino Marama, Panama Marama, Charm March, SallyWoelfin March, Markel Marchionne, AdriAnne Margulis, Edgware Marker, Tika Market, AiSenshi Market, Lizbeth Marlowe, Queue Marlowe, Joana Maroon, Grey Marquette, Adrianna Marquez, Jeremy Marquez, Shirley Marquez, Christian Marquez, Dax Mars, Dnate Mars, Xandi Mars, Sarah Marsi, Garmon Martin, Sean Martin, SignpostMarv Martin, Brittany Martinek, Sweet Martini, ElDraque Martov, Aminom Marvin, Edwin Marvin, Meatnik Marvin, Zanza Marx, bollit Masala, Nguai Masala, Satya Masala, team23 Mascot, Tyler Mason, NAM Massey, Minasojo Massiel, Gatto Mastroianni, Checho Masukami, SlavegirlPaula Masukami, Hellsing Matador, Femina Matahari, Leoki Matahari, Rosa Mathieson, Violet Mathieson, MikVik Mathilde, Jonathan Mathy, Ernesto Matova, Selenia Matova, Meltharas Matsukaze, lordneg Matzerath, Memnoch Matzerath, Dedric Mauriac, Kezz Mauriac, Wolruf Mauvaise, coyote Maverick, Martin Maxwell, jericka May, Jeza May, Mellony May, Lauri Mayfair, EnCore Mayne, revochen Mayne, amaya Mayo, Hellmanns Mayo, Jima Mayo, Kion Mayo, Kisho Mayo, Mo9a7i Mayo, Neobe Mayo, Salazar Mayo, Sat Mayo, Scotto Mayo, William Mayo, Gino McAllister, Masion McAllister, Wallace McAllister, DarlinNikki McAlpine, Hawk McAlpine, Inga McAlpine, Lex McArdle, Maggie McArdle, Joshua McCallister, Keegan McCallister, Bradford McCann, Ella McCann, Flox McCarey, Jezzie McCellan, David E . McClure, Cash McConachie, Cathal McConachie, Tad McConachie, Aodhan McDunnough, Drew McDunnough, Artie McFly, Minnie McGann, Sabine McGettigan, Poppet McGimsie, Carole McGuire, Tegwenn McKenna, Shaemus McLaglen, ShirleyM McLaglen, Dirty McLean, HoseQueen McLean, Billibob McLeod, Cari McLeod, Innes McLeod, Jaenae McLeod, Slate McLeod, Troy McLuhan, Anya McMahon, DoGGo McMahon, Hutch McMahon, Iras McMahon, Jian McMahon, Jimama McMahon, Kouki McMahon, Sioban McMahon, Akie McMillan, laika McMillan, Lauris McMillan, Marteze McMillan, Maye McMillan, Nicholas McMillan, Radikal McMillan, Tammi McMillan, Jax McNally, Arwyn Meadowbrook, Waterflower Meadowbrook, Ima Mechanique, Nber Medici, Chandra Meehan, Geo Meek, Earane Meiji, Jessica Meiklejohn, Emiko Meili, penelope Meili, Luz Melbourne, Marti Melnik, MenuBar Memorial, Aitor Mendes, Mona Mendes, Jay Menges, Kimmie Menges, Lennart Menges, Margaret Menges, Mikel Menjou, VzNevada Menoptra, Merselus Mensing, Leia Mercy, SAPPHIRE Mercy, Sofie Mercy, ozadakan Meriman, Sandycd Meriman, Washington1985 Meriman, Infiniview Merit, Nanashe Merkur, Ayahuasca Merlin, Craischen Merlin, devillover Merlin, Faer Merlin, Jarros Merlin, Jolie Merlin, Kejo Merlin, Mario4 Merlin, Sarah Merlin, Silas Merlin, Wizard01 Merlin, Telitha Merlin, Vrrgo Merlin, Rocky Merosi, Luxe Merrienboer, Lance Mertel, Angus Mesmer, MysElf Messmer, Lonny Miasma, Utopar Michinaga, MTC Mielziner, Enysy Mikita, Celeste Miles, Giovani Miles, Guli Miles, Mars Miles, Noah Miles, RobWest Miles, Subzero Miles, DALLAS Milestone, Jane Milev, Jesper Milev, MMz Milev, YumYum Milk, Belle Milland, Berri Milland, Joanne Milland, Vicky Miller, Samantha Miller, Calvin Millions, Envy Millions, Lusty Millions, Versu Millionsofus, AsteroidS Mills, Emixam Mills, Goodstuff Mills, Guntrinkyt Mills, Isabella Mills, Landen Mills, Noelle Mills, Sand Mills, Djarno Mills, Mandee Milner, Haika Milo, Mankud Milo, Slobodan Milosz, Eliezer Mimistrobell, Amoret Mineff, Little Ming, Mako Minogue, Mandee Minogue, Milena Minogue, Sylfie Minogue, Manon Mirabeau, Tygeria Mirabeau, leliel Mirihi, Cmdr Misfit, disisme Misfit, fangy Misfit, Grim Misfit, RedWolf Misfit, Michal Mishin, Robby Mission, Shawn Mission, Haravikk Mistral, Thom Mistral, Sertories Mitchell, Temporal Mitra, Bphero Mizser, Stolar Mohr, DarkWulf Mokeev, Nemo Mokeev, sharon Mokeev, Sech Molinari, lara Molinaro, MARIOS Molinaro, James Mommsen, Sierra Monnett, Joan Monstre, Cattra Montagne, Galadhriel Montagne, AnnaMarie Montgomery, Christine Montgomery, Mariah Montgomery, Shawna Montgomery, Jemima Moo, Jihashi Moo, Moonie Moo, Wiske Moo, Borgie Moody, DOA Moody, Makinzie Moody, Preciousse Moody, Bit Moody, Luna Moody, ziphren Moonflower, Axl Moonlight, FxyLdy Moonlight, Stormy Moonlight, Lichtje Moonsoo, Astryd Moore, Haze Moore, Walker Moore, wiseman Moore, Zak Moore, Mordechai Moose, JMM Morahan, Kayleigh Morahan, Cyndi Moran, Marcus Moreau, Kathy Morellet, Violet Morellet, Heather Morenz, Maggie Morgan, Newbie1canobe Morgan, Sumar Morgan, Bella Morico, Ornella Morigi, Eagle Morris, Amanda Morrison, Maeyanie Mosienko, Svetlana Mosienko, Trinity Mostel, Risa Mosuke, Falcon Mountain, NEWB Mountain, Windy Mountain, KittenAnne Mousehold, Minky Mousehold, Lawna Mower, Pure Moxie, webeagle Moy, Buckaroo Mu, Nye Mu, Kara Muir, Robert Muir, Criscad Muni, Jean Munro, Pranay Munro, Nobu Murakami, Shar Murakami, Yumi Murakami, Arrekusu Muromachi, Sasameyuki Muromachi, Usagi Musashi, Spiritfire Musketeer, Questyn Myhre, Myst Mysterio, Vincent Nacon, Fox Nadir, Morgana Nagorski, Sari Naheed, Yasmin Nakamichi, Aibyou Nakamura, Aluviel Nakamura, Kyriani Nakamura, Madeea Nakamura, Masao Nakamura, Misao Nakamura, Tammi Nakamura, Tanabata Nakamura, Nawtakune Nakatani, rich Nasu, Lev Nedkov, Coal Nelson, Shiharizad Nelson, Laurah Nemeth, Beladonna Nephilim, Lianna Nephilim, Seraph Nephilim, Sari Neruda, Tiberious Neruda, otakup0pe Neumann, Wilhelm Neumann, Chet Neurocam, Draconis Neurocam, Cenji Neutra, Lex Neva, Prokofy Neva, BC Nevadan, Seagel Neville, Judi Newall, Killian Newall, Si Newall, Roenik Newell, Jos Newman, Lynda Newman, MadCat Newman, Weaver Newman, Ian Newt, Ribblet Newt, ninjafoo Ng, Raideur Ng, William Niangao, Gao Niangao, Lori Nicholas, Pravda Nicholas, Evangeline Nichols, Joella Nico, Morpheus Nieder, Titzalina Nieder, Blaze Nielsen, Angelus Nielson, Lazaros Nikolaidis, lincoln Nikolaidis, Tiruviel Nikolaidis, Kenn Nilsson, Lib Nilsson, Jokyr Nimbus, Tateru Nino, Jyotsna Nishi, lloll Nishi, Roxas Nishi, Tuote Nishi, Katlene Niven, Kari Niven, Thegamer Nixdorf, May Noarlunga, Jo Noe, DesrAw Noel, Jacindia Noel, Jaz Noel, MelodyRose Noel, Mi Noel, Paden Noel, Ricky Noel, Sunno Noel, Ono Noh, Tuach Noh, Feras Nolan, Jane Nolan, Harald Nomad, Helen Nomura, Lolita Nomura, Richard Noonan, Aenea Nori, Aulin Normandy, Kat Normandy, Zebra North, Stephen Northport, Galare Novi, KittyMarie Novi, Soo Novi, Elia Nozaki, lynsey Nozaki, Rini Nozaki, Kinzo Nurmi, Yasmin Nurmi, Kyran Nyak, Lauren Nykvist, Karma Oates, Alice Obscure, Honeymoon Obscure, Mikhail Obscure, Origin Obscure, Dementia Obviate, Lucius Obviate, Mootly Obviate, TripleXXXTex Obviate, Vanessa Obviate, Vitis Obviate, Sieben Ochs, Avery Oddfellow, Clinton Oddfellow, Maczter Oddfellow, Sempervirens Oddfellow, Tashie Oddfellow, Wagahai Oddfellow, CarlinRae Odell, Johnny Odell, Liny Odell, Lucifer Odell, vanler Odets, Foxb Oe, Kiwini Oe, Natalie Oe, Eddy Ofarrel, Mylinn Ofeq, Roundabout Ogee, Bannock Ogg, Behemoth Ogre, Anju Oh, BlackCinders Oh, Canoe Oh, Crippy Oh, Dakotah Oh, Day Oh, Doo Oh, Feander Oh, Heady Oh, Job Oh, kyushudan Oh, Lila Oh, Luxura Oh, MrSim Oh, OHYES Oh, Oury Oh, Qyty Oh, Santa Oh, Svn Oh, Volta Oh, xepadd Oh, isla Oh, Angelina Ohara, Troy Oherlihy, Yasuragi Okame, Rephaim Okina, Sven Okonomi, benyamin Olaria, EvlDesire Oliver, Brightly Olivier, Renton Olivier, Gary Olson, Christopher Omega, Hamncheese Omlet, Joseph Omlet, Libuse Ondricek, luminye Onizuka, Miyuki Onmura, Toshiro Onmura, Hotaru Onomatopoeia, Isis Ophelia, Orchid Ophelia, Stumbelina Ophelia, Roberto Oppewall, Anthony Opus, Spaceman Opus, Vakis Oranos, Koop Orbit, Sammy Ormsby, Cal Orr, Usra Ostrich, Nikki Osumi, Ariel Otafuku, kevin Oto, CJ Oto, Ann Otoole, Patrice Otoole, Abyssin Otoro, Omega Otsuzum, Teravus Ousley, Straitjacket Overlord, Szegey Oxberger, LemonYellow Oxide, Tabitha Oxide, Rianne Ozsvar, Coyote Pace, Hare Pace, Dargon Pacer, Piero Padar, Zasha Padar, Chav Paderborn, Edison Paderborn, Otenth Paderborn, RC Paderborn, Sylvia Paderborn, Chandra Page, Lili Page, Raven Page, Web Page, AnneJoy Paine, DravenLee Paine, Isobella Paine, Larva Paine, Lushious Paine, Thomas42 Paine, Cesar Pakula, Federico Palen, Monica Palen, Diana Palmer, sense Palmer, Crazy Pangaea, Sacha Pangaea, Upinthe Panhandle, Simbiant Paperclip, Drea Paperdoll, Pannie Paperdoll, raymon Paperdoll, jaesung Papp, JohnJ Papp, Alec Paragon, Cliff Paris, Vertigo Paris, Blue Parisi, serena Parisi, JR Parker, Kora Parker, Prawnyloks Parker, Etheria Parrott, Tommy Parrott, Selaras Partridge, Sexy Partridge, Maegen Parvenu, Francie Pasternak, Mr Pasternak, Eloise Pasteur, sandhya2 Patel, Bruce Patton, Penny Patton, Dave Patton, Haole Pau, Andy Paul, LanNoire Paul, Nolte, Paul, Nicholi Pavlova, shadow Pawpaw, Cuffman Payne, Deseri Payne, Gypsy Paz, LupineFox Paz, Shy Peart, Tamara Peart, Pontias Peck, Robin Peel, Elum Pegler, Kotek Pekli, Pulp Pekli, Reaser Pencer, Caliandris Pendragon, Hiro Pendragon, Jopsy Pendragon, Darren Pennell, Mideon Pennell, Powell Pera, Stanley Pera, Tajma Pera, FlipperPA Peregrine, Jennyfur Peregrine, Alana Perenti, MaxPerfect Perenti, Revolution Perenti, MoonGazer Perhaps, Brooklyn Perinal, Shawk Pertwee, Drakior Perun, Charm Perway, Jubilee Pessoa, Riley Pessoa, Tristram Petion, Aline Petrov, Larry Petrov, PantzerHamzter Petshop, scott Petshop, Foxy Petunia, Inara Pey, Tony Pey, Brathak Pfeffer, Henrick Pfeffer, Jack Pfeffer, Marlo Pfeffer, Resi Pfeffer, Lum Pfohl, TACK Pfohl, rren Pfohl, Psyke Phaeton, Sangi Phaeton, Don Pharaoh, Topdog Pharaoh, Anderson Philbin, Philb Philbin, Ridge Phillips, Maximus Phlox, Careltje Phoenix, Winter Phoenix, Ummm Pickles, Piper Picnic, Loki Pico, Hawk Pidgeon, followmeimthe Piedpiper, Alin Piek, Ricky Piek, angelwithahintoflife Pierterson, Elsibeth Pierterson, Marod Pierterson, Noshi Pierterson, Shanel Pierterson, Natasha Pike, Joshua Pilote, Adeline Pinion, Miguel Pinion, Quinn Pinion, Peach Pink, Tisha Pink, Lulu Pink, alice Pinkerton, Getty Pinkerton, Apple Pinkney, Becky Pippen, Tam Pippen, sandra Pitney, Trish Pitney, Max Pitre, Hawk Pitts, Spritely Pixel, Chel Pixie, HotBuns Pixie, Mina Pixie, Mcplane Planer, simon Planer, Guy Plasma, Halogen Plasma, Mathias Plasma, Phill Plasma, White Platini, Phoenix Platthy, Gallia Plubeau, Corki Plunkett, PollyD Plunkett, Asalynda Pluto, Evgeniy Podolsky, OTTONE Pogelmann, Henry Poindexter, Phoebe Poitier, Rowan Poitier, Rigorus Poitier, Stephen Pollock, Mishka Pomeray, Kuatum Poole, Karina Popinjay, Francesca Poppy, Hot Poppy, Shelly Portello, Anthony Portsmouth, Ian Portsmouth, HackPatooey Posthorn, JohnnyD Posthorn, Madison Posthorn, Antitese Poulot, Uccello Poultry, Tanarus Pow, Frederic Prevost, Bill Priestly, Dit Priestly, Phil Priestman, Rachelle Priestman, Sage Priestman, Simone Prieto, Wundur Primbee, Jacob Primeau, Twilight Primeau, Beautifull Princess, Creamyyy Princess, Graciella Princess, Lyna Princess, Theo Prinz, Krono Pro, Don Proost, Games Prototype, Melissa Prunes, Pie Psaltery, Danger Pugilist, Lily Pussycat, LoL Pye, PITTACOS Pye, Prize Pyle, Reese Qian, Ash Qin, Jen Qinan, milesmess Qinan, Quino Quaggy, Starsitter Quality, Algeard Quamar, Flack Quartermass, Marcus Quartermass, Shaggy Quimby, Laura Quimby, Memir Quinn, Amy Quirk, Edge Qunhua, HeinzJoachim Qunhua, Tsing Qunhua, brooke Ra, Dael Ra, Knightsof Ra, Mayo Ra, Roger Raabe, Sharven Raabe, Sail Racer, Supra Racer, Ada Radius, Rob Raffke, Rayne Ragowski, Starfoxtj4 Rail, mantitaur2 Rainbow, Sparkly Rainbow, Andromeda Raine, musicteacher Rampal, Hoyle Rang, Hermione Ranger, jurnal Ranger, Horgus Rasmuson, Trend Rasmuson, Whoosh Rasmuson, Rascal Ratelle, Eriss Rau, Morugai Rau, Ozhika Rau, slave Rau, Awsoonn Rawley, Marie Rawley, Guy Raymaker, JAC Raymaker, PlanetThoughts Raymaker, Rogier Raymaker, Trident Raymaker, Xoren Raymaker, Ranaa Raymond, Rowena Rearwin, Londyn Reatequi, Neo Rebus, Bekka Redgrave, Etude Redgrave, Lyn Redgrave, Publicist Redgrave, Wingless Redgrave, Allie Ree, Jon Ree, Thyna Ree, Zi Ree, Todd Reed, RhaRha Rees, Alex Regent, Alexander Regent, Cat Rehula, Timoteo Reifsnider, Sirus Reiner, Trilobite Reisman, ali Reiter, Ruben Reiter, Fenrir Reitveld, EmpressNever Rejected, Maya Remblai, Kapu Ren, Atticus Renoir, catsrounds Renoir, Cedric Renoir, Julion Renoir, karman Renoir, Sim Renoir, Isabela Repine, MysticalCeCe Repine, Sissimaid Resistance, Tom Reuven, Beagle Revolution, Xin Revolution, Keex Rexroth, Ordos Reymont, Roz Reynolds, CJ Rezillo, Rena Rhea, Hiroaki Rhino, Curious Rhode, Lexy Rhode, Natriumcitrate Rhode, Toshi Rhode, Pam Ribble, Gia Richard, Gigly Richez, Hutton Richez, Renae Richez, Ronald Richez, Roxi Richez, Jimbo Richez, Josh Rident, Finncaev Riederer, Aeryn Riel, INK Rinkitink, Puck Rinkitink, Riki Rinkitink, Edoardo Ritt, Bibi Riva, Eche Riverview, helloau Riverview, Liam Roark, Angela Robertson, Jay Robson, Brooks Rocco, Marth Rocco, Mo Rocco, Wolf Rocco, dartagnan29 Rockett, marco Rockett, Monida Rockett, ortaga Rockett, Raziel Rockett, Anastasia Roelofs, Stormy Roentgen, Hector Roffo, Ricci Roffo, Tonio Roffo, Picaro Roffo, IvanTwin Rogers, Chrisje100 Rojyo, Rowana Rolland, Shine Rolls, Iris Ronmark, Jacques Ronmark, Phil Ronzoni, Keishii Roo, MattyMcHatton Roo, Kimika Rookwood, Prego Rosca, Rayne Rosca, Uber Rosca, Felix Rosenberg, Amethyst Rosencrans, Alejandro Rosenthal, Davian Rosenthal, Edgar Rosenthal, Seth Rosetta, Alustriel Rosewood, Arenae Rosewood, Fury Rosewood, Gwendelyn Rosewood, Kira Rosewood, liz Rosewood, Oriene Rosewood, Lashelle Rosse, Roodvosje Rosse, Rose Rosse, Rico Rosse, Jonah Rossini, Milordino Rossini, Sparrow Rossini, Yira Rossini, Zanah Rossini, zina Rossini, Francaldo Rotunno, Reckless Rotunno, Excel Rousselot, mica Rousselot, Lexie Rovio, Alexandra Rucker, Lilith Ruff, Stina Ruff, Aragorn Runo, Kragelund Runo, Rinziq Runo, ViRi Runo, Distilled1 Rush, Jordann Russell, Kryton Russell, Miyaki, Russell, Brent Russell, Revons Rutabaga, Rocky Rutabaga, FEZ Rutherford, Darcy Rutledge, Jo Ruttenberg, Odo Ruttenberg, Theodorrick Ruttenberg, Artix Ruxton, Armand Ryan, Zakeir Rydell, Cathy Ryder, McCall Ryder, Inarra Saarinen, Kai Sabena, Sarie Sabena, Alissa Sabre, Arcticfire Sabre, BamBam Sachertorte, kai Sachertorte, Umphrey Sachs, Mila Sadovnycha, Proxima Saenz, Lynne Sage, Cheloxchile2006 Saiman, Milo Saintlouis, Natasia Saintlouis, Trinity Saintlouis, Rollergirl Saiz, Nyoko Salome, Scandinavian Salomon, Agarash Salsman, Rayne Saltair, Horus Salubrius, Solta Salyut, Nicola Samiam, Aleg Sandell, angeltf Sands, Balkan Sands, Charmaign Sands, Check Sands, Damien Sands, Orika Sands, Other Sands, Padraic Sands, Sotos Sands, Taira Sands, Cloudia Sani, Carinthia Sansome, Allasandra Santos, Rosell Santos, Solanghe Sarlo, Ishara Sartre, Charles Sassoon, Damian Saule, Jesse Sautereau, Natalia Sawley, Billie Scaggs, Mordecai Scaggs, Roz Scaggs, Socaliwag Scaggs, Johannason Scarborough, Jim Schack, Norm Schack, Fatz Scheflo, MissKitten Schildhauer, Nelson Schmo, Werner Schnabel, Tammye Schneider, Frank Schneider, Funk Schnook, cleopatras Schnyder, mylife Schnyder, ScOrPiOn Schnyder, Count Schridde, Kircheis Schroeder, Julia Schulze, Anita Schwartzman, Cornelious Schwartzman, Etrius Schwartzman, Dr Scofield, Joe Scofield, RyanAva Scofield, Kira Scott, Six Seale, Sterremare Seale, Dallas Seaton, Star Seaton, Spurs Seattle, Elio Seelowe, Jaden Seelowe, Moira Seelowe, Teleio Seferis, Artemus Seifert, Gouranga Seiling, Alyrae Seitan, Grace Selene, Maureen Selene, amandaelisabeth Sellers, Chelsey Sellers, Fashion Sellers, Novellium Sellers, Kerutsen Sellery, Semolina Semaphore, ice Semple, Daisy Semyorka, Roxy Semyorka, DarkStar Senior, River Senyurt, Singular Seoul, James Seraph, Jesrad Seraph, Liv Serf, Tears Serf, Neon Serge, Magnum Serpentine, Jazzy Serra, Aiyana Serrurier, Coelacanth Seurat, Jean Severine, Landreu Severine, Gitana Sevier, Elizabell Sewell, johni Seymour, nayeli Shabazz, Talena Shabazz, Princess Shalala, Robbie Shamroy, Dimas Shan, Lancer Shan, Nae Shan, onlyyou Shan, Shango Shan, Spirit Shan, Jumpda Shark, DigiKatt Shaw, Steffi Shenlin, Afon Shepherd, Clair Shepherd, Eastern Shepherd, LadyLeah Shepherd, Lexis Shepherd, Siddhartha Shepherd, Taran Shepherd, Valentin Shepherd, Jieux Shepherd, Delicious Sheridan, LauraAnne Sheridan, Remco Sheridan, Aki Shichiroji, Todedoz Shichiroji, BlckCobra Shikami, Mary Shikami, Seven Shikami, Thomas Shikami, Szia Shilova, lisalove Shimada, Yoyo Shinobu, Tarrant Shipman, Kitsuribami Shirabyoshi, Amber Shirakawa, AmySue Shirakawa, Kanna Shirakawa, Shelectra Shirakawa, CJ Shojo, Felix Sholokhov, VonFoxFire Sholokhov, Renegade Shriner, Alexandra Shu, Bung Shu, Ddevine Shuftan, emmakael Shuftan, Skipper Shutt, Jaime Sicling, Ko Sicling, Lucien Sidek, Ulrich Sidran, Darlene Sieyes, Darling Sieyes, sparkles Sieyes, Mjren Silvera, Apotheus Silverman, HVX Silverstar, Nirven Silverstar, Rocco Silverstar, Tamar Silverstar, Rosie Simca, Drvid Simoni, Dragos Simons, barnowlgirl Sinatra, Cheyanne Sinatra, marilsdb Sinatra, Nanceee Sinatra, Quiet Sinatra, Vent Sinatra, Frosty Sinatra, Misty Singer, Katie Singh, Sydney Singh, Philo Sion, followingwaves Sirbu, Saya Sirbu, Don Sivocci, Danielle Skall, Hegemon Skall, JASMINE Skall, Mykal Skall, Dovryn Skall, Arathorn Slade, Artakan Slade, djsunz Slade, Eleana Slade, Erica Slade, Jupiter Slade, Kronikz Slade, Methosmv Slade, piro Slade, Snapeslove Slade, Sys Slade, TylerSnk Slade, Wylee Slade, ZirQ Slade, Xabax Slade, Malik Slapstick, Coug Sleeper, Kenny Sleeper, Lucia Slippery, Adrian Sloane, Alistair Sloane, Rysz Sloane, Angel Slocombe, PrinceDK Slunce, Flo Slunce, Tatiana Smagulov, badboy1331 Smalls, Brat Smalls, EDhardy Smalls, Lomgren Smalls, DonAmon Smirnov, Andrew Smith, Elliott Smith, Mikal Snakeankle, Esch Snoats, Eian Snook, Pavee Snook, floe Snookums, kramer Snookums, Rach Snookums, Jonboy Snye, fionn Soderstrom, miguel Soderstrom, Bellisima Sodwind, Dafydd Sodwind, Scott69 Sodwind, Shipper Sodwind, Ilianexsi Sojourner, Shirokuro Sojourner, The Sojourner, Wiccan Sojourner, Elijah Sol, Lara Sola, Vanilla Sola, Silvari Soleil, David23 Something, DolphPun Somme, Rhyph Somme, aewyn Sondergaard, Kali Sonic, Packard Sonic, Jayman Sonnenblume, Pippen Sonnenblume, Esichs Sonnerstein, Sylvia Sonoda, ASCLEPIUS Soon, Tecumseh Soon, Julia Soothsayer, Shadowspawn Soothsayer, Tindallia Soothsayer, RJ Source, Akemi Soy, Aln Soy, Aaron Soyer, Tsuno Soyinka, Oz Spade, Ellen Spark, karlynn Sparkle, Kaylie Sparkle, TruHeart Sparkle, Dave Sparrow, slyflower Sparrow, Flapjack Spatula, Cheyenne Spearmann, Jester Spearmann, JewelKicker Spearmann, Data Spectre, Rai Speculaas, Sin Speculaas, Thornne Speculaas, Ehdward Spengler, mo Spengler, Wesley Spengler, Datentyp Sperber, Niko Sperber, Giuseppe Spicoli, Snakeye Spicoli, Marcus Spire, Setori Spire, Crackervelli Spitteler, Naughty Spitteler, Studders101 Spitteler, Yojne Spitteler, ScaryMary Spitz, Geezer Spoonhammer, GutterBlood Spoonhammer, Tour Spoonhammer, Sheet Spotter, tree Sprawl, Kitty Sprocket, Alan Standish, Fox Standish, Clive Stanwell, Alexis Stapovic, Hippyjim Starbrook, Missy Starbrook, Thunder Starbrook, Babydoll Stardust, Birdy Stardust, Johannes Starostin, Ariana Starr, Funk Starr, eltee Statosky, Hanako Stawberry, Micheal Steadham, Blueman Steele, sugar Steele, Jennifer Steele, Golda Stein, Tyler Stein, Uber Stein, Bernd Steinhardt, Whisper Stella, Hjoerdis Stenvaag, Timmy Stepford, LaserFingers Steptoe, Athena Sterling, Selvina Sterling, Hunter Stern, Ocmer Sternberg, Jabath Steuart, Sylvia Steuben, Bracin Stevenson, Sammmy Stewart, Skeeter Stiglitz, Lily Stilman, Nisaa Stilman, Quick Stilman, Spaydar Stine, Unger Stine, Sherrade Stirling, Till Stirling, Juggernaut Stoklitsky, Meret Stonebender, Argent Stonecutter, Gearsawe Stonecutter, Kayla Stonecutter, Liquids Stonewall, Nevera Stooge, Matthew Stork, Sam Stork, Neotoy Story, AllieKat Stovall, Krystal Straaf, Kyrus Straaf, Laars Straaf, Niccia Straaf, Aloe Stradling, egbert Stradling, Lotus Stradling, SlyFox Stradling, Eristic Strangelove, Thaumata Strangelove, Valiant Strangelove, Salome Strangelove, Erica Strauss, Zinger Strauss, Gabrielle Street, Artistniko Streeter, Bruce82 Streeter, Builder Streeter, dast Streeter, Hans Streeter, Stilette Streeter, Darzus Strutt, Bluto Stubbs, Olivier Sturges, Kharie Su, Rexx Su, Vudu Suavage, Silverrain Sucettes, Siyu Suen, Zack Suen, Linnian Sugar, Sierra Sugar, Stacey Sugar, Jodie Suisei, Koto Sukra, Takira Sukra, Ravanne Sullivan, Rik Sullivan, Sofi Sullivan, Joffi Sumbula, BrightAngel Summers, Kiyana Summers, Eclipsed Sun, Shinshinto Sungsoo, Angel Sunset, Warord Suntzu, DalE Supply, ivan Supply, Frictionless Surface, Brightwing Surtees, David Surtees, Georges Susa, Caterina Susanti, Fatima Susanti, Owen Susanto, Caliburn Susanto, Kevin Susenko, Forseti Svarog, Kinga Svarog, Batman Swenholt, Flame Swenholt, Shyressa Swenholt, Earle Swenson, Harvey Swenson, Kevin Swenson, Anastasia Swindlehurst, Liz Swindlehurst, Swein Swindlehurst, Verrenus Swindlehurst, Christain Switchblade, Guy Szondi, Nonlucid Szondi, Sagmumu Szondi, XVenomX Szymborska, CaelThunderwing Tackleberry, Mitzi Tackleberry, Ayla Tae, Maya Tae, Princess Tae, Carsten Taft, Gigs Taggart, Aphrodite Tagore, Lynn Tagore, Jenna Taira, Zephora Taiyou, Rusmi Taka, Kaimen Takahe, Akina Takakura, Sabina Takakura, Tao Takashi, Cornelius Tal, Dolmere Talamasca, Kelindra Talamasca, Sabane Talamasca, Tod69 Talamasca, Bad Tamale, Kitchkinet Tamale, Dany Tammas, kym Tammas, Phoming Tammas, sasha Tammas, Alina Tamura, Janu Tamura, Karetta Tamura, Melli Tamura, Morina Tamura, Snake Tamura, Valentina Tamura, Rutain Tandino, Tracy Tani, Jolt Tank, Rachel Tapioca, Ilyara Tardis, Jaxx Tardis, Aaron Tardis, Sim Tatham, Tobi Taurog, Joey Tavoularis, John Taylor, Jeffrey Temin, Enabran Templar, Crymzon Tempura, Jehan Tendaze, Angel Tengu, Arctic Tenk, Ginevro Tenk, OolBatar Tenk, Sally Tenk, Storchi Tenk, Bloodsong Termagant, Cubey Terra, Lynn Terra, Niles Theas, Sterre Theas, Lost Thereian, Osprey Therian, Lukas Thetan, Larson Thibaud, Redd Thielt, Tana Thielt, Thongshaman Thirroul, Millie Thompson, Brooke Thurston, Lisa Thyben, Bengal Tiger, RavenAnn Tiger, Terrigo Tiger, Sable Till, Soraya Till, Zayn Till, Trixie Timtam, immortal Tiramisu, Matthew Todd, Watermelon Tokyo, Amily Toland, Prijian Toland, Wigger Toland, Wym Toland, Shaia Toll, harathoi Toman, EH Tomcat, Pawz Tomcat, nicky Tomsen, Olyntchen Tomsen, Siul Tomsen, Zukini Tomsen, Darkover Tone, JazzySweet Tone, Tea Tone, Shelly Toonie, Tristan Torgeson, Katie Tornado, manufr Torok, Drew Torres, Xavier Tosung, Benjamin Tower, TJ Tower, Coquine Tracy, Fintaya Tracy, Herman Tracy, killer Tracy, Marcel Tran, Cabal Trautman, Nadja Travanti, Steve Trenchard, Grimm Trenchmouth, Neogrinch Trenchmouth, Scarlet Trenton, input Trilam, Debbie Trilling, Dahlia Trimble, TrainingDay Trimble, Candy Tripp, FeelGood Tripp, Nate Tripp, Skalligrim Tripp, stimpy Tripp, Michael Tripsa, Orion Tristan, Sam Troell, Celebrity Trollop, MaidHeather Trollop, Roberto Trotter, Tipsey Troughton, Lucille Trudeau, Paul Trudeau, arthus Truffaut, Chambord Truffaut, Siss Truss, Boshiken Tsuki, Sindy Tsure, Dante Tucker, ImAOzGrl Tucker, Scott Tucker, BabyAlice Tulip, Bryce Tully, Pixie Tungl, Lyr Tuppakaka, Hawthorn Tuque, Omei Turnbull, Victor Tuxing, Cloe Twang, Twill Tymets, Andrew Tyson, Lyndyn Tzara, Ilyushin Tzedek �외�� 많� 분들� 수고해 주셨습니다.
 
 
 APR Copyright (C) 2000-2004 The Apache Software Foundation
@@ -22,9 +22,7 @@ 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.  �세한 내용� licenses.txt를 참고하십시오.
+All rights reserved.  �세한 내용� licenses.txt를 참조하십시오.
 
-
-결함� 아니� 특징입니다.
         </text_editor>
 </floater>
diff --git a/linden/indra/newview/skins/xui/ko/floater_about_land.xml b/linden/indra/newview/skins/xui/ko/floater_about_land.xml
index b164310..8c189a0 100644
--- a/linden/indra/newview/skins/xui/ko/floater_about_land.xml
+++ b/linden/indra/newview/skins/xui/ko/floater_about_land.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="utf-8" standalone="yes" ?>
 <floater name="floaterland" title="토지 소개">
         <tab_container name="landtab">
-                <panel label="�반사항" name="land_general_panel">
+                <panel label="�반" name="land_general_panel">
                         <text type="string" length="1" name="Name:">
                                 �름:
                         </text>
@@ -9,75 +9,75 @@
                                 설명:
                         </text>
                         <text type="string" length="1" name="Owner:">
-                                소유주:
+                                소유�:
                         </text>
                         <text type="string" length="1" name="OwnerText">
                                 Leyla Linden
                         </text>
-                        <button label="프로필..." label_selected="프로필..." name="Profile..." />
+                        <button label="프로필…" label_selected="프로필…" name="Profile..." />
                         <text type="string" length="1" name="Group:">
                                 그룹:
                         </text>
-                        <button label="설정..." label_selected="설정..." name="Set..." />
+                        <button label="설정…" label_selected="설정…" name="Set..." />
                         <check_box label="그룹� 양� 허용" name="check deed"
-                             tool_tip="그룹 간부는 � 토지가 그룹� 토지 할당으로 유지��� 해당 토지를 그룹� 양�할 수 있습니다." />
+                             tool_tip="그룹 운�진� � 토지가 그룹� 토지 할당으로 유지��� 해당 토지를 그룹� 양�할 수 있습니다." />
                         <button label="양�..." label_selected="양�..." name="Deed..."
-                             tool_tip="본�� 선� 그룹� 간부� 경우�만 토지를 양�하실 수 있습니다." />
-                        <check_box label="소유주가 양�로 기여" name="check contib"
-                             tool_tip="토지가 그룹� 양��면, �전 소유주는 해당 토지를 구룹� 지� 하기� 충분한 토지 할당분� 기부한 셈입니다." />
+                             tool_tip="사용�가 선�� 그룹� 운�진� 경우�만 토지를 양�할 수 있습니다." />
+                        <check_box label="소유주가 양�로 기여" name="check contrib"
+                             tool_tip="토지가 그룹� 양��면, �전 소유주는 해당 토지를 그룹� 지�하기� 충분한 토지 할당분� 기부한 셈입니다." />
                         <text type="string" length="1" name="For Sale:">
-                                매물:
+                                �매 여부:
                         </text>
                         <text type="string" length="1" name="Not for sale.">
-                                �매용� 아닙니다.
+                                비매용.
                         </text>
                         <text type="string" length="1" name="For Sale: Price L$[PRICE].">
                                 가격: L$[PRICE].
                         </text>
-                        <button label="토지 �매..." label_selected="토지 �매..." name="Sell Land..." />
+                        <button label="토지 �매…" label_selected="토지 �매…" name="Sell Land..." />
                         <text type="string" length="1" name="For sale to">
                                 �매 대�: [BUYER]
                         </text>
                         <text type="string" length="1" name="Sell with landowners objects in parcel.">
-                                �매� 아�템� �함�어 있습니다.
+                                �매� 오브�트가 �함�.
                         </text>
                         <text type="string" length="1" name="Selling with no objects in parcel.">
-                                �매� 아�템� �함�어 있지 않습니다.
+                                �매� 오브�트가 �함�지 않�.
                         </text>
                         <button label="토지 �매 취소" label_selected="토지 �매 취소"
                              name="Cancel Land Sale" />
                         <text type="string" length="1" name="Claimed:">
-                                권리 설정:
+                                개시�:
                         </text>
                         <text type="string" length="1" name="DateClaimText">
-                                2006년 8월 15� 화요� 15 13:47:25
+                                2006년 8월 15� 화요� 13:47:25
                         </text>
                         <text type="string" length="1" name="PriceLabel">
-                                �역:
+                                ë©´ì �:
                         </text>
                         <text type="string" length="1" name="PriceText">
-                                4048 �방 미터
+                                4048 제곱미터
                         </text>
                         <text type="string" length="1" name="Traffic:">
                                 통행량:
                         </text>
                         <text type="string" length="1" name="DwellText">
-                                0
+                                거짓
                         </text>
                         <button label="토지 구매하기..." label_selected="토지 구매하기..."
                              name="Buy Land..." />
-                        <button label="그룹 대신 구매하기..."
-                             label_selected="그룹 대신 구매하기..." name="Buy For Group..." />
+                        <button label="그룹 토지 구매..." label_selected="그룹 토지 구매..."
+                             name="Buy For Group..." />
                         <button label="패스 구매하기..." label_selected="패스 구매하기..."
                              name="Buy Pass..."
-                             tool_tip="패스는 � 토지� 대한 임시 액세스를 부여합니다." />
-                        <button label="토지 �기..." label_selected="토지 �기..."
+                             tool_tip="패스는 � 토지� 대한 임시 통행권� 부여합니다." />
+                        <button label="토지 버리기..." label_selected="토지 버리기..."
                              name="Abandon Land..." />
-                        <button label="토지 개간..." label_selected="토지 개간..."
+                        <button label="토지 재청구…" label_selected="토지 재청구…"
                              name="Reclaim Land..." />
-                        <button label="린든 매물..." label_selected="린든 매물..."
+                        <button label="린든 �매…" label_selected="린든 �매…"
                              name="Linden Sale..."
-                             tool_tip="토지는 소유 �태여야 하며, 내용물� 설정�어야 하며, �미 경매�태가 아니어야 합니다." />
+                             tool_tip="토지는 소유 �태여야 하며, 컨탠츠가 설정�어야 하며, 비경매�태 �어야 합니다." />
                         <text name="new users only">
                                 새로운 사용�� 한 함
                         </text>
@@ -85,9 +85,9 @@
                                 모든 사람
                         </text>
                 </panel>
-                <panel label="계약 조항" name="land_covenant_panel">
+                <panel label="시행 규칙" name="land_covenant_panel">
                         <text type="string" length="1" name="covenant_timestamp_text">
-                                최근 수정� 1969년 12월 31� 수요� 16:00:0
+                                최근 수정� 1969년 12월 31� 수요� 16:00:00
                         </text>
                         <text type="string" length="1" name="region_name_lbl">
                                 지역:
@@ -96,101 +96,100 @@
                                 leyla
                         </text>
                         <text type="string" length="1" name="estate_name_lbl">
-                                소유지:
+                                사유지:
                         </text>
                         <text type="string" length="1" name="estate_name_text">
-                                본토
+                                메�랜드
                         </text>
                         <text type="string" length="1" name="estate_owner_lbl">
-                                소유지 소유�:
+                                사유지 소유�:
                         </text>
                         <text type="string" length="1" name="estate_owner_text">
                                 (없�)
                         </text>
                         <text type="string" length="1" name="resellable_clause">
-                                � 지역�서 구입한 토지는 재�매할 수 없습니다.
+                                � 지역�서 구매한 토지는 재�매 할 수 없습니다.
                         </text>
                         <text type="string" length="1" name="changeable_clause">
-                                � 지역�서 구입한 토지는 결합 �는 분할 할 수 없습니다.
+                                � 지역�서 구매한 토지는 결합/분할 불가능 합니다.
                         </text>
                         <text_editor type="string" length="1" name="covenant_editor">
-                                � 소유지� 대해 제공� 계약 조항� 없습니다.
+                                � 사유지� 대해 제공�시행 규칙� 없습니다.
                         </text_editor>
                         <text name="can_resell">
-                                � 지역�서 구입한 토지는 재�매할 수 있습니다.
+                                � 지역�서 구매한 토지는 재�매 할 수 있습니다.
                         </text>
                         <text name="can_not_resell">
-                                � 지역�서 구입한 토지는 재�매할 수 없습니다.
+                                � 지역�서 구매한 토지는 재�매 할 수 없습니다.
                         </text>
                         <text name="can_change">
-                                � 지역�서 구입한 토지는 결합 �는 분할 할 수 있습니다.
+                                � 지역�서 구매한 토지는 결합 �는 분할 가능 합니다.
                         </text>
                         <text name="can_not_change">
-                                � 지역�서 구입한 토지는 결합 �는 분할 할 수 없습니다.
+                                � 지역�서 구매한 토지는 결합 �는 분할 불가능 합니다.
                         </text>
                 </panel>
-                <panel label="사물" name="land_objects_panel">
+                <panel label="오브�트" name="land_objects_panel">
                         <text type="string" length="1" name="Simulator primitive usage:">
-                                시뮬레�터 프리미티브 사용:
+                                시뮬레�터 프림 사용률:
                         </text>
                         <text type="string" length="1" name="0 out of 0 available">
                                 14055개 중 0개(14055개 사용 가능)
                         </text>
                         <text type="string" length="1" name="Primitives parcel supports:">
-                                구�� 지�하는 프리미티브:
+                                구�� 지�하는 프림 개수:
                         </text>
                         <text type="string" length="1" name="object_contrib_text">
                                 926
                         </text>
                         <text type="string" length="1" name="Primitives on parcel:">
-                                구� 프리미티브:
+                                구�내 프림 수:
                         </text>
                         <text type="string" length="1" name="total_objects_text">
-                                0
+                                거짓
                         </text>
                         <text type="string" length="1" name="Owned by parcel owner:">
                                 구� 소유주가 소유:
                         </text>
                         <text type="string" length="1" name="owner_objects_text">
-                                0
+                                거짓
                         </text>
                         <button label="표시" label_selected="표시" name="ShowOwner" />
-                        <button label="반환..." label_selected="반환..." name="ReturnOwner..."
-                             tool_tip="사물� � 소유주�게 반환." />
+                        <button label="반환…" label_selected="반환…" name="ReturnOwner..."
+                             tool_tip="오브�트를 � 소유��게 반환." />
                         <text type="string" length="1" name="Set to group:">
                                 그룹으로 설정:
                         </text>
                         <text type="string" length="1" name="group_objects_text">
-                                0
+                                거짓
                         </text>
                         <button label="표시" label_selected="표시" name="ShowGroup" />
-                        <button label="반환..." label_selected="반환..." name="ReturnGroup..."
-                             tool_tip="사물� � 소유주�게 반환." />
+                        <button label="반환…" label_selected="반환…" name="ReturnGroup..."
+                             tool_tip="오브�트를 � 소유��게 반환." />
                         <text type="string" length="1" name="Owned by others:">
                                 다른 사람� 소유:
                         </text>
                         <text type="string" length="1" name="other_objects_text">
-                                0
+                                거짓
                         </text>
                         <button label="표시" label_selected="표시" name="ShowOther" />
-                        <button label="반환..." label_selected="반환..." name="ReturnOther..."
-                             tool_tip="사물� � 소유주�게 반환." />
+                        <button label="반환…" label_selected="반환…" name="ReturnOther..."
+                             tool_tip="오브�트를 � 소유��게 반환." />
                         <text type="string" length="1" name="Selected / sat upon:">
                                 선� / 차지:
                         </text>
                         <text type="string" length="1" name="selected_objects_text">
-                                0
+                                거짓
                         </text>
-                        <text type="string" length="1" name="Autoreturn other resident&amp;apos;s objects (minutes, 0 for off):">
-                                다른 주민들� 사물� �� 반환(단위: 분; �려면 
-ìž…ë ¥):
+                        <text type="string" length="1" name="Autoreturn">
+                                다른 주민들� 오브�트� �� 반환(단위:분, �려면 0 입력):
                         </text>
                         <text type="string" length="1" name="Object Owners:">
-                                사물 소유주:
+                                오브�트 소유주:
                         </text>
                         <button label="목� 새로 고침" label_selected="목� 새로 고침"
                              name="Refresh List" />
-                        <button label="사물 반환..." label_selected="사물 반환..."
+                        <button label="오브�트 반환…" label_selected="오브�트 반환…"
                              name="Return objects..." />
                         <button label="" label_selected="" name="Type" tool_tip="유형 기준 정렬" />
                         <button label="�름" label_selected="�름" name="Name"
@@ -198,32 +197,44 @@
                         <button label="개수" label_selected="개수" name="Count"
                              tool_tip="수 기준 정렬" />
                 </panel>
-                <panel label="선�사항" name="land_options_panel">
+                <panel label="옵션" name="land_options_panel">
                         <text type="string" length="1" name="allow_label">
-                                다른 주민�게 허용:
+                                다른 주민�게 다�� 허용:
                         </text>
-                        <check_box label="사물 �성" name="edit objects check" />
                         <check_box label="지형 편집" name="edit land check" />
-                        <check_box label="경계 표시 �성" name="check landmark" />
-                        <check_box label="그룹 스�립트 실행" name="check group scripts" />
+                        <check_box label="랜드마� 만들기" name="check landmark" />
                         <check_box label="비행" name="check fly" />
-                        <check_box label="기타 스�립트 실행" name="check other scripts" />
+                        <text type="string" length="1" name="allow_label2">
+                                오브�트 만들기:
+                        </text>
+                        <check_box label="모든 주민" name="edit objects check" />
+                        <check_box label="그룹" name="edit group objects check" />
+                        <text type="string" length="1" name="allow_label3">
+                                오브�트 입력:
+                        </text>
+                        <check_box label="모든 주민" name="all object entry check" />
+                        <check_box label="그룹" name="group object entry check" />
+                        <text type="string" length="1" name="allow_label4">
+                                스�립트 실행:
+                        </text>
+                        <check_box label="모든 주민" name="check other scripts" />
+                        <check_box label="그룹" name="check group scripts" />
                         <text type="string" length="1" name="land_options_label">
                                 토지 옵션:
                         </text>
-                        <check_box label="안전(�실 없�)" name="check safe" />
+                        <check_box label="안전(�미지 없�)" name="check safe" />
                         <check_box label="밀기 한정" name="PushRestrictCheck"
-                             tool_tip="llPushObject기능� 구� 소유주 스�립트를 통하거나 기능 구현�가 스�립트 소유�� 경우�만 작�합니다." />
-                        <check_box label="Show in Search &gt; Places (L$30/week) under" name="ShowDirectoryCheck" />
+                             tool_tip="llPushObject기능� 구� 소유주 스�립트�거나 기능 구현�가 스�립트 소유�� 경우�만 작�합니다." />
+                        <check_box label="검색 &gt; 장소(L$30/주)� 보�기" name="ShowDirectoryCheck" />
                         <combo_box name="land category">
                                 <combo_item name="AnyCategory">
                                         모든 카테고리
                                 </combo_item>
                                 <combo_item name="LindenLocation">
-                                        린든 위치
+                                        린든랩 관련
                                 </combo_item>
                                 <combo_item name="Adult">
-                                        성�용
+                                        성� 전용
                                 </combo_item>
                                 <combo_item name="Arts&amp;Culture">
                                         예술 &amp; 문화
@@ -235,13 +246,13 @@
                                         �육용
                                 </combo_item>
                                 <combo_item name="Gaming">
-                                        게��
+                                        게임
                                 </combo_item>
                                 <combo_item name="Hangout">
-                                        �주 가는 곳
+                                        집합소
                                 </combo_item>
                                 <combo_item name="NewcomerFriendly">
-                                        신참�� 우호�
+                                        초보�용
                                 </combo_item>
                                 <combo_item name="Parks&amp;Nature">
                                         공� � �연
@@ -256,41 +267,41 @@
                                         기타
                                 </combo_item>
                         </combo_box>
-                        <check_box label="목� 웹� 게시" name="PublishCheck"
-                             tool_tip="내 구� 정보를 웹� 게시." />
                         <check_box label="성�용 컨�츠" name="MatureCheck"
-                             tool_tip="본�� 구� 정보는 성�용으로 간주 �니다." />
+                             tool_tip="사용�� 구� 정보 �는 컨�츠는 성� 전용으로 간주�니다." />
+                        <check_box label="웹� 게시" name="PublishCheck"
+                             tool_tip="내 구� 정보를 웹� 게시." />
                         <button label="?" label_selected="?" name="?" />
                         <text type="string" length="1" name="Snapshot:">
                                 스냅샷:
                         </text>
-                        <texture_picker label="" name="snapshot_ctrl" tool_tip="�릭해 그림� 선�하십시오" />
+                        <texture_picker label="" name="snapshot_ctrl"
+                             tool_tip="그림� 선�하려면 �릭 하십시오." />
                         <text type="string" length="1" name="Landing Point: (none)">
-                                착륙 지� (없�)
+                                텔레�트 �착지 (없�)
                         </text>
                         <button label="설정" label_selected="설정" name="Set"
-                             tool_tip="착륙 지�� 내 아바타 위치로 설정. � 토지 구� 내부여야 합니다." />
-                        <button label="비우기" label_selected="비우기" name="Clear"
-                             tool_tip="착륙 지� 확보." />
+                             tool_tip="텔레�트 �착지를 내 아바타 위치로 설정합니다. � 토지 구� 내부여야 합니다." />
+                        <button label="취소" label_selected="취소" name="Clear"
+                             tool_tip="텔레�트 �착지를 취소합니다." />
                         <text type="string" length="1" name="Teleport Routing: ">
-                                텔리�트 �우팅:
+                                텔레�트 착신 전환:
                         </text>
                         <combo_box name="landing type"
                              tool_tip="Teleport Routing -- select how to handle teleports onto your land.">
                                 <combo_item type="string" length="1" name="Blocked">
-                                        금지
+                                        금지�
                                 </combo_item>
                                 <combo_item type="string" length="1" name="LandingPoint">
-                                        착륙 지�
+                                        텔레�트 �착지
                                 </combo_item>
                                 <combo_item type="string" length="1" name="Anywhere">
-                                        어디든지
+                                        모든 위치
                                 </combo_item>
                         </combo_box>
                 </panel>
-                <panel label="매디아" name="land_media_panel">
-                        <check_box label="� 구��만 공간성 부여한 소리 한정"
-                             name="check sound local" />
+                <panel label="미디어" name="land_media_panel">
+                        <check_box label="소리를 � 구�으로 한정" name="check sound local" />
                         <text type="string" length="1" name="Music URL:">
                                 �악 URL:
                         </text>
@@ -299,39 +310,39 @@
 �스처:
                         </text>
                         <text type="string" length="1" name="Replace this texture:">
-                                � �스처 �체:
+                                � �스처를 대체함:
                         </text>
-                        <texture_picker label="" name="media texture" tool_tip="�릭해 그림� 선�하십시오" />
+                        <texture_picker label="" name="media texture"
+                             tool_tip="그림� 선�하려면 �릭 하십시오." />
                         <text type="string" length="1" name="with content from this URL:">
-                                � URL로부터� 컨�츠:
+                                � URL� 컨�츠로 �체:
                         </text>
-                        <check_box label="컨�츠 �� �기 조절(�� � 시� 품질 �소)"
+                        <check_box label="컨�츠 �� �기 조절 (�� � 시� 품질 저하)"
                              name="media_auto_scale"
-                             tool_tip="� 옵션� 선�할 경우 � 구�� 내용물� ��으로 비례 변환�니다. �� � 시�� 품질� 약간 떨어지나 추가�� �스처 비례 변환 �는 정렬� 필요 없습니다." />
+                             tool_tip="� 옵션� 선�하면 � 구�� 컨�츠� �기가 ��으로 조절�니다. �� � 시� 품질� 약간 떨어질 수 있지만 추가�� �스처 �기 조절�나 정렬� 필요 없습니다." />
                 </panel>
-                <panel label="엑세스" name="land_access_panel">
+                <panel label="사용 권한" name="land_access_panel">
                         <text type="string" length="1" name="Limit access to this parcel to:">
-                                � 구�� 대한 액세스를 다�으로 제한:
+                                � 구�� 대한 사용권한� 다�으로 제한:
                         </text>
                         <check_box label="그룹: (없�)" name="GroupCheck" />
                         <check_box label="아바타: (0개 나열, 최대 300개)" name="AccessCheck" />
                         <button label="추가..." label_selected="추가..." name="Add..." />
                         <button label="제거" label_selected="제거" name="Remove" />
-                        <check_box label="임시 액세스 허용 패스 �매:" name="PassCheck" />
-                        <spinner label="가격(단위: L$):" name="PriceSpin" />
-                        <spinner label="액세스 시간:" name="HoursSpin" />
+                        <check_box label="임시 통행권 �매:" name="PassCheck" />
+                        <spinner label="가격 (L$):" name="PriceSpin" />
+                        <spinner label="사용시간:" name="HoursSpin" />
                 </panel>
                 <panel label="차단" name="land_ban_panel">
-                        <check_box label="다� 아바타 금지: (0개 나열, 최대 300개)"
-                             name="LandBanCheck" />
+                        <check_box label="차단� 아바타: (0개 나열, 최대 300개)" name="LandBanCheck" />
                         <button label="추가..." label_selected="추가..." name="Add..." />
                         <button label="제거" label_selected="제거" name="Remove" />
                         <text type="string" length="1" name="Deny by Payment Status:">
-                                지불 �태� 따� 거부:
+                                지불 �태별로 출입 거부
                         </text>
-                        <check_box label="파�� 미지불 정보 거부" name="DenyAnonymousCheck" />
-                        <check_box label="파�� 지불 정보 거부" name="DenyIdentifiedCheck" />
-                        <check_box label="사용한 지불 정보 거부" name="DenyTransactedCheck" />
+                        <check_box label="결제수단 미등�� 출입 거부" name="DenyAnonymousCheck" />
+                        <check_box label="결제수단 등�� 출입 거부" name="DenyIdentifiedCheck" />
+                        <check_box label="결제수단 사용� 출입 거부" name="DenyTransactedCheck" />
                 </panel>
         </tab_container>
 </floater>
diff --git a/linden/indra/newview/skins/xui/ko/floater_animation_preview.xml b/linden/indra/newview/skins/xui/ko/floater_animation_preview.xml
index 5bd034a..cbf13ec 100644
--- a/linden/indra/newview/skins/xui/ko/floater_animation_preview.xml
+++ b/linden/indra/newview/skins/xui/ko/floater_animation_preview.xml
@@ -7,74 +7,73 @@
                 설명:
         </text>
         <spinner label="우선 순위" name="priority"
-             tool_tip="� 애니메�션� 어떤 애니메�션� 오버��드할지를 제어합니다." />
+             tool_tip="� 애니메�션� 어떤 애니메�션� 오버��드 할지를 제어 합니다." />
         <text name="preview_label">
-                다� 작업 �안 미리보기
+                다� 조건으로 미리보기
         </text>
         <combo_box label="" name="preview_base_anim"
              tool_tip="Use this to test your animation behavior while your avatar performs common actions.">
                 <combo_item name="Standing">
-                        서있다
+                        서기
                 </combo_item>
                 <combo_item name="Walking">
-                        걷는다
+                        걷기
                 </combo_item>
                 <combo_item name="Sitting">
-                        앉아있다
+                        앉기
                 </combo_item>
                 <combo_item name="Flying">
-                        날다
+                        비행
                 </combo_item>
         </combo_box>
-        <check_box label="루프" name="loop_check"
-             tool_tip="� 애니메�션� 루핑하게 �니다." />
-        <spinner label="In(%)" name="loop_in_point"
-             tool_tip="애니메�션� 루핑 반환� 설정." />
+        <check_box label="반복" name="loop_check" tool_tip="애니메�션 반복" />
+        <spinner label="(%)" name="loop_in_point"
+             tool_tip="애니메�션� 루핑 반환�� 설정합니다." />
         <spinner label="Out(%)" name="loop_out_point"
-             tool_tip="애니메�션� 루프 종료� 설정." />
+             tool_tip="애니메�션� 루프 종료�� 설정합니다." />
         <text name="hand_label">
-                � �작
+                � �즈
         </text>
         <combo_box label="" name="hand_pose_combo"
              tool_tip="Controls what hands do during animation.">
                 <combo_item name="Spread">
-                        펴다
+                        펼치기
                 </combo_item>
                 <combo_item name="Relaxed">
-                        �슨함
+                        릴렉스
                 </combo_item>
                 <combo_item name="PointBoth">
-                        양쪽 가리키기
+                        �(양쪽)
                 </combo_item>
                 <combo_item name="Fist">
                         주먹
                 </combo_item>
                 <combo_item name="RelaxedLeft">
-                        왼쪽 �슨함
+                        릴렉스(좌)
                 </combo_item>
                 <combo_item name="PointLeft">
-                        왼쪽 가리키기
+                        �(좌)
                 </combo_item>
                 <combo_item name="FistLeft">
                         왼쪽 주먹
                 </combo_item>
                 <combo_item name="RelaxedRight">
-                        오른쪽 �슨함
+                        릴렉스(우)
                 </combo_item>
                 <combo_item name="PointRight">
-                        오른쪽 가리키기
+                        ì �(ìš°)
                 </combo_item>
                 <combo_item name="FistRight">
                         오른쪽 주먹
                 </combo_item>
                 <combo_item name="SaluteRight">
-                        경례 오른쪽
+                        경�� 관한 권리
                 </combo_item>
                 <combo_item name="Typing">
-                        타�핑
+                        ìž…ë ¥
                 </combo_item>
                 <combo_item name="PeaceRight">
-                        �화 표시 오른쪽
+                        �화� 대한 권리
                 </combo_item>
         </combo_box>
         <text name="emote_label">
@@ -83,77 +82,77 @@
         <combo_box label="" name="emote_combo"
              tool_tip="Controls what face does during animation.">
                 <combo_item name="[None]">
-                        [없�]
+                        [None]
                 </combo_item>
                 <combo_item name="Aaaaah">
-                        ì•„ì•„ì•„ì•„
+                        ì•„-
                 </combo_item>
                 <combo_item name="Afraid">
-                        �렵다
+                        �려움
                 </combo_item>
                 <combo_item name="Angry">
                         화남
                 </combo_item>
                 <combo_item name="BigSmile">
-                        환한 미소
+                        활� 웃�
                 </combo_item>
                 <combo_item name="Bored">
-                        따분함
+                        지루함
                 </combo_item>
                 <combo_item name="Cry">
-                        울다
+                        울기
                 </combo_item>
                 <combo_item name="Disdain">
-                        경멸하다
+                        경멸
                 </combo_item>
                 <combo_item name="Embarrassed">
-                        당혹스럽다
+                        당황함
                 </combo_item>
                 <combo_item name="Frown">
-                        찡그리다
+                        표정 찡그림
                 </combo_item>
                 <combo_item name="Kiss">
                         키스
                 </combo_item>
                 <combo_item name="Laugh">
-                        웃다
+                        웃�
                 </combo_item>
                 <combo_item name="Plllppt">
                         Plllppt
                 </combo_item>
                 <combo_item name="Repulsed">
-                        �오스러움
+                        거절�
                 </combo_item>
                 <combo_item name="Sad">
                         슬픔
                 </combo_item>
                 <combo_item name="Shrug">
-                        어깨를 으쓱하다
+                        어깨를 으쓱하기
                 </combo_item>
                 <combo_item name="Smile">
                         미소
                 </combo_item>
                 <combo_item name="Surprise">
-                        놀�게하다
+                        놀람
                 </combo_item>
                 <combo_item name="Wink">
                         윙�
                 </combo_item>
                 <combo_item name="Worry">
-                        걱정함
+                        걱정
                 </combo_item>
         </combo_box>
-        <spinner label="Ease In(ì´ˆ)" name="ease_in_time"
+        <spinner label="�� 가까�(초)" name="ease_in_time"
              tool_tip="애니메�션� �용�는� 걸리는 시간(초단위)." />
-        <spinner label="Ease Out(ì´ˆ)" name="ease_out_time"
+        <spinner label="�저 멀리(초)" name="ease_out_time"
              tool_tip="애니메�션� 분리�는� 걸리는 시간(초단위)." />
         <button label="" name="play_btn" tool_tip="애니메�션 재�/�시 정지." />
         <button label="" name="stop_btn" tool_tip="애니메�션 재� 중지" />
         <slider label="" name="playback_slider" />
         <text name="bad_animation_text">
                 애니메�션 파�� �� 수 없습니다.
-        
-        Poser 4�서 BVH 파�� 내보내기하실 것� 권장합니다.
+ 
+        Poser 4�서 내보낸 BVH 파�� 사용할 것� 권장합니다.
         </text>
         <button label="취소" name="cancel_btn" />
         <button label="업로드(L$[AMOUNT])" name="ok_btn" />
diff --git a/linden/indra/newview/skins/xui/ko/floater_auction.xml b/linden/indra/newview/skins/xui/ko/floater_auction.xml
index 1ebd624..ea8e9c8 100644
--- a/linden/indra/newview/skins/xui/ko/floater_auction.xml
+++ b/linden/indra/newview/skins/xui/ko/floater_auction.xml
@@ -1,14 +1,6 @@
 <?xml version="1.0" encoding="utf-8" standalone="yes" ?>
 <floater name="floater_auction" title="린든 토지 �매 시작">
-        <check_box label="노란색 선� 펜스 �함" name="fence_check" />
-        <combo_box name="saletype_combo">
-                <combo_item name="Auction">
-                        경매
-                </combo_item>
-                <combo_item name="FirstLand">
-                        첫 토지
-                </combo_item>
-        </combo_box>
+        <check_box label="황색 선� 울타리 �함" name="fence_check" />
         <button label="스냅샷" label_selected="스냅샷" name="snapshot_btn" />
         <button label="확�" label_selected="확�" name="ok_btn" />
         <text name="already for sale">
diff --git a/linden/indra/newview/skins/xui/ko/floater_avatar_picker.xml b/linden/indra/newview/skins/xui/ko/floater_avatar_picker.xml
index 0bba42c..b0fe719 100644
--- a/linden/indra/newview/skins/xui/ko/floater_avatar_picker.xml
+++ b/linden/indra/newview/skins/xui/ko/floater_avatar_picker.xml
@@ -1,15 +1,21 @@
 <?xml version="1.0" encoding="utf-8" standalone="yes" ?>
-<floater name="avatarpicker" title="사람 선�">
+<floater name="avatarpicker" title="주민 선�">
         <text name="Type part of the person&apos;s name:">
-                �름� �부를 입력하십시오:
+                주민 �름� �부를 입력하십시오:
+        </text>
+        <text name="Type part of the resident&apos;s name:">
+                �름� �부를 입력 하십시오.
         </text>
         <button label="찾기" label_selected="찾기" name="Find" />
         <text name="Or select a calling card:">
-                �는 명함� 선�하십시오:
+                �는 프로필� 선�함:
+        </text>
+        <text name="Or select their calling card:">
+                �는 프로필 선�
         </text>
         <button label="선�" label_selected="선�" name="Select" />
         <button label="닫기" label_selected="닫기" name="Close" />
         <text name="NotFound">
-                ‘[TEXT]’(�)를 찾� 수 없습니다
+                &apos;[TEXT]&apos; 찾� 수 없�
         </text>
 </floater>
diff --git a/linden/indra/newview/skins/xui/ko/floater_avatar_textures.xml b/linden/indra/newview/skins/xui/ko/floater_avatar_textures.xml
index 96ddc64..7d75972 100644
--- a/linden/indra/newview/skins/xui/ko/floater_avatar_textures.xml
+++ b/linden/indra/newview/skins/xui/ko/floater_avatar_textures.xml
@@ -1,26 +1,26 @@
 <?xml version="1.0" encoding="utf-8" standalone="yes" ?>
-<floater name="avatar_texture_debug" title="Avatar Textures">
+<floater name="avatar_texture_debug" title="아바타 �스처">
         <text name="">
-                Baked Textures
+                저장� �스처
         </text>
         <text name="">
-                Composite Textures
+                복합 �스처
         </text>
         <texture_picker label="머리" name="baked_head" />
         <texture_picker label="메��업" name="head_bodypaint" />
-        <texture_picker label="헤어스타�" name="hair" />
-        <button label="Dump" label_selected="Dump" name="Dump" />
+        <texture_picker label="헤어" name="hair" />
+        <button label="�프" label_selected="�프" name="Dump" />
         <texture_picker label="눈" name="baked_eyes" />
-        <texture_picker label="Eye" name="eye_texture" />
-        <texture_picker label="Upper Body" name="baked_upper_body" />
-        <texture_picker label="Upper Body Tattoo" name="upper_bodypaint" />
-        <texture_picker label="�셔츠" name="undershirt" />
+        <texture_picker label="눈" name="eye_texture" />
+        <texture_picker label="�체" name="baked_upper_body" />
+        <texture_picker label="�체 문신" name="upper_bodypaint" />
+        <texture_picker label="내�(�)" name="undershirt" />
         <texture_picker label="장갑" name="gloves" />
         <texture_picker label="셔츠" name="shirt" />
-        <texture_picker label="Upper Jacket" name="upper_jacket" />
-        <texture_picker label="Lower Body" name="baked_lower_body" />
-        <texture_picker label="Lower Body Tattoo" name="lower_bodypaint" />
-        <texture_picker label="�바지" name="underpants" />
+        <texture_picker label="�� 재킷" name="upper_jacket" />
+        <texture_picker label="하반신" name="baked_lower_body" />
+        <texture_picker label="하반신 문신" name="lower_bodypaint" />
+        <texture_picker label="내�(하)" name="underpants" />
         <texture_picker label="양�" name="socks" />
         <texture_picker label="신발" name="shoes" />
         <texture_picker label="바지" name="pants" />
diff --git a/linden/indra/newview/skins/xui/ko/floater_build_options.xml b/linden/indra/newview/skins/xui/ko/floater_build_options.xml
index 7831280..b258fa6 100644
--- a/linden/indra/newview/skins/xui/ko/floater_build_options.xml
+++ b/linden/indra/newview/skins/xui/ko/floater_build_options.xml
@@ -2,6 +2,7 @@
 <floater name="build options floater" title="그리드 옵션">
         <spinner label="그리드 단위(미터)" name="GridResolution" />
         <spinner label="그리드 면�(미터)" name="GridDrawSize" />
-        <check_box label="하위 유닛 스내핑 켜기" name="GridSubUnit" />
-        <slider label="그리드 불투명�" name="GridOpacity" />
+        <check_box label="하위 그리드 �� 정렬" name="GridSubUnit" />
+        <check_box label="격� 보�기" name="GridCrossSection" />
+        <slider label="그리드 투명�" name="GridOpacity" />
 </floater>
diff --git a/linden/indra/newview/skins/xui/ko/floater_bumps.xml b/linden/indra/newview/skins/xui/ko/floater_bumps.xml
index 62703e5..35ee93c 100644
--- a/linden/indra/newview/skins/xui/ko/floater_bumps.xml
+++ b/linden/indra/newview/skins/xui/ko/floater_bumps.xml
@@ -1,21 +1,21 @@
 <?xml version="1.0" encoding="utf-8" standalone="yes" ?>
-<floater name="floater_bumps" title="추방, 밀기 � 때리기">
+<floater name="floater_bumps" title="밀기, 타격 등 �지">
         <text name="none_detected">
                 �지� 것� 없�
         </text>
         <text name="bump">
-                [TIME]� [LAST] [FIRST](�)가 귀하를 쫓아냈습니다
+                [TIME]  [FIRST] [LAST]님과 부딪혔습니다.
         </text>
         <text name="llpushobject">
-                [TIME]� [LAST] [FIRST](�)가 귀하를 스�립트로 밀었습니다.
+                [TIME]  [FIRST] [LAST]님� 스�립트로 밀었습니다.
         </text>
         <text name="selected_object_collide">
-                [TIME]� [LAST] [FIRST](�)가 귀하를 아�템으로 때렸습니다
+                [TIME]  [FIRST] [LAST]님� 오브�트로 쳤습니다,.
         </text>
         <text name="scripted_object_collide">
-                [TIME]� [LAST] [FIRST](�)가 귀하를 스�립트 아�템으로 때렸습니다
+                [TIME]  [FIRST] [LAST]님� 스�립트 오브�트로 쳤습니다.
         </text>
         <text name="physical_object_collide">
-                [TIME]� [LAST] [FIRST](�)가 귀하를 물리� 아�템으로 때렸습니다
+                [TIME]  [FIRST] [LAST]님� 물리 엔진 오브�트로 쳤습니다.
         </text>
 </floater>
diff --git a/linden/indra/newview/skins/xui/ko/floater_buy_contents.xml b/linden/indra/newview/skins/xui/ko/floater_buy_contents.xml
index c68dc57..4acc356 100644
--- a/linden/indra/newview/skins/xui/ko/floater_buy_contents.xml
+++ b/linden/indra/newview/skins/xui/ko/floater_buy_contents.xml
@@ -1,10 +1,10 @@
 <?xml version="1.0" encoding="utf-8" standalone="yes" ?>
 <floater name="floater_buy_contents" title="컨�츠 구매">
         <text name="contains_text">
-                [NAME]� �함� 내용:
+                [NAME]� �함� 사항:
         </text>
         <text name="buy_text">
-                [NAME](으)로부터 L$[AMOUNT]� 구입하시겠습니다?
+                L$[AMOUNT]� [NAME](으)로부터 구매 하시겠습니까?
         </text>
         <button label="취소" label_selected="취소" name="cancel_btn" />
         <button label="구매" label_selected="구매" name="buy_btn" />
diff --git a/linden/indra/newview/skins/xui/ko/floater_buy_currency.xml b/linden/indra/newview/skins/xui/ko/floater_buy_currency.xml
index e8ab54e..674b823 100644
--- a/linden/indra/newview/skins/xui/ko/floater_buy_currency.xml
+++ b/linden/indra/newview/skins/xui/ko/floater_buy_currency.xml
@@ -1,29 +1,29 @@
 <?xml version="1.0" encoding="utf-8" standalone="yes" ?>
-<floater name="buy currency" title="화� 구매">
+<floater name="buy currency" title="린든달러(L$) 구매">
         <text name="info_buying">
-                구매 화�:
+                린든달러(L$) 구매:
         </text>
         <text name="info_cannot_buy">
                 지금 구입할 수 없�:
         </text>
         <text name="info_need_more">
-                화�가 � 필요합니다.
+                린든달러(L$)가 � 필요합니다:
         </text>
         <text name="error_message">
-                �가 잘못�었습니다.
+                문제가 발�했습니다.
         </text>
-        <button label="웹사�트로 ��" name="error_web" />
+        <button label="웹 사�트로 가기" name="error_web" />
         <text name="contacting">
-                LindeX� 연� 중...
+                린�스(LindeX)� 연결 중...
         </text>
         <text name="buy_action_unknown">
-                LindeX 환율로 L$ 구입
+                LindeX 환율로 린든달러(L$) 구매
         </text>
         <text name="buy_action">
                 [NAME] L$ [PRICE]
         </text>
         <text name="currency_action">
-                L$ 구매
+                린든달러(L$) 구매
         </text>
         <line_editor name="currency_amt">
                 1234
@@ -38,24 +38,24 @@
                 L$ [AMT]
         </text>
         <text name="buying_label">
-                귀하� 구매 대�
+                구매 중입니다.
         </text>
         <text name="buying_amount">
                 L$ [AMT]
         </text>
         <text name="total_label">
-                귀하� 새 보유 잔고
+                귀하� 잔고는
         </text>
         <text name="total_amount">
                 L$ [AMT]
         </text>
         <text name="purchase_warning_repurchase">
-                � 구매를 확�하면 화�만 구매하게 �니다.
-작업� 재시�하셔야 합니다.
+                � 구매를 확�하면 린든달러(L$) 구매만 수행�니다.
+� 작업� 다시 시�해야 합니다.
         </text>
         <text name="purchase_warning_notenough">
-                충분한 화�를 사지 않았습니다
-구입하려는 금액� 늘리십시오.
+                충분한 린든달러를 구매하지 않았습니다.
+구매하려는 금액� 늘리십시오.
         </text>
         <button label="구매" name="buy_btn" />
         <button label="취소" name="cancel_btn" />
diff --git a/linden/indra/newview/skins/xui/ko/floater_buy_land.xml b/linden/indra/newview/skins/xui/ko/floater_buy_land.xml
index a01815f..e703181 100644
--- a/linden/indra/newview/skins/xui/ko/floater_buy_land.xml
+++ b/linden/indra/newview/skins/xui/ko/floater_buy_land.xml
@@ -1,70 +1,70 @@
 <?xml version="1.0" encoding="utf-8" standalone="yes" ?>
-<floater name="buy land" title="토지 구매">
+<floater name="buy land" title="토지 구매하기">
         <text name="region_name_label">
                 지역:
         </text>
         <text name="region_name_text">
-                (알려지지 않�)
+                (알 수 없�)
         </text>
         <text name="estate_name_label">
-                소유지:
+                사유지:
         </text>
         <text name="estate_name_text">
-                (알려지지 않�)
+                (알 수 없�)
         </text>
         <text name="estate_owner_label">
-                소유지 소유�:
+                사유지 소유�:
         </text>
         <text name="estate_owner_text">
-                (알려지지 않�)
+                (알 수 없�)
         </text>
         <text name="resellable_changeable_label">
-                � 지역�서 구입한 토지:
+                � 지역�서 구매한 토지:
         </text>
         <text name="resellable_clause">
-                � 지역�서 구입한 토지는 재�매할 수 없는 경우� 있습니다.
+                � 지역�서 구매한 토지는 재�매 할 수 없는 경우� 있습니다.
         </text>
         <text name="changeable_clause">
-                참여 �는 세분�지 않� 수 있습니다.
+                결합 �는 세분� 수 있습니다(�는 없습니다).
         </text>
         <text name="covenant_text">
-                다� 소유지 계약 조항� ��해야 합니다.
+                반드시 사유지 계약 조항� ��해야 합니다.
         </text>
         <text_editor name="covenant_editor">
-                로딩중...
+                로딩 중…
         </text_editor>
-        <check_box label="위� 정�한 계약 조항� ��합니다."
+        <check_box label="위� 정�한 시행 규칙� ��합니다."
              name="agree_covenant" />
         <text name="info_parcel_label">
                 구�:
         </text>
         <text name="info_parcel">
-                스코톱테릭스 138,204
+                Scotopteryx 138,204
         </text>
         <text name="info_size_label">
-                �기 :
+                �기:
         </text>
         <text name="info_size">
-                1024 �방 미터
+                1024 제곱미터
         </text>
         <text name="info_price_label">
                 가격:
         </text>
         <text name="info_price">
-                L$ 1500, 사물 �함
+                L$ 1500, 오브�트 �함
         </text>
         <text name="info_action">
-                � 토지를 매입할 경우:
+                � 토지 구매 내역:
         </text>
         <text name="error_message">
-                �가 잘못�었습니다.
+                문제가 발�했습니다.
         </text>
-        <button label="웹사�트로 ��" name="error_web" />
+        <button label="웹 사�트로 가기" name="error_web" />
         <text name="account_action">
-                프리미엄 멤버십으로 업그레�드합니다.
+                프리미엄 회�으로 업그레�드하십시오.
         </text>
         <text name="account_reason">
-                프리미엄 멤버만 토지를 소유할 수 있습니다.
+                프리미엄 회�만� 토지를 소유할 수 있습니다.
         </text>
         <combo_box name="account_level">
                 <combo_item name="US$9.95/month,billedmonthly">
@@ -78,20 +78,20 @@
                 </combo_item>
         </combo_box>
         <text name="land_use_action">
-                월 토지 사용료를 미화$ 40/월로 ��하십시오.
+                US$ 40/월로 월 토지 사용료를 높임
         </text>
         <text name="land_use_reason">
-                귀하는 현재 1,309 �방 미터� 토지를 보유하고 있습니다.
-� 구�� 512 �방 미터� 토지입니다.
+                귀하는 현재 1,309 제곱 미터� 토지를 소유하고 있습니다.
+� 구�� 512 제곱 미터입니다.
         </text>
         <text name="purchase_action">
-                Joe 주민�게 토지 대가로 L$4000를 지불합니다
+                주민 Joe�게 토지 대금 L$4000 지불
         </text>
         <text name="currency_reason">
-                귀하는 현재 L$2,100를 보유하고 있습니다.
+                현재 L$2,100를 보유하고 있습니다.
         </text>
         <text name="currency_action">
-                추가 L$ 구매
+                추가로 린든달러(L$) 구매
         </text>
         <line_editor name="currency_amt">
                 1000
@@ -100,9 +100,10 @@
                 약 US$ [AMOUNT2]
         </text>
         <text name="currency_balance">
-                귀하는 현재 L$2,100를 보유하고 있습니다.
+                현재 L$2,100를 보유하고 있습니다.
         </text>
-        <check_box label="구입�서 구룹기부 제외 하기" name="remove_contribution" />
+        <check_box label="그룹 기부�서 [AMOUNT] �방 미터를 제거합니다."
+             name="remove_contribution" />
         <button label="구매" name="buy_btn" />
         <button label="취소" name="cancel_btn" />
         <text name="can_resell">
@@ -121,7 +122,7 @@
                 활� 중� 그룹� 위해 토지를 매입할 권한� 없습니다.
         </text>
         <text name="no_land_selected">
-                토지를 선�하지 않았습니다.
+                토지를 선�하지 않�.
         </text>
         <text name="multiple_parcels_selected">
                 여러개� �기 다른 구�� 선��었습니다.
@@ -137,7 +138,7 @@
                 본 그룹� �미 해당 구�� 소유하고 있습니다.
         </text>
         <text name="you_already_own">
-                귀하는 해당 구�� �미 소유하고 있습니다.
+                해당 구�� �미 소유하고 있습니다.
         </text>
         <text name="set_to_sell_to_other">
                 선�한 구�� 다른 사람�게 �매하�� 설정�어 있습니다.
@@ -158,13 +159,15 @@
 귀하는 �미 토지를 소유하고 있습니다.
         </text>
         <text name="processing">
-                구입 처리중...   (1분�서 2분만 기다려 주십시요)
+                구매 처리 중..
+ 
+(몇 분� 소요� 수 있�.)
         </text>
         <text name="fetching_error">
-                토지 구매 정보를 가져오는 �안 오류가 있었습니다.
+                토지 구매 정보를 가져오는 �안 오류가 발�했습니다.
         </text>
         <text name="buying_will">
-                � 토지를 매입할 경우:
+                � 토지 구매 내역:
         </text>
         <text name="buying_for_group">
                 그룹� 대신해 토지 매입:
@@ -173,61 +176,55 @@
                 지금 구입할 수 없�:
         </text>
         <text name="not_for_sale">
-                비�매:.
+                비매용:
         </text>
         <text name="none_needed">
                 필요한 사항 없�
         </text>
         <text name="must_upgrade">
-                토지를 소유하려면 귀하� 계정� 업그레�드해야 합니다.
+                토지를 소유하려면 계정� 업그레�드해야 합니다.
         </text>
         <text name="cant_own_land">
                 귀하� 계정� 토지를 소유할 수 있습니다.
         </text>
-        <text name="first_purchase">
-                최초� 토지 구매�며 &apos;첫 토지&apos; 구�� 구입할 수 있는 유�한 기회입니다.
-        </text>
-        <text name="first_time_but_not_first_land">
-                최초� 토지 구매�지만 최초 구매�를 위해 예약� 구�� 아닙니다. 검색� 사용하여 저렴한 &apos;첫 토지&apos; 구�� 찾� 수 있습니다.
-        </text>
         <text name="land_holdings">
-                토지�  [BUYER] 스퀴어 미터를 소유하셨습니다.
+                토지� [BUYER] 제곱 미터를 소유하고 있습니다.
         </text>
         <text name="pay_to_for_land">
-                현재 토지� 대해 [�매�]�게 L$ [금액] 지불
+                [SELLER](�)게 토지 대금 [AMOUNT] 지불
         </text>
         <text name="buy_for_US">
-                약 US$ [AMOUNT2] � L$ [AMOUNT]구매,
+                약 US$ [AMOUNT2]� L$ [AMOUNT]를 구매 하시겠습니까?
         </text>
         <text name="parcel_meters">
                 � 구�� [AMOUNT] �방 미터입니다.
         </text>
         <text name="premium_land">
-                � 토지는 프리미엄�며 [AMOUNT] �방 미터로 비용� 부과�니다.
+                � 토지는 프리미엄 지역�며 [AMOUNT] �방 미터로 비용� 부과�니다.
         </text>
         <text name="discounted_land">
-                � 토지는 할��었으며 [AMOUNT] �방 미터로 비용� 부과�니다.
+                � 토지는 할� 지역�며 [AMOUNT] �방 미터로 비용� 부과�니다.
         </text>
         <text name="meters_supports_object">
-                [AMOUNT] �방 미터
-supports [AMOUNT2] 사물 지�
+                [AMOUNT]제곱미터
+[AMOUNT2]개� 오브�트 지�
         </text>
         <text name="sold_with_objects">
-                아�템과 함께 �매
+                오브�트와 함께 �매�
         </text>
         <text name="insufficient_land_credits">
-                그룹 [GROUP]�(는) 구매가 완료�기 전� 본 구�전체를 담당할 수 있는 토지 사용� 위한 충분한 신용� 필요합니다.
+                그룹 [GROUP]�(는) 본 구� 전체� 사용� 위한 충분한 신용� 필요하며, 구매가 완료�기 전� 확� �어야 합니다.
         </text>
         <text name="have_enough_lindens">
                 � 토지를 구입하기� 충분한 L$ [AMOUNT]�(를) 가지고 있습니다.
         </text>
         <text name="not_enough_lindens">
-                현재 L$ [AMOUNT]밖� 없으므로 L$ [AMOUNT2]�(가) � 필요합니다.
+                현재 L$ [AMOUNT]�(를) 보유하고 있으며 L$ [AMOUNT2]�(가) � 필요합니다.
         </text>
         <text name="balance_left">
-                구입 후� L$ [AMOUNT]�(가) 남게 �니다.
+                구입 후� L$ [AMOUNT]가 남게 �니다.
         </text>
         <text name="balance_needed">
-                � 토지를 구입하려면 L$ [AMOUNT] ��� 지불해야 합니다.
+                � 토지를 구입하려면 최소 L$ [AMOUNT] ��� 지불해야 합니다.
         </text>
 </floater>
diff --git a/linden/indra/newview/skins/xui/ko/floater_buy_object.xml b/linden/indra/newview/skins/xui/ko/floater_buy_object.xml
index 9468696..34e6e85 100644
--- a/linden/indra/newview/skins/xui/ko/floater_buy_object.xml
+++ b/linden/indra/newview/skins/xui/ko/floater_buy_object.xml
@@ -1,10 +1,10 @@
 <?xml version="1.0" encoding="utf-8" standalone="yes" ?>
-<floater name="contents" title="사물 복사본 구매">
+<floater name="contents" title="오브�트 복사본 구매">
         <text name="contents_text">
-                때렸습니다:
+                � 컨�츠:
         </text>
         <text name="buy_text">
-                [NAME](으)로부터 L$[AMOUNT]� 구입하시겠습니다?
+                L$[AMOUNT]� [NAME](으)로부터 구매 하시겠습니까?
         </text>
         <button label="취소" label_selected="취소" name="cancel_btn" />
         <button label="구매" label_selected="구매" name="buy_btn" />
diff --git a/linden/indra/newview/skins/xui/ko/floater_chat_history.xml b/linden/indra/newview/skins/xui/ko/floater_chat_history.xml
index 998931c..6babcf2 100644
--- a/linden/indra/newview/skins/xui/ko/floater_chat_history.xml
+++ b/linden/indra/newview/skins/xui/ko/floater_chat_history.xml
@@ -1,5 +1,6 @@
 <?xml version="1.0" encoding="utf-8" standalone="yes" ?>
 <floater name="chat floater" title="채팅 기�">
-        <button label="주민 �소거" label_selected="주민 �소거" name="Mute resident" />
-        <check_box label="�소거 �스트 표시하기" name="show mutes" />
+        <button label="채팅" name="Chat" />
+        <button label="차단" name="Mute resident" />
+        <check_box label="�소거� �스트 표시하기" name="show mutes" />
 </floater>
diff --git a/linden/indra/newview/skins/xui/ko/floater_clothing.xml b/linden/indra/newview/skins/xui/ko/floater_clothing.xml
index fd8d880..8c17b7d 100644
--- a/linden/indra/newview/skins/xui/ko/floater_clothing.xml
+++ b/linden/indra/newview/skins/xui/ko/floater_clothing.xml
@@ -1,9 +1,9 @@
 <?xml version="1.0" encoding="utf-8" standalone="yes" ?>
-<floater name="clothing" title="�류">
+<floater name="clothing" title="옷">
         <scroll_list name="clothing_list">
                 <column label="" name="icon" />
                 <column label="Name" name="name" />
         </scroll_list>
-        <button label="�륙" name="take_off_btn" />
+        <button label="벗기" name="take_off_btn" />
         <button label="ì°©ìš©" name="wear_btn" />
 </floater>
diff --git a/linden/indra/newview/skins/xui/ko/floater_color_picker.xml b/linden/indra/newview/skins/xui/ko/floater_color_picker.xml
index ceb3593..78fb662 100644
--- a/linden/indra/newview/skins/xui/ko/floater_color_picker.xml
+++ b/linden/indra/newview/skins/xui/ko/floater_color_picker.xml
@@ -1,10 +1,10 @@
 <?xml version="1.0" encoding="utf-8" standalone="yes" ?>
-<floater name="ColorPicker" title="색 피커">
+<floater name="ColorPicker" title="색 관리기">
         <text name="r_val_text">
-                빨간색:
+                �색:
         </text>
         <text name="g_val_text">
-                초�색:
+                녹색:
         </text>
         <text name="b_val_text">
                 파란색:
@@ -13,12 +13,12 @@
                 색조:
         </text>
         <text name="s_val_text">
-                Sat:
+                채�:
         </text>
         <text name="l_val_text">
-                럼:
+                명암:
         </text>
-        <check_box label="즉시 �용" name="apply_immediate" />
+        <check_box label="지금 �용" name="apply_immediate" />
         <button label="" label_selected="" name="color_pipette" />
         <button label="취소" label_selected="취소" name="cancel_btn" />
         <button label="선�" label_selected="선�" name="select_btn" />
@@ -26,6 +26,6 @@
                 현재 색:
         </text>
         <text name="(Drag below to save.)">
-                (아래로 드래그해 저장.)
+                아래로 �어 저장
         </text>
 </floater>
diff --git a/linden/indra/newview/skins/xui/ko/floater_critical.xml b/linden/indra/newview/skins/xui/ko/floater_critical.xml
index 26357c1..e5ce706 100644
--- a/linden/indra/newview/skins/xui/ko/floater_critical.xml
+++ b/linden/indra/newview/skins/xui/ko/floater_critical.xml
@@ -3,10 +3,10 @@
         <button label="계�" label_selected="계�" name="Continue" />
         <button label="취소" label_selected="취소" name="Cancel" />
         <text name="tos_title">
-                주요 메시지
+                중요 메시지
         </text>
         <text name="tos_heading">
-                아래 메시지를 �세히 �으십시오.
+                다� 메시지를 잘 �으세요.
         </text>
         <text_editor name="tos_text">
                 TOS_TEXT
diff --git a/linden/indra/newview/skins/xui/ko/floater_customize.xml b/linden/indra/newview/skins/xui/ko/floater_customize.xml
index 3abe397..9c29b1e 100644
--- a/linden/indra/newview/skins/xui/ko/floater_customize.xml
+++ b/linden/indra/newview/skins/xui/ko/floater_customize.xml
@@ -1,13 +1,8 @@
 <?xml version="1.0" encoding="utf-8" standalone="yes" ?>
-<floater name="floater customize" title="외양">
+<floater name="floater customize" title="내 모습">
         <tab_container name="customize tab container">
-                <panel label="신체부분" />
+                <panel label="신체 부위" />
                 <panel label="외형" name="Shape">
-                        <button label="새 모습 �성" label_selected="새 모습 �성" name="Create New" />
-                        <button label="�륙" label_selected="�륙" name="Take Off" />
-                        <button label="저장" label_selected="저장" name="Save" />
-                        <button label="다른 �름으로 저장" label_selected="다른 �름으로 저장"
-                             name="Save As" />
                         <button label="��리기" label_selected="��리기" name="Revert" />
                         <button label="ì‹ ì²´" label_selected="ì‹ ì²´" name="Body" />
                         <button label="머리" label_selected="머리" name="Head" />
@@ -18,151 +13,170 @@
                         <button label="턱" label_selected="턱" name="Chin" />
                         <button label="몸통" label_selected="몸통" name="Torso" />
                         <button label="다리" label_selected="다리" name="Legs" />
-                        <button label="임�로" label_selected="임�로" name="Randomize" />
+                        <radio_group name="sex radio">
+                                <radio_item type="string" length="1" name="radio">
+                                        여성
+                                </radio_item>
+                                <radio_item type="string" length="1" name="radio2">
+                                        남성
+                                </radio_item>
+                        </radio_group>
+                        <button label="무작위" label_selected="무작위" name="Randomize" />
                         <text type="string" length="1" name="title">
                                 [DESC]
                         </text>
                         <text type="string" length="1" name="title_no_modify">
-                                [DESC]: 수정할 수 없습니다
+                                [DESC]: 수정불가
                         </text>
                         <text type="string" length="1" name="title_loading">
-                                [DESC]: 로딩중...
+                                [DESC]: 로드 중...
                         </text>
                         <text type="string" length="1" name="title_not_worn">
-                                [DESC]: 마모�지 않습니다
+                                [DESC]: 착용 안 함
                         </text>
                         <text type="string" length="1" name="path">
-                                [PATH]� 위치
+                                [PATH]� 위치함
                         </text>
                         <text type="string" length="1" name="not worn instructions">
-                                보관함�서 새로운 외양� 드래그하여 아바타�게 �용해 보십시오. �는 스�랫치�서 새로운 형태를 만들어 사용할 수� 있습니다.
+                                �벤토리로부터 새 모습� 드래그하여 
+ 아바타� �용해 보십시오.. �는, 
+ 조절 슬���로 새로운 형태를 만들어 사용할 수� 있습니다.
                         </text>
                         <text type="string" length="1" name="no modify instructions">
                                 � 착용물� 수정할 권한� 없습니다.
                         </text>
-                        <radio_group name="sex radio">
-                                <radio_item type="string" length="1" name="radio">
-                                        여성
-                                </radio_item>
-                                <radio_item type="string" length="1" name="radio2">
-                                        남성
-                                </radio_item>
-                        </radio_group>
-                </panel>
-                <panel label="피부" name="Skin">
-                        <button label="새 피부 �성" label_selected="새 피부 �성" name="Create New" />
-                        <button label="�륙" label_selected="�륙" name="Take Off" />
+                        <button label="새 외형 만들기" label_selected="새 외형 만들기"
+                             name="Create New" />
+                        <button label="벗기" label_selected="벗기" name="Take Off" />
                         <button label="저장" label_selected="저장" name="Save" />
                         <button label="다른 �름으로 저장" label_selected="다른 �름으로 저장"
                              name="Save As" />
-                        <button label="��리기" label_selected="��리기" name="Revert" />
+                </panel>
+                <panel label="피부" name="Skin">
                         <button label="피부색" label_selected="피부색" name="Skin Color" />
-                        <button label="얼굴 세부 사항" label_selected="얼굴 세부 사항"
-                             name="Face Detail" />
+                        <button label="얼굴 디테�" label_selected="얼굴 디테�" name="Face Detail" />
                         <button label="메��업" label_selected="메��업" name="Makeup" />
-                        <button label="신체 세부 사항" label_selected="신체 세부 사항"
-                             name="Body Detail" />
-                        <button label="임�로" label_selected="임�로" name="Randomize" />
+                        <button label="신체 디테�" label_selected="신체 디테�" name="Body Detail" />
                         <text type="string" length="1" name="title">
                                 [DESC]
                         </text>
                         <text type="string" length="1" name="title_no_modify">
-                                [DESC]: 수정할 수 없습니다
+                                [DESC]: 수정불가
                         </text>
                         <text type="string" length="1" name="title_loading">
-                                [DESC]: 로딩중...
+                                [DESC]: 로드 중...
                         </text>
                         <text type="string" length="1" name="title_not_worn">
-                                [DESC]: 마모�지 않습니다
+                                [DESC]: 착용 안 함
                         </text>
                         <text type="string" length="1" name="path">
-                                [PATH]� 위치
+                                [PATH]� 위치함
                         </text>
                         <text type="string" length="1" name="not worn instructions">
-                                보관함�서  새로운 피부를 드래그하여 아바타�게 사용해 보십시오. �는 스�랫치�서 새로운 형태를 만들어 사용할 수� 있습니다.
+                                �벤토리로부터 새 피부를 드래그하여 
+ 아바타� �용해 보십시오.�는, 
+ 조절 슬���로 새로운 형태를 만들어 사용할 수� 있습니다.
                         </text>
                         <text type="string" length="1" name="no modify instructions">
                                 � 착용물� 수정할 권한� 없습니다.
                         </text>
                         <texture_picker label="머리 문신" name="Head Tattoos"
-                             tool_tip="�릭해 그림� 선�하십시오" />
-                        <texture_picker label="문신 올리기" name="Upper Tattoos"
-                             tool_tip="�릭해 그림� 선�하십시오" />
-                        <texture_picker label="문신 낮추기" name="Lower Tattoos"
-                             tool_tip="�릭해 그림� 선�하십시오" />
-                </panel>
-                <panel label="헤어스타�" name="Hair">
-                        <button label="새 헤어스타� �성" label_selected="새 헤어스타� �성"
+                             tool_tip="그림� 선�하려면 �릭 하십시오." />
+                        <texture_picker label="�반신 문신" name="Upper Tattoos"
+                             tool_tip="그림� 선�하려면 �릭 하십시오." />
+                        <texture_picker label="하단 문신" name="Lower Tattoos"
+                             tool_tip="그림� 선�하려면 �릭 하십시오." />
+                        <button label="무작위" label_selected="무작위" name="Randomize" />
+                        <button label="새 피부 만들기" label_selected="새 피부 만들기"
                              name="Create New" />
-                        <button label="�륙" label_selected="�륙" name="Take Off" />
+                        <button label="벗기" label_selected="벗기" name="Take Off" />
                         <button label="저장" label_selected="저장" name="Save" />
                         <button label="다른 �름으로 저장" label_selected="다른 �름으로 저장"
                              name="Save As" />
                         <button label="��리기" label_selected="��리기" name="Revert" />
+                </panel>
+                <panel label="헤어" name="Hair">
                         <button label="색" label_selected="색" name="Color" />
                         <button label="스타�" label_selected="스타�" name="Style" />
                         <button label="눈�" label_selected="눈�" name="Eyebrows" />
-                        <button label="얼굴" label_selected="얼굴" name="Facial" />
-                        <button label="임�로" label_selected="임�로" name="Randomize" />
+                        <button label="수염" label_selected="수염" name="Facial" />
                         <text type="string" length="1" name="title">
                                 [DESC]
                         </text>
                         <text type="string" length="1" name="title_no_modify">
-                                [DESC]: 수정할 수 없습니다
+                                [DESC]: 수정불가
                         </text>
                         <text type="string" length="1" name="title_loading">
-                                [DESC]: 로딩중...
+                                [DESC]: 로드 중...
                         </text>
                         <text type="string" length="1" name="title_not_worn">
-                                [DESC]: 마모�지 않습니다
+                                [DESC]: 착용 안 함
                         </text>
                         <text type="string" length="1" name="path">
-                                [PATH]� 위치
+                                [PATH]� 위치함
                         </text>
                         <text type="string" length="1" name="not worn instructions">
-                                보관함 으로부터 새로운 헤어스타�� 드래그하여 아바타�게 �용해 보십시오. �는 스�랫치�서 새로운 형태를 만들어 사용할 수� 있습니다.
+                                �벤토리로부터 새로운 헤어를 드래그하여 
+ 아바타� �용해 보십시오.�는, 
+ 조절 슬���로 새로운 형태를 만들어 사용할 수� 있습니다.
                         </text>
                         <text type="string" length="1" name="no modify instructions">
                                 � 착용물� 수정할 권한� 없습니다.
                         </text>
                         <texture_picker label="�스처" name="Texture"
-                             tool_tip="�릭해 그림� 선�하십시오" />
-                </panel>
-                <panel label="눈" name="Eyes">
-                        <button label="새 눈 �성" label_selected="새 눈 �성" name="Create New" />
-                        <button label="�륙" label_selected="�륙" name="Take Off" />
+                             tool_tip="그림� 선�하려면 �릭 하십시오." />
+                        <button label="무작위" label_selected="무작위" name="Randomize" />
+                        <button label="새 헤어 만들기" label_selected="새 헤어 만들기"
+                             name="Create New" />
+                        <button label="벗기" label_selected="벗기" name="Take Off" />
                         <button label="저장" label_selected="저장" name="Save" />
                         <button label="다른 �름으로 저장" label_selected="다른 �름으로 저장"
                              name="Save As" />
                         <button label="��리기" label_selected="��리기" name="Revert" />
-                        <button label="임�로" label_selected="임�로" name="Randomize" />
+                </panel>
+                <panel label="눈" name="Eyes">
                         <text type="string" length="1" name="title">
                                 [DESC]
                         </text>
                         <text type="string" length="1" name="title_no_modify">
-                                [DESC]: 수정할 수 없습니다
+                                [DESC]: 수정불가
                         </text>
                         <text type="string" length="1" name="title_loading">
-                                [DESC]: 로딩중...
+                                [DESC]: 로드 중...
                         </text>
                         <text type="string" length="1" name="title_not_worn">
-                                [DESC]: 마모�지 않습니다
+                                [DESC]: 착용 안 함
                         </text>
                         <text type="string" length="1" name="path">
-                                [PATH]� 위치
+                                [PATH]� 위치함
                         </text>
                         <text type="string" length="1" name="not worn instructions">
-                                보관함 으로부터 새로운 눈형태를� 드래그하여 아바타� 눈� �용해 보십시오. �는 스�랫치�서 새로운 형태를 만들어 사용할 수� 있습니다.
+                                �벤토리로부터 새  눈� 드래그하여 
+ 아바타� �용해 보십시오.�는, 
+ 조절 슬���로 새로운 형태를 만들어 사용할 수� 있습니다.
                         </text>
                         <text type="string" length="1" name="no modify instructions">
                                 � 착용물� 수정할 권한� 없습니다.
                         </text>
-                        <texture_picker label="�채" name="Iris" tool_tip="�릭해 그림� 선�하십시오" />
+                        <texture_picker label="눈��" name="Iris"
+                             tool_tip="그림� 선�하려면 �릭 하십시오." />
+                        <button label="무작위" label_selected="무작위" name="Randomize" />
+                        <button label="새 눈 만들기" label_selected="새 눈 만들기" name="Create New" />
+                        <button label="벗기" label_selected="벗기" name="Take Off" />
+                        <button label="저장" label_selected="저장" name="Save" />
+                        <button label="다른 �름으로 저장" label_selected="다른 �름으로 저장"
+                             name="Save As" />
+                        <button label="��리기" label_selected="��리기" name="Revert" />
                 </panel>
-                <panel label="�류" />
+                <panel label="��" />
                 <panel label="셔츠" name="Shirt">
-                        <button label="새 셔츠 �성" label_selected="새 셔츠 �성" name="Create New" />
-                        <button label="�륙" label_selected="�륙" name="Take Off" />
+                        <texture_picker label="옷�" name="Fabric"
+                             tool_tip="그림� 선�하려면 �릭 하십시오." />
+                        <color_swatch label="색�/색조" name="Color/Tint"
+                             tool_tip="색 관리기를 열려면 �릭 하십시오." />
+                        <button label="새 셔츠 만들기" label_selected="새 셔츠 만들기"
+                             name="Create New" />
+                        <button label="벗기" label_selected="벗기" name="Take Off" />
                         <button label="저장" label_selected="저장" name="Save" />
                         <button label="다른 �름으로 저장" label_selected="다른 �름으로 저장"
                              name="Save As" />
@@ -171,30 +185,33 @@
                                 [DESC]
                         </text>
                         <text type="string" length="1" name="title_no_modify">
-                                [DESC]: 수정할 수 없습니다
+                                [DESC]: 수정불가
                         </text>
                         <text type="string" length="1" name="title_loading">
-                                [DESC]: 로딩중...
+                                [DESC]: 로드 중...
                         </text>
                         <text type="string" length="1" name="title_not_worn">
-                                [DESC]: 마모�지 않습니다
+                                [DESC]: 착용 안 함
                         </text>
                         <text type="string" length="1" name="path">
-                                [PATH]� 위치
+                                [PATH]� 위치함
                         </text>
                         <text type="string" length="1" name="not worn instructions">
-                                보관함�서  새로운 셔츠를 드래그하여 아바타�게 사용해 보십시오. �는 스�랫치�서 새로운 형태를 만들어 사용할 수� 있습니다.
+                                �벤토리로부터 새 셔츠를 드래그하여 아바타� �용해 보십시오.�는, 
+ 조절 슬���로 새로운 형태를 만들어 사용할 수� 있습니다.
                         </text>
                         <text type="string" length="1" name="no modify instructions">
                                 � 착용물� 수정할 권한� 없습니다.
                         </text>
-                        <color_swatch label="색�/색조" name="Color/Tint"
-                             tool_tip="�릭해 색 피커를 여십시오" />
-                        <texture_picker label="옷�" name="Fabric" tool_tip="�릭해 그림� 선�하십시오" />
                 </panel>
                 <panel label="바지" name="Pants">
-                        <button label="새 바지 �성" label_selected="새 바지 �성" name="Create New" />
-                        <button label="�륙" label_selected="�륙" name="Take Off" />
+                        <texture_picker label="옷�" name="Fabric"
+                             tool_tip="그림� 선�하려면 �릭 하십시오." />
+                        <color_swatch label="색�/색조" name="Color/Tint"
+                             tool_tip="색 관리기를 열려면 �릭 하십시오." />
+                        <button label="새 바지 만들기" label_selected="새 바지 만들기"
+                             name="Create New" />
+                        <button label="벗기" label_selected="벗기" name="Take Off" />
                         <button label="저장" label_selected="저장" name="Save" />
                         <button label="다른 �름으로 저장" label_selected="다른 �름으로 저장"
                              name="Save As" />
@@ -203,259 +220,280 @@
                                 [DESC]
                         </text>
                         <text type="string" length="1" name="title_no_modify">
-                                [DESC]: 수정할 수 없습니다
+                                [DESC]: 수정불가
                         </text>
                         <text type="string" length="1" name="title_loading">
-                                [DESC]: 로딩중...
+                                [DESC]: 로드 중...
                         </text>
                         <text type="string" length="1" name="title_not_worn">
-                                [DESC]: 마모�지 않습니다
+                                [DESC]: 착용 안 함
                         </text>
                         <text type="string" length="1" name="path">
-                                [PATH]� 위치
+                                [PATH]� 위치함
                         </text>
                         <text type="string" length="1" name="not worn instructions">
-                                보관함 으로부터 새로운 바지를 드래그하여 아바타�게 �용해 보십시오. �는 스�랫치�서 새로운 형태를 만들어 사용할 수� 있습니다.
+                                �벤토리로부터 새 바지를 드래그하여 
+ 아바타� �용해 보십시오.�는, 
+ 조절 슬���로 새로운 형태를 만들어 사용할 수� 있습니다.
                         </text>
                         <text type="string" length="1" name="no modify instructions">
                                 � 착용물� 수정할 권한� 없습니다.
                         </text>
-                        <color_swatch label="색�/색조" name="Color/Tint"
-                             tool_tip="�릭해 색 피커를 여십시오" />
-                        <texture_picker label="옷�" name="Fabric" tool_tip="�릭해 그림� 선�하십시오" />
                 </panel>
                 <panel label="신발" name="Shoes">
-                        <button label="새 신발 �성" label_selected="새 신발 �성" name="Create New" />
-                        <button label="�륙" label_selected="�륙" name="Take Off" />
-                        <button label="저장" label_selected="저장" name="Save" />
-                        <button label="다른 �름으로 저장" label_selected="다른 �름으로 저장"
-                             name="Save As" />
-                        <button label="��리기" label_selected="��리기" name="Revert" />
                         <text type="string" length="1" name="title">
                                 [DESC]
                         </text>
                         <text type="string" length="1" name="title_no_modify">
-                                [DESC]: 수정할 수 없습니다
+                                [DESC]: 수정불가
                         </text>
                         <text type="string" length="1" name="title_loading">
-                                [DESC]: 로딩중...
+                                [DESC]: 로드 중...
                         </text>
                         <text type="string" length="1" name="title_not_worn">
-                                [DESC]: 마모�지 않습니다
+                                [DESC]: 착용 안 함
                         </text>
                         <text type="string" length="1" name="path">
-                                [PATH]� 위치
+                                [PATH]� 위치함
                         </text>
                         <text type="string" length="1" name="not worn instructions">
-                                보관함�서  새로운 신발� 드래그하여 아바타�게 사용해 보십시오. �는 스�랫치�서 새로운 형태를 만들어 사용할 수� 있습니다.
+                                �벤토리로부터 새 신발� 드래그하여 아바타� �용해 보십시오. �는, 
+ 조절 슬���로 새로운 형태를 만들어 사용할 수� 있습니다.
                         </text>
                         <text type="string" length="1" name="no modify instructions">
                                 � 착용물� 수정할 권한� 없습니다.
                         </text>
+                        <texture_picker label="옷�" name="Fabric"
+                             tool_tip="그림� 선�하려면 �릭 하십시오." />
                         <color_swatch label="색�/색조" name="Color/Tint"
-                             tool_tip="�릭해 색 피커를 여십시오" />
-                        <texture_picker label="옷�" name="Fabric" tool_tip="�릭해 그림� 선�하십시오" />
-                </panel>
-                <panel label="양�" name="Socks">
-                        <button label="새 양� �성" label_selected="새 양� �성" name="Create New" />
-                        <button label="�륙" label_selected="�륙" name="Take Off" />
+                             tool_tip="색 관리기를 열려면 �릭 하십시오." />
+                        <button label="새 신발 만들기" label_selected="새 신발 만들기"
+                             name="Create New" />
+                        <button label="벗기" label_selected="벗기" name="Take Off" />
                         <button label="저장" label_selected="저장" name="Save" />
                         <button label="다른 �름으로 저장" label_selected="다른 �름으로 저장"
                              name="Save As" />
                         <button label="��리기" label_selected="��리기" name="Revert" />
+                </panel>
+                <panel label="양�" name="Socks">
                         <text type="string" length="1" name="title">
                                 [DESC]
                         </text>
                         <text type="string" length="1" name="title_no_modify">
-                                [DESC]: 수정할 수 없습니다
+                                [DESC]: 수정불가
                         </text>
                         <text type="string" length="1" name="title_loading">
-                                [DESC]: 로딩중...
+                                [DESC]: 로드 중...
                         </text>
                         <text type="string" length="1" name="title_not_worn">
-                                [DESC]: 마모�지 않습니다
+                                [DESC]: 착용 안 함
                         </text>
                         <text type="string" length="1" name="path">
-                                [PATH]� 위치
+                                [PATH]� 위치함
                         </text>
                         <text type="string" length="1" name="not worn instructions">
-                                보관함�서  새로운 양�� 드래그하여 아바타�게 사용해 보십시오. �는 스�랫치�서 새로운 형태를 만들어 사용할 수� 있습니다.
+                                �벤토리로부터 새 양�� 드래그하여 
+ 아바타� �용해 보십시오.�는, 
+ 조절 슬���로 새로운 형태를 만들어 사용할 수� 있습니다.
                         </text>
                         <text type="string" length="1" name="no modify instructions">
                                 � 착용물� 수정할 권한� 없습니다.
                         </text>
+                        <texture_picker label="옷�" name="Fabric"
+                             tool_tip="그림� 선�하려면 �릭 하십시오." />
                         <color_swatch label="색�/색조" name="Color/Tint"
-                             tool_tip="�릭해 색 피커를 여십시오" />
-                        <texture_picker label="옷�" name="Fabric" tool_tip="�릭해 그림� 선�하십시오" />
-                </panel>
-                <panel label="재킷" name="Jacket">
-                        <button label="새 재킷 �성" label_selected="새 재킷 �성" name="Create New" />
-                        <button label="�륙" label_selected="�륙" name="Take Off" />
+                             tool_tip="색 관리기를 열려면 �릭 하십시오." />
+                        <button label="새 양� 만들기" label_selected="새 양� 만들기"
+                             name="Create New" />
+                        <button label="벗기" label_selected="벗기" name="Take Off" />
                         <button label="저장" label_selected="저장" name="Save" />
                         <button label="다른 �름으로 저장" label_selected="다른 �름으로 저장"
                              name="Save As" />
                         <button label="��리기" label_selected="��리기" name="Revert" />
+                </panel>
+                <panel label="재킷" name="Jacket">
                         <text type="string" length="1" name="title">
                                 [DESC]
                         </text>
                         <text type="string" length="1" name="title_no_modify">
-                                [DESC]: 수정할 수 없습니다
+                                [DESC]: 수정불가
                         </text>
                         <text type="string" length="1" name="title_loading">
-                                [DESC]: 로딩중...
+                                [DESC]: 로드 중...
                         </text>
                         <text type="string" length="1" name="title_not_worn">
-                                [DESC]: 마모�지 않습니다
+                                [DESC]: 착용 안 함
                         </text>
                         <text type="string" length="1" name="path">
-                                [PATH]� 위치
+                                [PATH]� 위치함
                         </text>
                         <text type="string" length="1" name="not worn instructions">
-                                보관함 으로부터 새로운 재킷� 드래그하여 아바타�게 �용해 보십시오. �는 스�랫치�서 새로운 형태를 만들어 사용할 수� 있습니다.
+                                �벤토리로부터 새 재킷� 드래그하여 
+ 아바타� �용해 보십시오.�는, 
+ 조절 슬���로 새로운 형태를 만들어 사용할 수� 있습니다.
                         </text>
                         <text type="string" length="1" name="no modify instructions">
                                 � 착용물� 수정할 권한� 없습니다.
                         </text>
+                        <texture_picker label="�반신 옷�" name="Upper Fabric"
+                             tool_tip="그림� 선�하려면 �릭 하십시오." />
+                        <texture_picker label="하단 옷�" name="Lower Fabric"
+                             tool_tip="그림� 선�하려면 �릭 하십시오." />
                         <color_swatch label="색�/색조" name="Color/Tint"
-                             tool_tip="�릭해 색 피커를 여십시오" />
-                        <texture_picker label="옷� 올리기" name="Upper Fabric"
-                             tool_tip="�릭해 그림� 선�하십시오" />
-                        <texture_picker label="옷� 낮추기" name="Lower Fabric"
-                             tool_tip="�릭해 그림� 선�하십시오" />
-                </panel>
-                <panel label="장갑" name="Gloves">
-                        <button label="새 장갑 �성" label_selected="새 장갑 �성" name="Create New" />
-                        <button label="�륙" label_selected="�륙" name="Take Off" />
+                             tool_tip="색 관리기를 열려면 �릭 하십시오." />
+                        <button label="새 재킷 만들기" label_selected="새 재킷 만들기"
+                             name="Create New" />
+                        <button label="벗기" label_selected="벗기" name="Take Off" />
                         <button label="저장" label_selected="저장" name="Save" />
                         <button label="다른 �름으로 저장" label_selected="다른 �름으로 저장"
                              name="Save As" />
                         <button label="��리기" label_selected="��리기" name="Revert" />
+                </panel>
+                <panel label="장갑" name="Gloves">
                         <text type="string" length="1" name="title">
                                 [DESC]
                         </text>
                         <text type="string" length="1" name="title_no_modify">
-                                [DESC]: 수정할 수 없습니다
+                                [DESC]: 수정불가
                         </text>
                         <text type="string" length="1" name="title_loading">
-                                [DESC]: 로딩중...
+                                [DESC]: 로드 중...
                         </text>
                         <text type="string" length="1" name="title_not_worn">
-                                [DESC]: 마모�지 않습니다
+                                [DESC]: 착용 안 함
                         </text>
                         <text type="string" length="1" name="path">
-                                [PATH]� 위치
+                                [PATH]� 위치함
                         </text>
                         <text type="string" length="1" name="not worn instructions">
-                                보관함 으로부터 새로운 장갑� 드래그하여 아바타�게 �용해 보십시오. �는 스�랫치�서 새로운 형태를 만들어 사용할 수� 있습니다.
+                                �벤토리로부터 새 장갑� 드래그하여 아바타� �용해 보십시오.�는, 
+ 조절 슬���로 새로운 형태를 만들어 사용할 수� 있습니다.
                         </text>
                         <text type="string" length="1" name="no modify instructions">
                                 � 착용물� 수정할 권한� 없습니다.
                         </text>
+                        <texture_picker label="옷�" name="Fabric"
+                             tool_tip="그림� 선�하려면 �릭 하십시오." />
                         <color_swatch label="색�/색조" name="Color/Tint"
-                             tool_tip="�릭해 색 피커를 여십시오" />
-                        <texture_picker label="옷�" name="Fabric" tool_tip="�릭해 그림� 선�하십시오" />
-                </panel>
-                <panel label="�셔츠" name="Undershirt">
-                        <button label="새 �셔츠 �성" label_selected="새 �셔츠 �성"
+                             tool_tip="색 관리기를 열려면 �릭 하십시오." />
+                        <button label="새 장갑 만들기" label_selected="새 장갑 만들기"
                              name="Create New" />
-                        <button label="�륙" label_selected="�륙" name="Take Off" />
+                        <button label="벗기" label_selected="벗기" name="Take Off" />
                         <button label="저장" label_selected="저장" name="Save" />
                         <button label="다른 �름으로 저장" label_selected="다른 �름으로 저장"
                              name="Save As" />
                         <button label="��리기" label_selected="��리기" name="Revert" />
+                </panel>
+                <panel label="내�(�)" name="Undershirt">
                         <text type="string" length="1" name="title">
                                 [DESC]
                         </text>
                         <text type="string" length="1" name="title_no_modify">
-                                [DESC]: 수정할 수 없습니다
+                                [DESC]: 수정불가
                         </text>
                         <text type="string" length="1" name="title_loading">
-                                [DESC]: 로딩중...
+                                [DESC]: 로드 중...
                         </text>
                         <text type="string" length="1" name="title_not_worn">
-                                [DESC]: 마모�지 않습니다
+                                [DESC]: 착용 안 함
                         </text>
                         <text type="string" length="1" name="path">
-                                [PATH]� 위치
+                                [PATH]� 위치함
                         </text>
                         <text type="string" length="1" name="not worn instructions">
-                                저장고�서 새로운 �셔츠를 드래그하여 아바타�게 사용해 보십시오. �는 스�랫치�서 새로운 형태를 만들어 사용할 수� 있습니다
+                                �벤토리로부터 새 내�(�)� 드래그하여 
+ 아바타� �용해 보십시오.�는, 
+ 조절 슬���로 새로운 형태를 만들어 사용할 수� 있습니다.
                         </text>
                         <text type="string" length="1" name="no modify instructions">
                                 � 착용물� 수정할 권한� 없습니다.
                         </text>
+                        <texture_picker label="옷�" name="Fabric"
+                             tool_tip="그림� 선�하려면 �릭 하십시오." />
                         <color_swatch label="색�/색조" name="Color/Tint"
-                             tool_tip="�릭해 색 피커를 여십시오" />
-                        <texture_picker label="옷�" name="Fabric" tool_tip="�릭해 그림� 선�하십시오" />
-                </panel>
-                <panel label="�바지" name="Underpants">
-                        <button label="새 �바지 �성" label_selected="새 �바지 �성"
+                             tool_tip="색 관리기를 열려면 �릭 하십시오." />
+                        <button label="새 내�(�) 만들기" label_selected="새 내�(�) 만들기"
                              name="Create New" />
-                        <button label="�륙" label_selected="�륙" name="Take Off" />
+                        <button label="벗기" label_selected="벗기" name="Take Off" />
                         <button label="저장" label_selected="저장" name="Save" />
                         <button label="다른 �름으로 저장" label_selected="다른 �름으로 저장"
                              name="Save As" />
                         <button label="��리기" label_selected="��리기" name="Revert" />
+                </panel>
+                <panel label="내�(하)" name="Underpants">
                         <text type="string" length="1" name="title">
                                 [DESC]
                         </text>
                         <text type="string" length="1" name="title_no_modify">
-                                [DESC]: 수정할 수 없습니다
+                                [DESC]: 수정불가
                         </text>
                         <text type="string" length="1" name="title_loading">
-                                [DESC]: 로딩중...
+                                [DESC]: 로드 중...
                         </text>
                         <text type="string" length="1" name="title_not_worn">
-                                [DESC]: 마모�지 않습니다
+                                [DESC]: 착용 안 함
                         </text>
                         <text type="string" length="1" name="path">
-                                [PATH]� 위치
+                                [PATH]� 위치함
                         </text>
                         <text type="string" length="1" name="not worn instructions">
-                                보관함�서  새로운 �바지를 드래그하여 아바타�게 사용해 보십시오. �는 스�랫치�서 새로운 형태를 만들어 사용할 수� 있습니다.
+                                �벤토리로부터 새 내�(하)� 드래그하여 
+ 아바타� �용해 보십시오.�는, 
+ 조절 슬���로 새로운 형태를 만들어 사용할 수� 있습니다.
                         </text>
                         <text type="string" length="1" name="no modify instructions">
                                 � 착용물� 수정할 권한� 없습니다.
                         </text>
+                        <texture_picker label="옷�" name="Fabric"
+                             tool_tip="그림� 선�하려면 �릭 하십시오." />
                         <color_swatch label="색�/색조" name="Color/Tint"
-                             tool_tip="�릭해 색 피커를 여십시오" />
-                        <texture_picker label="옷�" name="Fabric" tool_tip="�릭해 그림� 선�하십시오" />
-                </panel>
-                <panel label="치마" name="Skirt">
-                        <button label="새 스커트 �성" label_selected="새 스커트 �성"
+                             tool_tip="색 관리기를 열려면 �릭 하십시오." />
+                        <button label="새 내�(하) 만들기" label_selected="새 내�(하) 만들기"
                              name="Create New" />
-                        <button label="�륙" label_selected="�륙" name="Take Off" />
+                        <button label="벗기" label_selected="벗기" name="Take Off" />
                         <button label="저장" label_selected="저장" name="Save" />
                         <button label="다른 �름으로 저장" label_selected="다른 �름으로 저장"
                              name="Save As" />
                         <button label="��리기" label_selected="��리기" name="Revert" />
+                </panel>
+                <panel label="치마" name="Skirt">
                         <text type="string" length="1" name="title">
                                 [DESC]
                         </text>
                         <text type="string" length="1" name="title_no_modify">
-                                [DESC]: 수정할 수 없습니다
+                                [DESC]: 수정불가
                         </text>
                         <text type="string" length="1" name="title_loading">
-                                [DESC]: 로딩중...
+                                [DESC]: 로드 중...
                         </text>
                         <text type="string" length="1" name="title_not_worn">
-                                [DESC]: 마모�지 않습니다
+                                [DESC]: 착용 안 함
                         </text>
                         <text type="string" length="1" name="path">
-                                [PATH]� 위치
+                                [PATH]� 위치함
                         </text>
                         <text type="string" length="1" name="not worn instructions">
-                                보관함�서  새로운 스커트를 드래그하여 아바타�게 사용해 보십시오. �는 스�랫치�서 새로운 형태를 만들어 사용할 수�
+                                �벤토리로부터 새 스커트를 드래그하여 
+ 아바타� �용해 보십시오.�는, 
+ 조절 슬���로 새로운 형태를 만들어 사용할 수� 있습니다.
                         </text>
                         <text type="string" length="1" name="no modify instructions">
                                 � 착용물� 수정할 권한� 없습니다.
                         </text>
+                        <texture_picker label="옷�" name="Fabric"
+                             tool_tip="그림� 선�하려면 �릭 하십시오." />
                         <color_swatch label="색�/색조" name="Color/Tint"
-                             tool_tip="�릭해 색 피커를 여십시오" />
-                        <texture_picker label="옷�" name="Fabric" tool_tip="�릭해 그림� 선�하십시오" />
+                             tool_tip="색 관리기를 열려면 �릭 하십시오." />
+                        <button label="새 치마 만들기" label_selected="새 치마 만들기"
+                             name="Create New" />
+                        <button label="벗기" label_selected="벗기" name="Take Off" />
+                        <button label="저장" label_selected="저장" name="Save" />
+                        <button label="다른 �름으로 저장" label_selected="다른 �름으로 저장"
+                             name="Save As" />
+                        <button label="��리기" label_selected="��리기" name="Revert" />
                 </panel>
         </tab_container>
         <button label="복장 만들기" label_selected="복장 만들기" name="Make Outfit" />
-        <button label="전체 저장" label_selected="전체 저장" name="Save All" />
+        <button label="모� 저장" label_selected="모� 저장" name="Save All" />
         <button label="닫기" label_selected="닫기" name="Close" />
 </floater>
diff --git a/linden/indra/newview/skins/xui/ko/floater_directory.xml b/linden/indra/newview/skins/xui/ko/floater_directory.xml
index 08902e9..4bc5b3e 100644
--- a/linden/indra/newview/skins/xui/ko/floater_directory.xml
+++ b/linden/indra/newview/skins/xui/ko/floater_directory.xml
@@ -1,12 +1,19 @@
 <?xml version="1.0" encoding="utf-8" standalone="yes" ?>
 <floater name="directory" title="검색">
         <tab_container name="Directory Tabs">
-                <panel label="ì „ì²´" name="all_panel">
+                <panel label="모�" name="all_panel">
+                        <button label="&lt; �전" label_selected="&lt; �전" name="&lt; Prev" />
+                        <button label="다� &gt;" label_selected="다� &gt;" name="Next &gt;" />
+                        <text name="find">
+                                찾기:
+                        </text>
+                        <button label="검색" label_selected="검색" name="Search" />
+                        <check_box label="성�용 컨�츠 �함" name="incmature" />
                         <scroll_list name="results">
                                 <column label="" name="icon" />
                                 <column label="Name" name="name" />
                                 <column label="Price" name="price" />
-                                <column label="Time (PDT)" name="date" />
+                                <column label="Time (PT)" name="date" />
                                 <column label="Time" name="time" />
                                 <column label="Traffic" name="dwell" />
                                 <column label="Area" name="area" />
@@ -14,27 +21,14 @@
                                 <column label="Online" name="online" />
                                 <column label="Members" name="members" />
                         </scroll_list>
-                        <button label="&lt; 앞으로" label_selected="&lt; 앞으로" name="&lt; Prev" />
-                        <button label="다� &gt;" label_selected="다� &gt;" name="Next &gt;" />
-                        <text name="find">
-                                찾기:
-                        </text>
-                        <button label="검색" label_selected="검색" name="Search" />
-                        <check_box label="성�용 내용 �함" name="incmature" />
                 </panel>
                 <panel label="ê´‘ê³ " name="classified_panel">
-                        <scroll_list name="results">
-                                <column label="" name="icon" />
-                                <column label="" name="type" />
-                                <column label="Name" name="name" />
-                                <column label="Price" name="price" />
-                        </scroll_list>
-                        <button label="&lt; 앞으로" label_selected="&lt; 앞으로" name="&lt; Prev" />
+                        <button label="&lt; �전" label_selected="&lt; �전" name="&lt; Prev" />
                         <button label="다� &gt;" label_selected="다� &gt;" name="Next &gt;" />
                         <text name="find">
                                 찾기:
                         </text>
-                        <check_box label="성�용 내용 �함" name="incmature" />
+                        <check_box label="성�용 컨�츠 �함" name="incmature" />
                         <combo_box name="Category">
                                 <combo_item name="AnyCategory">
                                         모든 카테고리
@@ -46,57 +40,53 @@
                                         토지 임대
                                 </combo_item>
                                 <combo_item name="PropertyRental">
-                                        부�산 임대
+                                        소유물 임대
                                 </combo_item>
                                 <combo_item name="SpecialAttraction">
-                                        명소
+                                        명물
                                 </combo_item>
                                 <combo_item name="NewProducts">
                                         신제품
                                 </combo_item>
                                 <combo_item name="Employment">
-                                        취업
+                                        ��리
                                 </combo_item>
                                 <combo_item name="Wanted">
-                                        구함
+                                        모집
                                 </combo_item>
                                 <combo_item name="Service">
                                         서비스
                                 </combo_item>
                                 <combo_item name="Personal">
-                                        사�
+                                        개�
                                 </combo_item>
                         </combo_box>
                         <button label="검색" label_selected="검색" name="Search" />
-                        <button label="광고 내기..." label_selected="광고 내기..."
+                        <button label="광고 내기…" label_selected="광고 내기…"
                              name="Place an Ad..." />
                         <button label="삭제" label_selected="삭제" name="Delete" />
-                </panel>
-                <panel label="�벤트" name="events_panel">
                         <scroll_list name="results">
                                 <column label="" name="icon" />
                                 <column label="" name="type" />
                                 <column label="Name" name="name" />
-                                <column label="Time (PDT)" name="date" />
-                                <column label="" name="event_id" />
-                                <column label="Time" name="time" />
+                                <column label="Price" name="price" />
                         </scroll_list>
-                        <button label="&lt; 앞으로" label_selected="&lt; 앞으로" name="&lt; Prev" />
-                        <button label="다� &gt;" label_selected="다� &gt;" name="Next &gt;" />
+                </panel>
+                <panel label="�벤트" name="events_panel">
                         <radio_group name="date_mode">
                                 <radio_item name="current">
-                                        작업 진행과 다�과정
+                                        작업진행과 다�과정
                                 </radio_item>
                                 <radio_item name="date">
                                         날짜
                                 </radio_item>
                         </radio_group>
-                        <button label="&lt;&lt;" label_selected="&lt;&lt;" name="&lt;&lt;"
+                        <button label="&lt;&lt; " label_selected="&lt;&lt; " name="&lt;&lt;"
                              tool_tip="하루를 거슬러 갑니다" />
                         <text name="date_text">
                                 6/6
                         </text>
-                        <button label="&gt;&gt;" label_selected="&gt;&gt;" name="&gt;&gt;"
+                        <button label="&gt;&gt; " label_selected="&gt;&gt; " name="&gt;&gt;"
                              tool_tip="하루를 앞서 갑니다" />
                         <button label="오늘" label_selected="오늘" name="Today"
                              tool_tip="오늘� �벤트 표시" />
@@ -108,7 +98,7 @@
                         </text>
                         <combo_box name="category combo">
                                 <combo_item name="All">
-                                        ì „ì²´
+                                        모�
                                 </combo_item>
                                 <combo_item name="Discussion">
                                         토�
@@ -123,58 +113,59 @@
                                         �업
                                 </combo_item>
                                 <combo_item name="Nightlife/Entertainment">
-                                        여�/엔터테�먼트
+                                        유�/엔터테�먼트
                                 </combo_item>
                                 <combo_item name="Games/Contests">
                                         게임/경연대회
                                 </combo_item>
                                 <combo_item name="Pageants">
-                                        행사
+                                        전시회
                                 </combo_item>
                                 <combo_item name="Education">
                                         �육
                                 </combo_item>
                                 <combo_item name="ArtsandCulture">
-                                        예술과 문화
+                                        예술/ 문화
                                 </combo_item>
                                 <combo_item name="Charity/SupportGroups">
-                                        �선/지� 단체
+                                        �선/지�단체
                                 </combo_item>
                                 <combo_item name="Miscellaneous">
-                                        기타
+                                        다목�
                                 </combo_item>
                         </combo_box>
-                        <check_box label="성�용 표시하기" name="incmature" />
+                        <check_box label="성�용 �함" name="incmature" />
                         <button label="검색" label_selected="검색" name="Search" tool_tip="검색" />
                         <button label="삭제" label_selected="삭제" name="Delete" />
-                </panel>
-                <panel label="�기 장소" name="popular_panel">
                         <scroll_list name="results">
                                 <column label="" name="icon" />
                                 <column label="" name="type" />
                                 <column label="Name" name="name" />
-                                <column label="Traffic" name="dwell" />
+                                <column label="Time (PT)" name="date" />
+                                <column label="" name="event_id" />
+                                <column label="Time" name="time" />
                         </scroll_list>
-                        <button label="&lt; 앞으로" label_selected="&lt; 앞으로" name="&lt; Prev" />
+                        <button label="&lt; �전" label_selected="&lt; �전" name="&lt; Prev" />
+                        <button label="다� &gt;" label_selected="다� &gt;" name="Next &gt;" />
+                </panel>
+                <panel label="�기 장소" name="popular_panel">
+                        <button label="&lt; �전" label_selected="&lt; �전" name="&lt; Prev" />
                         <button label="다� &gt;" label_selected="다� &gt;" name="Next &gt;" />
-                        <check_box label="그림있는 장소만 보기" name="incpictures" />
-                        <check_box label="성�용 지역 장소 �함" name="incmature" />
+                        <check_box label="사진� 있는 장소만 보기" name="incpictures" />
+                        <check_box label="성�용 컨�츠 구� �함" name="incmature" />
                         <text
                              name="These are the most popular places in the world, as measured by traffic,         the amount of time people spend there.">
-                                통행량, 즉 사람들� 해당 장소�서 보내는 시간� 기준으로
-        세��서 가장 �기있는 장소들입니다.
+                                본 장소들� 통행량(사람들� 해당 장소�서 보내는 시간� 기준)� 따른 가장 �기 있는 장소들입니다.
                         </text>
-                </panel>
-                <panel label="토지�매" name="land_sales_panel">
                         <scroll_list name="results">
                                 <column label="" name="icon" />
                                 <column label="" name="type" />
                                 <column label="Name" name="name" />
-                                <column label="L$ Price" name="price" />
-                                <column label="Area" name="area" />
-                                <column label="L$/sq.m" name="per_meter" />
+                                <column label="Traffic" name="dwell" />
                         </scroll_list>
-                        <button label="&lt; 앞으로" label_selected="&lt; 앞으로" name="&lt; Prev" />
+                </panel>
+                <panel label="토지 매물" name="land_sales_panel">
+                        <button label="&lt; �전" label_selected="&lt; �전" name="&lt; Prev" />
                         <button label="다� &gt;" label_selected="다� &gt;" name="Next &gt;" />
                         <combo_box name="type">
                                 <combo_item name="AllTypes">
@@ -183,54 +174,56 @@
                                 <combo_item name="Auction">
                                         경매
                                 </combo_item>
-                                <combo_item name="ForSale">
-                                        매물
+                                <combo_item name="MainlandSales">
+                                        메�랜드 매물
                                 </combo_item>
-                                <combo_item name="FirstLand">
-                                        첫 토지
+                                <combo_item name="EstateSales">
+                                        사유지 매물
                                 </combo_item>
                         </combo_box>
                         <combo_box name="rating">
                                 <combo_item name="PG&amp;Mature">
-                                        PG(보호� 지� 필요) &amp; 성�용
+                                        미성� &amp; 성�
                                 </combo_item>
                                 <combo_item name="PGonly">
-                                        반드시 보호� 지� 필요
+                                        미성� 전용
                                 </combo_item>
                                 <combo_item name="Matureonly">
-                                        미성년� 불가
+                                        성� 전용
                                 </combo_item>
                         </combo_box>
-                        <check_box label="가격 &lt;= L$" name="pricecheck" />
-                        <check_box label="면� &gt;= sq.m.(�방 미터)" name="areacheck" />
+                        <check_box label="가격&lt;=L$" name="pricecheck" />
+                        <check_box label="ë©´ì �&gt;=sq.m." name="areacheck" />
                         <button label="검색" label_selected="검색" name="Search" />
                         <text name="land">
-                                토지는 린든 달러(L$)를 지불하고 �접 매입하거나, L$ �는 미국 달러(US$)를 지불하고 경매를 통해 매입할 수 있습니다.
-�접 구매하시려면, 해당 토지로 가서 제목 바� 있는 장소명� �릭하십시오.
+                                토지는 린든 달러(L$)로 �접 구매, �는 린든 달러(L$)나 US$로 경매하여 구매할 수 있습니다.
+�접 구매하려면, 토지를 방문하여 타�틀 바� 있는 장소 �름� �릭 하십시오!
                         </text>
-                </panel>
-                <panel label="장소" name="places_panel">
                         <scroll_list name="results">
                                 <column label="" name="icon" />
                                 <column label="" name="type" />
                                 <column label="Name" name="name" />
-                                <column label="Traffic" name="dwell" />
+                                <column label="L$ Price" name="price" />
+                                <column label="Area" name="area" />
+                                <column label="L$/sq.m" name="per_meter" />
                         </scroll_list>
-                        <button label="&lt; 앞으로" label_selected="&lt; 앞으로" name="&lt; Prev" />
+                </panel>
+                <panel label="장소" name="places_panel">
+                        <button label="&lt; �전" label_selected="&lt; �전" name="&lt; Prev" />
                         <button label="다� &gt;" label_selected="다� &gt;" name="Next &gt;" />
                         <text name="find">
                                 찾기:
                         </text>
-                        <check_box label="성�용 지역 장소 �함" name="incmature" />
+                        <check_box label="성�용 컨�츠 구� �함" name="incmature" />
                         <combo_box name="Category">
                                 <combo_item name="AnyCategory">
                                         모든 카테고리
                                 </combo_item>
                                 <combo_item name="LindenLocation">
-                                        린든 위치
+                                        린든랩 관련
                                 </combo_item>
                                 <combo_item name="Adult">
-                                        성�용
+                                        성� 전용
                                 </combo_item>
                                 <combo_item name="Arts&amp;Culture">
                                         예술 &amp; 문화
@@ -242,13 +235,13 @@
                                         �육용
                                 </combo_item>
                                 <combo_item name="Gaming">
-                                        게��
+                                        게임
                                 </combo_item>
                                 <combo_item name="Hangout">
-                                        �주 가는 곳
+                                        집합소
                                 </combo_item>
                                 <combo_item name="NewcomerFriendly">
-                                        신참�� 우호�
+                                        초보�용
                                 </combo_item>
                                 <combo_item name="Parks&amp;Nature">
                                         공� � �연
@@ -264,35 +257,41 @@
                                 </combo_item>
                         </combo_box>
                         <button label="검색" label_selected="검색" name="Search" />
-                </panel>
-                <panel label="사람" name="people_panel">
                         <scroll_list name="results">
                                 <column label="" name="icon" />
                                 <column label="" name="type" />
                                 <column label="Name" name="name" />
-                                <column label="Online" name="online" />
+                                <column label="Traffic" name="dwell" />
                         </scroll_list>
-                        <button label="&lt; 앞으로" label_selected="&lt; 앞으로" name="&lt; Prev" />
+                </panel>
+                <panel label="사람" name="people_panel">
+                        <button label="&lt; �전" label_selected="&lt; �전" name="&lt; Prev" />
                         <button label="다� &gt;" label_selected="다� &gt;" name="Next &gt;" />
                         <text name="find">
                                 찾기:
                         </text>
-                        <check_box label="온��" name="online check" />
                         <button label="검색" label_selected="검색" name="Search" />
-                </panel>
-                <panel label="그룹" name="groups_panel">
                         <scroll_list name="results">
                                 <column label="" name="icon" />
                                 <column label="" name="type" />
                                 <column label="Name" name="name" />
-                                <column label="Members" name="members" />
                         </scroll_list>
-                        <button label="&lt; 앞으로" label_selected="&lt; 앞으로" name="&lt; Prev" />
+                </panel>
+                <panel label="그룹" name="groups_panel">
+                        <button label="&lt; �전" label_selected="&lt; �전" name="&lt; Prev" />
                         <button label="다� &gt;" label_selected="다� &gt;" name="Next &gt;" />
                         <text name="find">
                                 찾기:
                         </text>
                         <button label="검색" label_selected="검색" name="Search" />
+                        <check_box label="성� 그룹 �함" name="incmature" />
+                        <scroll_list name="results">
+                                <column label="" name="icon" />
+                                <column label="" name="type" />
+                                <column label="Name" name="name" />
+                                <column label="Members" name="members" />
+                                <column label="" name="score" />
+                        </scroll_list>
                 </panel>
         </tab_container>
 </floater>
diff --git a/linden/indra/newview/skins/xui/ko/floater_friends.xml b/linden/indra/newview/skins/xui/ko/floater_friends.xml
index ccce2f9..64ccf19 100644
--- a/linden/indra/newview/skins/xui/ko/floater_friends.xml
+++ b/linden/indra/newview/skins/xui/ko/floater_friends.xml
@@ -1,17 +1,33 @@
 <?xml version="1.0" encoding="utf-8" standalone="yes" ?>
-<floater name="friends" title="친구들">
-        <button label="프로필..." name="profile_btn"
-             tool_tip="그림, 그룹 � 기타 정보 표시" />
-        <button label="텔리�트 제공..." name="offer_teleport_btn"
-             tool_tip="� 친구�게 귀하� 현재 위치로 텔리�팅� 제공" />
+<floater name="friends" title="친구">
+        <scroll_list name="friend_list"
+             tool_tip="Hold shift or control while clicking to select multiple friends">
+                <column label="Name" name="friend_name" />
+        </scroll_list>
+        <panel name="rights_container">
+                <text name="friend_name_label">
+                        친구를 선�하여 권한 변경…
+                </text>
+                <check_box label="내 온�� �태를 확�할 수 있습니다."
+                     name="online_status_cb"
+                     tool_tip="� 친구가 친구 목��나 통화 카드�서 내 온�� �태를 확� 가능한지 여부를 설정합니다." />
+                <check_box label="지��서 내 위치를 확�할 수 있습니다."
+                     name="map_status_cb"
+                     tool_tip="� 친구가 지��서 내 위치를 확� 가능한지 여부를 설정합니다." />
+                <check_box label="내 오브�트를 수정할 수 있습니다." name="modify_status_cb"
+                     tool_tip="� 친구가 내 오브�트를 수정할 수 있는지 여부를 설정합니다." />
+                <text name="process_rights_label">
+                        권한 변경 중…
+                </text>
+        </panel>
+        <button label="메신저" name="im_btn" tool_tip="메신저 세션 열기" />
+        <button label="텔리�트..." name="offer_teleport_btn"
+             tool_tip="� 친구�게 내 현재 위치로 텔리�트를 제공함" />
         <button label="추가..." name="add_btn" tool_tip="주민�게 우정 제공" />
-        <button label="지불..." name="pay_btn"
-             tool_tip="린든 달러(L$)를 � 친구�게 �니다" />
-        <button label="제거..." name="remove_btn"
+        <button label="프로필" name="profile_btn"
+             tool_tip="그림, 그룹 � 기타 정보 표시" />
+        <button label="지불…" name="pay_btn"
+             tool_tip="� 친구�게 린든 달러(L$) 주기" />
+        <button label="제거…" name="remove_btn"
              tool_tip="� 사람� 내 친구 목��서 삭제" />
-        <button label="메신저..." name="im_btn" tool_tip="메신저 세션 열기" />
-        <button label="수정 권한 부여..." name="grant_btn"
-             tool_tip="� 사용�가 내 사물� 수정하�� 허용" />
-        <button label="수정 권리 취소..." name="revoke_btn"
-             tool_tip="� 사용�가 내 사물� 수정하�� 허용" />
 </floater>
diff --git a/linden/indra/newview/skins/xui/ko/floater_gesture.xml b/linden/indra/newview/skins/xui/ko/floater_gesture.xml
index e3dd52b..85e2272 100644
--- a/linden/indra/newview/skins/xui/ko/floater_gesture.xml
+++ b/linden/indra/newview/skins/xui/ko/floater_gesture.xml
@@ -1,8 +1,8 @@
 <?xml version="1.0" encoding="utf-8" standalone="yes" ?>
-<floater name="gestures" title="활성 �태 제스처">
+<floater name="gestures" title="사용중� 제스처">
         <text name="help_label">
-                채팅�서 유발 어구를 사용하거나 특정 키를 누르면
-애니메�션과 사운드가 재��니다.
+                채팅 창� 바로가기 문구를 입력하거나 키를 눌러 애니메�션 �
+사운드를 재�합니다.
         </text>
         <scroll_list name="gesture_list">
                 <column label="Trigger" name="trigger" />
@@ -11,8 +11,8 @@
                 <column label="Name" name="name" />
         </scroll_list>
         <button label="신규" name="new_gesture_btn" />
-        <button label="저장고" name="inventory_btn" />
+        <button label="�벤토리" name="inventory_btn" />
         <button label="편집" name="edit_btn" />
-        <button label="플레�" name="play_btn" />
+        <button label="재�" name="play_btn" />
         <button label="중지" name="stop_btn" />
 </floater>
diff --git a/linden/indra/newview/skins/xui/ko/floater_god_tools.xml b/linden/indra/newview/skins/xui/ko/floater_god_tools.xml
index 804f8f3..5cd358b 100644
--- a/linden/indra/newview/skins/xui/ko/floater_god_tools.xml
+++ b/linden/indra/newview/skins/xui/ko/floater_god_tools.xml
@@ -1,9 +1,9 @@
 <?xml version="1.0" encoding="utf-8" standalone="yes" ?>
-<floater name="godtools floater" title="무� �구">
+<floater name="godtools floater" title="절대 옵션">
         <tab_container name="GodTools Tabs">
                 <panel label="그리드" name="grid">
-                        <button label="모든 사용� 쫓아내기"
-                             label_selected="모든 사용� 쫓아내기" name="Kick all users" />
+                        <button label="모든 사용� 추방하기"
+                             label_selected="모든 사용� 추방하기" name="Kick all users" />
                         <button label="� 지역� 지� 표시 �시 삭제"
                              label_selected="� 지역� 지� 표시 �시 삭제"
                              name="Flush This Region&apos;s Map Visibility Caches" />
@@ -14,20 +14,19 @@
                         </text>
                         <check_box label="머리�" name="check prelude"
                              tool_tip="� 지역� 머리�로 설정합니다." />
-                        <check_box label="고정 태양" name="check fixed sun"
-                             tool_tip="태양� 위치 고정(지역/소유지 &gt; 지형." />
-                        <check_box label="텔레�팅�서 집 재설정" name="check reset home"
-                             tool_tip="주민 텔레�팅� 고장났� 때 집� 목�지 위치로 재설정합니다." />
+                        <check_box label="태양 고정" name="check fixed sun" tool_tip="태양 위치 수정" />
+                        <check_box label="홈으로 텔레�팅 초기화" name="check reset home"
+                             tool_tip="주민 텔레�트가 고장났� 때 홈� 목�지 위치로 재설정합니다." />
                         <check_box label="표시�" name="check visible"
                              tool_tip="� 지역� �반��게 보��� 설정합니다." />
-                        <check_box label="�실" name="check damage"
-                             tool_tip="� 지역� ��� 활성화하�� 설정합니다." />
+                        <check_box label="�미지" name="check damage"
+                             tool_tip="� 지역� �미지를 활성화하�� 설정합니다." />
                         <check_box label="통행량 추� 금지" name="block dwell"
                              tool_tip="� 지역� 트래픽 계산� 하지 않�� 설정합니다." />
-                        <check_box label="테�� 금지" name="block terraform"
-                             tool_tip="사람들� �신� 토지를 테��할 수 있�� 설정합니다" />
-                        <check_box label="Sandbox" name="is sandbox"
-                             tool_tip="�곳� sandbox 지역�지를 토글합니다." />
+                        <check_box label="지형 변경 금지" name="block terraform"
+                             tool_tip="사람들� �신� 토지� 지형� 변경할 수 있�� 설정합니다." />
+                        <check_box label="샌드박스" name="is sandbox"
+                             tool_tip="�곳� 샌즈박스 지역�지 여부를 표시합니다." />
                         <button label="지형 저장" label_selected="지형 저장" name="Bake Terrain"
                              tool_tip="현재 지형� 기본 설정으로 저장합니다." />
                         <button label="지형 ��리기" label_selected="지형 ��리기"
@@ -36,13 +35,13 @@
                         <button label="지형 바꾸기" label_selected="지형 바꾸기" name="Swap Terrain"
                              tool_tip="기본 설정으로 현재 지형� 바꿉니다." />
                         <text name="estate id">
-                                소유지 ID:
+                                사유지 ID:
                         </text>
                         <text name="parent id">
                                 부모 ID:
                         </text>
                         <line_editor name="parentestate"
-                             tool_tip="�것� 해당 지역� 부모 소유지입니다" />
+                             tool_tip="�것� 해당 지역� 부모 사유지 입니다" />
                         <text name="Grid Pos: ">
                                 그리드 Pos:
                         </text>
@@ -57,61 +56,61 @@
                                 청구 가능 요�:
                         </text>
                         <text name="land cost text">
-                                �방 미터당 L$:
+                                제곱 미터당 L$:
                         </text>
                         <button label="새로 고침" label_selected="새로 고침" name="Refresh"
-                             tool_tip="위� 정보를 새로 고치려면 여기를 �릭하십시오." />
+                             tool_tip="위� 정보를 새로 고치려면 여기를 �릭 하십시오." />
                         <button label="�용" label_selected="�용" name="Apply"
-                             tool_tip="위� 변경 사항� �용 하려면 여기를 �릭하십시오." />
+                             tool_tip="여기를 �릭하여 위� 변경 사항� �용하십시오." />
                         <button label="지역 선�" label_selected="지역 선�" name="Select Region"
                              tool_tip="토지 �구로 전체 지역� 선�합니다." />
                         <button label="지금 �� 저장" label_selected="지금 �� 저장"
                              name="Autosave now"
                              tool_tip="디렉토리를 �� 저장하려면 gzipped �태를 저장합니다." />
                 </panel>
-                <panel label="사물" name="objects">
+                <panel label="오브�트" name="objects">
                         <text name="Sim Name:">
                                 시뮬레�션 �름:
                         </text>
                         <text name="region name">
-                                웨�스어
+                                웨�스어(Welsh)-베타
                         </text>
                         <check_box label="스�립트 �기" name="disable scripts"
-                             tool_tip="� 지역내 모든 스�립트를 비활성화 하�� 설정합니다" />
+                             tool_tip="� 지역 내 모든 스�립트를 비활성화하�� 설정합니다." />
                         <check_box label="충� �기" name="disable collisions"
-                             tool_tip="� 지역내 비��전트 충�� 비활성화 하�� 설정합니다" />
-                        <check_box label="물리 �기" name="disable physics"
-                             tool_tip="� 지역내 모든 물리� 현�� 설정합니다" />
+                             tool_tip="� 지역 내 비��전트 충�� 비활성화하�� 설정합니다." />
+                        <check_box label="물리엔진 �기" name="disable physics"
+                             tool_tip="� 지역 내 모든 물리� 현�� 설정합니다." />
                         <button label="�용" label_selected="�용" name="Apply"
-                             tool_tip="위� 변경 사항� �용 하려면 여기를 �릭하십시오." />
+                             tool_tip="여기를 �릭하여 위� 변경 사항� �용하십시오." />
                         <button label="대� 설정" label_selected="대� 설정" name="Set Target"
-                             tool_tip="대� 아바타를 삭제 사물로 설정합니다." />
+                             tool_tip="대� 아바타를 삭제 오브�트로 설정합니다." />
                         <text name="target_avatar_name">
                                 (대� 없�)
                         </text>
-                        <button label="다른 토지�� 있는 대�� 스�립트� 아�템 삭제"
-                             label_selected="다른 토지�� 있는 대�� 스�립트� 아�템 삭제"
+                        <button label="다른 토지� 있는 대�� 스�립트 오브�트 삭제"
+                             label_selected="다른 토지� 있는 대�� 스�립트 오브�트 삭제"
                              name="Delete Target&apos;s Scripted Objects On Others Land"
-                             tool_tip="� 대�� 아닌 토지� 대�� 소유한 모든 스�립트 아�템� 삭제합니다. (무복사) 아�템� 반환�니다." />
-                        <button label="*모든* 토지�� 있는 대�� 스�립트� 아�템 삭제"
-                             label_selected="*모든* 토지�� 있는 대�� 스�립트� 아�템 삭제"
+                             tool_tip="대�� 소유가 아닌 토지� 대�� 소유한 모든 스�립트 오브�트를 삭제합니다. (no copy) 오브�트는 반환�니다." />
+                        <button label="*모든* 토지� 있는 대�� 스�립트 오브�트 삭제"
+                             label_selected="*모든* 토지� 있는 대�� 스�립트 오브�트 삭제"
                              name="Delete Target&apos;s Scripted Objects On *Any* Land"
-                             tool_tip="� 지역�서 대�� 소유한 모든 스�립트 아�템� 삭제합니다. (무복사) 아�템� 반환�니다." />
-                        <button label="대�� *모든* 사물 삭제"
-                             label_selected="대�� *모든* 사물 삭제"
+                             tool_tip="� 지역�서 대�� 소유한 모든 스�립트 오브�트를 삭제합니다. (no copy) 오브�트는 반환�니다." />
+                        <button label="대�� *모든* 오브�트 삭제"
+                             label_selected="대�� *모든* 오브�트 삭제"
                              name="Delete *ALL* Of Target&apos;s Objects"
-                             tool_tip="� 지역�서 대�� 소유한 모든 아�템� 삭제합니다. (무복사) 아�템� 반환�니다." />
-                        <button label="탑 컬��� 가져오기"
-                             label_selected="탑 컬��� 가져오기" name="Get Top Colliders"
-                             tool_tip="호출� 가장 잦� 아�템� 목�� 가져옵니다" />
-                        <button label="탑 스�립트 가져오기"
-                             label_selected="탑 스�립트 가져오기" name="Get Top Scripts"
-                             tool_tip="스�립트 실행� 가장 많� 시간� 소모하는 아�템� 목�� 가져옵니다." />
+                             tool_tip="� 지역�서 대�� 소유한 모든 오브�트를 삭제합니다. (no copy) 오브�트는 반환�니다." />
+                        <button label="대용량 콜��� 보기"
+                             label_selected="대용량 콜��� 보기" name="Get Top Colliders"
+                             tool_tip="호출� 가장 잦� 오브�트� 목�� 가져옵니다" />
+                        <button label="대용량 스�립트 보기"
+                             label_selected="대용량 스�립트 보기" name="Get Top Scripts"
+                             tool_tip="스�립트 실행� 가장 많� 시간� 소모하는 오브�트� 목�� 가져옵니다." />
                         <button label="스�립트 다�제스트"
                              label_selected="스�립트 다�제스트" name="Scripts digest"
                              tool_tip="모든 스�립트 목� � � 발� 수를 가져옵니다." />
                 </panel>
-                <panel label="요구하기" name="request">
+                <panel label="요청" name="request">
                         <text name="Destination:">
                                 목�지:
                         </text>
@@ -124,20 +123,20 @@
                                 </combo_item>
                         </combo_box>
                         <text name="Request:">
-                                요청
+                                요청:
                         </text>
                         <combo_box name="request">
                                 <combo_item name="colliders&lt;steps&gt;">
-                                        충�형 가�기 &lt;스�&gt;
+                                        콜��� &lt;단계&gt;
                                 </combo_item>
                                 <combo_item name="scripts&lt;count&gt;,&lt;optionalpattern&gt;">
-                                        스�립트 &lt;개수&gt;,&lt;선� 패턴&gt;
+                                        스�립트 &lt;count&gt;,&lt;optional pattern&gt;
                                 </combo_item>
                                 <combo_item name="objects&lt;pattern&gt;">
-                                        사물 &lt;패턴&gt;
+                                        오브�트 &lt;pattern&gt;
                                 </combo_item>
                                 <combo_item name="rez&lt;asset_id&gt;">
-                                        rez &lt;asset_id&gt;
+                                        레쯔 &lt;asset_id&gt;
                                 </combo_item>
                         </combo_box>
                         <text name="Parameter:">
diff --git a/linden/indra/newview/skins/xui/ko/floater_group_info.xml b/linden/indra/newview/skins/xui/ko/floater_group_info.xml
index 3a9d149..658dc7e 100644
--- a/linden/indra/newview/skins/xui/ko/floater_group_info.xml
+++ b/linden/indra/newview/skins/xui/ko/floater_group_info.xml
@@ -1,24 +1,24 @@
 <?xml version="1.0" encoding="utf-8" standalone="yes" ?>
 <floater name="groupinfo" title="� 린든즈 - 그룹 정보">
         <tab_container name="tab">
-                <panel label="�반사항" name="gen">
+                <panel label="�반" name="gen">
                         <text name="title_box">
                                 그룹 정보
                         </text>
                         <text name="txt">
-                                그룹� 통해 친구들과 ��게 협력할 수 있습니다.
+                                그룹� 친구와 협력하기 위한 재미있는 방법입니다.
                         </text>
                         <text name="txt2">
-                                그룹� 소��면 �책 � 휘장� 부여받고 선거� 참여합니다.
+                                그룹� 내가 타�틀, 로고를 갖고 투표를 할 수 있게 합니다.
                         </text>
                         <text name="txt3">
-                                누구나 그룹� �성할 수 있습니다. � 개�� 최대 15개 그룹� 가입할 수 있습니다.
+                                누구든지 그룹� 만들 수 있습니다. � 개�� 최대 15개 그룹� �할 수 있습니다.
                         </text>
                         <text name="txt4">
-                                그룹� 최소 3명� 멤버로 구성�어야 활�� 가능합니다.
+                                그룹� 최소 회�� 3명 입니다.
                         </text>
                         <text name="group_create_text">
-                                그룹 �성 비용� L$100입니다.
+                                그룹� �성하려면 L$100가 듭니다.
                         </text>
                         <text name="lbl">
                                 �름:
@@ -30,88 +30,88 @@
                                 설립 조항:
                         </text>
                         <check_box label="그룹 목�� 표시하기" name="sho" />
-                        <check_box label="그룹 목�� 멤버 표시하기" name="sho_mem" />
-                        <check_box label="웹� 게시합니다." name="allow_publish"
+                        <check_box label="그룹 목�� 회� 표시하기" name="sho_mem" />
+                        <check_box label="웹� 게시" name="allow_publish"
                              tool_tip="내 프로필 정보를 웹� 게시." />
                         <button label="?" label_selected="?" name="publish_help_btn" />
                         <check_box label="성�용" name="mature"
-                             tool_tip="본�� 프로필 정보는 성�용으로 간주 �니다." />
+                             tool_tip="사용�� 프로필 정보는 성� 전용으로 간주�니다." />
                 </panel>
                 <panel label="타�틀" name="tit">
                         <text name="txt">
                                 그룹 타�틀
                         </text>
                         <text name="txt2">
-                                그룹� 간부와 멤버로 구성�며, 간부와 멤버 모� 특별 �책� 가질 수 있습니다.
+                                그룹�는 운�진들과 회�들� 있고, 모� 특수 타�틀� 가질 수 있습니다.
                         </text>
                         <text name="txt3">
-                                � 제목� 세�, 채팅, 메신저�서 �름 앞� 표시�니다.
+                                �러한 타�틀� 채팅 � 메신저�서 사용�는 �름 앞� 나타납니다.
                         </text>
                         <text name="lbl">
-                                간부 타�틀:
+                                운�진 타�틀:
                         </text>
                         <text name="lbl2">
-                                멤버 타�틀:
+                                회� 타�틀:
                         </text>
                         <text name="lbl3">
-                                저장고�서 �스처를 드래그해 그룹� 휘장� 설정하십시오.
+                                �신� �벤토리�서 �스처를 �어 그룹� 로고를 설정합니다.
                         </text>
-                        <texture_picker name="insig" tool_tip="�릭해 그림� 선�하십시오" />
+                        <texture_picker name="insig" tool_tip="그림� 선�하려면 �릭 하십시오." />
                 </panel>
-                <panel label="맴버" name="mem">
+                <panel label="회�" name="mem">
                         <text name="txt">
-                                그룹 멤버
+                                그룹 회�
                         </text>
                         <text name="txt2">
-                                현재 그룹 간부 � 멤버.
+                                현재 그룹� 운�진 � 회�입니다.
                         </text>
                         <text name="txt3">
-                                �름� �릭하면 멤버 프로필� 보실 수 있습니다.
+                                회�� 프로필� 보려면 �름� �릭하십시오.
                         </text>
                         <text name="lbl">
-                                간부:
+                                운�진:
                         </text>
                         <text name="members_label">
-                                멤버:
+                                회�:
                         </text>
-                        <button label="멤버 축출" label_selected="멤버 축출" name="eject_member_btn" />
+                        <button label="회� 강퇴" label_selected="회� 강퇴" name="eject_member_btn" />
                 </panel>
                 <panel label="투표" name="voting">
                         <tab_container name="tab">
-                                <panel label="추천" name="recall">
+                                <panel label="ì„ ê±°" name="recall">
                                         <text name="txt">
                                                 그룹 선거
                                         </text>
                                         <text name="instructions">
-                                                선거 시작 버튼� �릭하시면 새 선거가 시작�니다. 
-후보��는 모든 비간부 그룹 멤버가 �함�니다.
+                                                투표 시작 버튼� 눌러 새 투표를 시작합니다. 
+후보�는 모든 비운�진 그룹 회�� �함합니다.
                                         </text>
                                         <text name="lbl">
-                                                후보:
+                                                지��:
                                         </text>
                                         <button label="투표" label_selected="투표" name="btn_vote" />
                                         <button label="기권" label_selected="기권" name="btn_abstain" />
-                                        <button label="선거 시작" label_selected="선거 시작" name="btn_start_election" />
+                                        <button label="투표 시작" label_selected="투표 시작" name="btn_start_election" />
                                         <text name="lbl2">
                                                 정족수:
                                         </text>
                                         <spinner name="quorum"
                                              tool_tip="선거 결과가 효력� 발휘하려면 � #명� 투표 ��� 필요합니다." />
                                         <text name="quorum_text">
-                                                � 그룹 멤버 111명 중.
+                                                � 그룹 회� 111명 중.
                                         </text>
                                         <text name="lbl3">
-                                                과반수:
+                                                대부분:
                                         </text>
                                         <radio_group name="majority" tool_tip="Majority of total votes needed to win.">
                                                 <radio_item name="radio">
-                                                        간단한 매조리티
+                                                        단순 과반수
                                                 </radio_item>
                                                 <radio_item name="radio2">
-                                                        2/3 매조리티
+                                                        2/3 �표
                                                 </radio_item>
                                                 <radio_item name="radio3">
-                                                        �치한
+                                                        만장�치
                                                 </radio_item>
                                         </radio_group>
                                         <text name="duration_lbl">
@@ -128,23 +128,23 @@
                                                 선거 종료:
                                         </text>
                                 </panel>
-                                <panel label="프로�절" name="panel_group_proposals">
+                                <panel label="제안" name="panel_group_proposals">
                                         <text name="txt">
-                                                그룹 제안서
+                                                그룹 제안
                                         </text>
                                         <text name="instructions">
-                                                현재 진행중� 제안� 없습니다.  새 제안� �성하시려면 제안 �성
+                                                활성 제안� 없습니다.  새로운 제안� 작성하려면 제안 작성
 버튼� 누르십시오.
                                         </text>
                                         <text name="proposal_lbl">
-                                                제안서:
+                                                제안:
                                         </text>
                                         <button label="예" label_selected="예" name="btn_yes" />
                                         <button label="아니오" label_selected="아니오" name="btn_no" />
                                         <button label="기권" label_selected="기권" name="btn_abstain" />
                                         <button label="목� 보기" label_selected="목� 보기" name="btn_view_list" />
                                         <button label="아�템 보기" label_selected="아�템 보기" name="btn_view_item" />
-                                        <button label="제안 �성" label_selected="제안 �성" name="btn_proposal" />
+                                        <button label="제안 만들기" label_selected="제안 만들기" name="btn_proposal" />
                                         <button label="제출" label_selected="제출" name="btn_submit" />
                                         <text name="quorum_lbl">
                                                 정족수:
@@ -152,20 +152,20 @@
                                         <spinner name="quorum"
                                              tool_tip="선거 결과가 효력� 발휘하려면 � #명� 투표 ��� 필요합니다." />
                                         <text name="quorum_text">
-                                                � 그룹 멤버 111명 중.
+                                                � 그룹 회� 111명 중.
                                         </text>
                                         <text name="majority_lbl">
-                                                과반수:
+                                                대부분:
                                         </text>
                                         <radio_group name="majority" tool_tip="Majority of total votes needed to win.">
                                                 <radio_item name="radio">
-                                                        간단한 매조리티
+                                                        단순 과반수
                                                 </radio_item>
                                                 <radio_item name="radio2">
-                                                        2/3 매조리티
+                                                        2/3 �표
                                                 </radio_item>
                                                 <radio_item name="radio3">
-                                                        �치한
+                                                        만장�치
                                                 </radio_item>
                                         </radio_group>
                                         <text name="duration_lbl">
@@ -176,10 +176,10 @@
                                                 �
                                         </text>
                                         <text name="start_lbl">
-                                                투표 시작:
+                                                투표 시작�:
                                         </text>
                                         <text name="end_lbl">
-                                                투표 종료:
+                                                투표 종료�:
                                         </text>
                                 </panel>
                                 <panel label="기�" name="History">
@@ -187,13 +187,13 @@
                                                 그룹 투표 기�
                                         </text>
                                         <text name="instructions">
-                                                투표와 다�� 선�하시면 과거 그룹 투표 결과를 보실 수 있습니다
+                                                투표를 선�하여 과거 그룹� 투표 결과를 확�할 수 있습니다.
                                         </text>
                                         <text name="instructions2">
-                                                아�템 보기 �릭.
+                                                보기 항목 누름.
                                         </text>
                                         <text name="history_list_lbl">
-                                                과거 투표:
+                                                지난 투표:
                                         </text>
                                         <text name="vote_text_lbl">
                                                 투표 결과:
@@ -208,63 +208,62 @@
                                 그룹 초청
                         </text>
                         <text name="txt2">
-                                초청� 메신저를 통해 전송�니다.
+                                초대장� 메신저를 통해 보내집니다.
                         </text>
                         <text name="txt3">
-                                추가 버튼� �릭하면 목�� 사용�를 추가하실 수 있습니다.
+                                사용�를 목�� 추가하려면 추가 버튼� �릭 하십시오.
                         </text>
                         <text name="lbl">
-                                간부:
+                                운�진:
                         </text>
-                        <button label="간부 추가..." label_selected="간부 추가..."
+                        <button label="운�진 추가..." label_selected="운�진 추가..."
                              name="add_officer_btn" />
-                        <button label="선� 항목 제거" label_selected="선� 항목 제거"
+                        <button label="제거 선�함" label_selected="제거 선�함"
                              name="remove_officer_btn" />
                         <text name="lbl2">
-                                멤버:
+                                회�:
                         </text>
-                        <button label="멤버 추가..." label_selected="멤버 추가..."
+                        <button label="회� 추가..." label_selected="회� 추가..."
                              name="add_member_btn" />
-                        <button label="선� 항목 제거" label_selected="선� 항목 제거"
+                        <button label="제거 선�함" label_selected="제거 선�함"
                              name="remove_member_btn" />
                         <text name="lbl3">
                                 가입 수수료:
                         </text>
-                        <check_box label="�유 신청(초청 불필요)" name="open" />
+                        <check_box label="�유 가입(초대 불필요)" name="open" />
                 </panel>
                 <panel label="토지" name="land">
                         <text name="txt">
                                 그룹 소유 토지
                         </text>
                         <text name="lbl">
-                                � 기부 토지:
+                                전체 기부� 토지:
                         </text>
-                        <button label="지�..." label_selected="지�..." name="map_btn" />
+                        <button label="지�…" label_selected="지�…" name="map_btn" />
                         <text name="lbl2">
-                                사용중� � 토지:
+                                사용 중� 토지:
                         </text>
                         <text name="lbl3">
-                                가용 토지:
+                                미사용중� 토지:
                         </text>
-                        <button label="기여금 설정" label_selected="기여금 설정"
-                             name="set_contrib_btn" />
+                        <button label="기부 설정" label_selected="기부 설정" name="set_contrib_btn" />
                         <text name="warning_label">
-                                경고: 그룹 보유 토지가 지나치게 많습니다. 그룹 멤버들� 기부를 늘려야 합니다.
+                                경고: 그룹� 너무 많� 토지를 관리하고 있습니다. 그룹 회�� � 많� 토지 신용� 기여해야 합니다.
                         </text>
                 </panel>
                 <panel label="�" name="mon">
                         <tab_container name="group money history tab">
-                                <panel label="Planning" name="money panel" />
+                                <panel label="보고서" name="money panel" />
                                 <panel label="세부사항" name="money panel2">
                                         <button label="&lt; �전" label_selected="&lt; �전" name="&lt; Earlier"
                                              tool_tip="시간� 거슬러 갑니다" />
-                                        <button label="나중� &gt;" label_selected="나중� &gt;" name="Later &gt;"
+                                        <button label="나중�&gt;" label_selected="나중�&gt;" name="Later &gt;"
                                              tool_tip="시간� 앞서 갑니다" />
                                 </panel>
-                                <panel label="�매" name="money panel3">
+                                <panel label="�매내역" name="money panel3">
                                         <button label="&lt; �전" label_selected="&lt; �전" name="&lt; Earlier"
                                              tool_tip="시간� 거슬러 갑니다" />
-                                        <button label="나중� &gt;" label_selected="나중� &gt;" name="Later &gt;"
+                                        <button label="나중�&gt;" label_selected="나중�&gt;" name="Later &gt;"
                                              tool_tip="시간� 앞서 갑니다" />
                                 </panel>
                         </tab_container>
diff --git a/linden/indra/newview/skins/xui/ko/floater_groups.xml b/linden/indra/newview/skins/xui/ko/floater_groups.xml
index ce1d6d1..4e3b247 100644
--- a/linden/indra/newview/skins/xui/ko/floater_groups.xml
+++ b/linden/indra/newview/skins/xui/ko/floater_groups.xml
@@ -1,15 +1,15 @@
 <?xml version="1.0" encoding="utf-8" standalone="yes" ?>
 <floater name="groups" title="그룹">
         <text name="groupdesc">
-                귀하가 현재 활�중� 그룹� 굵� 글씨로 표시�니다.
+                현재 활� 중� 그룹� 굵� 글씨로 표시�니다.
         </text>
         <text name="groupcount">
-                귀하는 [COUNT] 그룹(최대 [MAX])� �해 있습니다
+                [COUNT] 그룹(최대 [MAX])� �해 있습니다.
         </text>
         <button label="활성화" label_selected="활성화" name="Activate" />
         <button label="ì •ë³´" label_selected="ì •ë³´" name="Info" />
-        <button label="떠나기" label_selected="떠나기" name="Leave" />
+        <button label="탈퇴" label_selected="탈퇴" name="Leave" />
         <button label="만들기" label_selected="만들기" name="Create" />
-        <button label="검색..." label_selected="검색..." name="Search..." />
+        <button label="검색…" label_selected="검색…" name="Search..." />
         <button label="닫기" label_selected="닫기" name="Close" />
 </floater>
diff --git a/linden/indra/newview/skins/xui/ko/floater_html.xml b/linden/indra/newview/skins/xui/ko/floater_html.xml
index fd20f0d..5807828 100644
--- a/linden/indra/newview/skins/xui/ko/floater_html.xml
+++ b/linden/indra/newview/skins/xui/ko/floater_html.xml
@@ -1,12 +1,16 @@
 <?xml version="1.0" encoding="utf-8" standalone="yes" ?>
-<floater name="html" title="웹 브�우저">
-        <button label="뒤로" name="back_btn" />
-        <button label="앞으로" name="forward_btn" />
-        <button label="재로딩" name="reload_btn" />
-        <button label="중지" name="stop_btn" />
-        <button label="집" name="home_btn" />
-        <button label="��" name="go_btn" />
-        <text name="status_text">
-                진행 �스트 위치
+<floater name="htmlfloater" title="">
+        <button label="닫기" name="close_btn" />
+        <text name="in-world_help_title">
+                �월드 �움�
+        </text>
+        <text name="in-world_help_url">
+                http://www.secondlife.com/app/support/inworld.html
+        </text>
+        <text name="additional_help_title">
+                추가 �움�
+        </text>
+        <text name="additional_help_url">
+                http://www.secondlife.com/app/support/support.html
         </text>
 </floater>
diff --git a/linden/indra/newview/skins/xui/ko/floater_html_help.xml b/linden/indra/newview/skins/xui/ko/floater_html_help.xml
index 1fe3412..2258112 100644
--- a/linden/indra/newview/skins/xui/ko/floater_html_help.xml
+++ b/linden/indra/newview/skins/xui/ko/floater_html_help.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="utf-8" standalone="yes" ?>
-<floater name="htmlhelp" title="Second Life �움�">
+<floater name="htmlhelp" title="세컨드��프 �움�">
         <button label="뒤로" name="back_btn" />
-        <button label="집" name="home_btn" />
+        <button label="홈" name="home_btn" />
         <button label="앞으로" name="forward_btn" />
         <button label="닫기" name="close_btn" />
         <text name="status_text">
diff --git a/linden/indra/newview/skins/xui/ko/floater_im.xml b/linden/indra/newview/skins/xui/ko/floater_im.xml
index 9241ee3..60ff087 100644
--- a/linden/indra/newview/skins/xui/ko/floater_im.xml
+++ b/linden/indra/newview/skins/xui/ko/floater_im.xml
@@ -1,9 +1,30 @@
 <?xml version="1.0" encoding="utf-8" standalone="yes" ?>
 <multi_floater name="im_floater" title="메신저">
         <text name="only_user_message">
-                귀하는 � 세션� 유�한 사용�입니다.
+                � 세션� 유�한 사용�입니다.
         </text>
         <text name="offline_message">
-                [LAST] [FIRST]�(가) 오프��입니다.
+                [FIRST] [LAST]님� 오프��입니다.
+        </text>
+        <text name="generic_request_error">
+                오류 보고 작성� 요청했으므로 나중� 다시 시�하십시오.
+        </text>
+        <text name="insufficient_perms_error">
+                충분한 권한� 없습니다.
+        </text>
+        <text name="user_no_help">
+                요청� 사용�는 � �� �움� 세션� 있지 않습니다.
+        </text>
+        <text name="add_session_event">
+                채팅 세션� ��전트 추가
+        </text>
+        <text name="message_session_event">
+                채팅하기
+        </text>
+        <text name="teleport_session_event">
+                �성�로 텔리�트
+        </text>
+        <text name="removed_from_group">
+                그룹�서 제거�었습니다.
         </text>
 </multi_floater>
diff --git a/linden/indra/newview/skins/xui/ko/floater_image_preview.xml b/linden/indra/newview/skins/xui/ko/floater_image_preview.xml
index b7a72b7..8cfa403 100644
--- a/linden/indra/newview/skins/xui/ko/floater_image_preview.xml
+++ b/linden/indra/newview/skins/xui/ko/floater_image_preview.xml
@@ -7,14 +7,14 @@
                 설명:
         </text>
         <text name="preview_label">
-                �미지 미리보기 형�:
+                �미지 미리보기:
         </text>
-        <combo_box label="복장 유형" name="clothing_type_combo">
+        <combo_box label="�� 유형" name="clothing_type_combo">
                 <combo_item name="Image">
                         �미지
                 </combo_item>
                 <combo_item name="Hair">
-                        헤어스타�
+                        헤어
                 </combo_item>
                 <combo_item name="FemaleHead">
                         여성 머리
@@ -37,11 +37,14 @@
                 <combo_item name="Skirt">
                         치마
                 </combo_item>
+                <combo_item name="SculptedPrim">
+                        조� 프림
+                </combo_item>
         </combo_box>
         <text name="bad_image_text">
-                �미지를 �� 수 없습니다.
-        
-        �미지를 24 비트 Targa(.tga)로 저장해 보십시오.
+                �미지 파�� �� 수 없습니다.
+ 
+        �미지를 24비트 Targa(.tga)로 저장해보십시오.
         </text>
         <button label="취소" name="cancel_btn" />
         <button label="업로드(L$[AMOUNT])" name="ok_btn" />
diff --git a/linden/indra/newview/skins/xui/ko/floater_import.xml b/linden/indra/newview/skins/xui/ko/floater_import.xml
index bb86ca4..44aa94b 100644
--- a/linden/indra/newview/skins/xui/ko/floater_import.xml
+++ b/linden/indra/newview/skins/xui/ko/floater_import.xml
@@ -7,7 +7,7 @@
                 설명:
         </text>
         <text name="preview_label">
-                업로드 대� 파�:
+                업로드할 파�:
         </text>
         <button label="취소" name="cancel_btn" />
         <button label="업로드(L$10)" name="ok_btn" />
diff --git a/linden/indra/newview/skins/xui/ko/floater_inspect.xml b/linden/indra/newview/skins/xui/ko/floater_inspect.xml
new file mode 100644
index 0000000..064dee7
--- /dev/null
+++ b/linden/indra/newview/skins/xui/ko/floater_inspect.xml
@@ -0,0 +1,14 @@
+<?xml version="1.0" encoding="utf-8" standalone="yes" ?>

+<floater name="inspect" title="오브�트 검사">

+        <scroll_list name="object_list"

+             tool_tip="Select an object from this list to highlight it in-world">

+                <column label="Object Name" name="object_name" />

+                <column label="Owner Name" name="owner_name" />

+                <column label="Creator Name" name="creator_name" />

+                <column label="Creation Date" name="creation_date" />

+        </scroll_list>

+        <button label="소유� 프로필 참조…" label_selected="" name="button owner"

+             tool_tip="강조 표시� 오브�트� 소유� 프로필 참조" />

+        <button label="작성� 프로필 참조…" label_selected="" name="button creator"

+             tool_tip="강조 표시� 오브�트� 최초 작성� 프로필 참조" />

+</floater>

diff --git a/linden/indra/newview/skins/xui/ko/floater_instant_message.xml b/linden/indra/newview/skins/xui/ko/floater_instant_message.xml
index a0cb5fd..c5973ee 100644
--- a/linden/indra/newview/skins/xui/ko/floater_instant_message.xml
+++ b/linden/indra/newview/skins/xui/ko/floater_instant_message.xml
@@ -1,18 +1,23 @@
 <?xml version="1.0" encoding="utf-8" standalone="yes" ?>
-<floater label="(알려지지 않�)" name="im_floater" title="(알려지지 않�)">
-        <button label="프로필..." label_selected="프로필..." name="profile_btn" />
+<floater label="(알 수 없�)" name="im_floater" title="(알 수 없�)">
+        <line_editor label="메신저를 사용하려면 여기를 �릭하십시오."
+             name="chat_editor" />
+        <button label="텔리�트" label_selected="텔리�트" name="teleport_btn" />
+        <button label="프로필…" label_selected="프로필…" name="profile_btn" />
         <button label="닫기" label_selected="닫기" name="close_btn" />
         <text name="live_help_dialog">
-                ***Second Life와 함께 �� 봉사�가 �료 주민� �와주는 ��브 �움�� 오신 것� 환�합니다! *** 
-F1� 눌러 SL �움� 페�지를 우선 확�하십시오. 
-답변� 찾� 수 없는 경우, 질문� 입력하고 시작하면 �답 가능한 봉사�가 곧 �답할 것입니다. 
-작업� 완료할 때까지 ��브 �움�� 닫지 마십시오. �답� 없�경우 차후 언제든지 다시 시�할 수 있습니다. 
-참고: ��브 �움� 봉사�는 린든� ��� 아니므로 �답�� 성� &apos;Linden&apos;� 아니�면 답변� 비공��� 것으로 간주�니다.
+                *** �움� 요청입니다 *** 
+먼저, F1� 누르거나 지�창고(http://secondlife.com/knowledgebase/)�서 SL �움� 페�지를 확�하십시오. 
+답변� 찾� 수 없는 경우, 질문� 입력하고 시작하면 �답 가능한 봉사�가 곧 �답할 것입니다.
+-=-=- 바� 시간대�는 �답 시간� 차�가 있� 수 있습니다.-=-=-
         </text>
         <text name="title_string">
-                Instant Message with [NAME]
+                [NAME](와)과 메신저 하기
         </text>
         <text name="typing_start_string">
-                [NAME] is typing...
+                [NAME]님 입력 중...
+        </text>
+        <text name="session_start_string">
+                [NAME](으)로 � 세션� 시작하는 중입니다. 잠시만 기다리십시오.
         </text>
 </floater>
diff --git a/linden/indra/newview/skins/xui/ko/floater_inventory.xml b/linden/indra/newview/skins/xui/ko/floater_inventory.xml
index d9d3bd3..16f0125 100644
--- a/linden/indra/newview/skins/xui/ko/floater_inventory.xml
+++ b/linden/indra/newview/skins/xui/ko/floater_inventory.xml
@@ -1,12 +1,11 @@
 <?xml version="1.0" encoding="utf-8" standalone="yes" ?>
-<floater name="Inventory" title="저장고">
+<floater name="Inventory" title="�벤토리">
         <tab_container name="inventory filter tabs">
                 <inventory_panel label="All Items" name="All Items" />
                 <inventory_panel label="Recent Items" name="Recent Items" />
         </tab_container>
         <menu_bar name="Inventory Menu">
                 <menu label="파�" name="File">
-                        <tearoff_menu label="~~~~~~~~~~~" name="~~~~~~~~~~~" />
                         <menu_item_call label="열기" name="Open" />
                         <menu_item_call label="새 창" name="New Window" />
                         <menu_item_call label="필터 표시" name="Show Filters" />
@@ -14,10 +13,9 @@
                         <menu_item_call label="휴지통 비우기" name="Empty Trash" />
                 </menu>
                 <menu label="만들기" name="Create">
-                        <tearoff_menu label="~~~~~~~~~~~" name="~~~~~~~~~~~" />
                         <menu_item_call label="새 ��" name="New Folder" />
                         <menu_item_call label="새 스�립트" name="New Script" />
-                        <menu_item_call label="새 참고" name="New Note" />
+                        <menu_item_call label="새 메모" name="New Note" />
                         <menu_item_call label="새 제스처" name="New Gesture" />
                         <menu name="New Clothes">
                                 <menu_item_call label="새 셔츠" name="New Shirt" />
@@ -27,26 +25,25 @@
                                 <menu_item_call label="새 재킷" name="New Jacket" />
                                 <menu_item_call label="새 스커트" name="New Skirt" />
                                 <menu_item_call label="새 장갑" name="New Gloves" />
-                                <menu_item_call label="새 �셔츠" name="New Undershirt" />
-                                <menu_item_call label="새 �바지" name="New Underpants" />
+                                <menu_item_call label="새 내�(�)" name="New Undershirt" />
+                                <menu_item_call label="새 내�(하)" name="New Underpants" />
                         </menu>
                         <menu name="New Body Parts">
                                 <menu_item_call label="새 모습" name="New Shape" />
                                 <menu_item_call label="새 피부" name="New Skin" />
-                                <menu_item_call label="새 헤어스타�" name="New Hair" />
+                                <menu_item_call label="새 헤어" name="New Hair" />
                                 <menu_item_call label="새 눈" name="New Eyes" />
                         </menu>
                 </menu>
-                <menu label="Sort" name="Sort">
-                        <tearoff_menu label="~~~~~~~~~~~" name="~~~~~~~~~~~" />
-                        <menu_item_check label="�름별" name="By Name" />
-                        <menu_item_check label="날짜별" name="By Date" />
-                        <menu_item_check label="항� �름별로 정렬한 ��" name="Folders Always By Name" />
+                <menu label="분류" name="Sort">
+                        <menu_item_check label="�름 순으로" name="By Name" />
+                        <menu_item_check label="날짜 순으로" name="By Date" />
+                        <menu_item_check label="항� �름순으로 �� 정렬" name="Folders Always By Name" />
+                        <menu_item_check label="시스템 ��는 위로" name="System Folders To Top" />
                 </menu>
-                <menu label="Filters" name="Filters">
-                        <tearoff_menu label="~~~~~~~~~~~" name="~~~~~~~~~~~" />
-                        <menu_item_check label="현재 �태 수정" name="Modify Current" />
-                        <menu_item_call label="현재 재설정" name="Reset Current" />
+                <menu label="í•„í„°" name="Filters">
+                        <menu_item_check label="수정하기" name="Modify Current" />
+                        <menu_item_call label="초기화하기" name="Reset Current" />
                 </menu>
         </menu_bar>
 </floater>
diff --git a/linden/indra/newview/skins/xui/ko/floater_inventory_item_properties.xml b/linden/indra/newview/skins/xui/ko/floater_inventory_item_properties.xml
index 50cee90..3e9a636 100644
--- a/linden/indra/newview/skins/xui/ko/floater_inventory_item_properties.xml
+++ b/linden/indra/newview/skins/xui/ko/floater_inventory_item_properties.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8" standalone="yes" ?>
-<floater name="item properties" title="저장고 아�템 특성">
+<floater name="item properties" title="�벤토리 �성">
         <text name="LabelItemNameTitle">
                 �름:
         </text>
@@ -7,36 +7,36 @@
                 설명:
         </text>
         <text name="LabelCreatorTitle">
-                �성�:
+                만든�:
         </text>
         <text name="LabelCreatorName">
-                니콜 린든
+                Nicole Linden
         </text>
-        <button label="프로필..." label_selected="" name="BtnCreator" />
+        <button label="프로필…" label_selected="" name="BtnCreator" />
         <text name="LabelOwnerTitle">
-                소유주:
+                소유�:
         </text>
         <text name="LabelOwnerName">
-                스랙스 린든
+                Thrax Linden
         </text>
-        <button label="프로필..." label_selected="" name="BtnOwner" />
+        <button label="프로필…" label_selected="" name="BtnOwner" />
         <text name="LabelAcquiredTitle">
-                취� 대�:
+                가져온 항목:
         </text>
         <text name="LabelAcquiredDate">
                 2006년 5월 24� 수요� 12:50:46
         </text>
         <text name="OwnerLabel">
-                귀하는:
+                다�과 같� 작업� 수행할 수 있습니다:
         </text>
         <check_box label="수정" name="CheckOwnerModify" />
         <check_box label="복사" name="CheckOwnerCopy" />
-        <check_box label="재�매/무료 배�" name="CheckOwnerTransfer" />
+        <check_box label="재�매/주기" name="CheckOwnerTransfer" />
         <text name="BaseMaskDebug">
                 B:
         </text>
         <text name="OwnerMaskDebug">
-                O:
+                O;
         </text>
         <text name="GroupMaskDebug">
                 G:
@@ -50,18 +50,18 @@
         <check_box label="그룹과 공유" name="CheckShareWithGroup" />
         <check_box label="아무나 복사 허용" name="CheckEveryoneCopy" />
         <text name="NextOwnerLabel">
-                다� 소유주는:
+                다� 소유� 권한:
         </text>
         <check_box label="수정" name="CheckNextOwnerModify" />
         <check_box label="복사" name="CheckNextOwnerCopy" />
-        <check_box label="재�매/무료 배�" name="CheckNextOwnerTransfer" />
+        <check_box label="재�매/주기" name="CheckNextOwnerTransfer" />
         <text name="SaleLabel">
                 아�템 표시:
         </text>
-        <check_box label="매물" name="CheckPurchase" />
+        <check_box label="�매 여부" name="CheckPurchase" />
         <radio_group name="RadioSaleType">
                 <radio_item name="radio">
-                        �창�임
+                        �본
                 </radio_item>
                 <radio_item name="radio2">
                         복사
diff --git a/linden/indra/newview/skins/xui/ko/floater_inventory_view_finder.xml b/linden/indra/newview/skins/xui/ko/floater_inventory_view_finder.xml
index aa00c83..9f762ac 100644
--- a/linden/indra/newview/skins/xui/ko/floater_inventory_view_finder.xml
+++ b/linden/indra/newview/skins/xui/ko/floater_inventory_view_finder.xml
@@ -1,17 +1,17 @@
 <?xml version="1.0" encoding="utf-8" standalone="yes" ?>
-<floater name="Inventory Finder" title="inventory_recent_items">
+<floater name="Inventory Finder" title="�벤토리_최신_아�템">
         <check_box label="애니메�션" name="check_animation" />
-        <check_box label="명함" name="check_calling_card" />
-        <check_box label="�류" name="check_clothing" />
+        <check_box label="프로필" name="check_calling_card" />
+        <check_box label="옷" name="check_clothing" />
         <check_box label="제스처" name="check_gesture" />
-        <check_box label="경계 표시" name="check_landmark" />
+        <check_box label="랜드마� 만들기" name="check_landmark" />
         <check_box label="노트카드" name="check_notecard" />
-        <check_box label="사물" name="check_object" />
+        <check_box label="오브�트" name="check_object" />
         <check_box label="스�립트" name="check_script" />
         <check_box label="사운드" name="check_sound" />
         <check_box label="�스처" name="check_texture" />
         <check_box label="스냅샷" name="check_snapshot" />
-        <button label="ì „ì²´" label_selected="ì „ì²´" name="All" />
+        <button label="모�" label_selected="모�" name="All" />
         <button label="없�" label_selected="없�" name="None" />
         <check_box label="항� �� 표시" name="check_show_empty" />
         <check_box label="로그오프 후 경과 시간" name="check_since_logoff" />
diff --git a/linden/indra/newview/skins/xui/ko/floater_joystick.xml b/linden/indra/newview/skins/xui/ko/floater_joystick.xml
new file mode 100644
index 0000000..8eb521f
--- /dev/null
+++ b/linden/indra/newview/skins/xui/ko/floater_joystick.xml
@@ -0,0 +1,55 @@
+<?xml version="1.0" encoding="utf-8" standalone="yes" ?>

+<floater name="build options floater" title="Flycam 옵션">

+        <text>

+                X축

+        </text>

+        <text>

+                Y축

+        </text>

+        <text>

+                Z축

+        </text>

+        <spinner label="매핑" />

+        <spinner label="매핑" />

+        <spinner label="매핑" />

+        <spinner label="�기" />

+        <spinner label="�기" />

+        <spinner label="�기" />

+        <spinner label="사�지대" />

+        <spinner label="사�지대" />

+        <spinner label="사�지대" />

+        <text>

+                ìš”

+        </text>

+        <text>

+                피치

+        </text>

+        <text>

+                ì—­í• 

+        </text>

+        <spinner label="매핑" />

+        <spinner label="매핑" />

+        <spinner label="매핑" />

+        <spinner label="�기" />

+        <spinner label="�기" />

+        <spinner label="�기" />

+        <spinner label="사�지대" />

+        <spinner label="사�지대" />

+        <spinner label="사�지대" />

+        <text name="ZoomLabel">

+                확대/축소

+        </text>

+        <spinner label="매핑" />

+        <spinner label="�기" />

+        <spinner label="사�지대" />

+        <check_box label="�접 확대/축소" />

+        <slider label="깃털 효과" name="FlycamFeathering" />

+        <check_box label="레벨 �� 수정" />

+        <check_box label="3D 커서" />

+        <text name="JoystickMonitor">

+                조�스틱 검사

+        </text>

+        <text name="Axis">

+                축 [NUM]

+        </text>

+</floater>

diff --git a/linden/indra/newview/skins/xui/ko/floater_land_holdings.xml b/linden/indra/newview/skins/xui/ko/floater_land_holdings.xml
index 839302c..9779e39 100644
--- a/linden/indra/newview/skins/xui/ko/floater_land_holdings.xml
+++ b/linden/indra/newview/skins/xui/ko/floater_land_holdings.xml
@@ -7,32 +7,32 @@
                 <column label="" name="hidden" />
         </scroll_list>
         <button label="텔리�트" label_selected="텔리�트" name="Teleport"
-             tool_tip="� 토지� 중심으로 텔리�팅." />
-        <button label="지�� 표시하기" label_selected="지�� 표시하기"
-             name="Show on Map" tool_tip="� 토지를 세계 지�� 표시." />
+             tool_tip="� 토지� 중심으로 텔리�트." />
+        <button label="지�� 표시" label_selected="지�� 표시" name="Show on Map"
+             tool_tip="� 토지를 월드 지�� 표시." />
         <text name="contrib_label">
-                소� 그룹� 대한 기부:
+                귀하� 그룹� 대한 기부:
         </text>
         <scroll_list name="grant list">
                 <column label="Group" name="group" />
                 <column label="Area" name="area" />
         </scroll_list>
         <text name="allowed_label">
-                현재 지불 플랜�서 허용� 토지 소유 내역:
+                현재 결제수단으로 허용�는 토지 보유량:
         </text>
         <text name="allowed_text">
-                0 �방 미터
+                0 제곱미터
         </text>
         <text name="current_label">
-                현재 토지 소유 내역:
+                현재 토지 보유량:
         </text>
         <text name="current_text">
-                0 �방 미터
+                0 제곱미터
         </text>
         <text name="available_label">
-                토지 매입 가능:
+                토지 구매� 사용 가능:
         </text>
         <text name="available_text">
-                0 �방 미터
+                0 제곱미터
         </text>
 </floater>
diff --git a/linden/indra/newview/skins/xui/ko/floater_live_lsleditor.xml b/linden/indra/newview/skins/xui/ko/floater_live_lsleditor.xml
index 683062c..066ab32 100644
--- a/linden/indra/newview/skins/xui/ko/floater_live_lsleditor.xml
+++ b/linden/indra/newview/skins/xui/ko/floater_live_lsleditor.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8" standalone="yes" ?>
 <floater name="script ed float" title="스�립트: 새 스�립트">
-        <button label="재설정" label_selected="재설정" name="Reset" />
+        <button label="초기화" label_selected="초기화" name="Reset" />
         <check_box label="실행 중" name="running" />
 </floater>
diff --git a/linden/indra/newview/skins/xui/ko/floater_lsl_guide.xml b/linden/indra/newview/skins/xui/ko/floater_lsl_guide.xml
new file mode 100644
index 0000000..17089ea
--- /dev/null
+++ b/linden/indra/newview/skins/xui/ko/floater_lsl_guide.xml
@@ -0,0 +1,7 @@
+<?xml version="1.0" encoding="utf-8" standalone="yes" ?>

+<floater name="script ed float" title="�� �움�">

+        <check_box label="커서 따�가기" name="lock_check" />

+        <combo_box label="잠금" name="history_combo" />

+        <button label="뒤로" name="back_btn" />

+        <button label="앞으로" name="fwd_btn" />

+</floater>

diff --git a/linden/indra/newview/skins/xui/ko/floater_mute.xml b/linden/indra/newview/skins/xui/ko/floater_mute.xml
index f00a49e..eddcef8 100644
--- a/linden/indra/newview/skins/xui/ko/floater_mute.xml
+++ b/linden/indra/newview/skins/xui/ko/floater_mute.xml
@@ -1,11 +1,10 @@
 <?xml version="1.0" encoding="utf-8" standalone="yes" ?>
-<floater name="mute floater" title="주민 �소거 � 아�템">
+<floater name="mute floater" title="주민 � 오브�트 차단">
         <scroll_list name="mutes" tool_tip="List of currently muted residents" />
-        <button label="주민 �소거..." label_selected="주민 �소거..."
-             name="Mute resident..." tool_tip="�소거할 주민 선�" />
-        <button label="�름별 �소거 개체..."
-             label_selected="�름별 �소거 개체..."
+        <button label="차단할 주민" label_selected="차단할 주민"
+             name="Mute resident..." tool_tip="차단할 주민 선�" />
+        <button label="차단할 오브�트" label_selected="차단할 오브�트"
              name="Mute object by name..." />
-        <button label="�소거 해제" label_selected="�소거 해제" name="Unmute"
-             tool_tip="주민 �는 아�템� �소거 목��서 삭제" />
+        <button label="차단 해제" label_selected="차단 해제" name="Unmute"
+             tool_tip="주민 �는 오브�트를 차단 목��서 삭제" />
 </floater>
diff --git a/linden/indra/newview/skins/xui/ko/floater_new_im.xml b/linden/indra/newview/skins/xui/ko/floater_new_im.xml
index 267d83d..325746a 100644
--- a/linden/indra/newview/skins/xui/ko/floater_new_im.xml
+++ b/linden/indra/newview/skins/xui/ko/floater_new_im.xml
@@ -3,7 +3,7 @@
         <button label="시작" label_selected="시작" name="start_btn" />
         <button label="닫기" label_selected="닫기" name="close_btn" />
         <text name="name_format">
-                [LAST] [FIRST]
+                [FIRST] [LAST]
         </text>
         <text name="online_descriptor">
                 (온��)
diff --git a/linden/indra/newview/skins/xui/ko/floater_new_outfit_dialog.xml b/linden/indra/newview/skins/xui/ko/floater_new_outfit_dialog.xml
index 60c846f..79da40b 100644
--- a/linden/indra/newview/skins/xui/ko/floater_new_outfit_dialog.xml
+++ b/linden/indra/newview/skins/xui/ko/floater_new_outfit_dialog.xml
@@ -4,19 +4,19 @@
         <button label="취소" label_selected="취소" name="Cancel" />
         <check_box label="외형" name="checkbox_Shape" />
         <check_box label="피부" name="checkbox_Skin" />
-        <check_box label="헤어스타�" name="checkbox_Hair" />
+        <check_box label="헤어" name="checkbox_Hair" />
         <check_box label="눈" name="checkbox_Eyes" />
-        <check_box label="�� �름으로 �류 �름 변경" name="rename" />
+        <check_box label="�� �름으로 �� �름 변경" name="rename" />
         <check_box label="셔츠" name="checkbox_Shirt" />
         <check_box label="바지" name="checkbox_Pants" />
         <check_box label="신발" name="checkbox_Shoes" />
         <check_box label="양�" name="checkbox_Socks" />
         <check_box label="재킷" name="checkbox_Jacket" />
         <check_box label="장갑" name="checkbox_Gloves" />
-        <check_box label="�셔츠" name="checkbox_Undershirt" />
-        <check_box label="�바지" name="checkbox_Underpants" />
+        <check_box label="내�(�)" name="checkbox_Undershirt" />
+        <check_box label="내�(하)" name="checkbox_Underpants" />
         <check_box label="치마" name="checkbox_Skirt" />
-        <check_box label="�부" name="checkbox_Chest" />
+        <check_box label="가슴" name="checkbox_Chest" />
         <check_box label="해골" name="checkbox_Skull" />
         <check_box label="왼쪽 어깨" name="checkbox_Left Shoulder" />
         <check_box label="오른쪽 어깨" name="checkbox_Right Shoulder" />
@@ -33,9 +33,9 @@
         <check_box label="왼쪽 안구" name="checkbox_Left Eyeball" />
         <check_box label="오른쪽 안구" name="checkbox_Right Eyeball" />
         <check_box label="ì½”" name="checkbox_Nose" />
-        <check_box label="오른쪽 팔죽지" name="checkbox_R Upper Arm" />
+        <check_box label="오른쪽 �박" name="checkbox_R Upper Arm" />
         <check_box label="오른쪽 팔�" name="checkbox_R Forearm" />
-        <check_box label="왼쪽 팔죽지" name="checkbox_L Upper Arm" />
+        <check_box label="왼쪽 �박" name="checkbox_L Upper Arm" />
         <check_box label="왼쪽 팔�" name="checkbox_L Forearm" />
         <check_box label="오른쪽 엉��" name="checkbox_Right Hip" />
         <check_box label="오른쪽 허벅지" name="checkbox_R Upper Leg" />
@@ -48,7 +48,7 @@
         <check_box label="오른쪽 가슴 근육" name="checkbox_Right Pec" />
         <check_box label="중앙 2" name="checkbox_Center 2" />
         <check_box label="오른쪽 �단" name="checkbox_Top Right" />
-        <check_box label="맨 위" name="checkbox_Top" />
+        <check_box label="�단" name="checkbox_Top" />
         <check_box label="왼쪽 �단" name="checkbox_Top Left" />
         <check_box label="중앙" name="checkbox_Center" />
         <check_box label="왼쪽 하단" name="checkbox_Bottom Left" />
@@ -62,8 +62,7 @@
                 복장� �복과 신체 부분� �함� ��입니다.
 복장 ��를 �어 �를 입히려는 아바타� 놓으십시오.
  
-&quot;새 복장 만들기&quot;는 새로운 ��를 만들어 지금 입고 있는 아�템�
-사본� 저장합니다.
+&quot;새 복장 만들기&quot;는 새로운 ��를 만들어 지금 입고 있는 아�템� 사본� 저장합니다.
         </text>
         <text type="string" length="1" name="Folder name:">
                 �� �름:
@@ -72,10 +71,10 @@
                 복장� �함시킬 아�템:
         </text>
         <text type="string" length="1" name="Body Parts:">
-                신체 부분:
+                신체 부위:
         </text>
         <text type="string" length="1" name="Clothes:">
-                �류:
+                ��:
         </text>
         <text type="string" length="1" name="Attachments:">
                 부착물:
diff --git a/linden/indra/newview/skins/xui/ko/floater_openobject.xml b/linden/indra/newview/skins/xui/ko/floater_openobject.xml
index 47cc047..cad165e 100644
--- a/linden/indra/newview/skins/xui/ko/floater_openobject.xml
+++ b/linden/indra/newview/skins/xui/ko/floater_openobject.xml
@@ -1,9 +1,9 @@
 <?xml version="1.0" encoding="utf-8" standalone="yes" ?>
-<floater name="objectcontents" title="아�템 컨�츠">
+<floater name="objectcontents" title="오브�트 컨�츠">
         <text type="string" length="1" name="object_name">
                 [DESC]:
         </text>
-        <button label="보관함� 복사" label_selected="보관함� 복사"
+        <button label="�벤토리� 복사" label_selected="�벤토리� 복사"
              name="copy_to_inventory_button" />
         <button label="복사 � 착용" label_selected="복사 � 착용"
              name="copy_and_wear_button" />
diff --git a/linden/indra/newview/skins/xui/ko/floater_pay.xml b/linden/indra/newview/skins/xui/ko/floater_pay.xml
index 12b363f..a76640b 100644
--- a/linden/indra/newview/skins/xui/ko/floater_pay.xml
+++ b/linden/indra/newview/skins/xui/ko/floater_pay.xml
@@ -7,10 +7,10 @@
         <button label="지불" label_selected="지불" name="pay btn" />
         <button label="취소" label_selected="취소" name="cancel btn" />
         <text type="string" length="1" name="payee_label">
-                지불 주민:
+                주민 지불:
         </text>
         <text type="string" length="1" name="payee_name">
-                [LAST] [FIRST]
+                [FIRST] [LAST]
         </text>
         <text type="string" length="1" name="fastpay text">
                 빠른 지불:
diff --git a/linden/indra/newview/skins/xui/ko/floater_pay_object.xml b/linden/indra/newview/skins/xui/ko/floater_pay_object.xml
index 6f30e20..8fa6dff 100644
--- a/linden/indra/newview/skins/xui/ko/floater_pay_object.xml
+++ b/linden/indra/newview/skins/xui/ko/floater_pay_object.xml
@@ -1,16 +1,16 @@
 <?xml version="1.0" encoding="utf-8" standalone="yes" ?>
 <floater name="Give Money" title="">
         <text type="string" length="1" name="payee_group">
-                지불 그룹:
+                그룹 지불:
         </text>
         <text type="string" length="1" name="payee_resident">
-                지불 주민:
+                주민 지불:
         </text>
         <text type="string" length="1" name="payee_name">
-                [LAST] [FIRST]
+                [FIRST] [LAST]
         </text>
         <text type="string" length="1" name="object_name_label">
-                매개 아�템:
+                매개 오브�트:
         </text>
         <text type="string" length="1" name="object_name_text">
                 ...
diff --git a/linden/indra/newview/skins/xui/ko/floater_postcard.xml b/linden/indra/newview/skins/xui/ko/floater_postcard.xml
index 5675e64..2d35b83 100644
--- a/linden/indra/newview/skins/xui/ko/floater_postcard.xml
+++ b/linden/indra/newview/skins/xui/ko/floater_postcard.xml
@@ -1,27 +1,27 @@
 <?xml version="1.0" encoding="utf-8" standalone="yes" ?>
-<floater name="Postcard" title="엽서 전송">
+<floater name="Postcard" title="엽서 보내기">
         <text name="to_label">
-                수신� �메�:
+                수신� �메�:
         </text>
         <text name="from_label">
-                귀하� �메�:
+                �메�:
         </text>
         <text name="name_label">
-                귀하� �름:
+                �름:
         </text>
         <text name="subject_label">
-                주제:
+                제목:
         </text>
         <text name="msg_label">
                 메시지:
         </text>
         <check_box label="웹� 게시" name="allow_publish_check"
-             tool_tip="� postcard를 웹� 게시." />
+             tool_tip="� 엽서를 웹� 게시." />
         <check_box label="성�용 컨�츠" name="mature_check"
-             tool_tip="� 엽서�는 성�용 내용� �함�어 있습니다." />
+             tool_tip="� 엽서�는 성� 전용 컨�츠가 �함�어 있습니다." />
         <button label="?" name="publish_help_btn" />
         <text name="fine_print">
-                귀하� 엽서 수신�가 SecondLife� 가입할 경우, 귀하는 추천 보너스를 받게�니다.
+                엽서 수령�� 세컨드��프� 가입 할 경우 추천 보너스를 얻게 �니다.
         </text>
         <button label="취소" name="cancel_btn" />
         <button label="보내기" name="send_btn" />
diff --git a/linden/indra/newview/skins/xui/ko/floater_preferences.xml b/linden/indra/newview/skins/xui/ko/floater_preferences.xml
index 4882524..2da29b4 100644
--- a/linden/indra/newview/skins/xui/ko/floater_preferences.xml
+++ b/linden/indra/newview/skins/xui/ko/floater_preferences.xml
@@ -1,7 +1,8 @@
 <?xml version="1.0" encoding="utf-8" standalone="yes" ?>
 <floater name="Preferences" title="환경 설정">
-        <button label="소개…" label_selected="소개…" name="About..." />
         <button label="확�" label_selected="확�" name="OK" />
         <button label="취소" label_selected="취소" name="Cancel" />
         <button label="�용" label_selected="�용" name="Apply" />
+        <button label="ì •ë³´..." label_selected="ì •ë³´..." name="About..." />
+        <button label="�움�" label_selected="�움�" name="Help" />
 </floater>
diff --git a/linden/indra/newview/skins/xui/ko/floater_preview_animation.xml b/linden/indra/newview/skins/xui/ko/floater_preview_animation.xml
index 769218f..4a0159f 100644
--- a/linden/indra/newview/skins/xui/ko/floater_preview_animation.xml
+++ b/linden/indra/newview/skins/xui/ko/floater_preview_animation.xml
@@ -1,10 +1,10 @@
 <?xml version="1.0" encoding="utf-8" standalone="yes" ?>
-<floater name="preview anim" title="애니메�션: latin salsa19">
+<floater name="preview_anim">
         <text type="string" length="1" name="desc txt">
                 설명:
         </text>
-        <button label="세계�서 플레�" label_selected="중지" name="Anim play btn"
+        <button label="월드�서 재�" label_selected="중지" name="Anim play btn"
              tool_tip="� 애니메�션� 다른 사람들� 볼 수 있�� 재�." />
-        <button label="로컬�서 플레�" label_selected="중지" name="Anim audition btn"
+        <button label="로컬 재�" label_selected="중지" name="Anim audition btn"
              tool_tip="� 애니메�션� 내가 볼 수 있�� 재�." />
 </floater>
diff --git a/linden/indra/newview/skins/xui/ko/floater_preview_embedded_texture.xml b/linden/indra/newview/skins/xui/ko/floater_preview_embedded_texture.xml
index 54e3832..42a0548 100644
--- a/linden/indra/newview/skins/xui/ko/floater_preview_embedded_texture.xml
+++ b/linden/indra/newview/skins/xui/ko/floater_preview_embedded_texture.xml
@@ -1,8 +1,7 @@
 <?xml version="1.0" encoding="utf-8" standalone="yes" ?>
-<floater name="preview texture" title="탑소�">
-        <button label="보관함� 복사" label_selected="보관함� 복사"
-             name="Copy To Inventory" />
+<floater name="preview_texture">
+        <button label="�벤토리� 복사" name="Copy To Inventory" />
         <text type="string" length="1" name="dimensions">
-                �기: [�] x [높�]
+                �기: [WIDTH]x[HEIGHT]
         </text>
 </floater>
diff --git a/linden/indra/newview/skins/xui/ko/floater_preview_existing_landmark.xml b/linden/indra/newview/skins/xui/ko/floater_preview_existing_landmark.xml
index 7c963ba..2ff0664 100644
--- a/linden/indra/newview/skins/xui/ko/floater_preview_existing_landmark.xml
+++ b/linden/indra/newview/skins/xui/ko/floater_preview_existing_landmark.xml
@@ -1,9 +1,8 @@
 <?xml version="1.0" encoding="utf-8" standalone="yes" ?>
-<floater name="Linden Land, Da Boom (154, 135, 35)"
-     title="  Linden Land, Da Boom (154, 135, 35)">
+<floater name="existing_landmark_preview">
         <text type="string" length="1" name="desc txt">
                 설명:
         </text>
         <button label="텔리�트" label_selected="" name="Teleport btn" />
-        <button label="지�� 표시하기" label_selected="" name="Show on Map btn" />
+        <button label="지�� 표시" label_selected="" name="Show on Map btn" />
 </floater>
diff --git a/linden/indra/newview/skins/xui/ko/floater_preview_gesture.xml b/linden/indra/newview/skins/xui/ko/floater_preview_gesture.xml
index 2233809..67b792d 100644
--- a/linden/indra/newview/skins/xui/ko/floater_preview_gesture.xml
+++ b/linden/indra/newview/skins/xui/ko/floater_preview_gesture.xml
@@ -1,24 +1,24 @@
 <?xml version="1.0" encoding="utf-8" standalone="yes" ?>
-<floater name="gesture" title="제스처">
+<floater name="gesture_preview">
         <text name="desc_label">
                 설명:
         </text>
         <text name="trigger_label">
-                방아쇠:
+                바로가기:
         </text>
         <text name="replace_text"
-             tool_tip="trigger 단어를 �러한 단어로 �체하기. 예: trigger &apos;hello&apos; 는&apos;howdy&apos;로 �체하면 �것� 쳇팅시 &apos;I wanted to say hello&apos; 를 &apos;I wanted to say howdy&apos; �고 바꾸게 �">
-                대체 대�:
+             tool_tip="�러한 �들로 시작 �� 대체합니다.   예를 들어, 시작 �� ’hello’�서 ‘howdy(How do you do)’로 대체하면 채팅� 제스처 재�과 함께 &apos;I wanted to say hello&apos;’�서 &apos;I wanted to say howdy&apos;로 바�니다.">
+                대체:
         </text>
         <line_editor name="replace_editor"
-             tool_tip="trigger 단어를 �러한 단어로 �체하기. 예: trigger &apos;hello&apos; 는&apos;howdy&apos;로 �체하면 �것� 쳇팅시 &apos;I wanted to say hello&apos; 를 &apos;I wanted to say howdy&apos; �고 바꾸게 �" />
+             tool_tip="�러한 �들로 시작 �� 대체합니다.   예를 들어, 시작 �� ’hello’�서 ‘howdy(How do you do)’로 대체하면 채팅� 제스처 재�과 함께 &apos;I wanted to say hello&apos;’�서 &apos;I wanted to say howdy&apos;로 바�니다." />
         <text name="key_label">
                 단축키:
         </text>
         <combo_box label="없�" name="modifier_combo" />
         <combo_box label="없�" name="key_combo" />
         <text>
-                �서관:
+                ��브러리:
         </text>
         <text>
                 단계:
@@ -28,8 +28,8 @@
         <button label="아래로 ��" name="down_btn" />
         <button label="제거" name="delete_btn" />
         <text name="help_label">
-                대기 과정� 추가하지 않� 경우 
-모든 과정� �시� 실행�니다.
+                사용�가 대기 단계를 추가하지 않는 한 
+모든 단계는 �시� 발�합니다.
         </text>
         <radio_group name="animation_trigger_type">
                 <radio_item>
@@ -42,7 +42,7 @@
         <check_box label="애니메�션 완료 시까지" name="wait_anim_check" />
         <check_box label="초 단위 시간" name="wait_time_check" />
         <check_box label="활성" name="active_check"
-             tool_tip="쳇팅 중� 액티브한 제스춰는 특정 구문�나 단축키� �해 실행 �니다. 단축키가 서로 간섭� 경우 제스춰는 실행�지 않습니다." />
+             tool_tip="채팅 창� 바로가기 문구를 입력하거나 핫키를 눌러 사용중� 제스처를 표시할 수 있습니다.  �반�으로 키 조합 충�� 있는 경우 제스처는 비활성화�니다." />
         <button label="미리보기" name="preview_btn" />
         <button label="저장" name="save_btn" />
 </floater>
diff --git a/linden/indra/newview/skins/xui/ko/floater_preview_new_landmark.xml b/linden/indra/newview/skins/xui/ko/floater_preview_new_landmark.xml
index ad6f4bc..5256ce7 100644
--- a/linden/indra/newview/skins/xui/ko/floater_preview_new_landmark.xml
+++ b/linden/indra/newview/skins/xui/ko/floater_preview_new_landmark.xml
@@ -1,9 +1,8 @@
 <?xml version="1.0" encoding="utf-8" standalone="yes" ?>
-<floater name="Linden Land, Da Boom (155, 136, 35)"
-     title="  Linden Land, Da Boom (155, 136, 35)">
+<floater name="landmark_preview">
         <button label="텔리�트" label_selected="" name="Teleport btn" />
-        <button label="지�� 표시하기" label_selected="" name="Show on Map btn" />
-        <button label="버리기" label_selected="" name="Discard btn" />
+        <button label="지�� 표시" label_selected="" name="Show on Map btn" />
+        <button label="취소" label_selected="" name="Discard btn" />
         <text type="string" length="1" name="desc txt">
                 설명:
         </text>
diff --git a/linden/indra/newview/skins/xui/ko/floater_preview_notecard.xml b/linden/indra/newview/skins/xui/ko/floater_preview_notecard.xml
index a7ffbd8..275c8e7 100644
--- a/linden/indra/newview/skins/xui/ko/floater_preview_notecard.xml
+++ b/linden/indra/newview/skins/xui/ko/floater_preview_notecard.xml
@@ -5,6 +5,6 @@
                 설명:
         </text>
         <text_editor type="string" length="1" name="Notecard Editor">
-                로딩중...
+                로딩 중…
         </text_editor>
 </floater>
diff --git a/linden/indra/newview/skins/xui/ko/floater_preview_notecard_keep_discard.xml b/linden/indra/newview/skins/xui/ko/floater_preview_notecard_keep_discard.xml
index 159e20a..967e06d 100644
--- a/linden/indra/newview/skins/xui/ko/floater_preview_notecard_keep_discard.xml
+++ b/linden/indra/newview/skins/xui/ko/floater_preview_notecard_keep_discard.xml
@@ -1,11 +1,11 @@
 <?xml version="1.0" encoding="utf-8" standalone="yes" ?>
-<floater name="preview notecard" title="참고: 외형 변경, Part 2">
+<floater name="preview_notecard">
         <text_editor type="string" length="1" name="Notecard Editor">
-                로딩중...
+                로딩 중…
         </text_editor>
         <text type="string" length="1" name="desc txt">
                 설명:
         </text>
         <button label="유지" label_selected="유지" name="Keep" />
-        <button label="버리기" label_selected="버리기" name="Discard" />
+        <button label="취소" label_selected="취소" name="Discard" />
 </floater>
diff --git a/linden/indra/newview/skins/xui/ko/floater_preview_sound.xml b/linden/indra/newview/skins/xui/ko/floater_preview_sound.xml
index bd73f6c..38ff533 100644
--- a/linden/indra/newview/skins/xui/ko/floater_preview_sound.xml
+++ b/linden/indra/newview/skins/xui/ko/floater_preview_sound.xml
@@ -1,12 +1,11 @@
 <?xml version="1.0" encoding="utf-8" standalone="yes" ?>
-<floater name="preview sound" title="소리: 멋진 여성 2">
+<floater name="preview_sound">
         <text type="string" length="1" name="desc txt">
                 설명:
         </text>
-        <button label="세계�서 플레�" label_selected="세계�서 플레�"
+        <button label="월드�서 재�" label_selected="월드�서 재�"
              name="Sound play btn"
              tool_tip="� 사운드를 다른 사람들� 들� 수 있�� 재�." />
-        <button label="로컬�서 플레�" label_selected="로컬�서 플레�"
-             name="Sound audition btn"
+        <button label="로컬 재�" label_selected="로컬 재�" name="Sound audition btn"
              tool_tip="� 사운드를 내가 들� 수 있�� 재�." />
 </floater>
diff --git a/linden/indra/newview/skins/xui/ko/floater_preview_texture.xml b/linden/indra/newview/skins/xui/ko/floater_preview_texture.xml
index 400695e..2281061 100644
--- a/linden/indra/newview/skins/xui/ko/floater_preview_texture.xml
+++ b/linden/indra/newview/skins/xui/ko/floater_preview_texture.xml
@@ -1,9 +1,9 @@
 <?xml version="1.0" encoding="utf-8" standalone="yes" ?>
-<floater name="preview texture" title="�스처: 회색 금� 스�랫치">
+<floater name="preview_texture">
         <text type="string" length="1" name="desc txt">
                 설명:
         </text>
         <text type="string" length="1" name="dimensions">
-                �기: [�] x [높�]
+                �기: [WIDTH]x[HEIGHT]
         </text>
 </floater>
diff --git a/linden/indra/newview/skins/xui/ko/floater_preview_texture_keep_discard.xml b/linden/indra/newview/skins/xui/ko/floater_preview_texture_keep_discard.xml
index fc610d2..616b0b6 100644
--- a/linden/indra/newview/skins/xui/ko/floater_preview_texture_keep_discard.xml
+++ b/linden/indra/newview/skins/xui/ko/floater_preview_texture_keep_discard.xml
@@ -1,11 +1,11 @@
 <?xml version="1.0" encoding="utf-8" standalone="yes" ?>
-<floater name="preview texture" title="�스처: slhand">
+<floater name="preview_texture">
         <text type="string" length="1" name="desc txt">
                 설명:
         </text>
         <button label="유지" label_selected="유지" name="Keep" />
-        <button label="버리기" label_selected="버리기" name="Discard" />
+        <button label="취소" label_selected="취소" name="Discard" />
         <text type="string" length="1" name="dimensions">
-                �기: [�] x [높�]
+                �기: [WIDTH]x[HEIGHT]
         </text>
 </floater>
diff --git a/linden/indra/newview/skins/xui/ko/floater_price_for_listing.xml b/linden/indra/newview/skins/xui/ko/floater_price_for_listing.xml
index 3f32abb..ccf2e4d 100644
--- a/linden/indra/newview/skins/xui/ko/floater_price_for_listing.xml
+++ b/linden/indra/newview/skins/xui/ko/floater_price_for_listing.xml
@@ -1,16 +1,16 @@
 <?xml version="1.0" encoding="utf-8" standalone="yes" ?>
 <floater name="price_for_listing" title="광고 게시">
         <text name="explanation_text">
-                귀하� 광고는 첫 게시�로부터 �주�간
+                귀하� 광고는 게시한 날짜부터 �주� �안 
 게재�니다. 
  
-광고 목��서 귀하 광고� 위치는 지불하시는
-액수� 따� 결정�니다.
-가장 높� 가격� 지불한 광고가 목�� 가장 위� 
-게재�고 검색 결과�서 가장 먼저 표시�니다.
+광고 목��서 귀하� 광고 위치는 
+귀하가 결제한 금액� 따� 결정�니다.
+최고 금액� 결제한 경우 목� 맨 위� 게시�고 
+검색 시 � 높� 순위로 나타납니다.
         </text>
         <text name="price_text">
-                광고 가격(L$):
+                광고 비용(L$):
         </text>
         <button label="가격 설정" name="set_price_btn" />
         <button label="취소" name="cancel_btn" />
diff --git a/linden/indra/newview/skins/xui/ko/floater_rate.xml b/linden/indra/newview/skins/xui/ko/floater_rate.xml
index f34d8cb..39aebc5 100644
--- a/linden/indra/newview/skins/xui/ko/floater_rate.xml
+++ b/linden/indra/newview/skins/xui/ko/floater_rate.xml
@@ -2,26 +2,26 @@
 <floater name="rate" title="Jeska Linden� 순위">
         <radio_group name="behavior">
                 <radio_item type="string" length="1" name="Positive">
-                        분명함
+                        양수
                 </radio_item>
                 <radio_item type="string" length="1" name="No Rating">
-                        무 ��
+                        등급 없�
                 </radio_item>
         </radio_group>
         <radio_group name="appearance">
                 <radio_item type="string" length="1" name="Positive">
-                        분명함
+                        양수
                 </radio_item>
                 <radio_item type="string" length="1" name="No Rating">
-                        무 ��
+                        등급 없�
                 </radio_item>
         </radio_group>
         <radio_group name="building">
                 <radio_item type="string" length="1" name="Positive">
-                        분명함
+                        양수
                 </radio_item>
                 <radio_item type="string" length="1" name="No Rating">
-                        무 ��
+                        등급 없�
                 </radio_item>
         </radio_group>
         <button label="확�" label_selected="확�" name="OK" />
@@ -30,7 +30,7 @@
                 전체� 행�:
         </text>
         <text type="string" length="1" name="Skill at appearance (clothing and attachments):">
-                꾸미기를 잘 함(�복 � 부착물):
+                꾸미기를 잘 함(�복 � 착용물):
         </text>
         <text type="string" length="1" name="Skill at building:">
                 건축� 잘 함:
@@ -39,6 +39,6 @@
                 메시지:
         </text>
         <text type="string" length="1" name="cost">
-                비용: � 등� 변경하는 비용 L$[비용].  � 비용: L$[TOTAL].
+                비용: 등급 변경 비용� L$[COST]입니다.  � 비용: L$[TOTAL]입니다.
         </text>
 </floater>
diff --git a/linden/indra/newview/skins/xui/ko/floater_report_abuse.xml b/linden/indra/newview/skins/xui/ko/floater_report_abuse.xml
index fe3cad5..4aa7cea 100644
--- a/linden/indra/newview/skins/xui/ko/floater_report_abuse.xml
+++ b/linden/indra/newview/skins/xui/ko/floater_report_abuse.xml
@@ -1,16 +1,27 @@
 <?xml version="1.0" encoding="utf-8" standalone="yes" ?>
-<floater name="floater_report_abuse" title="ì•…ìš© ì‹ ê³ ">
+<floater name="floater_report_abuse" title="신고하기">
         <text name="reporter_title">
-                신고�:
+                신고�:
         </text>
         <text name="sim_title">
-                시뮬레�터:
+                지역:
         </text>
         <text name="pos_title">
                 위치:
         </text>
-        <texture_picker label="ìž‘ì—…..." name="screenshot" />
+        <texture_picker label="작업 중..." name="screenshot" />
         <check_box label="스�린샷 �함" name="screen_check" />
+        <button label="" label_selected="" name="pick_btn"
+             tool_tip="오브�트 피커 - 오브�트를 본 보고서� 주제로 �별함" />
+        <text name="select_object_label">
+                버튼� �릭한 후 오브�트를 �릭 하십시오:
+        </text>
+        <text name="object_name_label">
+                �름:
+        </text>
+        <text name="owner_name_label">
+                소유�:
+        </text>
         <combo_box name="category_combo"
              tool_tip="Category -- select the category that best describes this report">
                 <combo_item name="Selectcategory">
@@ -41,38 +52,27 @@
                         기타
                 </combo_item>
         </combo_box>
-        <button label="" label_selected="" name="pick_btn"
-             tool_tip="아�템 피커 - 아�템� 본 보고서� 주제로 �별합니다" />
-        <text name="select_object_label">
-                버튼� �릭한 후 아�템� �릭하십시오:
-        </text>
-        <text name="object_name_label">
-                �름:
-        </text>
-        <text name="owner_name_label">
-                소유주:
-        </text>
         <text name="abuser_name_title">
                 악용� �름:
         </text>
         <button label="선�" label_selected="" name="select_abuser"
-             tool_tip="악용�� �름� 목��서 선�합니다" />
+             tool_tip="악용�� �름� 목��서 선�" />
         <text name="abuser_name_title2">
-                악용 장소:
+                악용 위치:
         </text>
         <text name="sum_title">
                 요약:
         </text>
         <text name="dscr_title">
-                �세 내역:
+                세부사항:
         </text>
         <text name="bug_aviso">
-                날짜, 장소, 악용 종류, 관련 채팅/IM �스트 등� 대해
-�세히 �고 가능하다면 아�템� 선�하십시오.
+                날짜, 위치, 악용 종류, 관련 채팅/메신저 �스트 등� 대해 
+ �세히 �고 가능하다면 오브�트를 선�하십시오.
         </text>
         <text name="incomplete_title">
-                참고: 완전하지 않� 보고서는 조사�지 않습니다
+                참고: 불완전한 보고서는 조사 대��서 제외�
         </text>
-        <button label="ì•…ìš© ì‹ ê³ " label_selected="ì•…ìš© ì‹ ê³ " name="send_btn" />
+        <button label="신고하기" label_selected="신고하기" name="send_btn" />
         <button label="취소" label_selected="취소" name="cancel_btn" />
 </floater>
diff --git a/linden/indra/newview/skins/xui/ko/floater_report_bug.xml b/linden/indra/newview/skins/xui/ko/floater_report_bug.xml
index 5207167..ec9779e 100644
--- a/linden/indra/newview/skins/xui/ko/floater_report_bug.xml
+++ b/linden/indra/newview/skins/xui/ko/floater_report_bug.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="utf-8" standalone="yes" ?>
 <floater name="bug_reporter" title="버그 신고">
         <text name="reporter_title">
-                신고�:
+                신고�:
         </text>
         <text name="sim_title">
                 시뮬레�터:
@@ -10,18 +10,18 @@
                 위치:
         </text>
         <text name="select_object_label">
-                버튼� �릭하고 선�할 아�템� �릭하십시오.
+                버튼 � 선�할 오브�트를 차례로 �릭하십시오:
         </text>
         <button label="" label_selected="" name="pick_btn"
-             tool_tip="아�템 피커 - 아�템� 본 보고서� 주제로 �별합니다" />
+             tool_tip="오브�트 피커 - 오브�트를 본 보고서� 주제로 �별함" />
         <text name="object_name_label">
                 �름:
         </text>
         <text name="owner_name_label">
-                소유주:
+                소유�:
         </text>
         <check_box label="스�린샷 �함" name="screen_check" />
-        <texture_picker label="ìž‘ì—…..." name="screenshot" />
+        <texture_picker label="작업 중..." name="screenshot" />
         <text name="category_label">
                 카테고리:
         </text>
@@ -31,7 +31,7 @@
                         카테고리 선�
                 </combo_item>
                 <combo_item name="Building">
-                        건물
+                        제작하기
                 </combo_item>
                 <combo_item name="Character">
                         �릭터
@@ -49,22 +49,22 @@
                         그래픽
                 </combo_item>
                 <combo_item name="Inventory">
-                        저장고
+                        �벤토리
                 </combo_item>
                 <combo_item name="Lag">
-                        뒤�지다
+                        ëž™
                 </combo_item>
                 <combo_item name="MissingContent">
-                        빠진 내용
+                        유실 컨�츠
                 </combo_item>
                 <combo_item name="LindenDollars(L$)">
-                        린든달러 (L$)
+                        린든달러(L$)
                 </combo_item>
                 <combo_item name="Permissions">
-                        허가
+                        권한
                 </combo_item>
                 <combo_item name="Physics">
-                        물리
+                        물리 엔진
                 </combo_item>
                 <combo_item name="Script">
                         스�립트
@@ -79,14 +79,14 @@
                         사용� �터페�스
                 </combo_item>
                 <combo_item name="Miscellaneous">
-                        기타
+                        다목�
                 </combo_item>
         </combo_box>
         <text name="sum_title">
                 요약:
         </text>
         <text name="dscr_title">
-                �세 내역:
+                세부사항: (가능한 한 많� 정보를 제공 하십시오.)
         </text>
         <text_editor name="details_edit">
                 버그 재� 방법:
@@ -96,9 +96,10 @@
 예� 결과:
         </text_editor>
         <text name="bug_aviso">
-                If this bug allows you to do something you should not be able 
-to do, especially if it impacts performance or security, please 
-select the &apos;Exploit&apos; category. Thank you!
+                참고: 불완전한 보고서는 조사 대��서 제외�
+� 버그로 �해 권한 밖� �� 가능하게 �면,  
+특히 실행�나 보안� �향� 줄 경우,  
+‘개척’ 카테고리를 선�하십시오. �사합니다!
         </text>
         <button label="버그 신고" label_selected="버그 신고" name="send_btn" />
         <button label="취소" label_selected="취소" name="cancel_btn" />
diff --git a/linden/indra/newview/skins/xui/ko/floater_script_debug.xml b/linden/indra/newview/skins/xui/ko/floater_script_debug.xml
index aa59d93..86eb10c 100644
--- a/linden/indra/newview/skins/xui/ko/floater_script_debug.xml
+++ b/linden/indra/newview/skins/xui/ko/floater_script_debug.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8" standalone="yes" ?>
 <multi_floater name="script debug floater" title="스�립트 오류/경고">
         <tab_container name="Preview Tabs">
-                <floater label="스�립트" name="all_scripts" title="[전체 스�립트]" />
+                <floater label="스�립트" name="all_scripts" title="[All scripts]" />
         </tab_container>
 </multi_floater>
diff --git a/linden/indra/newview/skins/xui/ko/floater_script_ed_panel.xml b/linden/indra/newview/skins/xui/ko/floater_script_ed_panel.xml
index e1e79c9..9d9c471 100644
--- a/linden/indra/newview/skins/xui/ko/floater_script_ed_panel.xml
+++ b/linden/indra/newview/skins/xui/ko/floater_script_ed_panel.xml
@@ -1,9 +1,9 @@
 <?xml version="1.0" encoding="utf-8" standalone="yes" ?>
 <panel name="script panel">
-        <button label="저장" label_selected="저장" name="Save_btn" />
         <text_editor type="string" length="1" name="Script Editor">
-                로딩중...
+                로딩 중…
         </text_editor>
+        <button label="저장" label_selected="저장" name="Save_btn" />
         <menu_bar name="script_menu">
                 <menu name="File">
                         <menu_item_call label="저장" name="Save" />
@@ -11,19 +11,20 @@
                 </menu>
                 <menu name="Edit">
                         <menu_item_call label="취소" name="Undo" />
-                        <menu_item_call label="다시 실행" name="Redo" />
+                        <menu_item_call label="반복" name="Redo" />
                         <menu_item_separator label="-----------" name="separator" />
                         <menu_item_call label="잘�내기" name="Cut" />
                         <menu_item_call label="복사" name="Copy" />
                         <menu_item_call label="붙여넣기" name="Paste" />
                         <menu_item_separator label="-----------" name="separator2" />
                         <menu_item_call label="모� 선�" name="Select All" />
-                        <menu_item_call label="선� 해제" name="Deselect" />
+                        <menu_item_call label="선� 취소" name="Deselect" />
                         <menu_item_separator label="-----------" name="separator3" />
-                        <menu_item_call label="검색 / 대체..." name="Search / Replace..." />
+                        <menu_item_call label="검색 / 대체…" name="Search / Replace..." />
                 </menu>
                 <menu name="Help">
-                        <menu_item_call label="�움�..." name="Help..." />
+                        <menu_item_call label="�움�…" name="Help..." />
+                        <menu_item_call label="LSL 위키 �움�…" name="LSL Wiki Help..." />
                 </menu>
         </menu_bar>
 </panel>
diff --git a/linden/indra/newview/skins/xui/ko/floater_script_queue.xml b/linden/indra/newview/skins/xui/ko/floater_script_queue.xml
index 1cc9fd9..5391244 100644
--- a/linden/indra/newview/skins/xui/ko/floater_script_queue.xml
+++ b/linden/indra/newview/skins/xui/ko/floater_script_queue.xml
@@ -1,4 +1,4 @@
 <?xml version="1.0" encoding="utf-8" standalone="yes" ?>
-<floater name="queue" title="진행 �황 재설정">
+<floater name="queue" title="진행 �황 초기화">
         <button label="닫기" label_selected="닫기" name="close" />
 </floater>
diff --git a/linden/indra/newview/skins/xui/ko/floater_script_search.xml b/linden/indra/newview/skins/xui/ko/floater_script_search.xml
index 90b2a97..614523a 100644
--- a/linden/indra/newview/skins/xui/ko/floater_script_search.xml
+++ b/linden/indra/newview/skins/xui/ko/floater_script_search.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8" standalone="yes" ?>
 <floater name="script search" title="스�립트 검색">
-        <check_box label="�문 대소문� 구분 안함" name="case_text" />
+        <check_box label="�문 대소문� 구분 안 함" name="case_text" />
         <button label="검색" label_selected="검색" name="search_btn" />
         <button label="대체" label_selected="대체" name="replace_btn" />
         <button label="모� 대체" label_selected="모� 대체" name="replace_all_btn" />
diff --git a/linden/indra/newview/skins/xui/ko/floater_sell_land.xml b/linden/indra/newview/skins/xui/ko/floater_sell_land.xml
index e04b09d..2844424 100644
--- a/linden/indra/newview/skins/xui/ko/floater_sell_land.xml
+++ b/linden/indra/newview/skins/xui/ko/floater_sell_land.xml
@@ -7,10 +7,10 @@
                 구� �름
         </text>
         <text name="info_size_label">
-                �기 :
+                �기:
         </text>
         <text name="info_size">
-                [AREA] �방 미터
+                [AREA]제곱미터
         </text>
         <text name="info_action">
                 � 구�� �매하려면:
@@ -19,19 +19,19 @@
                 가격 설정:
         </text>
         <text name="price_text">
-                � 토지� 대한 �절한 가격� 선�하십시오.
+                � 토지� 대한 �절한 가격� 선� 하십시오.
         </text>
         <text name="price_ld">
-                L$&quot;
+                L$
         </text>
         <text name="price_per_m">
-                (�방 미터당 L$[PER_METER])
+                (L$ [PER_METER]제곱미터당)
         </text>
         <text name="sell_to_label">
                 토지 �매 대�:
         </text>
         <text name="sell_to_text">
-                다른 사람 �는 특정 구매��게 �매여부를 선�하십시오.
+                다른 사람 �는 특정 구매��게 �매할지 여부를 선�하십시오.
         </text>
         <combo_box name="sell_to">
                 <combo_item name="--selectone--">
@@ -44,24 +44,24 @@
                         특정 사용�:
                 </combo_item>
         </combo_box>
-        <button label="선�..." name="sell_to_select_agent" />
+        <button label="선�…" name="sell_to_select_agent" />
         <text name="sell_objects_label">
-                토지와 함께 아�템� �매하시겠습니까?
+                토지와 함께 오브�트를 �매하겠습니까?
         </text>
         <text name="sell_objects_text">
-                Parcel� 토지소유�� 환전 가능한 아�템� 소유권� 바뀔 것입니다.
+                토지 소유주� 양� 가능한 오브�트 소유권� 변경합니다.
         </text>
         <radio_group name="sell_objects">
                 <radio_item name="no">
-                        아니오, 아�템� 소유권 유지
+                        아니오, 오브�트 소유권� 유지합니다.
                 </radio_item>
                 <radio_item name="yes">
-                        예, 아�템과 토지 �매
+                        예, 토지와 함께 오브�트를 �매합니다.
                 </radio_item>
         </radio_group>
-        <button label="사물 표시" name="show_objects" />
+        <button label="오브�트 표시" name="show_objects" />
         <text name="nag_message_label">
-                잊지 마십시오: 모든 매매는 환불� �지 않습니다.
+                잊지 � 것: 모든 매매는 환불 �지 않�.
         </text>
         <button label="토지 매물 설정" name="sell_btn" />
         <button label="취소" name="cancel_btn" />
diff --git a/linden/indra/newview/skins/xui/ko/floater_settings_debug.xml b/linden/indra/newview/skins/xui/ko/floater_settings_debug.xml
index bcf69ac..e63c4d3 100644
--- a/linden/indra/newview/skins/xui/ko/floater_settings_debug.xml
+++ b/linden/indra/newview/skins/xui/ko/floater_settings_debug.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8" standalone="yes" ?>
-<floater name="settings_debug" title="버그 수정 설정">
+<floater name="settings_debug" title="디버그 설정">
         <combo_box name="boolean_combo">
                 <combo_item name="TRUE">
                         ì°¸
@@ -8,8 +8,10 @@
                         거짓
                 </combo_item>
         </combo_box>
+        <color_swatch label="색" name="color_swatch" />
         <spinner label="x" name="val_spinner_1" />
         <spinner label="x" name="val_spinner_2" />
         <spinner label="x" name="val_spinner_3" />
         <spinner label="x" name="val_spinner_4" />
+        <button label="기본 설정으로 초기화" name="default_btn" />
 </floater>
diff --git a/linden/indra/newview/skins/xui/ko/floater_snapshot.xml b/linden/indra/newview/skins/xui/ko/floater_snapshot.xml
index 75313ee..e4702da 100644
--- a/linden/indra/newview/skins/xui/ko/floater_snapshot.xml
+++ b/linden/indra/newview/skins/xui/ko/floater_snapshot.xml
@@ -1,21 +1,21 @@
 <?xml version="1.0" encoding="utf-8" standalone="yes" ?>
 <floater name="Snapshot" title="스냅샷 미리보기">
         <text name="type_label">
-                무엇� 하고 싶으십니까?
+                스냅샷 용�
         </text>
         <radio_group label="스냅샷 유형" name="snapshot_type_radio">
                 <radio_item name="postcard">
-                        �스트카드 보내기
+                        보내기
                 </radio_item>
                 <radio_item name="texture">
-                        스넵샷 업로드
+                        스냅샷 업로드
                 </radio_item>
                 <radio_item name="local">
-                        스넵샷 저장하기
+                        저장하기
                 </radio_item>
         </radio_group>
         <text name="type_label2">
-                어떤 �기� �미지가 필요하십니까?
+                �미지 �기
         </text>
         <combo_box label="해��" name="postcard_size_combo">
                 <combo_item name="640x480">
@@ -31,7 +31,7 @@
                         현재 창
                 </combo_item>
                 <combo_item name="Custom">
-                        맞춤
+                        사용� �기
                 </combo_item>
         </combo_box>
         <combo_box label="해��" name="texture_size_combo">
@@ -42,13 +42,13 @@
                         소(128x128)
                 </combo_item>
                 <combo_item name="Medium(256x256)">
-                        중(256x256)
+                        중 (256 x256)
                 </combo_item>
                 <combo_item name="Large(512x512)">
-                        대(512x512)
+                        대 (512x512)
                 </combo_item>
                 <combo_item name="Custom">
-                        맞춤
+                        사용� �기
                 </combo_item>
         </combo_box>
         <combo_box label="해��" name="local_size_combo">
@@ -74,38 +74,38 @@
                         1600x1200
                 </combo_item>
                 <combo_item name="Custom">
-                        맞춤
+                        사용� �기
                 </combo_item>
         </combo_box>
         <spinner label="�" name="snapshot_width" />
         <spinner label="높�" name="snapshot_height" />
-        <slider label="�미지 품질" name="image_quality_slider" />
+        <slider label="�미지 해��" name="image_quality_slider" />
         <text name="layer_type_label">
-                캡처:
+                스타�:
         </text>
         <combo_box label="�미지 레�어" name="layer_types">
                 <combo_item name="Colors">
                         색
                 </combo_item>
                 <combo_item name="Depth">
-                        깊�
+                        실루엣
                 </combo_item>
                 <combo_item name="ObjectMattes">
-                        아�템 매트
+                        오브�트
                 </combo_item>
         </combo_box>
         <text name="file_size_label">
                 파� �기: [SIZE]
         </text>
-        <check_box label="스냅샷으로 �터페�스 표시하기" name="ui_check" />
-        <check_box label="HUD 사물 스냅샷으로 보기" name="hud_check" />
-        <check_box label="저장 후�� 열어�기" name="keep_open_check" />
-        <check_box label="정해진 화�비 유지" name="keep_aspect_check" />
-        <check_box label="테�리 고정(전체 화면 미리보기)" name="freeze_frame_check" />
+        <check_box label="메뉴 보�기" name="ui_check" />
+        <check_box label="HUD 보�기" name="hud_check" />
+        <check_box label="저장후 열어�기" name="keep_open_check" />
+        <check_box label="화�비 유지하기" name="keep_aspect_check" />
+        <check_box label="전체 화면으로 미리보기" name="freeze_frame_check" />
         <button label="새 스냅샷" name="new_snapshot_btn" />
         <check_box label="�� 스냅샷" name="auto_snapshot_check" />
         <button label="업로드(L$10)" name="upload_btn" />
         <button label="보내기" name="send_btn" />
         <button label="저장" name="save_btn" />
-        <button label="버리기" name="discard_btn" />
+        <button label="취소" name="discard_btn" />
 </floater>
diff --git a/linden/indra/newview/skins/xui/ko/floater_telehub.xml b/linden/indra/newview/skins/xui/ko/floater_telehub.xml
index bec649d..439018e 100644
--- a/linden/indra/newview/skins/xui/ko/floater_telehub.xml
+++ b/linden/indra/newview/skins/xui/ko/floater_telehub.xml
@@ -1,28 +1,28 @@
 <?xml version="1.0" encoding="utf-8" standalone="yes" ?>
-<floater name="telehub" title="텔리허브">
+<floater name="telehub" title="텔레허브">
         <text name="status_text_connected">
-                사물[OBJECT]� 연결� 텔리허브
+                [OBJECT] 오브�트� 연결� 텔레허브
         </text>
         <text name="status_text_not_connected">
-                텔리허브가 연결�지 않았습니다.
+                텔레허브가 연결�지 않�.
         </text>
         <text name="help_text_connected">
-                삭제하려면 연결 해제를 �릭합니다.
+                삭제하려면 &apos;연결 해제&apos;를 �릭합니다.
         </text>
         <text name="help_text_not_connected">
-                아�템� 선�한 후 텔리허브 연결� �릭하십시오.
+                오브�트를 선�하고 텔리허브 연결� �릭하십시오.
         </text>
-        <button label="텔리허브 연결" name="connect_btn" />
+        <button label="텔레허브 연결" name="connect_btn" />
         <button label="연결 해제" name="disconnect_btn" />
         <text name="spawn_points_text">
-                스� 지�(사물� 아니� 위치):
+                시작 지�(오브�트가 아닌 위치임):
         </text>
-        <button label="스� 추가" name="add_spawn_point_btn" />
+        <button label="�� 추가" name="add_spawn_point_btn" />
         <button label="스� 제거" name="remove_spawn_point_btn" />
         <text name="spawn_point_help">
-                사물� 선�한 후 추가를 �릭해 위치를 설정하십시오.
-그런 다� 사물� �� �는 삭제하실 수 있습니다.
-위치� 기준� 텔리허브 중심입니다.
-목��서 아�템� 선�하시면 세계�서� 위치가 표시�니다.
+                오브�트를 선�하고 추가를 �릭하여 위치를 정합니다.
+그런 다�, 오브�트를 ��, 삭제할 수 있습니다.
+위치는 텔리허브 센터� 따� �대�입니다.
+월드 위치를 표시하기 위해 목�� 항목� 선�합니다.
         </text>
 </floater>
diff --git a/linden/indra/newview/skins/xui/ko/floater_texture_ctrl.xml b/linden/indra/newview/skins/xui/ko/floater_texture_ctrl.xml
index 9c5ff01..6b464ca 100644
--- a/linden/indra/newview/skins/xui/ko/floater_texture_ctrl.xml
+++ b/linden/indra/newview/skins/xui/ko/floater_texture_ctrl.xml
@@ -1,16 +1,16 @@
 <?xml version="1.0" encoding="utf-8" standalone="yes" ?>
 <floater name="texture picker" title="선�: �스처">
         <text type="string" length="1" name="Multiple">
-                다중
+                다목�
         </text>
         <text type="string" length="1" name="unknown">
-                �기: 512 x 512
+                �기: 512x512
         </text>
         <button label="기본 설정" label_selected="기본 설정" name="Default" />
         <button label="없�" label_selected="없�" name="None" />
         <button label="공백" label_selected="공백" name="Blank" />
         <check_box label="�� 표시" name="show_folders_check" />
-        <check_box label="즉시 �용" name="apply_immediate_check" />
+        <check_box label="지금 �용" name="apply_immediate_check" />
         <button label="" label_selected="" name="Pipette" />
         <button label="취소" label_selected="취소" name="Cancel" />
         <button label="선�" label_selected="선�" name="Select" />
diff --git a/linden/indra/newview/skins/xui/ko/floater_tools.xml b/linden/indra/newview/skins/xui/ko/floater_tools.xml
index 2d67e05..7baaef6 100644
--- a/linden/indra/newview/skins/xui/ko/floater_tools.xml
+++ b/linden/indra/newview/skins/xui/ko/floater_tools.xml
@@ -2,7 +2,7 @@
 <floater name="toolbox floater" title="">
         <button label="" label_selected="" name="button focus" />
         <text name="tool label">
-                촛�
+                보기
         </text>
         <button label="" label_selected="" name="button move" />
         <text name="tool label2">
@@ -20,30 +20,30 @@
         <text name="tool label5">
                 토지
         </text>
-        <check_box label="줌" name="radio zoom" />
+        <check_box label="확대/축소" name="radio zoom" />
         <check_box label="궤�회전(Ctrl)" name="radio orbit" />
         <check_box label="팬(Ctrl-Shift)" name="radio pan" />
         <check_box label="��" name="radio move" />
-        <check_box label="올리기(Ctrl)" name="radio lift" />
-        <check_box label="스핀(Ctrl-Shift)" name="radio spin" />
+        <check_box label="들기(Ctrl)" name="radio lift" />
+        <check_box label="�리기(Ctrl-Shift)" name="radio spin" />
         <check_box label="위치" name="radio position" />
         <check_box label="회전(Ctrl)" name="radio rotate" />
         <check_box label="늘리기(Ctrl-Shift)" name="radio stretch" />
         <check_box label="�스처 선�" name="radio select face" />
-        <check_box label="연결 부분 편집" name="checkbox edit linked parts" />
+        <check_box label="연결� 오브�트 편집" name="checkbox edit linked parts" />
         <check_box label="그리드 사용" name="checkbox snap to grid" />
-        <button label="옵션..." label_selected="옵션..." name="Options..." />
+        <button label="옵션…" label_selected="옵션…" name="Options..." />
         <check_box label="양쪽 모� 늘리기" name="checkbox uniform" />
         <check_box label="�스처 늘리기" name="checkbox stretch textures" />
         <text name="text ruler mode">
-                지�� 모드:
+                눈금� 설정:
         </text>
         <text name="text status">
-                ��� 드래그, 복사는 Shift 키-드래그하십시오
+                ��� �기, 복사는 Shift 키-�기하십시오.
         </text>
         <combo_box name="combobox grid mode">
                 <combo_item name="World">
-                        세계
+                        월드
                 </combo_item>
                 <combo_item name="Local">
                         로컬
@@ -62,7 +62,7 @@
         <button label="" label_selected="" name="ToolHemiCone" />
         <button label="" label_selected="" name="ToolSphere" />
         <button label="" label_selected="" name="ToolHemiSphere" />
-        <check_box label="복사 선�" name="checkbox copy selection" />
+        <check_box label="선� 항목 복사" name="checkbox copy selection" />
         <button label="" label_selected="" name="ToolTorus" />
         <button label="" label_selected="" name="ToolTube" />
         <button label="" label_selected="" name="ToolRing" />
@@ -74,8 +74,8 @@
         <check_box label="토지 선�" name="radio select land" />
         <check_box label="토지 �탄화" name="radio flatten" />
         <check_box label="토지 올리기" name="radio raise" />
-        <check_box label="토지 낮추기" name="radio lower" />
-        <check_box label="토지 부드럽게 하기" name="radio smooth" />
+        <check_box label="낮� 토지" name="radio lower" />
+        <check_box label="토지 고르기" name="radio smooth" />
         <check_box label="토지 거칠게 만들기" name="radio noise" />
         <check_box label="토지 ��리기" name="radio revert" />
         <combo_box name="combobox brush size">
@@ -92,10 +92,10 @@
         <button label="선� 사항� �용" label_selected="선� 사항� �용"
              name="button apply to selection" tool_tip="선�한 토지 수정" />
         <check_box label="소유주 표시" name="checkbox show owners" />
-        <button label="추가 &gt;&gt;" name="button more" tool_tip="고급 옵션" />
-        <button label="&lt;&lt; �게" name="button less" tool_tip="고급 옵션" />
+        <button label="� 보기 &gt;&gt;" name="button more" tool_tip="고급 옵션" />
+        <button label="&lt;&lt; 닫기" name="button less" tool_tip="고급 옵션" />
         <tab_container name="Object Info Tabs">
-                <panel label="�반사항" name="General">
+                <panel label="�반" name="General">
                         <text name="Name:">
                                 �름:
                         </text>
@@ -103,38 +103,38 @@
                                 설명:
                         </text>
                         <text name="Creator:">
-                                �성�:
+                                만든�:
                         </text>
                         <text name="Creator Name">
-                                스랙스 린든
+                                Thrax Linden
                         </text>
-                        <button label="프로필..." label_selected="프로필..."
+                        <button label="프로필…" label_selected="프로필…"
                              name="button creator profile" />
                         <text name="Owner:">
-                                소유주:
+                                소유�:
                         </text>
                         <text name="Owner Name">
-                                스랙스 린든
+                                Thrax Linden
                         </text>
-                        <button label="프로필..." label_selected="프로필..." name="button owner profile" />
+                        <button label="프로필…" label_selected="프로필…" name="button owner profile" />
                         <text name="Group:">
                                 그룹:
                         </text>
                         <text name="Group Name Proxy">
                                 � 린든즈
                         </text>
-                        <button label="설정..." label_selected="설정..." name="button set group" />
+                        <button label="설정…" label_selected="설정…" name="button set group" />
                         <text name="prim info">
-                                아�템 1개, 프리미티브 1개
+                                오브�트 1개, 프림 1개
                         </text>
                         <text name="Permissions:">
                                 권한:
                         </text>
                         <text name="perm_modify">
-                                � 아�템� 수정할 수 있습니다
+                                � 오브�트는 수정할 수 있습니다.
                         </text>
                         <check_box label="그룹과 공유" name="checkbox share with group"
-                             tool_tip="그룹 멤버�게 ��, 수정, 복사, 삭제 허용." />
+                             tool_tip="그룹 회��게 ��, 수정, 복사 � 삭제를 허용합니다." />
                         <text name="text deed continued">
                                 양�...
                         </text>
@@ -142,30 +142,30 @@
                                 양�
                         </text>
                         <button label="양�..." label_selected="양�..." name="button deed"
-                             tool_tip="그룹 공유 사물� 그룹 간부가 양�할 수 있습니다." />
+                             tool_tip="그룹 공유 오브�트는 그룹 운�진� 양�할 수 있습니다." />
                         <check_box label="아무나 �� 허용" name="checkbox allow everyone move" />
                         <check_box label="아무나 복사 허용" name="checkbox allow everyone copy" />
-                        <check_box label="매물" name="checkbox for sale" />
+                        <check_box label="�매 여부" name="checkbox for sale" />
                         <text name="Price:  L$">
                                 가격:  L$
                         </text>
                         <radio_group name="sale type">
                                 <radio_item name="Original">
-                                        �창�임
+                                        �본
                                 </radio_item>
                                 <radio_item name="Copy">
                                         복사
                                 </radio_item>
                                 <radio_item name="Contents">
-                                        ë‚´ìš©
+                                        컨�츠
                                 </radio_item>
                         </radio_group>
                         <text name="Next owner can:">
-                                다� 소유주는:
+                                다� 소유� 권한:
                         </text>
                         <check_box label="수정" name="checkbox next owner can modify" />
                         <check_box label="복사" name="checkbox next owner can copy" />
-                        <check_box label="재�매/무료 배�" name="checkbox next owner can transfer" />
+                        <check_box label="재�매/주기" name="checkbox next owner can transfer" />
                         <text name="label click action">
                                 왼쪽 �릭했� 때:
                         </text>
@@ -174,13 +174,13 @@
                                         만지기/잡기(기본 설정)
                                 </combo_item>
                                 <combo_item name="Sitonobject">
-                                        사물� 앉기
+                                        오브�트� 앉기
                                 </combo_item>
                                 <combo_item name="Buyobject">
-                                        아�템 구매
+                                        오브�트 구매
                                 </combo_item>
                                 <combo_item name="Payobject">
-                                        아�템으로 지불
+                                        오브�트로 지불
                                 </combo_item>
                                 <combo_item name="Open">
                                         열기
@@ -205,36 +205,36 @@
                                 F:
                         </text>
                         <text name="text modify info 1">
-                                � 아�템� 수정할 수 있습니다
+                                � 오브�트는 수정할 수 있습니다.
                         </text>
                         <text name="text modify info 2">
-                                � 아�템들� 수정할 수 있습니다.
+                                �러한 오브�트를 수정할 수 있습니다.
                         </text>
                         <text name="text modify info 3">
-                                � 아�템� 수정할 수 있습니다.
+                                � 오브�트는 수정할 수 없습니다.
                         </text>
                         <text name="text modify info 4">
-                                � 아�템� 수정할 수 없습니다.
+                                � 오브�트는 수정할 수 없습니다.
                         </text>
                         <text name="text modify warning">
-                                권한� 설정하려면 전체 아�템� 선�하셔야 합니다.
+                                권한� 설정하려면 전체 오브�트를 선�해야 합니다.
                         </text>
                 </panel>
-                <panel label="사물" name="Object">
+                <panel label="오브�트" name="Object">
                         <text name="select_single">
-                                매개변수를 편집할 프리미티브를 하나만 선�하십시오.
+                                매개변수를 편집할 프림� 하나만 선�하십시오.
                         </text>
                         <text name="edit_object">
-                                아�템 매개변수 편집:
+                                오브�트 매개변수 편집:
                         </text>
                         <check_box label="잠금" name="checkbox locked"
-                             tool_tip="아�템� ��-삭제�는 것� 금지합니다. 건축 중 ��하지 않� 변경� 막는 � 유용합니다." />
-                        <check_box label="물리�" name="Physical Checkbox Ctrl"
-                             tool_tip="사물� 중력� �해 밀리고 �향받�� 허용" />
+                             tool_tip="오브�트가 ��-삭제�는 것� 금지합니다. 건축 중 ��하지 않� 변경� 방지� 유용합니다." />
+                        <check_box label="물리 엔진" name="Physical Checkbox Ctrl"
+                             tool_tip="오브�트가 중력� �해 밀리고 �향받�� 허용" />
                         <check_box label="임시" name="Temporary Checkbox Ctrl"
-                             tool_tip="�성 후 1분 후� 아�템� 삭제��� 합니다." />
-                        <check_box label="유령" name="Phantom Checkbox Ctrl"
-                             tool_tip="아�템� 다른 아�템 �는 아바타와 충�하지 않�� 합니다" />
+                             tool_tip="�성한지 1분 후� 오브�트가 삭제 ��� 합니다." />
+                        <check_box label="팬텀" name="Phantom Checkbox Ctrl"
+                             tool_tip="오브�트가 다른 오브�트 �는 아바타와 충�하지 않�� 합니다." />
                         <text name="label position">
                                 위치(미터)
                         </text>
@@ -280,7 +280,7 @@
                                 </combo_item>
                         </combo_box>
                         <text name="label basetype">
-                                건축용 블� 유형
+                                블� 유형
                         </text>
                         <combo_box name="comboBaseType">
                                 <combo_item name="Box">
@@ -302,7 +302,10 @@
                                         ê´€
                                 </combo_item>
                                 <combo_item name="Ring">
-                                        반지
+                                        �
+                                </combo_item>
+                                <combo_item name="Sculpted">
+                                        ì¡°ê°�
                                 </combo_item>
                         </combo_box>
                         <text name="text cut">
@@ -334,7 +337,7 @@
                                 </combo_item>
                         </combo_box>
                         <text name="text twist">
-                                나선 꼬임 시작 과 종료
+                                나선 꼬임 시작과 종료
                         </text>
                         <spinner label="B" name="Twist Begin" />
                         <spinner label="E" name="Twist End" />
@@ -370,16 +373,17 @@
                         <text name="text revolutions">
                                 회전
                         </text>
+                        <texture_picker label="�스처" name="sculpt texture control" tool_tip="�미지 선�" />
                 </panel>
                 <panel label="특징" name="Features">
                         <text name="select_single">
-                                특징� 편집할 프리미티브를 하나만 선�하십시오
+                                특징� 편집할 프림� 하나만 선�하십시오.
                         </text>
                         <text name="edit_object">
-                                아�템 특성 편집:
+                                오브�트 특성 편집:
                         </text>
                         <check_box label="신축 경로" name="Flexible1D Checkbox Ctrl"
-                             tool_tip="사물� Z 축� 중심으로 구부러지�� 허용. (���언트측만 해당)" />
+                             tool_tip="오브�트가 Z 축� 중심으로 구부러지�� 허용. (���언트측만 해당)" />
                         <spinner label="부드러움" name="FlexNumSections" />
                         <spinner label="중력" name="FlexGravity" />
                         <spinner label="�기" name="FlexFriction" />
@@ -389,19 +393,21 @@
                         <spinner label="�스 Y" name="FlexForceY" />
                         <spinner label="�스 Z" name="FlexForceZ" />
                         <check_box label="ë¹›" name="Light Checkbox Ctrl"
-                             tool_tip="아�템� 빛� 발하게 합니다" />
+                             tool_tip="오브�트가 빛� 발하게 합니다." />
                         <text name="label color">
                                 색
                         </text>
-                        <color_swatch label="" name="colorswatch" tool_tip="�릭해 색 피커를 여십시오" />
+                        <color_swatch label="" name="colorswatch"
+                             tool_tip="색 관리기를 열려면 �릭 하십시오." />
                         <spinner label="강�" name="Light Intensity" />
                         <spinner label="반지름" name="Light Radius" />
                         <spinner label="하�" name="Light Falloff" />
                 </panel>
                 <panel label="�스처" name="Texture">
                         <texture_picker label="�스처" name="texture control"
-                             tool_tip="�릭해 그림� 선�하십시오" />
-                        <color_swatch label="색" name="colorswatch" tool_tip="�릭해 색 피커를 여십시오" />
+                             tool_tip="그림� 선�하려면 �릭 하십시오." />
+                        <color_swatch label="색" name="colorswatch"
+                             tool_tip="색 관리기를 열려면 �릭 하십시오." />
                         <text name="color trans">
                                 투명� %
                         </text>
@@ -418,7 +424,7 @@
                                 </combo_item>
                         </combo_box>
                         <text name="label shininess">
-                                광채
+                                광�
                         </text>
                         <combo_box name="combobox shininess">
                                 <combo_item name="None">
@@ -435,14 +441,14 @@
                                 </combo_item>
                         </combo_box>
                         <text name="label bumpiness">
-                                울�불�함
+                                질�
                         </text>
                         <combo_box name="combobox bumpiness">
                                 <combo_item name="None">
                                         없�
                                 </combo_item>
                                 <combo_item name="Brightness">
-                                        ��
+                                        �기
                                 </combo_item>
                                 <combo_item name="Darkness">
                                         어�움
@@ -457,25 +463,25 @@
                                         벽�
                                 </combo_item>
                                 <combo_item name="checker">
-                                        체커
+                                        검사기
                                 </combo_item>
                                 <combo_item name="concrete">
                                         콘�리트
                                 </combo_item>
                                 <combo_item name="crustytile">
-                                        �러스티타�
+                                        거친 타�
                                 </combo_item>
                                 <combo_item name="cutstone">
                                         다듬�
                                 </combo_item>
                                 <combo_item name="discs">
-                                        ��
+                                        디스�
                                 </combo_item>
                                 <combo_item name="gravel">
                                         �갈
                                 </combo_item>
                                 <combo_item name="petridish">
-                                        페트리 접시
+                                        페트리디쉬
                                 </combo_item>
                                 <combo_item name="siding">
                                         ë²½
@@ -490,11 +496,11 @@
                                         ��
                                 </combo_item>
                                 <combo_item name="weave">
-                                        짜기
+                                        조립
                                 </combo_item>
                         </combo_box>
                         <text name="tex scale">
-                                면별 반복
+                                면 단위 반복
                         </text>
                         <spinner label="수�(U)" name="TexScaleU" />
                         <check_box label="뒤집기" name="checkbox flip s" />
@@ -507,20 +513,20 @@
                                 미터당 반복
                         </text>
                         <text name="string repeats per face">
-                                면별 반복
+                                면 단위 반복
                         </text>
                         <text name="rpt">
                                 미터당 반복
                         </text>
                         <button label="�용" label_selected="�용" name="button apply" />
                         <text name="tex offset">
-                                �쇄
+                                오프셋
                         </text>
                         <spinner label="수�(U)" name="TexOffsetU" />
                         <spinner label="수�(V)" name="TexOffsetV" />
                         <text name="textbox autofix">
                                 미디어 �스처 정렬
-(먼저 로딩 필요)
+(먼저 로드 필요)
                         </text>
                         <button label="ì •ë ¬" label_selected="ì •ë ¬" name="button align" />
                 </panel>
@@ -531,17 +537,17 @@
         </tab_container>
         <panel name="land info panel">
                 <text name="label_area_price">
-                        가격: [AREA] �방 미터� 대해 L$[PRICE]
+                        가격: [AREA] 제곱 미터 당 L$[PRICE]
                 </text>
                 <text name="label_area">
-                        �역: [AREA] �방 미터
+                        ë©´ì �: [AREA]sq. m.
                 </text>
                 <button label="토지 구매하기..." label_selected="토지 구매하기..."
                      name="button buy land" />
-                <button label="토지 �기..." label_selected="토지 �기..."
+                <button label="토지 버리기..." label_selected="토지 버리기..."
                      name="button abandon land" />
                 <button label="세분..." label_selected="세분..." name="button subdivide land" />
-                <button label="ê²°í•©..." label_selected="ê²°í•©..." name="button join land" />
+                <button label="가입…" label_selected="가입…" name="button join land" />
                 <button label="토지 소개..." label_selected="토지 소개..."
                      name="button about land" />
         </panel>
diff --git a/linden/indra/newview/skins/xui/ko/floater_top_objects.xml b/linden/indra/newview/skins/xui/ko/floater_top_objects.xml
index 5c13072..22c9f38 100644
--- a/linden/indra/newview/skins/xui/ko/floater_top_objects.xml
+++ b/linden/indra/newview/skins/xui/ko/floater_top_objects.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="utf-8" standalone="yes" ?>
-<floater name="top_objects" title="로딩중...">
+<floater name="top_objects" title="로딩 중…">
         <text name="title_text">
-                로딩중...
+                로딩 중…
         </text>
         <scroll_list name="objects_list">
                 <column label="Score" name="score" />
@@ -10,41 +10,41 @@
                 <column label="Location" name="location" />
         </scroll_list>
         <text name="id_text">
-                사물 ID:
+                오브�트 ID:
         </text>
-        <button label="표지 표시하기" name="show_beacon_btn" />
+        <button label="표� 표시" name="show_beacon_btn" />
         <text name="obj_name_text">
-                아�템 �름:
+                오브�트 �름:
         </text>
         <button label="í•„í„°" name="filter_object_btn" />
         <text name="owner_name_text">
-                소유주 �름:
+                소유� �름:
         </text>
         <button label="í•„í„°" name="filter_owner_btn" />
-        <button label="선� 항목 반환" name="return_selected_btn" />
-        <button label="전체 반환" name="return_all_btn" />
+        <button label="반환 선�함" name="return_selected_btn" />
+        <button label="전부 반환" name="return_all_btn" />
         <button label="선� 항목 �기" name="disable_selected_btn" />
-        <button label="전체 �기" name="disable_all_btn" />
+        <button label="모� 비활성" name="disable_all_btn" />
         <button label="새로 고침" name="refresh_btn" />
         <text name="top_scripts_title">
-                탑 스�립트
+                대용량 스�립트
         </text>
         <text name="top_scripts_text">
-                [COUNT] 스�립트가 � [TIME]ms를 사용하고 있습니다
+                [COUNT]개� 스�립트� � [TIME]밀리초 소요
         </text>
         <text name="scripts_score_label">
                 시간
         </text>
         <text name="top_colliders_title">
-                탑 컬���
+                대용량 콜���
         </text>
         <text name="top_colliders_text">
-                다양한 충� 가능성� 경험하는 최� [COUNT] 아�템
+                충� 가능한 최�위 [COUNT]개 오브�트
         </text>
         <text name="colliders_score_label">
                 �수
         </text>
         <text name="none_descriptor">
-                찾� 것� 없습니다.
+                발견�지 않�.
         </text>
 </floater>
diff --git a/linden/indra/newview/skins/xui/ko/floater_tos.xml b/linden/indra/newview/skins/xui/ko/floater_tos.xml
index 302e98d..a5d0a47 100644
--- a/linden/indra/newview/skins/xui/ko/floater_tos.xml
+++ b/linden/indra/newview/skins/xui/ko/floater_tos.xml
@@ -4,18 +4,18 @@
         <button label="취소" label_selected="취소" name="Cancel" />
         <radio_group name="tos_agreement">
                 <radio_item name="radio_disagree">
-                        �용약관� �� 하지 않습니다
+                        �용 약관� �� 안합니다.
                 </radio_item>
                 <radio_item name="radio_agree">
-                        �용약관� �� 합니다.
+                        �용 약관� ��합니다.
                 </radio_item>
         </radio_group>
         <text name="tos_title">
-                서비스 계약 조항
+                서비스 약관
         </text>
         <text name="tos_heading">
-                아래 서비스 계약 내용� 주� �세히 �으십시오. Second Life� 계� 로그�하시려면,
-계약서� ��하셔야 합니다.
+                다� 서비스 약관� 잘 �으세요. 세컨드��프�서 계�하여 로그�� 하려면,
+사용 조건 ��를 수�해야 합니다.
         </text>
         <text_editor name="tos_text">
                 TOS_TEXT
diff --git a/linden/indra/newview/skins/xui/ko/floater_wearable_save_as.xml b/linden/indra/newview/skins/xui/ko/floater_wearable_save_as.xml
index 8d94910..554b1bd 100644
--- a/linden/indra/newview/skins/xui/ko/floater_wearable_save_as.xml
+++ b/linden/indra/newview/skins/xui/ko/floater_wearable_save_as.xml
@@ -3,9 +3,9 @@
         <button label="저장" label_selected="저장" name="Save" />
         <button label="취소" label_selected="취소" name="Cancel" />
         <text type="string" length="1" name="Save item as:">
-                항목� 다른 �름으로 저장 :
+                항목� 다른 �름으로 저장:
         </text>
         <line_editor name="name ed">
-                새 [DESC]
+                신규 [DESC]
         </line_editor>
 </floater>
diff --git a/linden/indra/newview/skins/xui/ko/floater_world_map.xml b/linden/indra/newview/skins/xui/ko/floater_world_map.xml
index 903363a..abe0e3f 100644
--- a/linden/indra/newview/skins/xui/ko/floater_world_map.xml
+++ b/linden/indra/newview/skins/xui/ko/floater_world_map.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="utf-8" standalone="yes" ?>
-<floater name="worldmap" title="세계 지�">
+<floater name="worldmap" title="월드 지�">
         <tab_container name="maptab">
-                <panel label="사물" name="objects_mapview" />
+                <panel label="오브�트" name="objects_mapview" />
                 <panel label="지형" name="terrain_mapview" />
         </tab_container>
         <text name="land_for_sale_label">
@@ -11,31 +11,31 @@
                 경매
         </text>
         <text name="you_label">
-                귀하
+                나
         </text>
         <text name="home_label">
-                집
+                홈
         </text>
-        <button label="집으로 ��" label_selected="집으로 ��" name="Go Home"
-             tool_tip="우리 집으로 텔리�팅" />
+        <button label="홈으로 ��" label_selected="홈으로 ��" name="Go Home"
+             tool_tip="홈으로 텔리�트" />
         <text name="classifieds_label">
                 ê´‘ê³ 
         </text>
         <check_box label=" " name="class_chk" />
         <text name="person_label">
-                개�
+                아바타
         </text>
         <check_box label=" " name="people_chk" />
         <text name="infohub_label">
-                정보 허브
+                ��허브
         </text>
         <check_box label=" " name="infohub_chk" />
         <text name="telehub_label">
-                텔리허브
+                텔레허브
         </text>
         <check_box label=" " name="telehubchk" />
         <text name="popular_label">
-                �기
+                �기장소
         </text>
         <check_box label=" " name="popular_chk" />
         <text name="land_for_sale_label2">
@@ -47,7 +47,7 @@
         </text>
         <check_box label=" " name="event_chk" />
         <text name="events_mature_label">
-                �벤트(M)
+                �벤트(성�)
         </text>
         <check_box label=" " name="event_mature_chk" />
         <combo_box label="내 친구들" name="friend combo" tool_tip="Friend to Show on Map">
@@ -55,16 +55,14 @@
                         내 친구들
                 </combo_item>
         </combo_box>
-        <combo_box label="내 경계 표지" name="landmark combo"
+        <combo_box label="내 랜드마�" name="landmark combo"
              tool_tip="Landmark to Show on Map">
                 <combo_item name="none_selected">
-                        내 경계 표지
+                        내 랜드마�
                 </combo_item>
         </combo_box>
-        <line_editor name="location" tool_tip="지역 �름 입력">
-                지역명으로 검색
-        </line_editor>
-        <button label="검색" label_selected="&gt;" name="DoSearch" tool_tip="지역 검색" />
+        <line_editor label="지역명으로 검색" name="location" tool_tip="지역 �름 입력" />
+        <button label="검색" name="DoSearch" tool_tip="지역 검색" />
         <text name="search_label">
                 검색 결과:
         </text>
@@ -73,20 +71,21 @@
                 <column label="" name="sim_name" />
         </scroll_list>
         <text name="location_label">
-                장소:
+                위치:
         </text>
-        <spinner name="spin x" tool_tip="현 위치� X 좌표 를지�� 표시" />
-        <spinner name="spin y" tool_tip="현 위치� Y 좌표 를지�� 표시" />
-        <spinner name="spin z" tool_tip="현 위치� Z 좌표 를 지�� 표시" />
+        <spinner name="spin x" tool_tip="현 위치� X 좌표를 지�� 표시" />
+        <spinner name="spin y" tool_tip="현 위치� Y 좌표를 지�� 표시" />
+        <spinner name="spin z" tool_tip="현 위치� Z 좌표를 지�� 표시" />
         <button label="텔리�트" label_selected="텔리�트" name="Teleport"
-             tool_tip="선� 지�으로 텔리�팅" />
+             tool_tip="선� 지�으로 텔리�트" />
         <button label="목�지 표시하기" label_selected="목�지 표시하기"
              name="Show Destination"
-             tool_tip="선�한 위치� 지�� 중심� 위치시킵니다" />
-        <button label="비우기" label_selected="비우기" name="Clear"
-             tool_tip="추� 중지" />
+             tool_tip="선�한 위치� 지�� 중심� 위치시킵니다." />
+        <button label="취소" label_selected="취소" name="Clear" tool_tip="추� 중지" />
         <button label="내 위치 표시하기" label_selected="내 위치 표시하기"
              name="Show My Location"
-             tool_tip="아바타� 위치� 지�� 중심� 위치시킵니다" />
-        <slider label="줌" name="zoom slider" />
+             tool_tip="아바타� 위치� 지�� 중심� 위치시킵니다." />
+        <button label="�립보드로 SLURL 복사하기" name="copy_slurl"
+             tool_tip="현재 위치를 웹�서 사용할 수 있�� SLURL로 복사합니다." />
+        <slider label="확대/축소" name="zoom slider" />
 </floater>
diff --git a/linden/indra/newview/skins/xui/ko/menu_inventory.xml b/linden/indra/newview/skins/xui/ko/menu_inventory.xml
index 795275f..dcf71d2 100644
--- a/linden/indra/newview/skins/xui/ko/menu_inventory.xml
+++ b/linden/indra/newview/skins/xui/ko/menu_inventory.xml
@@ -2,14 +2,15 @@
 <menu name="Popup">
         <menu_item_call label="구매" name="Task Buy" />
         <menu_item_call label="열기" name="Task Open" />
-        <menu_item_call label="플레�" name="Task Play" />
-        <menu_item_call label="특성" name="Task Properties" />
+        <menu_item_call label="재�" name="Task Play" />
+        <menu_item_call label="소유물" name="Task Properties" />
         <menu_item_call label="�름 변경" name="Task Rename" />
         <menu_item_call label="삭제" name="Task Remove" />
         <menu_item_call label="휴지통 비우기" name="Empty Trash" />
+        <menu_item_call label="분실 � 발견 �� 비우기" name="Empty Lost And Found" />
         <menu_item_call label="새 ��" name="New Folder" />
         <menu_item_call label="새 스�립트" name="New Script" />
-        <menu_item_call label="새 참고" name="New Note" />
+        <menu_item_call label="새 메모" name="New Note" />
         <menu_item_call label="새 제스처" name="New Gesture" />
         <menu name="New Clothes">
                 <menu_item_call label="새 셔츠" name="New Shirt" />
@@ -19,22 +20,22 @@
                 <menu_item_call label="새 재킷" name="New Jacket" />
                 <menu_item_call label="새 스커트" name="New Skirt" />
                 <menu_item_call label="새 장갑" name="New Gloves" />
-                <menu_item_call label="새 �셔츠" name="New Undershirt" />
-                <menu_item_call label="새 �바지" name="New Underpants" />
+                <menu_item_call label="새 내�(�)" name="New Undershirt" />
+                <menu_item_call label="새 내�(하)" name="New Underpants" />
         </menu>
         <menu name="New Body Parts">
                 <menu_item_call label="새 모습" name="New Shape" />
                 <menu_item_call label="새 피부" name="New Skin" />
-                <menu_item_call label="새 헤어스타�" name="New Hair" />
+                <menu_item_call label="새 헤어" name="New Hair" />
                 <menu_item_call label="새 눈" name="New Eyes" />
         </menu>
         <menu_item_call label="열기" name="Landmark Open" />
         <menu_item_call label="열기" name="Animation Open" />
         <menu_item_call label="열기" name="Sound Open" />
-        <menu_item_call label="아�템 삭제" name="Purge Item" />
-        <menu_item_call label="아�템 복�" name="Restore Item" />
+        <menu_item_call label="오브�트 삭제" name="Purge Item" />
+        <menu_item_call label="오브�트 복�" name="Restore Item" />
         <menu_item_call label="열기" name="Open" />
-        <menu_item_call label="특성" name="Properties" />
+        <menu_item_call label="소유물" name="Properties" />
         <menu_item_call label="�름 변경" name="Rename" />
         <menu_item_call label="�산 UUID 복사" name="Copy Asset UUID" />
         <menu_item_call label="복사" name="Copy" />
@@ -42,23 +43,23 @@
         <menu_item_call label="삭제" name="Delete" />
         <menu_item_call label="복장� 추가" name="Add To Outfit" />
         <menu_item_call label="복장 대체" name="Replace Outfit" />
-        <menu_item_call label="�륙 아�템" name="Take Off Items" />
-        <menu_item_call label="IM ��� 온�� 연�처" name="IM Online Contacts In Folder" />
-        <menu_item_call label="IM ��� 모든 연�처" name="IM All Contacts In Folder" />
-        <menu_item_call label="플레�" name="Sound Play" />
-        <menu_item_call label="지역 표시로 텔레�팅" name="Teleport To Landmark" />
-        <menu_item_call label="세계�서 플레�" name="Animation Play" />
-        <menu_item_call label="로컬�서 플레�" name="Animation Audition" />
+        <menu_item_call label="아�템 벗기" name="Take Off Items" />
+        <menu_item_call label="회� 채팅 시작" name="Conference Chat Folder" />
+        <menu_item_call label="재�" name="Sound Play" />
+        <menu_item_call label="랜드마�로 텔리�트" name="Teleport To Landmark" />
+        <menu_item_call label="월드�서 재�" name="Animation Play" />
+        <menu_item_call label="로컬 재�" name="Animation Audition" />
         <menu_item_call label="메신저 전송" name="Send Instant Message" />
-        <menu_item_call label="텔리�트 제공..." name="Offer Teleport..." />
+        <menu_item_call label="텔레�트 제공.." name="Offer Teleport..." />
+        <menu_item_call label="회� 채팅 시작" name="Conference Chat" />
         <menu_item_call label="활성화" name="Activate" />
-        <menu_item_call label="사용 안함" name="Deactivate" />
+        <menu_item_call label="비활성화" name="Deactivate" />
         <menu_item_call label="�신�서 분리" name="Detach From Yourself" />
         <menu_item_call label="ì°©ìš©" name="Object Wear" />
-        <menu label="부착 대�" name="Attach To" />
-        <menu label="HUD� 부착" name="Attach To HUD" />
+        <menu label="착용 대�" name="Attach To" />
+        <menu label="HUDì—� ì°©ìš©" name="Attach To HUD" />
         <menu_item_call label="ì°©ìš©" name="Wearable Wear" />
         <menu_item_call label="편집" name="Wearable Edit" />
-        <menu_item_call label="�륙" name="Take Off" />
+        <menu_item_call label="벗기" name="Take Off" />
         <menu_item_call label="--옵션 없�--" name="--no options--" />
 </menu>
diff --git a/linden/indra/newview/skins/xui/ko/menu_pie_avatar.xml b/linden/indra/newview/skins/xui/ko/menu_pie_avatar.xml
index dc3bffd..70d2e66 100644
--- a/linden/indra/newview/skins/xui/ko/menu_pie_avatar.xml
+++ b/linden/indra/newview/skins/xui/ko/menu_pie_avatar.xml
@@ -1,15 +1,17 @@
 <?xml version="1.0" encoding="utf-8" standalone="yes" ?>
 <pie_menu name="Avatar Pie">
-        <menu_item_call label="프로필..." name="Profile..." />
-        <menu_item_call label="�소거" name="Avatar Mute" />
+        <menu_item_call label="프로필…" name="Profile..." />
+        <menu_item_call label="차단" name="Avatar Mute" />
         <menu_item_call label="�� 장소" name="Go To" />
+        <menu_item_call label="�가" name="Rate" />
         <menu_item_call label="친구 추가" name="Add Friend" />
-        <menu_item_call label="지불..." name="Pay..." />
-        <pie_menu label="추가 &gt;" name="More &gt;">
-                <menu_item_call label="고정…" name="Freeze..." />
-                <menu_item_call label="카드 제공" name="Give Card" />
+        <menu_item_call label="지불…" name="Pay..." />
+        <pie_menu label="� 보기&gt;" name="More &gt;">
+                <menu_item_call label="�결" name="Freeze..." />
+                <menu_item_call label="카드 주기" name="Give Card" />
                 <menu_item_call label="축출…" name="Eject..." />
-                <menu_item_call label="Debug..." name="Debug..." />
+                <menu_item_call label="디버그..." name="Debug..." />
+                <menu_item_call label="검사" name="Object Inspect" />
         </pie_menu>
-        <menu_item_call label="IM 전송..." name="Send IM..." />
+        <menu_item_call label="쪽지 전송…" name="Send IM..." />
 </pie_menu>
diff --git a/linden/indra/newview/skins/xui/ko/menu_pie_object.xml b/linden/indra/newview/skins/xui/ko/menu_pie_object.xml
index bd115bd..e7e165e 100644
--- a/linden/indra/newview/skins/xui/ko/menu_pie_object.xml
+++ b/linden/indra/newview/skins/xui/ko/menu_pie_object.xml
@@ -4,20 +4,23 @@
         <menu_item_call label="만들기" name="Create" />
         <menu_item_call label="만지기" name="Object Touch" />
         <menu_item_call label="앉기" name="Object Sit" />
-        <menu_item_call label="사용하기" name="Pie Object Take" />
-        <menu_item_call label="지불..." name="Pay..." />
-        <pie_menu label="추가 &gt;" name="More &gt;">
+        <menu_item_call label="가지기" name="Pie Object Take" />
+        <menu_item_call label="지불…" name="Pay..." />
+        <pie_menu label="� 보기&gt;" name="More &gt;">
                 <menu_item_call label="삭제" name="Delete" />
                 <menu_item_call label="ì°©ìš©" name="Wear" />
                 <menu_item_call label="복사하기" name="Take Copy" />
-                <pie_menu label="HUD 부착 &gt;" name="Object Attach HUD" />
-                <pie_menu label="부착 &gt;" name="Object Attach" />
-                <menu_item_call label="반환..." name="Return..." />
-                <pie_menu label="추가 &gt;" name="Rate Menu">
-                        <menu_item_call label="ì•…ìš© ì‹ ê³ ..." name="Report Abuse..." />
-                        <menu_item_call label="�소거" name="Object Mute" />
+                <pie_menu label="HUD ì°©ìš© &gt;" name="Object Attach HUD" />
+                <pie_menu label="ì°©ìš© &gt;" name="Object Attach" />
+                <menu_item_call label="반환…" name="Return..." />
+                <pie_menu label="� 보기&gt;" name="Rate Menu">
+                        <menu_item_call label="소유주 �가…" name="Rate Owner..." />
+                        <menu_item_call label="신고하기…" name="Report Abuse..." />
+                        <menu_item_call label="�성� �가…" name="Rate Creator..." />
+                        <menu_item_call label="차단" name="Object Mute" />
+                        <menu_item_call label="검사" name="Object Inspect" />
                 </pie_menu>
                 <menu_item_call label="구매..." name="Buy..." />
         </pie_menu>
-        <menu_item_call label="편집…" name="Edit..." />
+        <menu_item_call label="편집..." name="Edit..." />
 </pie_menu>
diff --git a/linden/indra/newview/skins/xui/ko/menu_pie_self.xml b/linden/indra/newview/skins/xui/ko/menu_pie_self.xml
index bce2a60..8c09290 100644
--- a/linden/indra/newview/skins/xui/ko/menu_pie_self.xml
+++ b/linden/indra/newview/skins/xui/ko/menu_pie_self.xml
@@ -1,23 +1,23 @@
 <?xml version="1.0" encoding="utf-8" standalone="yes" ?>
 <pie_menu name="Self Pie">
-        <menu_item_call label="프로필..." name="Profile..." />
-        <menu_item_call label="그룹..." name="Groups..." />
-        <menu_item_call label="��..." name="Go..." />
+        <menu_item_call label="프로필…" name="Profile..." />
+        <menu_item_call label="그룹…" name="Groups..." />
+        <menu_item_call label="��¡¦" name="Go..." />
         <menu_item_call label="서기" name="Stand Up" />
-        <menu_item_call label="친구들…" name="Friends..." />
+        <menu_item_call label="친구" name="Friends..." />
         <menu_item_call label="제스처…" name="Gestures..." />
-        <pie_menu label="�륙 &gt;" name="Take Off &gt;">
-                <pie_menu label="�류 &gt;" name="Clothes &gt;">
+        <pie_menu label="벗기 &gt;" name="Take Off &gt;">
+                <pie_menu label="�� &gt;" name="Clothes &gt;">
                         <menu_item_call label="셔츠" name="Shirt" />
                         <menu_item_call label="바지" name="Pants" />
                         <menu_item_call label="신발" name="Shoes" />
                         <menu_item_call label="양�" name="Socks" />
                         <menu_item_call label="재킷" name="Jacket" />
                         <menu_item_call label="장갑" name="Gloves" />
-                        <pie_menu label="추가 &gt;" name="More &gt;">
-                                <menu_item_call label="�셔츠" name="Self Undershirt" />
-                                <menu_item_call label="모든 �류" name="All Clothes" />
-                                <menu_item_call label="�바지" name="Self Underpants" />
+                        <pie_menu label="� 보기&gt;" name="More &gt;">
+                                <menu_item_call label="내�(�)" name="Self Undershirt" />
+                                <menu_item_call label="모든 ��" name="All Clothes" />
+                                <menu_item_call label="내�(하)" name="Self Underpants" />
                         </pie_menu>
                         <menu_item_call label="치마" name="Skirt" />
                 </pie_menu>
@@ -25,5 +25,5 @@
                 <pie_menu label="분리 &gt;" name="Object Detach" />
                 <menu_item_call label="모� 분리" name="Detach All" />
         </pie_menu>
-        <menu_item_call label="외양..." name="Appearance..." />
+        <menu_item_call label="내 모습..." name="Appearance..." />
 </pie_menu>
diff --git a/linden/indra/newview/skins/xui/ko/menu_viewer.xml b/linden/indra/newview/skins/xui/ko/menu_viewer.xml
index 7e91b73..b82118d 100644
--- a/linden/indra/newview/skins/xui/ko/menu_viewer.xml
+++ b/linden/indra/newview/skins/xui/ko/menu_viewer.xml
@@ -2,21 +2,20 @@
 <menu_bar name="Main Menu">
         <menu label="파�" name="File">
                 <tearoff_menu label="~~~~~~~~~~~" name="~~~~~~~~~~~" />
-                <menu_item_call label="�미지 업로드(L$[COST])..." name="Upload Image" />
-                <menu_item_call label="사운드 업로드(L$[COST])..." name="Upload Sound" />
-                <menu_item_call label="애니메�션 업로드(L$[COST])..." name="Upload Animation" />
-                <menu_item_call label="벌� 업로드(파�당 L$[COST])..." name="Bulk Upload" />
+                <menu_item_call label="�미지 업로드(L$[COST])" name="Upload Image" />
+                <menu_item_call label="사운드 업로드(L$[COST])" name="Upload Sound" />
+                <menu_item_call label="애니메�션 업로드(L$[COST])" name="Upload Animation" />
+                <menu_item_call label="한꺼번� 업로드(파�당 L$[COST])" name="Bulk Upload" />
                 <menu_item_separator label="-----------" name="separator" />
                 <menu_item_call label="창 닫기" name="Close Window" />
                 <menu_item_separator label="-----------" name="separator2" />
-                <menu_item_call label="�스처를 다른 �름으로 저장..." name="Save Texture As..." />
+                <menu_item_call label="�스처를 다른 �름으로 저장" name="Save Texture As..." />
                 <menu_item_separator label="-----------" name="separator3" />
-                <menu_item_call label="스냅샷 �기" name="Take Snapshot" />
-                <menu_item_call label="디스�로 스냅샷" name="Snapshot to Disk" />
+                <menu_item_call label="스냅샷 미리보기" name="Take Snapshot" />
+                <menu_item_call label="스냅샷 �기" name="Snapshot to Disk" />
                 <menu_item_separator label="-----------" name="separator4" />
-                <menu_item_call label="디스�� �화 시작/중지" name="Start/Stop Movie to Disk" />
-                <menu label="윈�우 사�즈 조정" name="Set Window Size">
-                        <tearoff_menu label="~~~~~~~~~~~" name="~~~~~~~~~~~" />
+                <menu_item_call label="��� �기" name="Start/Stop Movie to Disk" />
+                <menu label="창 �기 조절" name="Set Window Size">
                         <menu_item_call label="320x240" name="320x240" />
                         <menu_item_call label="640x480" name="640x480" />
                         <menu_item_call label="800x600" name="800x600" />
@@ -25,127 +24,119 @@
                         <menu_item_call label="768x576(PAL)" name="768x576 (PAL)" />
                 </menu>
                 <menu_item_separator label="-----------" name="separator5" />
-                <menu_item_call label="�내기" name="Quit" />
+                <menu_item_call label="종료" name="Quit" />
         </menu>
         <menu label="편집" name="Edit">
-                <tearoff_menu label="~~~~~~~~~~~" name="~~~~~~~~~~~" />
                 <menu_item_call label="취소" name="Undo" />
-                <menu_item_call label="다시 실행" name="Redo" />
+                <menu_item_call label="반복" name="Redo" />
                 <menu_item_separator label="-----------" name="separator" />
                 <menu_item_call label="잘�내기" name="Cut" />
                 <menu_item_call label="복사" name="Copy" />
                 <menu_item_call label="붙여넣기" name="Paste" />
                 <menu_item_call label="삭제" name="Delete" />
                 <menu_item_separator label="-----------" name="separator2" />
-                <menu_item_call label="검색..." name="Search..." />
+                <menu_item_call label="검색" name="Search..." />
                 <menu_item_separator label="-----------" name="separator3" />
                 <menu_item_call label="모� 선�" name="Select All" />
-                <menu_item_call label="선� 해제" name="Deselect" />
+                <menu_item_call label="선� 취소" name="Deselect" />
                 <menu_item_separator label="-----------" name="separator4" />
                 <menu_item_call label="복제" name="Duplicate" />
                 <menu_item_separator label="-----------" name="separator5" />
-                <menu label="오브�트 연결" name="Attach Object" />
+                <menu label="오브�트 착용" name="Attach Object" />
                 <menu label="오브�트 분리" name="Detach Object" />
-                <menu label="옷 갈아입기" name="Take Off Clothing">
-                        <tearoff_menu label="~~~~~~~~~~~" name="~~~~~~~~~~~" />
+                <menu label="옷 벗기" name="Take Off Clothing">
                         <menu_item_call label="셔츠" name="Shirt" />
                         <menu_item_call label="바지" name="Pants" />
                         <menu_item_call label="신발" name="Shoes" />
                         <menu_item_call label="양�" name="Socks" />
                         <menu_item_call label="재킷" name="Jacket" />
                         <menu_item_call label="장갑" name="Gloves" />
-                        <menu_item_call label="�셔츠" name="Menu Undershirt" />
-                        <menu_item_call label="�바지" name="Menu Underpants" />
+                        <menu_item_call label="내�(�)" name="Menu Undershirt" />
+                        <menu_item_call label="내�(하)" name="Menu Underpants" />
                         <menu_item_call label="치마" name="Skirt" />
-                        <menu_item_call label="모든 �류" name="All Clothes" />
+                        <menu_item_call label="모든 ��" name="All Clothes" />
                 </menu>
                 <menu_item_separator label="-----------" name="separator6" />
-                <menu_item_call label="제스처…" name="Gestures..." />
-                <menu_item_call label="프로필..." name="Profile..." />
-                <menu_item_call label="외양..." name="Appearance..." />
+                <menu_item_call label="제스처" name="Gestures..." />
+                <menu_item_call label="프로필" name="Profile..." />
+                <menu_item_call label="내 모습" name="Appearance..." />
                 <menu_item_separator label="-----------" name="separator7" />
-                <menu_item_check label="친구들…" name="Friends..." />
-                <menu_item_call label="그룹..." name="Groups..." />
+                <menu_item_check label="친구" name="Friends..." />
+                <menu_item_call label="그룹" name="Groups..." />
                 <menu_item_separator label="-----------" name="separator8" />
-                <menu_item_call label="환경 설정..." name="Preferences..." />
+                <menu_item_call label="환경 설정" name="Preferences..." />
         </menu>
         <menu label="보기" name="View">
                 <tearoff_menu label="~~~~~~~~~~~" name="~~~~~~~~~~~" />
-                <menu_item_call label="마우스 시�" name="Mouselook" />
-                <menu_item_check label="짓기" name="Build" />
-                <menu_item_call label="보기 재설정" name="Reset View" />
-                <menu_item_call label="마지막 채터 보기" name="Look at Last Chatter" />
+                <menu_item_call label="1�칭 시�" name="Mouselook" />
+                <menu_item_check label="만들기" name="Build" />
+                <menu_item_call label="보기 초기화" name="Reset View" />
+                <menu_item_call label="�한 사람 보기" name="Look at Last Chatter" />
                 <menu_item_separator label="-----------" name="separator" />
-                <menu_item_check label="�구 모�" name="Toolbar" />
+                <menu_item_check label="툴바" name="Toolbar" />
                 <menu_item_check label="채팅 기�" name="Chat History" />
                 <menu_item_check label="메신저" name="Instant Message" />
-                <menu_item_call label="저장고" name="Inventory" />
-                <menu_item_check label="�소거 목�" name="Mute List" />
+                <menu_item_call label="�벤토리" name="Inventory" />
+                <menu_item_check label="차단 목�" name="Mute List" />
                 <menu_item_separator label="-----------" name="separator2" />
                 <menu_item_check label="카메� 제어" name="Camera Controls" />
                 <menu_item_check label="움�임 제어" name="Movement Controls" />
-                <menu_item_check label="세계 지�" name="World Map" />
-                <menu_item_check label="미니 지�" name="Mini-Map" />
+                <menu_item_check label="월드 지�" name="World Map" />
+                <menu_item_check label="미니지�" name="Mini-Map" />
                 <menu_item_separator label="-----------" name="separator3" />
-                <menu_item_check label="통계 표시줄" name="Statistics Bar" />
-                <menu_item_check label="특성 행" name="Property Lines" />
+                <menu_item_check label="통계보기" name="Statistics Bar" />
+                <menu_item_check label="소유물 행" name="Property Lines" />
                 <menu_item_check label="토지 소유주" name="Land Owners" />
                 <menu_item_separator label="-----------" name="separator4" />
-                <menu label="�움�보기" name="Hover Tips">
-                        <tearoff_menu label="~~~~~~~~~~~" name="~~~~~~~~~~~" />
+                <menu label="�" name="Hover Tips">
                         <menu_item_check label="� 표시" name="Show Tips" />
                         <menu_item_separator label="-----------" name="separator" />
-                        <menu_item_check label="토지 정보" name="Land Tips" />
-                        <menu_item_check label="모든 아�템� �" name="Tips On All Objects" />
+                        <menu_item_check label="토지 �" name="Land Tips" />
+                        <menu_item_check label="모든 오브�트 �" name="Tips On All Objects" />
                 </menu>
-                <menu_item_check label="대안�으로 물리� 사항 표시" name="Alt Shows Physical" />
-                <menu_item_check label="투명 강조표시" name="Highlight Transparent" />
-                <menu label="지표만들기" name="Beacons">
-                        <tearoff_menu label="~~~~~~~~~~~" name="~~~~~~~~~~~" />
-                        <menu_item_check label="스�립트� 아�템" name="Scripted Objects" />
-                        <menu_item_check label="물리� 사물" name="Physical Objects" />
-                        <menu_item_check label="사운드 소스" name="Sound Sources" />
-                        <menu_item_check label="특수효과 소스" name="Particle Sources" />
+                <menu_item_check label="Alt 키로 물리 오브�트 보기" name="Alt Shows Physical" />
+                <menu_item_check label="투명 오브�트 보기" name="Highlight Transparent" />
+                <menu label="표�" name="Beacons">
+                        <menu_item_check label="스�립트� 오브�트" name="Scripted Objects" />
+                        <menu_item_check label="물리 엔진 오브�트" name="Physical Objects" />
+                        <menu_item_check label="사운드" name="Sound Sources" />
+                        <menu_item_check label="파티�" name="Particle Sources" />
                         <menu_item_separator label="-----------" name="separator" />
-                        <menu_item_check label="�펙트 숨기기" name="Hide Particles" />
+                        <menu_item_check label="파티� 숨기기" name="Hide Particles" />
                 </menu>
-                <menu_item_check label="HUD 부착물 표시" name="Show HUD Attachments" />
+                <menu_item_check label="착용 HUD 보기" name="Show HUD Attachments" />
                 <menu_item_separator label="-----------" name="separator5" />
                 <menu_item_call label="확대" name="Zoom In" />
-                <menu_item_call label="줌 기본 설정" name="Zoom Default" />
+                <menu_item_call label="기본" name="Zoom Default" />
                 <menu_item_call label="축소" name="Zoom Out" />
                 <menu_item_separator label="-----------" name="separator6" />
-                <menu label="More" name="More">
-                        <menu_item_call label="전체화면 토글" name="Toggle Fullscreen" />
-                        <menu_item_call label="UI �기를 기본 설정으로 설정" name="Set UI Size to Default" />
-                </menu>
+                <menu_item_call label="전체 화면" name="Toggle Fullscreen" />
+                <menu_item_call label="메뉴창 기본 �기" name="Set UI Size to Default" />
         </menu>
-        <menu label="세계" name="World">
-                <tearoff_menu label="~~~~~~~~~~~" name="~~~~~~~~~~~" />
+        <menu label="월드" name="World">
                 <menu_item_call label="채팅" name="Chat" />
                 <menu_item_call label="제스처 시작" name="Start Gesture" />
-                <menu_item_check label="항� 실행" name="Always Run" />
+                <menu_item_check label="항� 뛰기" name="Always Run" />
                 <menu_item_check label="비행" name="Fly" />
                 <menu_item_separator label="-----------" name="separator" />
-                <menu_item_call label="여기� �역표시 �성" name="Create Landmark Here" />
-                <menu_item_call label="�곳� 집으로 설정" name="Set Home to Here" />
+                <menu_item_call label="여기� 랜드마� �성" name="Create Landmark Here" />
+                <menu_item_call label="�곳� 홈으로 설정" name="Set Home to Here" />
                 <menu_item_separator label="-----------" name="separator2" />
-                <menu_item_call label="텔레�팅 홈" name="Teleport Home" />
+                <menu_item_call label="홈으로 텔리�트" name="Teleport Home" />
                 <menu_item_separator label="-----------" name="separator3" />
                 <menu_item_call label="�리비움 설정" name="Set Away" />
                 <menu_item_call label="다른 용무 중 설정" name="Set Busy" />
                 <menu_item_separator label="-----------" name="separator4" />
-                <menu_item_call label="계정 기�…" name="Account History..." />
-                <menu_item_call label="내 계정 관리..." name="Manage My Account..." />
-                <menu_item_call label="L$구매..." name="Buy and Sell L$..." />
+                <menu_item_call label="계정 기�" name="Account History..." />
+                <menu_item_call label="내 계정 관리" name="Manage My Account..." />
+                <menu_item_call label="린든달러(L$) 구매" name="Buy and Sell L$..." />
                 <menu_item_separator label="-----------" name="separator5" />
-                <menu_item_call label="내 토지..." name="My Land..." />
-                <menu_item_call label="토지 소개..." name="About Land..." />
-                <menu_item_call label="토지 구매하기..." name="Buy Land..." />
-                <menu_item_call label="지역/소유지..." name="Region/Estate..." />
+                <menu_item_call label="내 토지" name="My Land..." />
+                <menu_item_call label="토지 소개" name="About Land..." />
+                <menu_item_call label="토지 구매하기" name="Buy Land..." />
+                <menu_item_call label="지역/사유지" name="Region/Estate..." />
                 <menu_item_separator label="-----------" name="separator6" />
                 <menu label="태양 조정" name="Force Sun">
-                        <tearoff_menu label="~~~~~~~~~~~" name="~~~~~~~~~~~" />
                         <menu_item_call label="�출" name="Sunrise" />
                         <menu_item_call label="정오" name="Noon" />
                         <menu_item_call label="�몰" name="Sunset" />
@@ -154,74 +145,73 @@
                         <menu_item_call label="지역 기본 설정으로 ��리기" name="Revert to Region Default" />
                 </menu>
         </menu>
-        <menu label="�구들" name="Tools">
-                <tearoff_menu label="~~~~~~~~~~~" name="~~~~~~~~~~~" />
-                <menu label="선��구" name="Select Tool">
-                        <tearoff_menu label="~~~~~~~~~~~" name="~~~~~~~~~~~" />
-                        <menu_item_call label="촛�" name="Focus" />
+        <menu label="�구" name="Tools">
+                <menu label="�구 선�" name="Select Tool">
+                        <menu_item_call label="보기" name="Focus" />
                         <menu_item_call label="��" name="Move" />
                         <menu_item_call label="편집" name="Edit" />
                         <menu_item_call label="만들기" name="Create" />
                         <menu_item_call label="토지" name="Land" />
                 </menu>
                 <menu_item_separator label="-----------" name="separator" />
-                <menu_item_check label="내 아�템만 선�" name="Select Only My Objects" />
-                <menu_item_check label="�� 가능한 아�템만 선�" name="Select Only Movable Objects" />
+                <menu_item_check label="내 오브�트만 선�" name="Select Only My Objects" />
+                <menu_item_check label="�� 가능한 오브�트만 선�"
+                     name="Select Only Movable Objects" />
                 <menu_item_check label="환경별 선�" name="Select By Surrounding" />
-                <menu_item_check label="숨� 선� 사항 표시" name="Show Hidden Selection" />
+                <menu_item_check label="숨� 선� 부분 표시" name="Show Hidden Selection" />
                 <menu_item_check label="선� 사항� 대한 빛 반지름 표시"
                      name="Show Light Radius for Selection" />
-                <menu_item_check label="선� 빛 표시" name="Show Selection Beam" />
+                <menu_item_check label="선� 광선 표시" name="Show Selection Beam" />
                 <menu_item_separator label="-----------" name="separator2" />
-                <menu_item_check label="그리드� 붙�기" name="Snap to Grid" />
-                <menu_item_call label="개체 XY를 그리드� 붙�기" name="Snap Object XY to Grid" />
-                <menu_item_call label="그리드 선� 사항 사용" name="Use Selection for Grid" />
-                <menu_item_call label="그리드 옵션" name="Grid Options..." />
+                <menu_item_check label="�� 정렬" name="Snap to Grid" />
+                <menu_item_call label="오브�트 XY를 �� 정렬" name="Snap Object XY to Grid" />
+                <menu_item_call label="오브�트 기준 �� 정렬" name="Use Selection for Grid" />
+                <menu_item_call label="그리드 옵션…" name="Grid Options..." />
                 <menu_item_separator label="-----------" name="separator3" />
                 <menu_item_call label="ì—°ê²°" name="Link" />
                 <menu_item_call label="연결 해제" name="Unlink" />
                 <menu_item_separator label="-----------" name="separator4" />
                 <menu_item_call label="모든 애니메�션 중지" name="Stop All Animations" />
                 <menu_item_separator label="-----------" name="separator5" />
-                <menu_item_call label="선� 사항� 촛�" name="Focus on Selection" />
-                <menu_item_call label="선� 사항� 줌" name="Zoom to Selection" />
-                <menu_item_call label="아�템 구매" name="Menu Object Take" />
+                <menu_item_call label="선� 오브�트� 초� 맞추기" name="Focus on Selection" />
+                <menu_item_call label="선� �역 확대/축소" name="Zoom to Selection" />
+                <menu_item_call label="오브�트 구매" name="Menu Object Take" />
                 <menu_item_call label="복사하기" name="Take Copy" />
-                <menu_item_call label="내 보관함� 사물 다시 저장"
+                <menu_item_call label="내 �벤토리� 오브�트 다시 저장"
                      name="Save Object Back to My Inventory" />
-                <menu_item_call label="아�템 컨�츠� 아�템 다시 저장"
+                <menu_item_call label="오브�트 컨�츠� 오브�트 다시 저장"
                      name="Save Object Back to Object Contents" />
                 <menu_item_separator label="-----------" name="separator6" />
                 <menu_item_call label="스�립트 경고/오류 창 표시"
                      name="Show Script Warning/Error Window" />
-                <menu_item_call label="선� 사항� 스�립트 다시 컴파�"
+                <menu_item_call label="선� 사항� 스�립트 리컴파�"
                      name="Recompile Scripts in Selection" />
-                <menu_item_call label="선� 사항� 스�립트 재설정"
+                <menu_item_call label="선� 사항� 스�립트 초기화"
                      name="Reset Scripts in Selection" />
-                <menu_item_call label="선� 사항�서 실행으로 스�립트 설정"
+                <menu_item_call label="선� 오브�트� 스�립트 실행"
                      name="Set Scripts to Running in Selection" />
-                <menu_item_call label="선� 사항�서 실행 안함으로 스�립트 설정"
+                <menu_item_call label="선� 오브�트� 스�립트 중단"
                      name="Set Scripts to Not Running in Selection" />
+                <menu_item_separator label="-----------" name="separator6" />
+                <menu_item_call label="버그 신고" name="Report Bug..." />
         </menu>
         <menu label="�움�" name="Help">
-                <tearoff_menu label="~~~~~~~~~~~" name="~~~~~~~~~~~" />
-                <menu_item_call label="Second Life �움�" name="Second Life Help" />
-                <menu_item_call label="기술 �료..." name="Knowledge Base..." />
-                <menu_item_call label="��브 �움�..." name="Live Help..." />
+                <menu_item_call label="세컨드��프 �움�" name="Second Life Help" />
+                <menu_item_call label="�월드 �움�" name="In-World Help" />
+                <menu_item_call label="추가 �움�" name="Additional Help" />
                 <menu_item_separator label="-----------" name="separator" />
-                <menu_item_call label="공� 린든 블로그..." name="Official Linden Blog..." />
+                <menu_item_call label="공� 린든 블로그" name="Official Linden Blog..." />
                 <menu_item_separator label="-----------" name="separator2" />
                 <menu_item_call label="스�립팅 가�드..." name="Scripting Guide..." />
-                <menu_item_call label="스�립팅 위키..." name="Scripting Wiki..." />
+                <menu_item_call label="스�립팅 �탈" name="Scripting Portal..." />
                 <menu_item_separator label="-----------" name="separator3" />
-                <menu_item_call label="오늘� 메시지..." name="Message of the Day..." />
+                <menu_item_call label="오늘� 메시지" name="Message of the Day..." />
                 <menu_item_separator label="-----------" name="separator4" />
-                <menu_item_call label="ì•…ìš© ì‹ ê³ ..." name="Report Abuse..." />
-                <menu_item_call label="추방, 밀기 � 때리기..." name="Bumps, Pushes &amp;amp; Hits..." />
+                <menu_item_call label="신고하기…" name="Report Abuse..." />
+                <menu_item_call label="밀기, 타격 등 �지" name="Bumps, Pushes &amp;amp; Hits..." />
                 <menu_item_separator label="-----------" name="separator5" />
-                <menu_item_call label="버그 신고..." name="Report Bug..." />
-                <menu_item_call label="출시 정보..." name="Release Notes..." />
+                <menu_item_call label="출시 정보" name="Release Notes..." />
                 <menu_item_separator label="-----------" name="separator6" />
-                <menu_item_call label="Second Life 소개…" name="About Second Life..." />
+                <menu_item_call label="세컨드��프 정보" name="About Second Life..." />
         </menu>
 </menu_bar>
diff --git a/linden/indra/newview/skins/xui/ko/need_to_translate.xml b/linden/indra/newview/skins/xui/ko/need_to_translate.xml
index b262393..2405b62 100644
--- a/linden/indra/newview/skins/xui/ko/need_to_translate.xml
+++ b/linden/indra/newview/skins/xui/ko/need_to_translate.xml
@@ -1,2 +1,658 @@
-<?xml version="1.0" encoding="utf-8" standalone="yes" ?>

-<strings />

+<?xml version="1.0"?>

+<?mso-application progid="Excel.Sheet"?>

+<Workbook xmlns="urn:schemas-microsoft-com:office:spreadsheet"

+ xmlns:o="urn:schemas-microsoft-com:office:office"

+ xmlns:x="urn:schemas-microsoft-com:office:excel"

+ xmlns:ss="urn:schemas-microsoft-com:office:spreadsheet"

+ xmlns:html="http://www.w3.org/TR/REC-html40">

+ <DocumentProperties xmlns="urn:schemas-microsoft-com:office:office">

+  <Author>dongyunyoum</Author>

+  <LastAuthor>Leyla Farazha</LastAuthor>

+  <Created>2007-06-04T06:38:01Z</Created>

+  <LastSaved>2007-06-05T18:22:13Z</LastSaved>

+  <Company>organization</Company>

+  <Version>11.6568</Version>

+ </DocumentProperties>

+ <ExcelWorkbook xmlns="urn:schemas-microsoft-com:office:excel">

+  <WindowHeight>11145</WindowHeight>

+  <WindowWidth>16560</WindowWidth>

+  <WindowTopX>360</WindowTopX>

+  <WindowTopY>30</WindowTopY>

+  <ProtectStructure>False</ProtectStructure>

+  <ProtectWindows>False</ProtectWindows>

+ </ExcelWorkbook>

+ <Styles>

+  <Style ss:ID="Default" ss:Name="Normal">

+   <Alignment ss:Vertical="Center"/>

+   <Borders/>

+   <Font ss:FontName="�움" x:CharSet="129" x:Family="Modern" ss:Size="11"/>

+   <Interior/>

+   <NumberFormat/>

+   <Protection/>

+  </Style>

+  <Style ss:ID="s21">

+   <Font ss:FontName="굴림" x:CharSet="129" x:Family="Modern" ss:Size="11"/>

+  </Style>

+  <Style ss:ID="s22">

+   <Font ss:FontName="�움" x:CharSet="129" x:Family="Modern" ss:Size="11"

+    ss:Bold="1"/>

+  </Style>

+  <Style ss:ID="s23">

+   <Font ss:FontName="�움" x:CharSet="129" x:Family="Modern" ss:Size="11"

+    ss:Bold="1"/>

+   <Interior ss:Color="#C0C0C0" ss:Pattern="Solid"/>

+  </Style>

+  <Style ss:ID="s24">

+   <Alignment ss:Vertical="Center" ss:WrapText="1"/>

+  </Style>

+  <Style ss:ID="s25">

+   <Font ss:FontName="굴림" x:CharSet="129" x:Family="Modern" ss:Size="11"/>

+   <Interior/>

+  </Style>

+  <Style ss:ID="s26">

+   <Font ss:FontName="굴림" x:CharSet="129" x:Family="Modern" ss:Size="9"/>

+  </Style>

+ </Styles>

+ <Worksheet ss:Name="need_to_translate">

+  <Table ss:ExpandedColumnCount="9" ss:ExpandedRowCount="91" x:FullColumns="1"

+   x:FullRows="1" ss:DefaultColumnWidth="54" ss:DefaultRowHeight="16.5">

+   <Column ss:AutoFitWidth="0" ss:Width="117"/>

+   <Column ss:Width="81"/>

+   <Column ss:Width="100.5"/>

+   <Column ss:Width="74.25"/>

+   <Column ss:AutoFitWidth="0" ss:Width="231.75"/>

+   <Column ss:AutoFitWidth="0" ss:Width="199.5"/>

+   <Column ss:AutoFitWidth="0" ss:Width="255.75"/>

+   <Column ss:StyleID="s21" ss:AutoFitWidth="0" ss:Width="168"/>

+   <Column ss:AutoFitWidth="0" ss:Width="123"/>

+   <Row ss:AutoFitHeight="0">

+    <Cell ss:StyleID="s22"><Data ss:Type="String">/strings</Data></Cell>

+   </Row>

+   <Row ss:AutoFitHeight="0">

+    <Cell ss:StyleID="s23"><Data ss:Type="String">/string/a_file</Data></Cell>

+    <Cell ss:StyleID="s23"><Data ss:Type="String">/string/b_path</Data></Cell>

+    <Cell ss:StyleID="s23"><Data ss:Type="String">/string/c_attribute</Data></Cell>

+    <Cell ss:StyleID="s23"><Data ss:Type="String">/string/d_old</Data></Cell>

+    <Cell ss:StyleID="s23"><Data ss:Type="String">/string/e_new</Data></Cell>

+    <Cell ss:StyleID="s23"><Data ss:Type="String">/string/f_old_trans</Data></Cell>

+    <Cell ss:StyleID="s23"><Data ss:Type="String">/string/f_translation</Data></Cell>

+   </Row>

+   <Row ss:AutoFitHeight="0">

+    <Cell><Data ss:Type="String">alerts.xml</Data></Cell>

+    <Cell><Data ss:Type="String">//WearableSave/message</Data></Cell>

+    <Cell ss:Index="5"><Data ss:Type="String">Save changes to current clothing/body part?</Data></Cell>

+    <Cell ss:Index="7" ss:StyleID="s21"><Data ss:Type="String">현재 내 모습� 저장 하시겠습니까?</Data></Cell>

+   </Row>

+   <Row ss:AutoFitHeight="0">

+    <Cell><Data ss:Type="String">alerts.xml</Data></Cell>

+    <Cell><Data ss:Type="String">//WearableSave/Save</Data></Cell>

+    <Cell ss:Index="5"><Data ss:Type="String">Save</Data></Cell>

+    <Cell ss:Index="7" ss:StyleID="s21"><Data ss:Type="String">저장</Data></Cell>

+   </Row>

+   <Row ss:AutoFitHeight="0">

+    <Cell><Data ss:Type="String">alerts.xml</Data></Cell>

+    <Cell><Data ss:Type="String">//WearableSave/Don'tSave</Data></Cell>

+    <Cell ss:Index="5"><Data ss:Type="String">Don't Save</Data></Cell>

+    <Cell ss:Index="7" ss:StyleID="s21"><Data ss:Type="String">저장하지 않�</Data></Cell>

+   </Row>

+   <Row ss:AutoFitHeight="0">

+    <Cell><Data ss:Type="String">alerts.xml</Data></Cell>

+    <Cell><Data ss:Type="String">//WearableSave/Cancel</Data></Cell>

+    <Cell ss:Index="5"><Data ss:Type="String">Cancel</Data></Cell>

+    <Cell ss:Index="7" ss:StyleID="s21"><Data ss:Type="String">취소</Data></Cell>

+   </Row>

+   <Row ss:AutoFitHeight="0">

+    <Cell><Data ss:Type="String">alerts.xml</Data></Cell>

+    <Cell><Data ss:Type="String">//ClassifiedSave/message</Data></Cell>

+    <Cell ss:Index="5"><Data ss:Type="String">Save changes to classified [NAME]?</Data></Cell>

+    <Cell ss:Index="7" ss:StyleID="s21"><Data ss:Type="String">[NAME]광고� 저장 하시겠습니까?</Data></Cell>

+   </Row>

+   <Row ss:AutoFitHeight="0">

+    <Cell><Data ss:Type="String">alerts.xml</Data></Cell>

+    <Cell><Data ss:Type="String">//ClassifiedSave/Save</Data></Cell>

+    <Cell ss:Index="5"><Data ss:Type="String">Save</Data></Cell>

+    <Cell ss:Index="7" ss:StyleID="s21"><Data ss:Type="String">저장</Data></Cell>

+   </Row>

+   <Row ss:AutoFitHeight="0">

+    <Cell><Data ss:Type="String">alerts.xml</Data></Cell>

+    <Cell><Data ss:Type="String">//ClassifiedSave/Don'tSave</Data></Cell>

+    <Cell ss:Index="5"><Data ss:Type="String">Don't Save</Data></Cell>

+    <Cell ss:Index="7" ss:StyleID="s21"><Data ss:Type="String">저장하지 않�</Data></Cell>

+   </Row>

+   <Row ss:AutoFitHeight="0">

+    <Cell><Data ss:Type="String">alerts.xml</Data></Cell>

+    <Cell><Data ss:Type="String">//ClassifiedSave/Cancel</Data></Cell>

+    <Cell ss:Index="5"><Data ss:Type="String">Cancel</Data></Cell>

+    <Cell ss:Index="7" ss:StyleID="s21"><Data ss:Type="String">취소</Data></Cell>

+   </Row>

+   <Row ss:AutoFitHeight="0" ss:Height="148.5">

+    <Cell><Data ss:Type="String">alerts.xml</Data></Cell>

+    <Cell><Data ss:Type="String">//DisplaySettingsNoShaders/message</Data></Cell>

+    <Cell ss:Index="5" ss:StyleID="s24"><Data ss:Type="String">[SECOND_LIFE] crashed while initializing graphics drivers.&#10;Shaders will be disabled in order to avoid some common driver errors.&#10;This will disable some graphics features.&#10;We recommend updating your graphics card drivers.&#10;Shaders can be re-enabled in Preferences &gt; Graphics Detail.</Data></Cell>

+    <Cell ss:Index="7" ss:StyleID="s21"><Data ss:Type="String">그래픽 드��버 ��중 오류가 발�했습니다. �반�� 드��버 오류를 피하기 위해 ���는 ��으로 비활성 � 것 입니다. �것� �부 그래픽 관련 효과를 비활성 시킬 것 입니다.그래픽 카드나 드�아버� 업��트를 권유합니다. ���는 환경설정&gt;그래픽 디테� �서 다시 활성화 시킬 수 있습니다.</Data></Cell>

+   </Row>

+   <Row ss:AutoFitHeight="0">

+    <Cell><Data ss:Type="String">alerts.xml</Data></Cell>

+    <Cell><Data ss:Type="String">//WebLaunchBugReport101/message</Data></Cell>

+    <Cell ss:Index="5"><Data ss:Type="String">Visit the [SECOND_LIFE] Wiki and Learn how to Report Bugs Correctly.</Data></Cell>

+    <Cell ss:Index="7" ss:StyleID="s21"><Data ss:Type="String">세컨드��프 위키�서 버그신고� 대해 보기</Data></Cell>

+   </Row>

+   <Row ss:AutoFitHeight="0">

+    <Cell><Data ss:Type="String">alerts.xml</Data></Cell>

+    <Cell><Data ss:Type="String">//WebLaunchBugReport101/ignore</Data></Cell>

+    <Cell ss:Index="5"><Data ss:Type="String">When launching web browser to view the Bug Reporting 101 Wiki</Data></Cell>

+    <Cell ss:Index="7" ss:StyleID="s21"><Data ss:Type="String">버그신고 101 위키를 웹 브�우저�서 볼때 </Data></Cell>

+   </Row>

+   <Row ss:AutoFitHeight="0">

+    <Cell><Data ss:Type="String">alerts.xml</Data></Cell>

+    <Cell><Data ss:Type="String">//WebLaunchBugReport101/Gotopage</Data></Cell>

+    <Cell ss:Index="5"><Data ss:Type="String">OK</Data></Cell>

+    <Cell ss:Index="7" ss:StyleID="s21"><Data ss:Type="String">확�</Data></Cell>

+   </Row>

+   <Row ss:AutoFitHeight="0">

+    <Cell><Data ss:Type="String">alerts.xml</Data></Cell>

+    <Cell><Data ss:Type="String">//WebLaunchBugReport101/Cancel</Data></Cell>

+    <Cell ss:Index="5"><Data ss:Type="String">Cancel</Data></Cell>

+    <Cell ss:Index="7" ss:StyleID="s21"><Data ss:Type="String">취소</Data></Cell>

+   </Row>

+   <Row ss:AutoFitHeight="0">

+    <Cell><Data ss:Type="String">alerts.xml</Data></Cell>

+    <Cell><Data ss:Type="String">//WebLaunchSecurityIssues/message</Data></Cell>

+    <Cell ss:Index="5"><Data ss:Type="String">Visit the [SECOND_LIFE] Wiki for Details of How to Report a Security Issue.</Data></Cell>

+    <Cell ss:Index="7" ss:StyleID="s21"><Data ss:Type="String">세컨드��프 위키�서 보안 관련 신고� 대해 보기</Data></Cell>

+   </Row>

+   <Row ss:AutoFitHeight="0">

+    <Cell><Data ss:Type="String">alerts.xml</Data></Cell>

+    <Cell><Data ss:Type="String">//WebLaunchSecurityIssues/ignore</Data></Cell>

+    <Cell ss:Index="5"><Data ss:Type="String">When launching web browser to view Security Issues Wiki</Data></Cell>

+    <Cell ss:Index="7" ss:StyleID="s21"><Data ss:Type="String">보안 관련 위키를 웹 브�우저�서 볼때 </Data></Cell>

+   </Row>

+   <Row ss:AutoFitHeight="0">

+    <Cell><Data ss:Type="String">alerts.xml</Data></Cell>

+    <Cell><Data ss:Type="String">//WebLaunchSecurityIssues/Gotopage</Data></Cell>

+    <Cell ss:Index="5"><Data ss:Type="String">OK</Data></Cell>

+    <Cell ss:Index="7" ss:StyleID="s21"><Data ss:Type="String">확�</Data></Cell>

+   </Row>

+   <Row ss:AutoFitHeight="0">

+    <Cell><Data ss:Type="String">alerts.xml</Data></Cell>

+    <Cell><Data ss:Type="String">//WebLaunchSecurityIssues/Cancel</Data></Cell>

+    <Cell ss:Index="5"><Data ss:Type="String">Cancel</Data></Cell>

+    <Cell ss:Index="7" ss:StyleID="s21"><Data ss:Type="String">취소</Data></Cell>

+   </Row>

+   <Row ss:AutoFitHeight="0">

+    <Cell><Data ss:Type="String">alerts.xml</Data></Cell>

+    <Cell><Data ss:Type="String">//WebLaunchPublicIssue/message</Data></Cell>

+    <Cell ss:Index="5"><Data ss:Type="String">Visit the [SECOND_LIFE] Public Issue Tracker, Where you can Report Bugs and other Issues.</Data></Cell>

+    <Cell ss:Index="7" ss:StyleID="s21"><Data ss:Type="String">�슈 트랙�서 버그 � 보안 관련 신고 보기</Data></Cell>

+   </Row>

+   <Row ss:AutoFitHeight="0">

+    <Cell><Data ss:Type="String">alerts.xml</Data></Cell>

+    <Cell><Data ss:Type="String">//WebLaunchPublicIssue/ignore</Data></Cell>

+    <Cell ss:Index="5"><Data ss:Type="String">When launching web browser to view the Public Issue Tracker</Data></Cell>

+    <Cell ss:Index="7" ss:StyleID="s21"><Data ss:Type="String">�슈 트랙� 웹 브�우저�서 볼때 </Data></Cell>

+   </Row>

+   <Row ss:AutoFitHeight="0">

+    <Cell><Data ss:Type="String">alerts.xml</Data></Cell>

+    <Cell><Data ss:Type="String">//WebLaunchPublicIssue/Gotopage</Data></Cell>

+    <Cell ss:Index="5"><Data ss:Type="String">Go to page</Data></Cell>

+    <Cell ss:Index="7" ss:StyleID="s21"><Data ss:Type="String">확�</Data></Cell>

+   </Row>

+   <Row ss:AutoFitHeight="0">

+    <Cell><Data ss:Type="String">alerts.xml</Data></Cell>

+    <Cell><Data ss:Type="String">//WebLaunchPublicIssue/Cancel</Data></Cell>

+    <Cell ss:Index="5"><Data ss:Type="String">Cancel</Data></Cell>

+    <Cell ss:Index="7" ss:StyleID="s21"><Data ss:Type="String">취소</Data></Cell>

+   </Row>

+   <Row ss:AutoFitHeight="0">

+    <Cell><Data ss:Type="String">alerts.xml</Data></Cell>

+    <Cell><Data ss:Type="String">//WebLaunchPublicIssueHelp/message</Data></Cell>

+    <Cell ss:Index="5"><Data ss:Type="String">Visit the [SECOND_LIFE] Wiki for info on how to use the Public Issue Tracker.</Data></Cell>

+    <Cell ss:Index="7" ss:StyleID="s21"><Data ss:Type="String">세컨드��프 위키�서 �슈 트랙� 대해 보기</Data></Cell>

+   </Row>

+   <Row ss:AutoFitHeight="0">

+    <Cell><Data ss:Type="String">alerts.xml</Data></Cell>

+    <Cell><Data ss:Type="String">//WebLaunchPublicIssueHelp/ignore</Data></Cell>

+    <Cell ss:Index="5"><Data ss:Type="String">When launching web browser to view Public Issue Tracker Wiki</Data></Cell>

+    <Cell ss:Index="7" ss:StyleID="s21"><Data ss:Type="String">�슈 트랙 관련 위키를 웹 브�우저�서 볼때 </Data></Cell>

+   </Row>

+   <Row ss:AutoFitHeight="0">

+    <Cell><Data ss:Type="String">alerts.xml</Data></Cell>

+    <Cell><Data ss:Type="String">//WebLaunchPublicIssueHelp/Gotopage</Data></Cell>

+    <Cell ss:Index="5"><Data ss:Type="String">Go to page</Data></Cell>

+    <Cell ss:Index="7" ss:StyleID="s21"><Data ss:Type="String">확�</Data></Cell>

+   </Row>

+   <Row ss:AutoFitHeight="0">

+    <Cell><Data ss:Type="String">alerts.xml</Data></Cell>

+    <Cell><Data ss:Type="String">//WebLaunchPublicIssueHelp/Cancel</Data></Cell>

+    <Cell ss:Index="5"><Data ss:Type="String">Cancel</Data></Cell>

+    <Cell ss:Index="7" ss:StyleID="s21"><Data ss:Type="String">취소</Data></Cell>

+   </Row>

+   <Row ss:AutoFitHeight="0">

+    <Cell><Data ss:Type="String">alerts.xml</Data></Cell>

+    <Cell><Data ss:Type="String">//ConfirmKick/Kick</Data></Cell>

+    <Cell ss:Index="5"><Data ss:Type="String">Kick All Users</Data></Cell>

+    <Cell ss:Index="7" ss:StyleID="s21"><Data ss:Type="String">추방하기</Data></Cell>

+   </Row>

+   <Row ss:AutoFitHeight="0">

+    <Cell><Data ss:Type="String">alerts.xml</Data></Cell>

+    <Cell><Data ss:Type="String">//ConfirmKick/Cancel</Data></Cell>

+    <Cell ss:Index="5"><Data ss:Type="String">Cancel</Data></Cell>

+    <Cell ss:Index="7" ss:StyleID="s21"><Data ss:Type="String">취소</Data></Cell>

+   </Row>

+   <Row ss:AutoFitHeight="0" ss:Height="33">

+    <Cell><Data ss:Type="String">alerts.xml</Data></Cell>

+    <Cell><Data ss:Type="String">//ConfirmClearBrowserCache/message</Data></Cell>

+    <Cell ss:Index="5" ss:StyleID="s24"><Data ss:Type="String">Are you sure you want to clear your&#10;browser cache?</Data></Cell>

+    <Cell ss:Index="7" ss:StyleID="s21"><Data ss:Type="String">브�우저� �쉬를 전부 삭제 하시겠습니까?</Data></Cell>

+   </Row>

+   <Row ss:AutoFitHeight="0">

+    <Cell><Data ss:Type="String">alerts.xml</Data></Cell>

+    <Cell><Data ss:Type="String">//ConfirmClearBrowserCache/Yes</Data></Cell>

+    <Cell ss:Index="5"><Data ss:Type="String">Yes</Data></Cell>

+    <Cell ss:Index="7" ss:StyleID="s21"><Data ss:Type="String">확�</Data></Cell>

+   </Row>

+   <Row ss:AutoFitHeight="0">

+    <Cell><Data ss:Type="String">alerts.xml</Data></Cell>

+    <Cell><Data ss:Type="String">//ConfirmClearBrowserCache/No</Data></Cell>

+    <Cell ss:Index="5"><Data ss:Type="String">Cancel</Data></Cell>

+    <Cell ss:Index="7" ss:StyleID="s21"><Data ss:Type="String">취소</Data></Cell>

+   </Row>

+   <Row ss:AutoFitHeight="0" ss:Height="33">

+    <Cell><Data ss:Type="String">alerts.xml</Data></Cell>

+    <Cell><Data ss:Type="String">//ConfirmClearCookies/message</Data></Cell>

+    <Cell ss:Index="5" ss:StyleID="s24"><Data ss:Type="String">Are you sure you want to clear &#10;your cookies?</Data></Cell>

+    <Cell ss:Index="7" ss:StyleID="s21"><Data ss:Type="String">쿠키를 전부 삭제 하시겠습니까?</Data></Cell>

+   </Row>

+   <Row ss:AutoFitHeight="0">

+    <Cell><Data ss:Type="String">alerts.xml</Data></Cell>

+    <Cell><Data ss:Type="String">//ConfirmClearCookies/Yes</Data></Cell>

+    <Cell ss:Index="5"><Data ss:Type="String">Yes</Data></Cell>

+    <Cell ss:Index="7" ss:StyleID="s21"><Data ss:Type="String">확�</Data></Cell>

+   </Row>

+   <Row ss:AutoFitHeight="0">

+    <Cell><Data ss:Type="String">alerts.xml</Data></Cell>

+    <Cell><Data ss:Type="String">//ConfirmClearCookies/No</Data></Cell>

+    <Cell ss:Index="5"><Data ss:Type="String">Cancel</Data></Cell>

+    <Cell ss:Index="7" ss:StyleID="s21"><Data ss:Type="String">취소</Data></Cell>

+   </Row>

+   <Row ss:AutoFitHeight="0" ss:Height="33">

+    <Cell><Data ss:Type="String">alerts.xml</Data></Cell>

+    <Cell><Data ss:Type="String">//Cannot_Purchase_an_Attachment/message</Data></Cell>

+    <Cell ss:Index="5" ss:StyleID="s24"><Data ss:Type="String">Items may not be purchased while&#10;   they are part of an attachment.</Data></Cell>

+    <Cell ss:Index="7" ss:StyleID="s21"><Data ss:Type="String">착용중� 아�템� 구매 불가능 합니다.</Data></Cell>

+   </Row>

+   <Row ss:AutoFitHeight="0">

+    <Cell><Data ss:Type="String">floater_avatar_picker.xml</Data></Cell>

+    <Cell><Data ss:Type="String">/avatarpicker/Type part of the resident's name:</Data></Cell>

+    <Cell ss:Index="5"><Data ss:Type="String">Type part of the resident's name:</Data></Cell>

+    <Cell ss:Index="7" ss:StyleID="s21"><Data ss:Type="String">�름� �부를 입력 하십시오.</Data></Cell>

+   </Row>

+   <Row ss:AutoFitHeight="0">

+    <Cell><Data ss:Type="String">floater_avatar_picker.xml</Data></Cell>

+    <Cell><Data ss:Type="String">/avatarpicker/Or select their calling card:</Data></Cell>

+    <Cell ss:Index="5"><Data ss:Type="String">Or select a calling card:</Data></Cell>

+    <Cell ss:Index="7" ss:StyleID="s21"><Data ss:Type="String">�는 프로필 선�</Data></Cell>

+   </Row>

+   <Row ss:AutoFitHeight="0">

+    <Cell><Data ss:Type="String">floater_image_preview.xml</Data></Cell>

+    <Cell><Data ss:Type="String">/Image Preview/clothing_type_combo/SculptedPrim</Data></Cell>

+    <Cell ss:Index="5"><Data ss:Type="String">Sculpted Prim</Data></Cell>

+    <Cell ss:Index="7" ss:StyleID="s25"><Data ss:Type="String">조� 프림</Data></Cell>

+   </Row>

+   <Row ss:AutoFitHeight="0">

+    <Cell><Data ss:Type="String">floater_inventory.xml</Data></Cell>

+    <Cell><Data ss:Type="String">/Inventory/Inventory Menu/Sort/System Folders To Top</Data></Cell>

+    <Cell><Data ss:Type="String">label</Data></Cell>

+    <Cell ss:Index="5"><Data ss:Type="String">System Folders To Top</Data></Cell>

+    <Cell ss:Index="7" ss:StyleID="s21"><Data ss:Type="String">시스템 ��는 위로</Data></Cell>

+   </Row>

+   <Row ss:AutoFitHeight="0">

+    <Cell><Data ss:Type="String">floater_preferences.xml</Data></Cell>

+    <Cell><Data ss:Type="String">/Preferences/Help</Data></Cell>

+    <Cell><Data ss:Type="String">label</Data></Cell>

+    <Cell ss:Index="5"><Data ss:Type="String">Help</Data></Cell>

+    <Cell ss:Index="7" ss:StyleID="s21"><Data ss:Type="String">�움�</Data></Cell>

+   </Row>

+   <Row ss:AutoFitHeight="0">

+    <Cell><Data ss:Type="String">floater_preferences.xml</Data></Cell>

+    <Cell><Data ss:Type="String">/Preferences/Help</Data></Cell>

+    <Cell><Data ss:Type="String">label_selected</Data></Cell>

+    <Cell ss:Index="5"><Data ss:Type="String">Help</Data></Cell>

+    <Cell ss:Index="7" ss:StyleID="s21"><Data ss:Type="String">�움�</Data></Cell>

+   </Row>

+   <Row ss:AutoFitHeight="0">

+    <Cell><Data ss:Type="String">floater_tools.xml</Data></Cell>

+    <Cell><Data ss:Type="String">/toolbox floater/Object Info Tabs/Object/comboBaseType/Sculpted</Data></Cell>

+    <Cell ss:Index="5"><Data ss:Type="String">Sculpted</Data></Cell>

+    <Cell ss:Index="7" ss:StyleID="s25"><Data ss:Type="String">ì¡°ê°�</Data></Cell>

+   </Row>

+   <Row ss:AutoFitHeight="0">

+    <Cell><Data ss:Type="String">floater_tools.xml</Data></Cell>

+    <Cell><Data ss:Type="String">/toolbox floater/Object Info Tabs/Object/sculpt texture control</Data></Cell>

+    <Cell><Data ss:Type="String">label</Data></Cell>

+    <Cell ss:Index="5"><Data ss:Type="String">Sculpt Texture</Data></Cell>

+    <Cell ss:Index="7" ss:StyleID="s21"><Data ss:Type="String">�스처</Data></Cell>

+   </Row>

+   <Row ss:AutoFitHeight="0">

+    <Cell><Data ss:Type="String">floater_tools.xml</Data></Cell>

+    <Cell><Data ss:Type="String">/toolbox floater/Object Info Tabs/Object/sculpt texture control</Data></Cell>

+    <Cell><Data ss:Type="String">tool_tip</Data></Cell>

+    <Cell ss:Index="5"><Data ss:Type="String">Click to choose a picture</Data></Cell>

+    <Cell ss:Index="7" ss:StyleID="s21"><Data ss:Type="String">�미지 선�</Data></Cell>

+   </Row>

+   <Row ss:AutoFitHeight="0">

+    <Cell><Data ss:Type="String">menu_viewer.xml</Data></Cell>

+    <Cell><Data ss:Type="String">/Main Menu/File/Close All Windows</Data></Cell>

+    <Cell><Data ss:Type="String">label</Data></Cell>

+    <Cell ss:Index="5"><Data ss:Type="String">Close All Windows</Data></Cell>

+    <Cell ss:Index="7" ss:StyleID="s21"><Data ss:Type="String">모든 창 닫기</Data></Cell>

+   </Row>

+   <Row ss:AutoFitHeight="0">

+    <Cell><Data ss:Type="String">menu_viewer.xml</Data></Cell>

+    <Cell><Data ss:Type="String">/Main Menu/Tools/separator7</Data></Cell>

+    <Cell><Data ss:Type="String">label</Data></Cell>

+    <Cell ss:Index="5"><Data ss:Type="String">&#45;&#45;&#45;&#45;&#45;&#45;&#45;&#45;&#45;&#45;-</Data></Cell>

+    <Cell ss:Index="7" ss:StyleID="s21"/>

+   </Row>

+   <Row ss:AutoFitHeight="0">

+    <Cell><Data ss:Type="String">menu_viewer.xml</Data></Cell>

+    <Cell><Data ss:Type="String">/Main Menu/Tools/Select Tool/Report Bug...</Data></Cell>

+    <Cell><Data ss:Type="String">label</Data></Cell>

+    <Cell ss:Index="5"><Data ss:Type="String">Report Bug...</Data></Cell>

+    <Cell ss:Index="7" ss:StyleID="s26"><Data ss:Type="String">버그신고 </Data></Cell>

+   </Row>

+   <Row ss:AutoFitHeight="0">

+    <Cell><Data ss:Type="String">menu_viewer.xml</Data></Cell>

+    <Cell><Data ss:Type="String">/Main Menu/Tools/Select Tool/Bug Reporing 101...</Data></Cell>

+    <Cell><Data ss:Type="String">label</Data></Cell>

+    <Cell ss:Index="5"><Data ss:Type="String">Bug Reporting 101...</Data></Cell>

+    <Cell ss:Index="7" ss:StyleID="s26"><Data ss:Type="String">버그신고 101</Data></Cell>

+   </Row>

+   <Row ss:AutoFitHeight="0">

+    <Cell><Data ss:Type="String">menu_viewer.xml</Data></Cell>

+    <Cell><Data ss:Type="String">/Main Menu/Tools/Select Tool/Security Issues...</Data></Cell>

+    <Cell><Data ss:Type="String">label</Data></Cell>

+    <Cell ss:Index="5"><Data ss:Type="String">Security Issues...</Data></Cell>

+    <Cell ss:Index="7" ss:StyleID="s21"><Data ss:Type="String">보안관련 </Data></Cell>

+   </Row>

+   <Row ss:AutoFitHeight="0">

+    <Cell><Data ss:Type="String">menu_viewer.xml</Data></Cell>

+    <Cell><Data ss:Type="String">/Main Menu/Tools/Select Tool/separator7</Data></Cell>

+    <Cell><Data ss:Type="String">label</Data></Cell>

+    <Cell ss:Index="5"><Data ss:Type="String">&#45;&#45;&#45;&#45;&#45;&#45;&#45;&#45;&#45;&#45;-</Data></Cell>

+    <Cell ss:Index="7" ss:StyleID="s21"/>

+   </Row>

+   <Row ss:AutoFitHeight="0">

+    <Cell><Data ss:Type="String">menu_viewer.xml</Data></Cell>

+    <Cell><Data ss:Type="String">/Main Menu/Tools/Select Tool/Public Issue Tracker...</Data></Cell>

+    <Cell><Data ss:Type="String">label</Data></Cell>

+    <Cell ss:Index="5"><Data ss:Type="String">Public Issue Tracker...</Data></Cell>

+    <Cell ss:Index="7" ss:StyleID="s21"><Data ss:Type="String">�슈 트랙</Data></Cell>

+   </Row>

+   <Row ss:AutoFitHeight="0">

+    <Cell><Data ss:Type="String">menu_viewer.xml</Data></Cell>

+    <Cell><Data ss:Type="String">/Main Menu/Tools/Select Tool/Publc Issue Tracker Help...</Data></Cell>

+    <Cell><Data ss:Type="String">label</Data></Cell>

+    <Cell ss:Index="5"><Data ss:Type="String">Public Issue Tracker Help...</Data></Cell>

+    <Cell ss:Index="7" ss:StyleID="s21"><Data ss:Type="String">�슈 트랙 �움�</Data></Cell>

+   </Row>

+   <Row ss:AutoFitHeight="0">

+    <Cell><Data ss:Type="String">panel_avatar.xml</Data></Cell>

+    <Cell><Data ss:Type="String">/Panel Avatar/tab/2nd Life/Add Friend...</Data></Cell>

+    <Cell><Data ss:Type="String">label</Data></Cell>

+    <Cell ss:Index="5"><Data ss:Type="String">Add Friend...</Data></Cell>

+    <Cell ss:Index="7" ss:StyleID="s21"><Data ss:Type="String">친구 추가</Data></Cell>

+   </Row>

+   <Row ss:AutoFitHeight="0">

+    <Cell><Data ss:Type="String">panel_avatar.xml</Data></Cell>

+    <Cell><Data ss:Type="String">/Panel Avatar/tab/2nd Life/Add Friend...</Data></Cell>

+    <Cell><Data ss:Type="String">label_selected</Data></Cell>

+    <Cell ss:Index="5"><Data ss:Type="String">Add Friend...</Data></Cell>

+    <Cell ss:Index="7" ss:StyleID="s21"><Data ss:Type="String">친구 추가</Data></Cell>

+   </Row>

+   <Row ss:AutoFitHeight="0">

+    <Cell><Data ss:Type="String">panel_group_general.xml</Data></Cell>

+    <Cell><Data ss:Type="String">/general_tab/group_name_editor</Data></Cell>

+    <Cell><Data ss:Type="String">label</Data></Cell>

+    <Cell ss:Index="5"><Data ss:Type="String">Type your new group name here</Data></Cell>

+    <Cell ss:Index="7" ss:StyleID="s21"><Data ss:Type="String">새 그룹� �름� 입력 하십시오</Data></Cell>

+   </Row>

+   <Row ss:AutoFitHeight="0">

+    <Cell><Data ss:Type="String">panel_preferences_graphics2.xml</Data></Cell>

+    <Cell><Data ss:Type="String">/Display panel 3/shaders</Data></Cell>

+    <Cell><Data ss:Type="String">label</Data></Cell>

+    <Cell ss:Index="5"><Data ss:Type="String">Enable Vertex Shaders</Data></Cell>

+    <Cell ss:Index="7" ss:StyleID="s21"><Data ss:Type="String">버�스 ��� 활성화</Data></Cell>

+   </Row>

+   <Row ss:AutoFitHeight="0">

+    <Cell><Data ss:Type="String">panel_preferences_graphics2.xml</Data></Cell>

+    <Cell><Data ss:Type="String">/Display panel 3/shaders</Data></Cell>

+    <Cell><Data ss:Type="String">tool_tip</Data></Cell>

+    <Cell ss:Index="5"><Data ss:Type="String">Disabling this option may prevent some graphics card drivers from crashing.</Data></Cell>

+    <Cell ss:Index="7" ss:StyleID="s21"><Data ss:Type="String">그래픽 카드와� 충�� 피하기 위해 옵션� 비활성화함</Data></Cell>

+   </Row>

+   <Row ss:AutoFitHeight="0">

+    <Cell><Data ss:Type="String">panel_preferences_graphics3.xml</Data></Cell>

+    <Cell><Data ss:Type="String">/Display panel 2/debug beacon line width</Data></Cell>

+    <Cell><Data ss:Type="String">label</Data></Cell>

+    <Cell ss:Index="5"><Data ss:Type="String">Debug Beacon Line Width:</Data></Cell>

+    <Cell ss:Index="7" ss:StyleID="s21"><Data ss:Type="String">표� 선 굵기</Data></Cell>

+   </Row>

+   <Row ss:AutoFitHeight="0">

+    <Cell><Data ss:Type="String">panel_preferences_graphics3.xml</Data></Cell>

+    <Cell><Data ss:Type="String">/Display panel 2/probe_hardware_checkbox</Data></Cell>

+    <Cell><Data ss:Type="String">label</Data></Cell>

+    <Cell ss:Index="5"><Data ss:Type="String">Auto-detect graphics hardware on next startup</Data></Cell>

+    <Cell ss:Index="7" ss:StyleID="s21"><Data ss:Type="String">다� 로그� 시 그래픽 하드웨어 �� �지</Data></Cell>

+   </Row>

+   <Row ss:AutoFitHeight="0">

+    <Cell><Data ss:Type="String">panel_preferences_graphics3.xml</Data></Cell>

+    <Cell><Data ss:Type="String">/Display panel 2/probe_hardware_checkbox</Data></Cell>

+    <Cell><Data ss:Type="String">tool_tip</Data></Cell>

+    <Cell ss:Index="5"><Data ss:Type="String">Second Life automatically configures some graphics settings based on your hardware.  If you install new hardware, you should have Second Life detect it again.</Data></Cell>

+    <Cell ss:Index="7" ss:StyleID="s21"><Data ss:Type="String">��으로 하드웨어� �합한 그래픽 세팅� 합니다. 새로운 하드웨어를 �스톨 할경우 세컨드��프를 재�� 시키십시오</Data></Cell>

+   </Row>

+   <Row ss:AutoFitHeight="0">

+    <Cell><Data ss:Type="String">panel_preferences_popups.xml</Data></Cell>

+    <Cell><Data ss:Type="String">/popups</Data></Cell>

+    <Cell><Data ss:Type="String">title</Data></Cell>

+    <Cell ss:Index="5"><Data ss:Type="String">Popups</Data></Cell>

+    <Cell ss:Index="7" ss:StyleID="s21"><Data ss:Type="String">�업</Data></Cell>

+   </Row>

+   <Row ss:AutoFitHeight="0">

+    <Cell><Data ss:Type="String">panel_preferences_popups.xml</Data></Cell>

+    <Cell><Data ss:Type="String">/popups/accept_new_inventory</Data></Cell>

+    <Cell><Data ss:Type="String">label</Data></Cell>

+    <Cell ss:Index="5"><Data ss:Type="String">Automatically accept</Data></Cell>

+    <Cell ss:Index="7" ss:StyleID="s25"><Data ss:Type="String">�� 수�</Data></Cell>

+   </Row>

+   <Row ss:AutoFitHeight="0">

+    <Cell><Data ss:Type="String">panel_preferences_popups.xml</Data></Cell>

+    <Cell><Data ss:Type="String">/popups/show_new_inventory</Data></Cell>

+    <Cell><Data ss:Type="String">label</Data></Cell>

+    <Cell ss:Index="5"><Data ss:Type="String">Automatically view after accepting</Data></Cell>

+    <Cell ss:Index="7" ss:StyleID="s25"><Data ss:Type="String">�� 수� 후 확�</Data></Cell>

+   </Row>

+   <Row ss:AutoFitHeight="0">

+    <Cell><Data ss:Type="String">panel_preferences_web.xml</Data></Cell>

+    <Cell><Data ss:Type="String">/web</Data></Cell>

+    <Cell><Data ss:Type="String">label</Data></Cell>

+    <Cell ss:Index="5"><Data ss:Type="String">Web</Data></Cell>

+    <Cell ss:Index="7" ss:StyleID="s25"><Data ss:Type="String">웹</Data></Cell>

+   </Row>

+   <Row ss:AutoFitHeight="0">

+    <Cell><Data ss:Type="String">panel_preferences_web.xml</Data></Cell>

+    <Cell><Data ss:Type="String">/web/cache_size_label_l</Data></Cell>

+    <Cell ss:Index="5"><Data ss:Type="String">Browser cache:</Data></Cell>

+    <Cell ss:Index="7" ss:StyleID="s25"><Data ss:Type="String">브�우저  �쉬</Data></Cell>

+   </Row>

+   <Row ss:AutoFitHeight="0">

+    <Cell><Data ss:Type="String">panel_preferences_web.xml</Data></Cell>

+    <Cell><Data ss:Type="String">/web/clear_cache</Data></Cell>

+    <Cell><Data ss:Type="String">label</Data></Cell>

+    <Cell ss:Index="5"><Data ss:Type="String">Clear Now</Data></Cell>

+    <Cell ss:Index="7" ss:StyleID="s25"><Data ss:Type="String">지금 삭제</Data></Cell>

+   </Row>

+   <Row ss:AutoFitHeight="0">

+    <Cell><Data ss:Type="String">panel_preferences_web.xml</Data></Cell>

+    <Cell><Data ss:Type="String">/web/cookie_label</Data></Cell>

+    <Cell ss:Index="5"><Data ss:Type="String">Cookies:</Data></Cell>

+    <Cell ss:Index="7" ss:StyleID="s25"><Data ss:Type="String">쿠키</Data></Cell>

+   </Row>

+   <Row ss:AutoFitHeight="0">

+    <Cell><Data ss:Type="String">panel_preferences_web.xml</Data></Cell>

+    <Cell><Data ss:Type="String">/web/cookies_enabled</Data></Cell>

+    <Cell><Data ss:Type="String">label</Data></Cell>

+    <Cell ss:Index="5"><Data ss:Type="String">Accept cookies from sites</Data></Cell>

+    <Cell ss:Index="7" ss:StyleID="s25"><Data ss:Type="String">사�트로 부터 쿠키 수�</Data></Cell>

+   </Row>

+   <Row ss:AutoFitHeight="0">

+    <Cell><Data ss:Type="String">panel_preferences_web.xml</Data></Cell>

+    <Cell><Data ss:Type="String">/web/clear_cookies</Data></Cell>

+    <Cell><Data ss:Type="String">label</Data></Cell>

+    <Cell ss:Index="5"><Data ss:Type="String">Clear Now</Data></Cell>

+    <Cell ss:Index="7" ss:StyleID="s25"><Data ss:Type="String">지금 삭제</Data></Cell>

+   </Row>

+   <Row ss:AutoFitHeight="0" ss:Height="115.5">

+    <Cell><Data ss:Type="String">teleport_strings.xml</Data></Cell>

+    <Cell><Data ss:Type="String">//errors/invalid_tport</Data></Cell>

+    <Cell ss:Index="5" ss:StyleID="s24"><Data ss:Type="String">Problem encountered processing your teleport request. You may&#10;   need to log back in before you can teleport. If you continue&#10;   to get this message, please check the Tech Support FAQ at:&#10;   www.secondlife.com/support</Data></Cell>

+    <Cell ss:Index="7" ss:StyleID="s25"><Data ss:Type="String">텔레�트중 문제가 발�했으며 다시 로그� 하십시오, 계� 같� 문제가 발�할 경우�는 www.secondlife.com/support� Tech Support FAQ를 확�해 주십시오. </Data></Cell>

+   </Row>

+   <Row ss:AutoFitHeight="0" ss:Height="115.5">

+    <Cell><Data ss:Type="String">teleport_strings.xml</Data></Cell>

+    <Cell><Data ss:Type="String">//errors/invalid_region_handoff</Data></Cell>

+    <Cell ss:Index="5" ss:StyleID="s24"><Data ss:Type="String">Problem encountered processing your region crossing. You may&#10;   need to log back in before you can cross regions. If you continue&#10;   to get this message, please check the Tech Support FAQ at:&#10;   www.secondlife.com/support.</Data></Cell>

+    <Cell ss:Index="7" ss:StyleID="s21"><Data ss:Type="String">지역 ��중 문제가 발�했으며 다시 로그� 하십시오, 계� 같� 문제가 발�할 경우�는 www.secondlife.com/support� Tech Support FAQ를 확�해 주십시오. </Data></Cell>

+   </Row>

+   <Row ss:AutoFitHeight="0" ss:Height="82.5">

+    <Cell><Data ss:Type="String">teleport_strings.xml</Data></Cell>

+    <Cell><Data ss:Type="String">//errors/blocked_tport</Data></Cell>

+    <Cell ss:Index="5" ss:StyleID="s24"><Data ss:Type="String">Sorry, teleport is currently blocked. Try again in a moment.&#10;   If you still cannot teleport, please log out and log back in to&#10;   resolve the problem.</Data></Cell>

+    <Cell ss:Index="7" ss:StyleID="s21"><Data ss:Type="String">현재 텔레�트가 금지�었습니다, 잠시후 다시 시� 하십시오. 계� 텔레�트� 문제가 있�경우 다시 로그� 하십시오.</Data></Cell>

+   </Row>

+   <Row ss:AutoFitHeight="0">

+    <Cell><Data ss:Type="String">teleport_strings.xml</Data></Cell>

+    <Cell><Data ss:Type="String">//errors/nolandmark_tport</Data></Cell>

+    <Cell ss:Index="5"><Data ss:Type="String">Sorry, but system was unable to locate landmark destination.</Data></Cell>

+    <Cell ss:Index="7" ss:StyleID="s21"><Data ss:Type="String">랜드마� �성� 문제가 있습니다</Data></Cell>

+   </Row>

+   <Row ss:AutoFitHeight="0" ss:Height="49.5">

+    <Cell><Data ss:Type="String">teleport_strings.xml</Data></Cell>

+    <Cell><Data ss:Type="String">//errors/timeout_tport</Data></Cell>

+    <Cell ss:Index="5" ss:StyleID="s24"><Data ss:Type="String">Sorry, but system was unable to complete the teleport connection.&#10;   Try again in a moment.</Data></Cell>

+    <Cell ss:Index="7" ss:StyleID="s21"><Data ss:Type="String">텔레�트중 문제가 발�했으며 잠시후 다시 시� 하십시오.</Data></Cell>

+   </Row>

+   <Row ss:AutoFitHeight="0">

+    <Cell><Data ss:Type="String">teleport_strings.xml</Data></Cell>

+    <Cell><Data ss:Type="String">//errors/noaccess_tport</Data></Cell>

+    <Cell ss:Index="5"><Data ss:Type="String">Sorry, you do not have access to that teleport destination.</Data></Cell>

+    <Cell ss:Index="7" ss:StyleID="s21"><Data ss:Type="String">텔레�트 목�지� 연결하지 못했습니다.</Data></Cell>

+   </Row>

+   <Row ss:AutoFitHeight="0" ss:Height="82.5">

+    <Cell><Data ss:Type="String">teleport_strings.xml</Data></Cell>

+    <Cell><Data ss:Type="String">//errors/missing_attach_tport</Data></Cell>

+    <Cell ss:Index="5" ss:StyleID="s24"><Data ss:Type="String">Your attachments have not arrived yet. Try waiting for a few&#10;   more seconds or log out and back in again before attempting&#10;   to teleport.</Data></Cell>

+    <Cell ss:Index="7" ss:StyleID="s21"><Data ss:Type="String">부착물들� 아� �착하지 못했습니다. 잠시후 다시 로그� 해보십시오.</Data></Cell>

+   </Row>

+   <Row ss:AutoFitHeight="0" ss:Height="99">

+    <Cell><Data ss:Type="String">teleport_strings.xml</Data></Cell>

+    <Cell><Data ss:Type="String">//errors/too_many_uploads_tport</Data></Cell>

+    <Cell ss:Index="5" ss:StyleID="s24"><Data ss:Type="String">The asset queue in this region is currently clogged so your teleport&#10;   request will not be able to succeed in a timely manner. Please try again&#10;   in a few minutes or go to a less busy area.</Data></Cell>

+    <Cell ss:Index="7" ss:StyleID="s21"><Data ss:Type="String">접�� 수가 많아 텔레�트가 �지 않습니다. 잠시후 다시 시� 하시거나 접�� 수가 �� 지역으로 텔레�트 하십시오.</Data></Cell>

+   </Row>

+   <Row ss:AutoFitHeight="0" ss:Height="66">

+    <Cell><Data ss:Type="String">teleport_strings.xml</Data></Cell>

+    <Cell><Data ss:Type="String">//errors/expired_tport</Data></Cell>

+    <Cell ss:Index="5" ss:StyleID="s24"><Data ss:Type="String">Sorry, but the system was unable to complete your teleport request&#10;   in a timely fashion. Please try again in a few minutes.</Data></Cell>

+    <Cell ss:Index="7" ss:StyleID="s21"><Data ss:Type="String">텔레�트가 완료�지 못했으며 잠시후 다시 시� 하십시오.</Data></Cell>

+   </Row>

+   <Row ss:AutoFitHeight="0" ss:Height="66">

+    <Cell><Data ss:Type="String">teleport_strings.xml</Data></Cell>

+    <Cell><Data ss:Type="String">//errors/expired_region_handoff</Data></Cell>

+    <Cell ss:Index="5" ss:StyleID="s24"><Data ss:Type="String">Sorry, but the system was unable to complete your region crossing&#10;   in a timely fashion. Please try again in a few minutes.</Data></Cell>

+    <Cell ss:Index="7" ss:StyleID="s21"><Data ss:Type="String">지역 ��중 문제가 발�했으며 다시 시� 하십시오.</Data></Cell>

+   </Row>

+   <Row ss:AutoFitHeight="0" ss:Height="82.5">

+    <Cell><Data ss:Type="String">teleport_strings.xml</Data></Cell>

+    <Cell><Data ss:Type="String">//errors/no_host</Data></Cell>

+    <Cell ss:Index="5" ss:StyleID="s24"><Data ss:Type="String">Unable to find teleport destination. The destination may be&#10;   temporarily unavailable or no longer exists. Please try again&#10;   in a few minutes.</Data></Cell>

+    <Cell ss:Index="7" ss:StyleID="s21"><Data ss:Type="String">텔레�트 목�지를 찾� 수 없습니다. 목�지가 잠시 유효하지 않거나 � �� 존재하지 않� 수 있습니다. 잠시후 다시 시� 하십시오.</Data></Cell>

+   </Row>

+   <Row ss:AutoFitHeight="0">

+    <Cell><Data ss:Type="String">teleport_strings.xml</Data></Cell>

+    <Cell><Data ss:Type="String">//progress/sending_dest</Data></Cell>

+    <Cell ss:Index="5"><Data ss:Type="String">Sending to destination.</Data></Cell>

+    <Cell ss:Index="7" ss:StyleID="s21"><Data ss:Type="String">목�지로 ��</Data></Cell>

+   </Row>

+   <Row ss:AutoFitHeight="0">

+    <Cell><Data ss:Type="String">teleport_strings.xml</Data></Cell>

+    <Cell><Data ss:Type="String">//progress/redirecting</Data></Cell>

+    <Cell ss:Index="5"><Data ss:Type="String">Redirecting to different location.</Data></Cell>

+    <Cell ss:Index="7" ss:StyleID="s21"><Data ss:Type="String">다른 장소로 재설정</Data></Cell>

+   </Row>

+   <Row ss:AutoFitHeight="0">

+    <Cell><Data ss:Type="String">teleport_strings.xml</Data></Cell>

+    <Cell><Data ss:Type="String">//progress/relaying</Data></Cell>

+    <Cell ss:Index="5"><Data ss:Type="String">Relaying to destination.</Data></Cell>

+    <Cell ss:Index="7" ss:StyleID="s21"><Data ss:Type="String">목�지 �체</Data></Cell>

+   </Row>

+   <Row ss:AutoFitHeight="0">

+    <Cell><Data ss:Type="String">teleport_strings.xml</Data></Cell>

+    <Cell><Data ss:Type="String">//progress/sending_home</Data></Cell>

+    <Cell ss:Index="5"><Data ss:Type="String">Sending home location request.</Data></Cell>

+    <Cell ss:Index="7" ss:StyleID="s21"><Data ss:Type="String">홈 지정 요청 보내기</Data></Cell>

+   </Row>

+   <Row ss:AutoFitHeight="0">

+    <Cell><Data ss:Type="String">teleport_strings.xml</Data></Cell>

+    <Cell><Data ss:Type="String">//progress/sending_landmark</Data></Cell>

+    <Cell ss:Index="5"><Data ss:Type="String">Sending landmark location request.</Data></Cell>

+    <Cell ss:Index="7" ss:StyleID="s21"><Data ss:Type="String">랜드마� 지정 요청 보내기</Data></Cell>

+   </Row>

+   <Row ss:AutoFitHeight="0">

+    <Cell><Data ss:Type="String">teleport_strings.xml</Data></Cell>

+    <Cell><Data ss:Type="String">//progress/completing</Data></Cell>

+    <Cell ss:Index="5"><Data ss:Type="String">Completing teleport.</Data></Cell>

+    <Cell ss:Index="7" ss:StyleID="s21"><Data ss:Type="String">텔레�트 완료</Data></Cell>

+   </Row>

+   <Row ss:AutoFitHeight="0">

+    <Cell><Data ss:Type="String">teleport_strings.xml</Data></Cell>

+    <Cell><Data ss:Type="String">//progress/resolving</Data></Cell>

+    <Cell ss:Index="5"><Data ss:Type="String">Resolving destination.</Data></Cell>

+    <Cell ss:Index="7" ss:StyleID="s21"><Data ss:Type="String">목�지 파악</Data></Cell>

+   </Row>

+   <Row ss:AutoFitHeight="0">

+    <Cell><Data ss:Type="String">teleport_strings.xml</Data></Cell>

+    <Cell><Data ss:Type="String">//progress/contacting</Data></Cell>

+    <Cell ss:Index="5"><Data ss:Type="String">Contacting new region.</Data></Cell>

+    <Cell ss:Index="7" ss:StyleID="s21"><Data ss:Type="String">새 지역 접�</Data></Cell>

+   </Row>

+   <Row ss:AutoFitHeight="0">

+    <Cell><Data ss:Type="String">teleport_strings.xml</Data></Cell>

+    <Cell><Data ss:Type="String">//progress/arriving</Data></Cell>

+    <Cell ss:Index="5"><Data ss:Type="String">Arriving...</Data></Cell>

+    <Cell ss:Index="7" ss:StyleID="s21"><Data ss:Type="String">�착</Data></Cell>

+   </Row>

+   <Row ss:AutoFitHeight="0">

+    <Cell><Data ss:Type="String">teleport_strings.xml</Data></Cell>

+    <Cell><Data ss:Type="String">//progress/requesting</Data></Cell>

+    <Cell ss:Index="5"><Data ss:Type="String">Requesting Teleport...</Data></Cell>

+    <Cell ss:Index="7" ss:StyleID="s21"><Data ss:Type="String">텔레�트</Data></Cell>

+   </Row>

+  </Table>

+  <WorksheetOptions xmlns="urn:schemas-microsoft-com:office:excel">

+   <Unsynced/>

+   <Selected/>

+   <TopRowVisible>27</TopRowVisible>

+   <Panes>

+    <Pane>

+     <Number>3</Number>

+     <ActiveRow>38</ActiveRow>

+     <RangeSelection>R39</RangeSelection>

+    </Pane>

+   </Panes>

+   <ProtectObjects>False</ProtectObjects>

+   <ProtectScenarios>False</ProtectScenarios>

+  </WorksheetOptions>

+ </Worksheet>

+</Workbook>

diff --git a/linden/indra/newview/skins/xui/ko/need_to_update.xml b/linden/indra/newview/skins/xui/ko/need_to_update.xml
index b262393..9bd6732 100644
--- a/linden/indra/newview/skins/xui/ko/need_to_update.xml
+++ b/linden/indra/newview/skins/xui/ko/need_to_update.xml
@@ -1,2 +1,4028 @@
 <?xml version="1.0" encoding="utf-8" standalone="yes" ?>

-<strings />

+

+<strings>

+<string><a_file>alerts.xml</a_file>

+<b_path>//WriteAnimationFail/message</b_path>

+<c_attribute></c_attribute>

+<d_old>

+                        Failure writing animation data.

+                </d_old>

+<e_new>

+                        There was a problem writing animation data.  Please try again later.

+                </e_new>

+<f_old_trans>

+                        애니메�션 ��터를 �용하지 못했습니다.

+                </f_old_trans>

+<f_translation/></string><string><a_file>alerts.xml</a_file>

+<b_path>//RemoveFriend/message</b_path>

+<c_attribute></c_attribute>

+<d_old>

+                        Do you want to remove [FIRST] [LAST] from your friends?

+                </d_old>

+<e_new>

+                        Do you want to remove [FIRST] [LAST] from your list of friends?

+                </e_new>

+<f_old_trans>

+                        [FIRST] [LAST]님� 친구�서 제거하시겠습니까?

+                </f_old_trans>

+<f_translation/></string><string><a_file>alerts.xml</a_file>

+<b_path>//CreateGroupCanAfford/message</b_path>

+<c_attribute></c_attribute>

+<d_old>

+                        Creating a group costs L$[COST].

+ 

+To maintain the group for more than three days,

+you must reach a total of three or more members.

+ 

+Create group?

+                </d_old>

+<e_new>

+                        Creating a group costs L$[COST].

+ 

+To maintain the group for more than three days,

+you must reach a total of two or more members.

+ 

+Create group?

+                </e_new>

+<f_old_trans>

+                        그룹� �성하려면 L$[COST]가 듭니다.

+ 

+그룹� 3� �� 유지하려면

+회� 수가 � 3� ��� �어야 합니다.

+ 

+그룹� �성 하시겠습니까?

+                </f_old_trans>

+<f_translation/></string><string><a_file>alerts.xml</a_file>

+<b_path>//CreateGroupCannotAfford/message</b_path>

+<c_attribute></c_attribute>

+<d_old>

+                        Creating a group costs L$[COST].

+You do not have enough money to create this group.

+                </d_old>

+<e_new>

+                        Creating a group costs L$[COST].

+You do not have enough L$ to create this group.

+                </e_new>

+<f_old_trans>

+                        그룹� �성하려면 L$[COST]가 듭니다.

+�금� 부족하여 � 그룹� �성할 수 없습니다.

+                </f_old_trans>

+<f_translation/></string><string><a_file>alerts.xml</a_file>

+<b_path>//GroupNameUsesReservedWord/message</b_path>

+<c_attribute></c_attribute>

+<d_old>

+                        The group name uses a reserved word. Please

+choose a different name.

+                </d_old>

+<e_new>

+                        The group name uses a censored word. Please

+choose a different name.

+                </e_new>

+<f_old_trans>

+                        그룹 �름� 예약� 단어가 사용�고 있습니다. 다른

+�름� 선�하십시오.

+                </f_old_trans>

+<f_translation/></string><string><a_file>alerts.xml</a_file>

+<b_path>//SalePriceRestriction/message</b_path>

+<c_attribute></c_attribute>

+<d_old>

+                        Sale price must be set to &gt; L$0 if selling to anybody.

+Please select an individual to sell to if selling for L$0.

+                </d_old>

+<e_new>

+                        Sale price must be set to more than L$0 if selling to anyone.

+Please select an individual to sell to if selling for L$0.

+                </e_new>

+<f_old_trans>

+                        �매하는 경우, �매 가격� &gt; L$0(으)로 설정�어야 함.

+L$0로 �매하는 경우, 팔 사람� 선�하십시오.

+                </f_old_trans>

+<f_translation/></string><string><a_file>alerts.xml</a_file>

+<b_path>//ConfirmLandSaleChange/message</b_path>

+<c_attribute></c_attribute>

+<d_old>

+                        The selected [LAND_SIZE] sq. m. land is being set for sale.

+Your selling price will be L$[SALE_PRICE] and will be authorized for sale to [NAME].

+ 

+Would you like to continue making this change?

+                </d_old>

+<e_new>

+                        The selected [LAND_SIZE] m2 land is being set for sale.

+Your selling price will be L$[SALE_PRICE] and will be authorized for sale to [NAME].

+ 

+                </e_new>

+<f_old_trans>

+                        선�� [LAND_SIZE] �방 미터� 토지가 �매용으로 설정�었습니다.

+�매 가격� L$[SALE_PRICE]�고 [NAME]�게 �매가 승��니다.

+ 

+� 변경 사항� 계� �용하시겠습니까?

+                </f_old_trans>

+<f_translation/></string><string><a_file>alerts.xml</a_file>

+<b_path>//ConfirmLandSaleChange/Continue</b_path>

+<c_attribute></c_attribute>

+<d_old>

+                        Continue

+                </d_old>

+<e_new>

+                        OK

+                </e_new>

+<f_old_trans>

+                        계�

+                </f_old_trans>

+<f_translation/></string><string><a_file>alerts.xml</a_file>

+<b_path>//ReturnObjectsDeededToGroup/Return</b_path>

+<c_attribute></c_attribute>

+<d_old>

+                        Return

+                </d_old>

+<e_new>

+                        OK

+                </e_new>

+<f_old_trans>

+                        반환

+                </f_old_trans>

+<f_translation/></string><string><a_file>alerts.xml</a_file>

+<b_path>//ReturnObjectsOwnedByUser/message</b_path>

+<c_attribute></c_attribute>

+<d_old>

+                        Are you sure you want to return all objects owned by the

+resident &apos;[NAME]&apos; on this parcel of land

+back to their inventory?

+ 

+Objects: [N]

+                </d_old>

+<e_new>

+                        Are you sure you want to return all objects owned by the

+Resident &apos;[NAME]&apos; on this parcel of land

+back to their inventory?

+ 

+Objects: [N]

+                </e_new>

+<f_old_trans>

+                        � 토지 구�� 있는 주민 &apos;[NAME]&apos; 소유� 오브�트를

+모� 오브�트 �벤토리�

+반환 하시겠습니까?

+ 

+오브�트: [N]

+                </f_old_trans>

+<f_translation/></string><string><a_file>alerts.xml</a_file>

+<b_path>//ReturnObjectsOwnedByUser/Return</b_path>

+<c_attribute></c_attribute>

+<d_old>

+                        Return

+                </d_old>

+<e_new>

+                        OK

+                </e_new>

+<f_old_trans>

+                        반환

+                </f_old_trans>

+<f_translation/></string><string><a_file>alerts.xml</a_file>

+<b_path>//ReturnObjectsOwnedBySelf/Return</b_path>

+<c_attribute></c_attribute>

+<d_old>

+                        Return

+                </d_old>

+<e_new>

+                        OK

+                </e_new>

+<f_old_trans>

+                        반환

+                </f_old_trans>

+<f_translation/></string><string><a_file>alerts.xml</a_file>

+<b_path>//ReturnObjectsNotOwnedBySelf/Return</b_path>

+<c_attribute></c_attribute>

+<d_old>

+                        Return

+                </d_old>

+<e_new>

+                        OK

+                </e_new>

+<f_old_trans>

+                        반환

+                </f_old_trans>

+<f_translation/></string><string><a_file>alerts.xml</a_file>

+<b_path>//ReturnObjectsNotOwnedByUser/Return</b_path>

+<c_attribute></c_attribute>

+<d_old>

+                        Return

+                </d_old>

+<e_new>

+                        OK

+                </e_new>

+<f_old_trans>

+                        반환

+                </f_old_trans>

+<f_translation/></string><string><a_file>alerts.xml</a_file>

+<b_path>//ReturnAllTopObjects/Return</b_path>

+<c_attribute></c_attribute>

+<d_old>

+                        Return

+                </d_old>

+<e_new>

+                        OK

+                </e_new>

+<f_old_trans>

+                        반환

+                </f_old_trans>

+<f_translation/></string><string><a_file>alerts.xml</a_file>

+<b_path>//DisableAllTopObjects/Disable</b_path>

+<c_attribute></c_attribute>

+<d_old>

+                        Disable

+                </d_old>

+<e_new>

+                        OK

+                </e_new>

+<f_old_trans>

+                        비활성

+                </f_old_trans>

+<f_translation/></string><string><a_file>alerts.xml</a_file>

+<b_path>//ReturnObjectsNotOwnedByGroup/Return</b_path>

+<c_attribute></c_attribute>

+<d_old>

+                        Return

+                </d_old>

+<e_new>

+                        OK

+                </e_new>

+<f_old_trans>

+                        반환

+                </f_old_trans>

+<f_translation/></string><string><a_file>alerts.xml</a_file>

+<b_path>//UnableToDisableOutsideScripts/message</b_path>

+<c_attribute></c_attribute>

+<d_old>

+                        Unable to disable outside scripts.

+This entire region is health enabled (not safe).

+Scripts must be allowed to run for guns to work.

+                </d_old>

+<e_new>

+                        Can not disable scripts.

+This entire region is damage enabled.

+Scripts must be allowed to run for weapons to work.

+                </e_new>

+<f_old_trans>

+                        외부 스�립트를 비활성화할 수 없습니다.

+� 전체 지역� 활성 �태입니다(안전하지 않�).

+스�립트는 �� 작�할 수 있�� 실행�어야 합니다.

+                </f_old_trans>

+<f_translation/></string><string><a_file>alerts.xml</a_file>

+<b_path>//ErrorEncodingSnapshot/message</b_path>

+<c_attribute></c_attribute>

+<d_old>

+                        Error encoding snapshot!

+                </d_old>

+<e_new>

+                        Error encoding snapshot.

+                </e_new>

+<f_old_trans>

+                        스냅샷 �코딩 중 오류가 발�했습니다.

+                </f_old_trans>

+<f_translation/></string><string><a_file>alerts.xml</a_file>

+<b_path>//CannotWearTrash/message</b_path>

+<c_attribute></c_attribute>

+<d_old>

+                        Cannot wear clothes or body parts that are in the trash

+                </d_old>

+<e_new>

+                        You can not wear clothes or body parts that are in the trash

+                </e_new>

+<f_old_trans>

+                        옷� 착용할 수 없거나 신체부위가 휴지통� 있습니다.

+                </f_old_trans>

+<f_translation/></string><string><a_file>alerts.xml</a_file>

+<b_path>//CannotWearInfoNotComplete/message</b_path>

+<c_attribute></c_attribute>

+<d_old>

+                        Cannot wear that item since the complete information set it not yet available. Please try again in a minute.

+                </d_old>

+<e_new>

+                        You can not wear that item because it has not yet loaded. Please try again in a minute.

+                </e_new>

+<f_old_trans>

+                        전체 정보가 설정�지 않아 � 아�템� 착용할 수 없습니다. 잠시 후� 다시 시�해 주십시오.

+                </f_old_trans>

+<f_translation/></string><string><a_file>alerts.xml</a_file>

+<b_path>//MustHaveAccountToLogInNoLinks/OK</b_path>

+<c_attribute></c_attribute>

+<d_old>

+                        OK

+                </d_old>

+<e_new>

+                        Close

+                </e_new>

+<f_old_trans>

+                        확�

+                </f_old_trans>

+<f_translation/></string><string><a_file>alerts.xml</a_file>

+<b_path>//MustHaveAccountToLogIn/message</b_path>

+<c_attribute></c_attribute>

+<d_old>

+                        You must have an account to connect to [SECOND_LIFE].

+ 

+Go to www.secondlife.com to create a new account?

+                </d_old>

+<e_new>

+                        You must have an account to connect to [SECOND_LIFE].

+ 

+Go to www.secondlife.com to create an account?

+                </e_new>

+<f_old_trans>

+                        [SECOND_LIFE]� 연결하려면 계정� 갖고 있어야 합니다.

+ 

+www.secondlife.com으로 ��하여 새로운 계정� 만드시겠습니까?

+                </f_old_trans>

+<f_translation/></string><string><a_file>alerts.xml</a_file>

+<b_path>//AddClassified/message</b_path>

+<c_attribute></c_attribute>

+<d_old>

+                        Classified ads appear in the &apos;Classified&apos; section of the

+Search directory for one week.

+ 

+Fill out your ad, then click &apos;Publish...&apos; to add it to the

+directory.

+ 

+You&apos;ll be asked for a price to pay when clicking Publish.

+Paying more makes your ad appear higher in the list, and

+also appear higher when people search for keywords.

+                </d_old>

+<e_new>

+                        Classified ads appear in the &apos;Classified&apos; section of the

+Search directory and on www.secondlife.com for one week.

+ 

+Fill out your ad, then click &apos;Publish...&apos; to add it to the

+directory.

+ 

+You&apos;ll be asked for a price to pay when clicking Publish.

+Paying more makes your ad appear higher in the list, and

+also appear higher when people search for keywords.

+                </e_new>

+<f_old_trans>

+                        광고가 1주� �안 검색 디렉토리� &apos;광고&apos; 섹션�

+나타납니다.

+ 

+광고를 작성한 후 &apos;게시하기...&apos;를 �릭하여 디렉토리�

+추가합니다.

+ 

+게시하기를 �릭하면 지불할 가격� 묻는 메시지가 나타납니다.

+높� 가격� 지불할수� 광고가 목��서 � 높� 위치� 게재�고

+키워드 검색 결과�서 � 우선�으로 표시�니다.

+                </f_old_trans>

+<f_translation/></string><string><a_file>alerts.xml</a_file>

+<b_path>//DeleteClassified/Delete</b_path>

+<c_attribute></c_attribute>

+<d_old>

+                        Delete

+                </d_old>

+<e_new>

+                        OK

+                </e_new>

+<f_old_trans>

+                        삭제

+                </f_old_trans>

+<f_translation/></string><string><a_file>alerts.xml</a_file>

+<b_path>//DeleteAvatarPick/Delete</b_path>

+<c_attribute></c_attribute>

+<d_old>

+                        Delete

+                </d_old>

+<e_new>

+                        OK

+                </e_new>

+<f_old_trans>

+                        삭제

+                </f_old_trans>

+<f_translation/></string><string><a_file>alerts.xml</a_file>

+<b_path>//PromptGoToEventsPage/GotoPage</b_path>

+<c_attribute></c_attribute>

+<d_old>

+                        Go to Page

+                </d_old>

+<e_new>

+                        OK

+                </e_new>

+<f_old_trans>

+                        페�지로 ��

+                </f_old_trans>

+<f_translation/></string><string><a_file>alerts.xml</a_file>

+<b_path>//SelectItemToView/message</b_path>

+<c_attribute></c_attribute>

+<d_old>

+                        Please select an item to view.

+                </d_old>

+<e_new>

+                        Please select a proposal to view.

+                </e_new>

+<f_old_trans>

+                        보려는 항목� 선�하십시오.

+                </f_old_trans>

+<f_translation/></string><string><a_file>alerts.xml</a_file>

+<b_path>//GoToAuctionPage/GotoPage</b_path>

+<c_attribute></c_attribute>

+<d_old>

+                        Go to Page

+                </d_old>

+<e_new>

+                        OK

+                </e_new>

+<f_old_trans>

+                        페�지로 ��

+                </f_old_trans>

+<f_translation/></string><string><a_file>alerts.xml</a_file>

+<b_path>//ScriptCannotUndo/message</b_path>

+<c_attribute></c_attribute>

+<d_old>

+                        Could not undo all changes in your version of the script.

+Would you like to load the server&apos;s last saved version?

+(Note: this operation cannot be undone.)

+                </d_old>

+<e_new>

+                        Could not undo all changes in your version of the script.

+Would you like to load the server&apos;s last saved version?

+(**Warning** This operation cannot be undone.)

+                </e_new>

+<f_old_trans>

+                        스�립트 버전� 대한 모든 변경 사항� 취소할 수 없습니다.

+서버� 저장� 최신 버전� 로드 하시겠습니까?

+(참고: � 작업� 취소할 수 없습니다.)

+                </f_old_trans>

+<f_translation/></string><string><a_file>alerts.xml</a_file>

+<b_path>//ScriptCannotUndo/Yes</b_path>

+<c_attribute></c_attribute>

+<d_old>

+                        Yes

+                </d_old>

+<e_new>

+                        OK

+                </e_new>

+<f_old_trans>

+                        예

+                </f_old_trans>

+<f_translation/></string><string><a_file>alerts.xml</a_file>

+<b_path>//ScriptCannotUndo/No</b_path>

+<c_attribute></c_attribute>

+<d_old>

+                        No

+                </d_old>

+<e_new>

+                        Cancel

+                </e_new>

+<f_old_trans>

+                        아니오

+                </f_old_trans>

+<f_translation/></string><string><a_file>alerts.xml</a_file>

+<b_path>//SaveScriptFailObjectNotFound/message</b_path>

+<c_attribute></c_attribute>

+<d_old>

+                        Could not save the script because the object it is on could not be found.

+The object may be out of range or may have been deleted.

+                </d_old>

+<e_new>

+                        Could not save the script because the object it is in could not be found.

+The object may be out of range or may have been deleted.

+                </e_new>

+<f_old_trans>

+                        스�립트가 위치한 오브�트를 찾� 수 없어 스�립트를 저장할 수 없습니다.

+오브�트가 해당 범위 밖� 있거나 삭제 �었� 수 있습니다.

+                </f_old_trans>

+<f_translation/></string><string><a_file>alerts.xml</a_file>

+<b_path>//CannotLoadWearable/message</b_path>

+<c_attribute></c_attribute>

+<d_old>

+                        Sorry, unable to load wearable.

+                </d_old>

+<e_new>

+                        Unable to load wearable.

+                </e_new>

+<f_old_trans>

+                        죄송합니다. 착용물� 로드할 수 없습니다.

+                </f_old_trans>

+<f_translation/></string><string><a_file>alerts.xml</a_file>

+<b_path>//CannotConnectDNSError/message</b_path>

+<c_attribute></c_attribute>

+<d_old>

+                        Unable to connect to [SECOND_LIFE].

+DNS could not resolve the host name.

+Please verify that you can connect to the www.secondlife.com

+web site.  If you can, but continue to receive this error,

+please go to the support section and report this problem.

+                </d_old>

+<e_new>

+                        Unable to connect to [SECOND_LIFE].

+DNS could not resolve the host name.

+Please verify that you can connect to the www.secondlife.com

+web site.  If you can, but continue to receive this error,

+please go to www.secondlife.com/support and report this problem.

+                </e_new>

+<f_old_trans>

+                        [SECOND_LIFE]� 연결하지 못했습니다.

+DNS가 호스트 �름� 확�할 수 없습니다.

+www.secondlife.com 웹사�트� 연결할 수 있는지 여부를

+확�하십시오.  연결� �었지만 � 오류가 계� 발�하는 경우

+지� 섹션으로 ��하여 � 문제를 신고해 주십시오.

+                </f_old_trans>

+<f_translation/></string><string><a_file>alerts.xml</a_file>

+<b_path>//CannotConnectSecurityError/message</b_path>

+<c_attribute></c_attribute>

+<d_old>

+                        Unable to establish a secure connection to the login server.

+Often this means that your computer&apos;s clock is set incorrectly.

+Please go to Control Panels and make sure the time and date

+are set correctly.

+ 

+If you continue to receive this error, please go

+to the Support section of the SecondLife.com web site

+and report the problem.

+                </d_old>

+<e_new>

+                        Unable to establish a secure connection to the login server.

+Often this means that your computer&apos;s clock is set incorrectly.

+Please ensure the time and date are set correctly.

+ 

+If you continue to receive this error, please go

+to www.secondlife.com/support

+and report the problem.

+                </e_new>

+<f_old_trans>

+                        로그� 서버� 대한 보안 연결� 설정할 수 없습니다.

+종종 � 문제는 컴퓨터 시계가 잘못 설정� 것� �미합니다.

+제어�으로 ��하여 시간과 날짜가 올바르게 설정�었는지

+확�하십시오.

+ 

+� 오류가 계�해서 발�하는 경우�는

+SecondLife.com 웹사�트� Support 섹션으로 ��한 후

+문제를 신고해 주십시오.

+                </f_old_trans>

+<f_translation/></string><string><a_file>alerts.xml</a_file>

+<b_path>//CannotConnectVerificationError/message</b_path>

+<c_attribute></c_attribute>

+<d_old>

+                        Unable to connect to [SECOND_LIFE].

+The login server couldn&apos;t verify itself via SSL.

+If you continue to receive this error, please go

+to the Support section of the SecondLife.com web site

+and report the problem.

+                </d_old>

+<e_new>

+                        Unable to connect to [SECOND_LIFE].

+The login server couldn&apos;t verify itself via SSL.

+If you continue to receive this error, please go

+to www.secondlife.com/support

+and report the problem.

+                </e_new>

+<f_old_trans>

+                        [SECOND_LIFE]� 연결하지 못했습니다.

+SSL� 통해 로그� 서버가 확��지 않습니다.

+� 오류가 계�해서 발�하는 경우�는

+SecondLife.com 웹사�트� Support 섹션으로 ��한 다�

+문제를 신고해 주십시오.

+                </f_old_trans>

+<f_translation/></string><string><a_file>alerts.xml</a_file>

+<b_path>//CannotConnectUnknownErrorWindows/message</b_path>

+<c_attribute></c_attribute>

+<d_old>

+                        Unable to connect to [SECOND_LIFE].

+Despite our best efforts, something unexpected has gone wrong.

+Please go to the Support section of the SecondLife.com web site

+and report the problem.  If possible, include your SecondLife.log

+file from: C:\Documents and Settings\(name)\Application Data\SecondLife\logs

+Thank you.

+                </d_old>

+<e_new>

+                        Unable to connect to [SECOND_LIFE].

+Despite our best efforts, something unexpected has gone wrong.

+Please go to www.secondlife.com/support

+and report the problem.  If possible, include your SecondLife.log

+file from: C:\Documents and Settings\(name)\Application Data\SecondLife\logs

+Thank you.

+                </e_new>

+<f_old_trans>

+                        [SECOND_LIFE]� 연결하지 못했습니다.

+최선� 노력�� 불구하고 예�치 못한 문제가 발�했습니다.

+SecondLife.com 웹사�트� Support 섹션�서

+문제를 신고해 주십시오.  가능하면 C:\Documents and Settings\(name)\Application Data\SecondLife\logs�

+있는 귀하� SecondLife.log 파�� 함께 보내주십시오.

+�사합니다.

+                </f_old_trans>

+<f_translation/></string><string><a_file>alerts.xml</a_file>

+<b_path>//CannotConnectUnknownErrorDarwin/message</b_path>

+<c_attribute></c_attribute>

+<d_old>

+                        Unable to connect to [SECOND_LIFE].

+Despite our best efforts, something unexpected has gone wrong.

+Please go to the Support section of the SecondLife.com web site

+and report the problem.  If possible, include your SecondLife.log

+file from: ~/Library/Application Support/SecondLife/logs

+Thank you.

+                </d_old>

+<e_new>

+                        Unable to connect to [SECOND_LIFE].

+Despite our best efforts, something unexpected has gone wrong.

+Please go to www.secondlife.com/support

+and report the problem.  If possible, include your SecondLife.log

+file from: ~/Library/Application Support/SecondLife/logs

+Thank you.

+                </e_new>

+<f_old_trans>

+                        [SECOND_LIFE]� 연결하지 못했습니다.

+최선� 노력�� 불구하고 예�치 못한 문제가 발�했습니다.

+SecondLife.com 웹사�트� Support 섹션�서

+문제를 신고해 주십시오.  가능하면 ~/Library/Application Support/SecondLife/logs�

+있는 귀하� SecondLife.log 파�� 함께 보내주십시오.

+�사합니다.

+                </f_old_trans>

+<f_translation/></string><string><a_file>alerts.xml</a_file>

+<b_path>//CannotResolveLoginToken/message</b_path>

+<c_attribute></c_attribute>

+<d_old>

+                        There was a problem resolving your login

+authentication token. Please try logging in

+again. If you continue to receive this error,

+please goto the Support section of the

+SecondLife.com web site.

+                </d_old>

+<e_new>

+                        There was a problem resolving your login

+authentication token. Please try logging in

+again. If you continue to receive this error,

+please go to www.secondlife.com/support.

+                </e_new>

+<f_old_trans>

+                        로그� ��� 확�하는 중 문제가

+발�했습니다. 로그�� 다시 시�해

+보시� 오류가 계�해서 발�하는 경우�는

+SecondLife.com 웹사�트� Support 섹션�서 관련정보를 참고 하십시오.

+                </f_old_trans>

+<f_translation/></string><string><a_file>alerts.xml</a_file>

+<b_path>//CannotConnectNoMessage/message</b_path>

+<c_attribute></c_attribute>

+<d_old>

+                        Unknown problem trying to connect.

+(Blank error message from server.)

+ 

+Please try again in a few minutes, or click Help

+for advice and a link to the system status web page.

+                </d_old>

+<e_new>

+                        Unknown problem trying to connect.

+ 

+Please try again in a few minutes, or click Help

+for advice and a link to the system status web page.

+                </e_new>

+<f_old_trans>

+                        연결� 시�하는 중 알 수 없는 문제가 발�했습니다.

+(서버� 공백 오류 메시지)

+ 

+몇 초 후� 다시 시�하거나 �움�� �릭하여

+시스템 �태 웹 페�지� 대한 지� 정보 � ��를 확�하십시오.

+                </f_old_trans>

+<f_translation/></string><string><a_file>alerts.xml</a_file>

+<b_path>//ClothingStillDownloading/message</b_path>

+<c_attribute></c_attribute>

+<d_old>

+                        Your clothing is still downloading.

+You can use the world normally, and other users

+will see you correctly.

+                </d_old>

+<e_new>

+                        Your avatar is still downloading.

+You can use [SECOND_LIFE] normally, and other Residents

+will see you correctly.

+                </e_new>

+<f_old_trans>

+                        ��� 다운로드하는 중입니다.

+�반�으로 세컨드��프를 사용할 수 있으며 다른 사용��게

+귀하� 모습� 제대로 표시� 것입니다.

+                </f_old_trans>

+<f_translation/></string><string><a_file>alerts.xml</a_file>

+<b_path>//WelcomeToSecondLife/message</b_path>

+<c_attribute></c_attribute>

+<d_old>

+                        Welcome to [SECOND_LIFE]! 

+ 

+Use arrow keys to walk.

+ 

+Please choose the male or female character. 

+You can change your mind later.

+                </d_old>

+<e_new>

+                        Welcome to [SECOND_LIFE]! 

+ 

+Use arrow keys to walk.

+ 

+Please choose the male or female avatar. 

+You can change your mind later.

+                </e_new>

+<f_old_trans>

+                        [SECOND_LIFE]� 오신 것� 환�합니다! 

+ 

+화살표 키를 �용하여 걸� 수 있습니다.

+ 

+남성 �는 여성 �릭터를 선�해 주십시오. 

+차후� 변경� 가능합니다.

+                </f_old_trans>

+<f_translation/></string><string><a_file>alerts.xml</a_file>

+<b_path>//WelcomeToSecondLifeSimple/message</b_path>

+<c_attribute></c_attribute>

+<d_old>

+                        Welcome to [SECOND_LIFE]! 

+ 

+Use arrow keys to walk.

+ 

+Please choose the male or female character.

+                </d_old>

+<e_new>

+                        Welcome to [SECOND_LIFE]! 

+ 

+Use arrow keys to walk.

+ 

+Please choose the male or female avatar.

+                </e_new>

+<f_old_trans>

+                        [SECOND_LIFE]� 오신 것� 환�합니다! 

+ 

+화살표 키를 �용하여 걸� 수 있습니다.

+ 

+남성 �는 여성 �릭터를 선�해 주십시오.

+                </f_old_trans>

+<f_translation/></string><string><a_file>alerts.xml</a_file>

+<b_path>//RegionNoTerraforming/message</b_path>

+<c_attribute></c_attribute>

+<d_old>

+                        The region [REGION] does not allow terraforming.

+You will need to buy land in another part of the world

+to terraform it.

+                </d_old>

+<e_new>

+                        The region [REGION] does not allow terraforming.

+                </e_new>

+<f_old_trans>

+                        지역 [REGION]�(는) 지형 변경� 허용�지 않습니다.

+� 지역� 지형� 변경하려면 다른 토지를

+매입해야 합니다.

+                </f_old_trans>

+<f_translation/></string><string><a_file>alerts.xml</a_file>

+<b_path>//TooManyItems/message</b_path>

+<c_attribute></c_attribute>

+<d_old>

+                        Cannot give that many items in a single inventory transfer.

+                </d_old>

+<e_new>

+                        Cannot give more than 42 items in a single inventory transfer.

+                </e_new>

+<f_old_trans>

+                        �만� 많� 아�템� 한번� �벤토리 전송으로 보낼 수 없습니다.

+                </f_old_trans>

+<f_translation/></string><string><a_file>alerts.xml</a_file>

+<b_path>//NoItems/message</b_path>

+<c_attribute></c_attribute>

+<d_old>

+                        No items you can give.

+                </d_old>

+<e_new>

+                        You do not have permission to transfer

+                        the selected items.

+                </e_new>

+<f_old_trans>

+                        제공할 아�템 없�.

+                </f_old_trans>

+<f_translation/></string><string><a_file>alerts.xml</a_file>

+<b_path>//CannotGiveCategory/message</b_path>

+<c_attribute></c_attribute>

+<d_old>

+                        Unable to give inventory category.

+                </d_old>

+<e_new>

+                        You do not have permission to transfer

+                        the selected folder.

+                </e_new>

+<f_old_trans>

+                        아�템 카테고리를 제공할 수 없습니다.

+                </f_old_trans>

+<f_translation/></string><string><a_file>alerts.xml</a_file>

+<b_path>//InvalidUUID/message</b_path>

+<c_attribute></c_attribute>

+<d_old>

+                        Not a valid uuid

+                </d_old>

+<e_new>

+                        Not a valid UUID.

+                </e_new>

+<f_old_trans>

+                        올바른uuid가 아님

+                </f_old_trans>

+<f_translation/></string><string><a_file>alerts.xml</a_file>

+<b_path>//TakeLockedOrNotOwnedBy/message</b_path>

+<c_attribute></c_attribute>

+<d_old>

+                        At least one object is locked or not owned by you.

+If an object is not owned by you and you take it, 

+next owner permissions will be applied to it and

+possibly restrict your ability to modify or copy it

+in the future.

+However, you can still take the current selection.

+Are you sure you want to take these itmes?

+                </d_old>

+<e_new>

+                        At least one object is locked or not owned by you.

+If an object is not owned by you and you take it, 

+next owner permissions will be applied to it and

+possibly restrict your ability to modify or copy it.

+

+Are you sure you want to take these itmes?

+                </e_new>

+<f_old_trans>

+                        1개 ��� 오브�트가 잠겨 있거나 귀하� 소유가 아닙니다.

+귀하� 소유가 아닌 오브�트를 귀하가 가지면 

+� 오브�트� 다� 소유� 권한� �용�어

+�후� 귀하가 수정하거나 복사할 권한� 제한� 수

+있습니다.

+하지만 현재 �하는 아�템� 선�할 수 있습니다.

+� 아�템� 소유 하시겠습니까?

+                </f_old_trans>

+<f_translation/></string><string><a_file>alerts.xml</a_file>

+<b_path>//TakeLockedOrNotOwnedBy/Yes</b_path>

+<c_attribute></c_attribute>

+<d_old>

+                        Yes

+                </d_old>

+<e_new>

+                        OK

+                </e_new>

+<f_old_trans>

+                        예

+                </f_old_trans>

+<f_translation/></string><string><a_file>alerts.xml</a_file>

+<b_path>//TakeLockedOrNotOwnedBy/No</b_path>

+<c_attribute></c_attribute>

+<d_old>

+                        No

+                </d_old>

+<e_new>

+                        Cancel

+                </e_new>

+<f_old_trans>

+                        아니오

+                </f_old_trans>

+<f_translation/></string><string><a_file>alerts.xml</a_file>

+<b_path>//PromptGoToCurrencyPage/GotoPage</b_path>

+<c_attribute></c_attribute>

+<d_old>

+                        Go to Page

+                </d_old>

+<e_new>

+                        OK

+                </e_new>

+<f_old_trans>

+                        페�지로 ��

+                </f_old_trans>

+<f_translation/></string><string><a_file>alerts.xml</a_file>

+<b_path>//UnableToLinkObjects/message</b_path>

+<c_attribute></c_attribute>

+<d_old>

+                        Unable to link these [COUNT] objects.

+You can link a maximum of [MAX] objects.

+Try selecting fewer objects.

+                </d_old>

+<e_new>

+                        Unable to link these [COUNT] objects.

+You can link a maximum of [MAX] objects.

+                </e_new>

+<f_old_trans>

+                        [COUNT]개 오브�트를 연결할 수 없습니다.

+최대 [MAX]개� 오브�트를 연결할 수 있습니다.

+� �� 수� 오브�트를 선�해 주십시오.

+                </f_old_trans>

+<f_translation/></string><string><a_file>alerts.xml</a_file>

+<b_path>//CannotUploadSoundFile/message</b_path>

+<c_attribute></c_attribute>

+<d_old>

+                        Couldn&apos;t open upload sound file for reading:

+[FILE]

+                </d_old>

+<e_new>

+                        Couldn&apos;t open uploaded sound file for reading:

+[FILE]

+                </e_new>

+<f_old_trans>

+                        �기를 수행할 업로드 사운드 파�� 열 수 없습니다:

+[FILE]

+                </f_old_trans>

+<f_translation/></string><string><a_file>alerts.xml</a_file>

+<b_path>//UnknownVorbisEncodeFailure/message</b_path>

+<c_attribute></c_attribute>

+<d_old>

+                        Unknown vorbis encode failure on: [FILE]

+                </d_old>

+<e_new>

+                        Unknown Vorbis encode failure on: [FILE]

+                </e_new>

+<f_old_trans>

+                        알 수 없는 vorbis �코딩 오류: [FILE]

+                </f_old_trans>

+<f_translation/></string><string><a_file>alerts.xml</a_file>

+<b_path>//CorruptResourceFile/message</b_path>

+<c_attribute></c_attribute>

+<d_old>

+                        corrupt resource file: [FILE]

+                </d_old>

+<e_new>

+                        Corrupt resource file: [FILE]

+                </e_new>

+<f_old_trans>

+                        ��� 리소스 파�: [FILE]

+                </f_old_trans>

+<f_translation/></string><string><a_file>alerts.xml</a_file>

+<b_path>//UnknownResourceFileVersion/message</b_path>

+<c_attribute></c_attribute>

+<d_old>

+                        unknown linden resource file version in file: [FILE]

+                </d_old>

+<e_new>

+                        Unknown Linden resource file version in file: [FILE]

+                </e_new>

+<f_old_trans>

+                        파�� 알 수 없는 린든 리소스 파� 버전� 있습니다: [FILE]

+                </f_old_trans>

+<f_translation/></string><string><a_file>alerts.xml</a_file>

+<b_path>//DoNotSupportBulkAnimationUpload/message</b_path>

+<c_attribute></c_attribute>

+<d_old>

+                        We do not currently support bulk upload of animation files

+                </d_old>

+<e_new>

+                        We do not currently support bulk upload of animation files.

+                </e_new>

+<f_old_trans>

+                        현재 애니메�션 파�� �괄 업로드는 지��지 않습니다.

+                </f_old_trans>

+<f_translation/></string><string><a_file>alerts.xml</a_file>

+<b_path>//InsufficientFundsToUploadFile/message</b_path>

+<c_attribute></c_attribute>

+<d_old>

+                        Insufficient funds to upload file: cost is L$[COST], balance is L$[BALANCE]

+                </d_old>

+<e_new>

+                        Insufficient L$ to upload file: the price is L$[COST], your balance is L$[BALANCE]

+                </e_new>

+<f_old_trans>

+                        파�� 업로드하는 � 린든달러가 부족함: 비용� L$[COST]�고, 잔액� L$[BALANCE]임

+                </f_old_trans>

+<f_translation/></string><string><a_file>alerts.xml</a_file>

+<b_path>//InsufficientFundsToFinishUpload/message</b_path>

+<c_attribute></c_attribute>

+<d_old>

+                        Insufficient funds to finish uploading [FILE]: cost is L$[COST], balance is L$[BALANCE]

+                </d_old>

+<e_new>

+                        Insufficient L$ to finish uploading [FILE]: the price is L$[COST], your balance is L$[BALANCE]

+                </e_new>

+<f_old_trans>

+                        [FILE] (�)를 업로드하는 � 린든달러가 부족함: 비용� L$[COST]�고, 잔액� L$[BALANCE]임

+                </f_old_trans>

+<f_translation/></string><string><a_file>alerts.xml</a_file>

+<b_path>//CannotCreateLandmarkNotOwner/message</b_path>

+<c_attribute></c_attribute>

+<d_old>

+                        You cannot create a landmark here because

+the owner of the land doesn&apos;t allow it.

+Try moving a few meters away first.

+                </d_old>

+<e_new>

+                        You cannot create a landmark here because

+the owner of the land doesn&apos;t allow it.

+                </e_new>

+<f_old_trans>

+                        토지� 소유주가 허용하지 않으므로 여기�

+랜드마�를 작성할 수 없습니다.

+먼저 몇 m � ��해 보십시오.

+                </f_old_trans>

+<f_translation/></string><string><a_file>alerts.xml</a_file>

+<b_path>//CannotRecompileSelectObjectsNoScripts/message</b_path>

+<c_attribute></c_attribute>

+<d_old>

+                        Not able to perform recompilation.

+Select objects with scripts that

+are valid.

+                </d_old>

+<e_new>

+                        Not able to perform &apos;recompilation&apos;.

+Select an object with a script.

+                </e_new>

+<f_old_trans>

+                        리컴파��� 수행할 수 없�.

+올바른 

+ 스�립트� 오브�트틀 선�합니다.

+                </f_old_trans>

+<f_translation/></string><string><a_file>alerts.xml</a_file>

+<b_path>//CannotRecompileSelectObjectsNoPermission/message</b_path>

+<c_attribute></c_attribute>

+<d_old>

+                        Not able to perform recompilation.

+Select objects with scripts that you

+have permission to modify.

+                </d_old>

+<e_new>

+                        Not able to perform &apos;recompilation&apos;.

+Select objects with scripts that you

+have permission to modify.

+                </e_new>

+<f_old_trans>

+                        리컴파��� 수행할 수 없�.

+내가 수정할 권한� 있는 

+ 스�립트� 오브�트틀 선�합니다.

+                </f_old_trans>

+<f_translation/></string><string><a_file>alerts.xml</a_file>

+<b_path>//CannotResetSelectObjectsNoScripts/message</b_path>

+<c_attribute></c_attribute>

+<d_old>

+                        Not able to perform reset.

+Select objects with scripts that you

+are valid.

+                </d_old>

+<e_new>

+                        Not able to perform &apos;reset&apos;.

+Select objects with scripts.

+                </e_new>

+<f_old_trans>

+                        초기화를 수행할 수 없�.

+올바른 

+ 스�립트� 오브�트틀 선�합니다..

+                </f_old_trans>

+<f_translation/></string><string><a_file>alerts.xml</a_file>

+<b_path>//CannotResetSelectObjectsNoPermission/message</b_path>

+<c_attribute></c_attribute>

+<d_old>

+                        Not able to perform reset.

+Select objects with scripts that you

+have permission to modify.

+                </d_old>

+<e_new>

+                        Not able to perform &apos;reset&apos;.

+Select objects with scripts that you

+have permission to modify.

+                </e_new>

+<f_old_trans>

+                        초기화를 수행할 수 없�.

+내가 수정할 권한� 있는 

+ 스�립트� 오브�트틀 선�합니다.

+                </f_old_trans>

+<f_translation/></string><string><a_file>alerts.xml</a_file>

+<b_path>//CannotSetRunningSelectObjectsNoScripts/message</b_path>

+<c_attribute></c_attribute>

+<d_old>

+                        Not able to set any scripts to running.

+Select objects with scripts that

+are valid.

+                </d_old>

+<e_new>

+                        Not able to set any scripts to &apos;running&apos;.

+Select objects with scripts.

+                </e_new>

+<f_old_trans>

+                        스�립트를 실행 함으로 설정할 수 없�.

+올바른 

+ 스�립트� 오브�트틀 선�합니다.

+                </f_old_trans>

+<f_translation/></string><string><a_file>alerts.xml</a_file>

+<b_path>//CannotSetRunningSelectObjectsNoPermission/message</b_path>

+<c_attribute></c_attribute>

+<d_old>

+                        Not able to set any scripts to running.

+Select objects with scripts that you

+have permission to modify.

+                </d_old>

+<e_new>

+                        Not able to set any scripts to &apos;running&apos;.

+Select objects with scripts that you

+have permission to modify.

+                </e_new>

+<f_old_trans>

+                        스�립트를 실행 함으로 설정할 수 없�.

+내가 수정할 권한� 있는 

+ 스�립트� 오브�트틀 선�합니다.

+                </f_old_trans>

+<f_translation/></string><string><a_file>alerts.xml</a_file>

+<b_path>//CannotSetRunningNotSelectObjectsNoScripts/message</b_path>

+<c_attribute></c_attribute>

+<d_old>

+                        Not able to set any scripts to not running.

+Select objects with scripts that

+are valid.

+                </d_old>

+<e_new>

+                        Unable to set any scripts to &apos;not running&apos;.

+Select objects with scripts.

+                </e_new>

+<f_old_trans>

+                        스�립트를 실행 안 함으로 설정할 수 없�.

+올바른 

+ 스�립트� 오브�트틀 선�합니다.

+                </f_old_trans>

+<f_translation/></string><string><a_file>alerts.xml</a_file>

+<b_path>//CannotSetRunningNotSelectObjectsNoPermission/message</b_path>

+<c_attribute></c_attribute>

+<d_old>

+                        Not able to set any scripts to not running.

+Select objects with scripts that you

+have permission to modify.

+                </d_old>

+<e_new>

+                        Unable to set any scripts to &apos;not running&apos;.

+Select objects with scripts that you

+have permission to modify.

+                </e_new>

+<f_old_trans>

+                        스�립트를 실행 안 함으로 설정할 수 없�.

+내가 수정할 권한� 있는 

+ 스�립트� 오브�트틀 선�합니다.

+                </f_old_trans>

+<f_translation/></string><string><a_file>alerts.xml</a_file>

+<b_path>//NoFrontmostFloater/message</b_path>

+<c_attribute></c_attribute>

+<d_old>

+                        No frontmost floater to save

+                </d_old>

+<e_new>

+                        No frontmost floater to save.

+                </e_new>

+<f_old_trans>

+                        맨 앞� 플러터 저장 안함

+                </f_old_trans>

+<f_translation/></string><string><a_file>alerts.xml</a_file>

+<b_path>//CannotSetLandOwnerNothingSelected/message</b_path>

+<c_attribute></c_attribute>

+<d_old>

+                        Unable to set land owner:

+Nothing selected.

+                </d_old>

+<e_new>

+                        Unable to set land owner:

+No parcel selected.

+                </e_new>

+<f_old_trans>

+                        토지 소유주를 설정할 수 없습니다:

+선�한 항목� 없습니다.

+                </f_old_trans>

+<f_translation/></string><string><a_file>alerts.xml</a_file>

+<b_path>//ForceOwnerAuctionWarning/Force</b_path>

+<c_attribute></c_attribute>

+<d_old>

+                        Force

+                </d_old>

+<e_new>

+                        OK

+                </e_new>

+<f_old_trans>

+                        �스

+                </f_old_trans>

+<f_translation/></string><string><a_file>alerts.xml</a_file>

+<b_path>//CannotContentifyNothingSelected/message</b_path>

+<c_attribute></c_attribute>

+<d_old>

+                        Unable to contentify:

+Nothing selected.

+                </d_old>

+<e_new>

+                        Unable to contentify:

+No parcel selected.

+                </e_new>

+<f_old_trans>

+                        컨�츠를 확�할 수 없습니다:

+선�한 항목� 없습니다.

+                </f_old_trans>

+<f_translation/></string><string><a_file>alerts.xml</a_file>

+<b_path>//CannotContentifyNoRegion/message</b_path>

+<c_attribute></c_attribute>

+<d_old>

+                        Unable to contentify:

+No region.

+                </d_old>

+<e_new>

+                        Unable to contentify:

+No region selected.

+                </e_new>

+<f_old_trans>

+                        컨�츠를 확�할 수 없습니다:

+지역� 없습니다.

+                </f_old_trans>

+<f_translation/></string><string><a_file>alerts.xml</a_file>

+<b_path>//CannotReleaseLandNothingSelected/message</b_path>

+<c_attribute></c_attribute>

+<d_old>

+                        Unable to abandon land:

+Nothing selected.

+                </d_old>

+<e_new>

+                        Unable to abandon land:

+No parcel selected.

+                </e_new>

+<f_old_trans>

+                        토지를 �기하지 못했습니다:

+선�한 항목� 없습니다.

+                </f_old_trans>

+<f_translation/></string><string><a_file>alerts.xml</a_file>

+<b_path>//CannotBuyLandNothingSelected/message</b_path>

+<c_attribute></c_attribute>

+<d_old>

+                        Unable to buy land:

+Nothing selected.

+                </d_old>

+<e_new>

+                        Unable to buy land:

+No parcel selected.

+                </e_new>

+<f_old_trans>

+                        토지를 구매하지 못했습니다:

+선�한 항목� 없습니다.

+                </f_old_trans>

+<f_translation/></string><string><a_file>alerts.xml</a_file>

+<b_path>//CannotDeedLandNothingSelected/message</b_path>

+<c_attribute></c_attribute>

+<d_old>

+                        Unable to deed land:

+Nothing selected.

+                </d_old>

+<e_new>

+                        Unable to deed land:

+No parcel selected.

+                </e_new>

+<f_old_trans>

+                        토지를 양�하지 못했습니다:

+선�한 항목� 없습니다.

+                </f_old_trans>

+<f_translation/></string><string><a_file>alerts.xml</a_file>

+<b_path>//CannotDeedLandNoGroup/message</b_path>

+<c_attribute></c_attribute>

+<d_old>

+                        Unable to deed land:

+No Group.

+                </d_old>

+<e_new>

+                        Unable to deed land:

+No Group selected.

+                </e_new>

+<f_old_trans>

+                        토지를 양�하지 못했습니다:

+그룹� 없습니다.

+                </f_old_trans>

+<f_translation/></string><string><a_file>alerts.xml</a_file>

+<b_path>//CannotSetLandOwnerNothingSelected/message</b_path>

+<c_attribute></c_attribute>

+<d_old>

+                        Unable to set land owner:

+Nothing selected.

+                </d_old>

+<e_new>

+                        Unable to set land owner:

+No parcel selected.

+                </e_new>

+<f_old_trans>

+                        토지 소유주를 설정할 수 없습니다:

+선�한 항목� 없습니다.

+                </f_old_trans>

+<f_translation/></string><string><a_file>alerts.xml</a_file>

+<b_path>//CannotBuyLandMultipleSelected/message</b_path>

+<c_attribute></c_attribute>

+<d_old>

+                        Unable to buy land:

+Multiple different parcels selected.

+Try selecting a smaller area.

+                </d_old>

+<e_new>

+                        Unable to buy land:

+Multiple parcels selected.

+Try selecting a single parcel.

+                </e_new>

+<f_old_trans>

+                        토지를 구매하지 못했습니다:

+여러 개� �기 다른 구�� 선��었습니다.

+� 작� �역� 선�해 주십시오.

+                </f_old_trans>

+<f_translation/></string><string><a_file>alerts.xml</a_file>

+<b_path>//CannotDeedLandMultipleSelected/message</b_path>

+<c_attribute></c_attribute>

+<d_old>

+                        Unable to deed land:

+Multiple different parcels selected.

+Try selecting a smaller area.

+                </d_old>

+<e_new>

+                        Unable to deed land:

+Multiple parcels selected.

+Try selecting a single parcel.

+                </e_new>

+<f_old_trans>

+                        토지를 양�하지 못했습니다:

+여러 개� �기 다른 구�� 선��었습니다.

+� 작� �역� 선�해 주십시오.

+                </f_old_trans>

+<f_translation/></string><string><a_file>alerts.xml</a_file>

+<b_path>//CannotBuyLandWaitingForServer/message</b_path>

+<c_attribute></c_attribute>

+<d_old>

+                        Unable to buy land:

+Waiting for server to report cost.

+Try again in a few seconds.

+                </d_old>

+<e_new>

+                        Unable to buy land:

+Waiting for server to report cost.

+Please try again.

+                </e_new>

+<f_old_trans>

+                        토지를 구매하지 못했습니다:

+서버가 비용� 보고할 때까지 기다리는 중입니다.

+몇 초 후 다시 시�해 주십시오.

+                </f_old_trans>

+<f_translation/></string><string><a_file>alerts.xml</a_file>

+<b_path>//CannotDeedLandWaitingForServer/message</b_path>

+<c_attribute></c_attribute>

+<d_old>

+                        Unable to deed land:

+Waiting for server to report ownership.

+Try again in a few seconds.

+                </d_old>

+<e_new>

+                        Unable to deed land:

+Waiting for server to report ownership.

+Please try again.

+                </e_new>

+<f_old_trans>

+                        토지를 양�하지 못했습니다:

+서버가 소유권� 보고할 때까지 기다리는 중입니다.

+몇 초 후 다시 시�해 주십시오.

+                </f_old_trans>

+<f_translation/></string><string><a_file>alerts.xml</a_file>

+<b_path>//CannotBuyLandLandOwned/message</b_path>

+<c_attribute></c_attribute>

+<d_old>

+                        Unable to buy land:

+Land owned by another user is selected.

+Try selecting a smaller area.

+                </d_old>

+<e_new>

+                        Unable to buy land:

+You have selected a parcel owned

+by another Resident.

+                </e_new>

+<f_old_trans>

+                        토지를 구매하지 못했습니다:

+다른 사용� 소유� 토지가 선��었습니다.

+� 작� �역� 선�해 주십시오.

+                </f_old_trans>

+<f_translation/></string><string><a_file>alerts.xml</a_file>

+<b_path>//CannotBuyLandInsufficientFunds/message</b_path>

+<c_attribute></c_attribute>

+<d_old>

+                        Buying this [AREA] sq. meters of land costs L$[PRICE].

+You only have L$[BALANCE].

+                </d_old>

+<e_new>

+                        Buying this [AREA] m2 of land costs L$[PRICE].

+You only have L$[BALANCE].

+                </e_new>

+<f_old_trans>

+                        � 토지 [AREA]제곱미터를 구매 하려면 L$[PRICE]가 듭니다.

+귀하� 잔고는 L$[BALANCE]�입니다.

+                </f_old_trans>

+<f_translation/></string><string><a_file>alerts.xml</a_file>

+<b_path>//CannotReleaseLandNothingSelected/message</b_path>

+<c_attribute></c_attribute>

+<d_old>

+                        Unable to abandon land:

+Nothing selected.

+                </d_old>

+<e_new>

+                        Unable to abandon land:

+No parcel selected.

+                </e_new>

+<f_old_trans>

+                        토지를 �기하지 못했습니다:

+선�한 항목� 없습니다.

+                </f_old_trans>

+<f_translation/></string><string><a_file>alerts.xml</a_file>

+<b_path>//CannotReleaseLandWatingForServer/message</b_path>

+<c_attribute></c_attribute>

+<d_old>

+                        Unable to abandon land:

+Waiting for server to report cost.

+Try again in a few seconds.

+                </d_old>

+<e_new>

+                        Unable to abandon land:

+Waiting for server to update parcel information.

+Try again in a few seconds.

+                </e_new>

+<f_old_trans>

+                        토지를 �기하지 못했습니다:

+서버가 비용� 보고할 때까지 기다리는 중입니다.

+몇 초 후 다시 시�해 주십시오.

+                </f_old_trans>

+<f_translation/></string><string><a_file>alerts.xml</a_file>

+<b_path>//CannotReleaseLandSelected/message</b_path>

+<c_attribute></c_attribute>

+<d_old>

+                        Unable to abandon land:

+Multiple different parcels selected.

+Try selecting a smaller area.

+                </d_old>

+<e_new>

+                        Unable to abandon land:

+You do not own all the parcels selected.

+Please select a single parcel.

+                </e_new>

+<f_old_trans>

+                        토지를 �기하지 못했습니다:

+여러 개� �기 다른 구�� 선��었습니다.

+� 작� �역� 선�해 주십시오.

+                </f_old_trans>

+<f_translation/></string><string><a_file>alerts.xml</a_file>

+<b_path>//CannotReleaseLandPartialSelection/message</b_path>

+<c_attribute></c_attribute>

+<d_old>

+                        Unable to abandon land:

+You must select an entire parcel to release it.

+Try double-clicking to select an entire parcel, or 

+first divide your parcel.

+                </d_old>

+<e_new>

+                        Unable to abandon land:

+You must select an entire parcel to release it.

+Select an entire parcel, or divide your parcel first.

+                </e_new>

+<f_old_trans>

+                        토지를 �기하지 못했습니다:

+토지를 방출하려면 전체 구�� 선�해야 합니다.

+전체 구�� 선�하려면 �블 �릭하거나 

+먼저 구�� 분할해 보십시오.

+                </f_old_trans>

+<f_translation/></string><string><a_file>alerts.xml</a_file>

+<b_path>//ReleaseLandWarning/message</b_path>

+<c_attribute></c_attribute>

+<d_old>

+                        You are about to release [AREA] sq. meters of land.

+Releasing this parcel will remove it from your land

+holdings, but will not credit any L$.

+ 

+Release this land?

+                </d_old>

+<e_new>

+                        You are about to release [AREA] m2 of land.

+Releasing this parcel will remove it from your land

+holdings, but will not grant any L$.

+ 

+Release this land?

+                </e_new>

+<f_old_trans>

+                        귀하께서는 토지� [AREA] �방 미터를 방출하려고 합니다.

+� 구�� 방출하면 소유한 토지�서 제거�지만

+토지� 대한 신용(L$)� �립�지 않습니다.

+ 

+� 토지를 방출하시겠습니까?

+                </f_old_trans>

+<f_translation/></string><string><a_file>alerts.xml</a_file>

+<b_path>//ReleaseLandWarning/Release</b_path>

+<c_attribute></c_attribute>

+<d_old>

+                        Release

+                </d_old>

+<e_new>

+                        OK

+                </e_new>

+<f_old_trans>

+                        해제

+                </f_old_trans>

+<f_translation/></string><string><a_file>alerts.xml</a_file>

+<b_path>//CannotDivideLandNothingSelected/message</b_path>

+<c_attribute></c_attribute>

+<d_old>

+                        Unable to divide land:

+Nothing selected.

+                </d_old>

+<e_new>

+                        Unable to divide land:

+No parcels selected.

+                </e_new>

+<f_old_trans>

+                        토지를 분할하지 못했습니다:

+선�한 항목� 없습니다.

+                </f_old_trans>

+<f_translation/></string><string><a_file>alerts.xml</a_file>

+<b_path>//CannotDivideLandPartialSelection/message</b_path>

+<c_attribute></c_attribute>

+<d_old>

+                        Unable to divide land:

+You have an entire parcel selected.

+Try selecting a smaller area by clicking

+and dragging.

+                </d_old>

+<e_new>

+                        Unable to divide land:

+You have an entire parcel selected.

+Try selecting a part of the parcel.

+                </e_new>

+<f_old_trans>

+                        토지를 분할하지 못했습니다:

+전체 구�� 선�하셨습니다.

+�역� �릭하고 드래그하여 � 작� �역�

+선�해 주십시오.

+                </f_old_trans>

+<f_translation/></string><string><a_file>alerts.xml</a_file>

+<b_path>//LandDivideWarning/Divide</b_path>

+<c_attribute></c_attribute>

+<d_old>

+                        Divide

+                </d_old>

+<e_new>

+                        OK

+                </e_new>

+<f_old_trans>

+                        분할

+                </f_old_trans>

+<f_translation/></string><string><a_file>alerts.xml</a_file>

+<b_path>//CannotJoinLandNothingSelected/message</b_path>

+<c_attribute></c_attribute>

+<d_old>

+                        Unable to join land:

+Nothing selected.

+                </d_old>

+<e_new>

+                        Unable to join land:

+No parcels selected.

+                </e_new>

+<f_old_trans>

+                        토지를 결합하지 못했습니다:

+선�한 항목� 없습니다.

+                </f_old_trans>

+<f_translation/></string><string><a_file>alerts.xml</a_file>

+<b_path>//CannotJoinLandEntireParcelSelected/message</b_path>

+<c_attribute></c_attribute>

+<d_old>

+                        Unable to join land:

+You have an entire parcel selected.

+Try selecting a larger area by clicking

+and dragging.

+                </d_old>

+<e_new>

+                        Unable to join land:

+You only have one parcel selected.

+Select land across both parcels.

+                </e_new>

+<f_old_trans>

+                        토지를 결합하지 못했습니다:

+전체 구�� 선�하셨습니다.

+�역� �릭하고 드래그하여 � � �역�

+선�해 주십시오.

+                </f_old_trans>

+<f_translation/></string><string><a_file>alerts.xml</a_file>

+<b_path>//CannotJoinLandSelection/message</b_path>

+<c_attribute></c_attribute>

+<d_old>

+                        Unable to join land:

+You must select more than one parcel.

+Try selecting a larger area by clicking

+and dragging.

+                </d_old>

+<e_new>

+                        Unable to join land:

+You must select more than one parcel.

+Select land across both parcels.

+                </e_new>

+<f_old_trans>

+                        토지를 결합하지 못했습니다:

+둘 ��� 구�� 선�해야 합니다.

+�역� �릭하고 드래그하여 � � �역�

+선�해 주십시오.

+                </f_old_trans>

+<f_translation/></string><string><a_file>alerts.xml</a_file>

+<b_path>//JoinLandWarning/Join</b_path>

+<c_attribute></c_attribute>

+<d_old>

+                        Join

+                </d_old>

+<e_new>

+                        OK

+                </e_new>

+<f_old_trans>

+                        가입

+                </f_old_trans>

+<f_translation/></string><string><a_file>alerts.xml</a_file>

+<b_path>//ConfirmNotecardSave/Save</b_path>

+<c_attribute></c_attribute>

+<d_old>

+                        Save

+                </d_old>

+<e_new>

+                        OK

+                </e_new>

+<f_old_trans>

+                        저장

+                </f_old_trans>

+<f_translation/></string><string><a_file>alerts.xml</a_file>

+<b_path>//ConfirmLandmarkCopy/message</b_path>

+<c_attribute></c_attribute>

+<d_old>

+                        Copy this item to your inventory?

+                </d_old>

+<e_new>

+                        Copy this landmark to your inventory?

+                </e_new>

+<f_old_trans>

+                        � 항목� 귀하� �벤토리로 복사 하시겠습니까?

+                </f_old_trans>

+<f_translation/></string><string><a_file>alerts.xml</a_file>

+<b_path>//ConfirmLandmarkCopy/Copy</b_path>

+<c_attribute></c_attribute>

+<d_old>

+                        Copy

+                </d_old>

+<e_new>

+                        OK

+                </e_new>

+<f_old_trans>

+                        복사

+                </f_old_trans>

+<f_translation/></string><string><a_file>alerts.xml</a_file>

+<b_path>//OnlyOfficerCanBuyLand/message</b_path>

+<c_attribute></c_attribute>

+<d_old>

+                        Unable to buy land for the group:

+You do not have permission to buy land for your active group.

+Please activate another group using Edit -&gt; Groups...

+                </d_old>

+<e_new>

+                        Unable to buy land for the group:

+You do not have permission to buy land for your active group.

+                </e_new>

+<f_old_trans>

+                        그룹� 대신해 토지를 매입하지 못했습니다:

+활� 중� 그룹� 위해 토지를 매입할 권한� 없습니다.

+편집 -&gt; 그룹...� �용하여 다른 그룹� 활성화하십시오.

+                </f_old_trans>

+<f_translation/></string><string><a_file>alerts.xml</a_file>

+<b_path>//AddFriend/Offer</b_path>

+<c_attribute></c_attribute>

+<d_old>

+                        Offer

+                </d_old>

+<e_new>

+                        OK

+                </e_new>

+<f_old_trans>

+                        제공

+                </f_old_trans>

+<f_translation/></string><string><a_file>alerts.xml</a_file>

+<b_path>//RemoveFromFriends/message</b_path>

+<c_attribute></c_attribute>

+<d_old>

+                        Do you want to remove [FIRST_NAME] [LAST_NAME] from your friends?

+                </d_old>

+<e_new>

+                        Do you want to remove [FIRST_NAME] [LAST_NAME] from your Friends List?

+                </e_new>

+<f_old_trans>

+                        [FIRST_NAME] [LAST_NAME]님� 친구�서 제거하시겠습니까?

+                </f_old_trans>

+<f_translation/></string><string><a_file>alerts.xml</a_file>

+<b_path>//RemoveFromFriends/Remove</b_path>

+<c_attribute></c_attribute>

+<d_old>

+                        Remove

+                </d_old>

+<e_new>

+                        OK

+                </e_new>

+<f_old_trans>

+                        제거

+                </f_old_trans>

+<f_translation/></string><string><a_file>alerts.xml</a_file>

+<b_path>//RemoveMultipleFromFriends/message</b_path>

+<c_attribute></c_attribute>

+<d_old>

+                        Do you want to remove multiple friends from your friends list?

+                </d_old>

+<e_new>

+                        Do you want to remove multiple friends from your Friends list?

+                </e_new>

+<f_old_trans>

+                        친구 목��서 여러 명� 친구를 제거하시겠습니까?

+                </f_old_trans>

+<f_translation/></string><string><a_file>alerts.xml</a_file>

+<b_path>//RemoveMultipleFromFriends/Remove</b_path>

+<c_attribute></c_attribute>

+<d_old>

+                        Remove

+                </d_old>

+<e_new>

+                        OK

+                </e_new>

+<f_old_trans>

+                        제거

+                </f_old_trans>

+<f_translation/></string><string><a_file>alerts.xml</a_file>

+<b_path>//GodDeleteAllScriptedPublicObjectsByUser/DELETE!!</b_path>

+<c_attribute></c_attribute>

+<d_old>

+                        DELETE!!

+                </d_old>

+<e_new>

+                        OK

+                </e_new>

+<f_old_trans>

+                        삭제!!

+                </f_old_trans>

+<f_translation/></string><string><a_file>alerts.xml</a_file>

+<b_path>//GodDeleteAllScriptedObjectsByUser/!!DELETEALL!!</b_path>

+<c_attribute></c_attribute>

+<d_old>

+                        !!DELETE ALL!!

+                </d_old>

+<e_new>

+                        OK

+                </e_new>

+<f_old_trans>

+                        !!모� 삭제!!

+                </f_old_trans>

+<f_translation/></string><string><a_file>alerts.xml</a_file>

+<b_path>//GodDeleteAllObjectsByUser/!!DELETEALL!!</b_path>

+<c_attribute></c_attribute>

+<d_old>

+                        !!DELETE ALL!!

+                </d_old>

+<e_new>

+                        OK

+                </e_new>

+<f_old_trans>

+                        !!모� 삭제!!

+                </f_old_trans>

+<f_translation/></string><string><a_file>alerts.xml</a_file>

+<b_path>//BlankClassifiedName/message</b_path>

+<c_attribute></c_attribute>

+<d_old>

+                        You must specify a non-blank name for your classified.

+                </d_old>

+<e_new>

+                        You must specify a name for your classified.

+                </e_new>

+<f_old_trans>

+                        광고� 대해 �름� 입력해야 합니다.

+                </f_old_trans>

+<f_translation/></string><string><a_file>alerts.xml</a_file>

+<b_path>//ConfirmObjectDeleteLock/message</b_path>

+<c_attribute></c_attribute>

+<d_old>

+                        At least one object is locked.

+However, you can delete the current selection.

+Are you sure you want to delete these items?

+                </d_old>

+<e_new>

+                        At least one of the items you have selected is locked.

+

+Are you sure you want to delete these items?

+                </e_new>

+<f_old_trans>

+                        1개 ��� 오브�트가 잠겨 있습니다.

+하지만 현재 선� 아�템� 삭제할 수 있습니다.

+� 아�템� 삭제하시겠습니까?

+                </f_old_trans>

+<f_translation/></string><string><a_file>alerts.xml</a_file>

+<b_path>//ConfirmObjectDeleteLock/Yes</b_path>

+<c_attribute></c_attribute>

+<d_old>

+                        Yes

+                </d_old>

+<e_new>

+                        OK

+                </e_new>

+<f_old_trans>

+                        예

+                </f_old_trans>

+<f_translation/></string><string><a_file>alerts.xml</a_file>

+<b_path>//ConfirmObjectDeleteLock/No</b_path>

+<c_attribute></c_attribute>

+<d_old>

+                        No

+                </d_old>

+<e_new>

+                        Cancel

+                </e_new>

+<f_old_trans>

+                        아니오

+                </f_old_trans>

+<f_translation/></string><string><a_file>alerts.xml</a_file>

+<b_path>//ConfirmObjectDeleteNoCopy/message</b_path>

+<c_attribute></c_attribute>

+<d_old>

+                        At least one object is not copyable.

+However, you can delete the current selection.

+Are you sure you want to delete these items?

+                </d_old>

+<e_new>

+                        At least one of the items you have selected is not copyable.

+

+Are you sure you want to delete these items?

+                </e_new>

+<f_old_trans>

+                        1개 ��� 오브�트를 복사할 수 없습니다.

+하지만 현재 선� 아�템� 삭제할 수 있습니다.

+� 아�템� 삭제하시겠습니까?

+                </f_old_trans>

+<f_translation/></string><string><a_file>alerts.xml</a_file>

+<b_path>//ConfirmObjectDeleteNoCopy/Yes</b_path>

+<c_attribute></c_attribute>

+<d_old>

+                        Yes

+                </d_old>

+<e_new>

+                        OK

+                </e_new>

+<f_old_trans>

+                        예

+                </f_old_trans>

+<f_translation/></string><string><a_file>alerts.xml</a_file>

+<b_path>//ConfirmObjectDeleteNoCopy/No</b_path>

+<c_attribute></c_attribute>

+<d_old>

+                        No

+                </d_old>

+<e_new>

+                        Cancel

+                </e_new>

+<f_old_trans>

+                        아니오

+                </f_old_trans>

+<f_translation/></string><string><a_file>alerts.xml</a_file>

+<b_path>//ConfirmObjectDeleteNoOwn/message</b_path>

+<c_attribute></c_attribute>

+<d_old>

+                        You do not own least one object.

+However, you can delete the current selection.

+Are you sure you want to delete these items?

+                </d_old>

+<e_new>

+                        You do not own least one of the items you have selected .

+

+Are you sure you want to delete these items?

+                </e_new>

+<f_old_trans>

+                        최소 하나 ��� 오브�트를 소유하고 있지 않습니다.

+하지만 현재 선� 항목� 삭제할 수 있습니다.

+�러한 아�템� 삭제하시겠습니까?

+                </f_old_trans>

+<f_translation/></string><string><a_file>alerts.xml</a_file>

+<b_path>//ConfirmObjectDeleteNoOwn/Yes</b_path>

+<c_attribute></c_attribute>

+<d_old>

+                        Yes

+                </d_old>

+<e_new>

+                        OK

+                </e_new>

+<f_old_trans>

+                        예

+                </f_old_trans>

+<f_translation/></string><string><a_file>alerts.xml</a_file>

+<b_path>//ConfirmObjectDeleteNoOwn/No</b_path>

+<c_attribute></c_attribute>

+<d_old>

+                        No

+                </d_old>

+<e_new>

+                        Cancel

+                </e_new>

+<f_old_trans>

+                        아니오

+                </f_old_trans>

+<f_translation/></string><string><a_file>alerts.xml</a_file>

+<b_path>//ConfirmObjectDeleteLockNoCopy/message</b_path>

+<c_attribute></c_attribute>

+<d_old>

+                        At least one object is locked.

+At least one object is not copyable.

+However, you can delete the current selection.

+Are you sure you want to delete these items?

+                </d_old>

+<e_new>

+                        At least one object is locked.

+At least one object is not copyable.

+

+Are you sure you want to delete these items?

+                </e_new>

+<f_old_trans>

+                        1개 ��� 오브�트가 잠겨 있습니다.

+1개 ��� 오브�트를 복사할 수 없습니다.

+하지만 현재 선� 아�템� 삭제할 수 있습니다.

+� 아�템� 삭제 하시겠습니까?

+                </f_old_trans>

+<f_translation/></string><string><a_file>alerts.xml</a_file>

+<b_path>//ConfirmObjectDeleteLockNoCopy/Yes</b_path>

+<c_attribute></c_attribute>

+<d_old>

+                        Yes

+                </d_old>

+<e_new>

+                        OK

+                </e_new>

+<f_old_trans>

+                        예

+                </f_old_trans>

+<f_translation/></string><string><a_file>alerts.xml</a_file>

+<b_path>//ConfirmObjectDeleteLockNoCopy/No</b_path>

+<c_attribute></c_attribute>

+<d_old>

+                        No

+                </d_old>

+<e_new>

+                        Cancel

+                </e_new>

+<f_old_trans>

+                        아니오

+                </f_old_trans>

+<f_translation/></string><string><a_file>alerts.xml</a_file>

+<b_path>//ConfirmObjectDeleteLockNoOwn/message</b_path>

+<c_attribute></c_attribute>

+<d_old>

+                        At least one object is locked.

+You do not own least one object.

+However, you can delete the current selection.

+Are you sure you want to delete these items?

+                </d_old>

+<e_new>

+                        At least one object is locked.

+You do not own least one object.

+

+Are you sure you want to delete these items?

+                </e_new>

+<f_old_trans>

+                        1개 ��� 오브�트가 잠겨 있습니다.

+1개 ��� 오브�트가 귀하� 소유가 아닙니다.

+하지만 현재 선� 아�템� 삭제할 수 있습니다.

+� 아�템� 삭제하시겠습니까?

+                </f_old_trans>

+<f_translation/></string><string><a_file>alerts.xml</a_file>

+<b_path>//ConfirmObjectDeleteLockNoOwn/Yes</b_path>

+<c_attribute></c_attribute>

+<d_old>

+                        Yes

+                </d_old>

+<e_new>

+                        OK

+                </e_new>

+<f_old_trans>

+                        예

+                </f_old_trans>

+<f_translation/></string><string><a_file>alerts.xml</a_file>

+<b_path>//ConfirmObjectDeleteLockNoOwn/No</b_path>

+<c_attribute></c_attribute>

+<d_old>

+                        No

+                </d_old>

+<e_new>

+                        Cancel

+                </e_new>

+<f_old_trans>

+                        아니오

+                </f_old_trans>

+<f_translation/></string><string><a_file>alerts.xml</a_file>

+<b_path>//ConfirmObjectDeleteNoCopyNoOwn/message</b_path>

+<c_attribute></c_attribute>

+<d_old>

+                        At least one object is not copyable.

+You do not own least one object.

+However, you can delete the current selection.

+Are you sure you want to delete these items?

+                </d_old>

+<e_new>

+                        At least one object is not copyable.

+You do not own least one object.

+

+Are you sure you want to delete these items?

+                </e_new>

+<f_old_trans>

+                        1개 ��� 오브�트를 복사할 수 없습니다.

+1개 ��� 오브�트가 귀하� 소유가 아닙니다.

+하지만 현재 선� 아�템� 삭제할 수 있습니다.

+� 아�템� 삭제하시겠습니까?

+                </f_old_trans>

+<f_translation/></string><string><a_file>alerts.xml</a_file>

+<b_path>//ConfirmObjectDeleteNoCopyNoOwn/Yes</b_path>

+<c_attribute></c_attribute>

+<d_old>

+                        Yes

+                </d_old>

+<e_new>

+                        OK

+                </e_new>

+<f_old_trans>

+                        예

+                </f_old_trans>

+<f_translation/></string><string><a_file>alerts.xml</a_file>

+<b_path>//ConfirmObjectDeleteNoCopyNoOwn/No</b_path>

+<c_attribute></c_attribute>

+<d_old>

+                        No

+                </d_old>

+<e_new>

+                        Cancel

+                </e_new>

+<f_old_trans>

+                        아니오

+                </f_old_trans>

+<f_translation/></string><string><a_file>alerts.xml</a_file>

+<b_path>//ConfirmObjectDeleteLockNoCopyNoOwn/message</b_path>

+<c_attribute></c_attribute>

+<d_old>

+                        At least one object is locked.

+At least one object is not copyable.

+You do not own least one object.

+However, you can delete the current selection.

+Are you sure you want to delete these items?

+                </d_old>

+<e_new>

+                        At least one object is locked.

+At least one object is not copyable.

+You do not own least one object.

+

+Are you sure you want to delete these items?

+                </e_new>

+<f_old_trans>

+                        1개 ��� 오브�트가 잠겨 있습니다.

+1개 ��� 오브�트를 복사할 수 없습니다.

+1개 ��� 오브�트가 귀하� 소유가 아닙니다.

+하지만 현재 선� 아�템� 삭제할 수 있습니다.

+� 아�템� 삭제 하시겠습니까?

+                </f_old_trans>

+<f_translation/></string><string><a_file>alerts.xml</a_file>

+<b_path>//ConfirmObjectDeleteLockNoCopyNoOwn/Yes</b_path>

+<c_attribute></c_attribute>

+<d_old>

+                        Yes

+                </d_old>

+<e_new>

+                        OK

+                </e_new>

+<f_old_trans>

+                        예

+                </f_old_trans>

+<f_translation/></string><string><a_file>alerts.xml</a_file>

+<b_path>//ConfirmObjectDeleteLockNoCopyNoOwn/No</b_path>

+<c_attribute></c_attribute>

+<d_old>

+                        No

+                </d_old>

+<e_new>

+                        cancel

+                </e_new>

+<f_old_trans>

+                        아니오

+                </f_old_trans>

+<f_translation/></string><string><a_file>alerts.xml</a_file>

+<b_path>//ConfirmObjectTakeLock/message</b_path>

+<c_attribute></c_attribute>

+<d_old>

+                        At least one object is locked.

+However, you can take the current selection.

+Are you sure you want to take these items?

+                </d_old>

+<e_new>

+                        At least one object is locked.

+

+Are you sure you want to take these items?

+                </e_new>

+<f_old_trans>

+                        1개 ��� 오브�트가 잠겨 있습니다.

+하지만 현재 �하는 아�템� 선�할 수 있습니다.

+� 아�템� 소유 하시겠습니까?

+                </f_old_trans>

+<f_translation/></string><string><a_file>alerts.xml</a_file>

+<b_path>//ConfirmObjectTakeLock/Yes</b_path>

+<c_attribute></c_attribute>

+<d_old>

+                        Yes

+                </d_old>

+<e_new>

+                        OK

+                </e_new>

+<f_old_trans>

+                        예

+                </f_old_trans>

+<f_translation/></string><string><a_file>alerts.xml</a_file>

+<b_path>//ConfirmObjectTakeLock/No</b_path>

+<c_attribute></c_attribute>

+<d_old>

+                        No

+                </d_old>

+<e_new>

+                        Cancel

+                </e_new>

+<f_old_trans>

+                        아니오

+                </f_old_trans>

+<f_translation/></string><string><a_file>alerts.xml</a_file>

+<b_path>//ConfirmObjectTakeNoOwn/message</b_path>

+<c_attribute></c_attribute>

+<d_old>

+                        You do not own all of the objects you are taking.

+If you continue, next owner permissions will be

+applied to the objects and possibly restrict your

+ability to modify or copy them in the future.

+However, you can take the current selection.

+Are you sure you want to take these items?

+                </d_old>

+<e_new>

+                        You do not own all of the objects you are taking.

+If you continue, next owner permissions will be

+applied and possibly restrict your

+ability to modify or copy them.

+

+Are you sure you want to take these items?

+                </e_new>

+<f_old_trans>

+                        가져오려는 모든 오브�트를 소유하고 있지 않습니다.

+계�하면 � 오브�트� 다� 소유주 권한�

+�용�고 나중� 오브�트를 수정 �는 복사하는 � 필요한

+귀하� 권한� 제한� 수 있습니다.

+하지만 현재 선�한 항목� 가져올 수 있습니다.

+�러한 아�템� 가져오시겠습니까?

+                </f_old_trans>

+<f_translation/></string><string><a_file>alerts.xml</a_file>

+<b_path>//ConfirmObjectTakeNoOwn/Yes</b_path>

+<c_attribute></c_attribute>

+<d_old>

+                        Yes

+                </d_old>

+<e_new>

+                        OK

+                </e_new>

+<f_old_trans>

+                        예

+                </f_old_trans>

+<f_translation/></string><string><a_file>alerts.xml</a_file>

+<b_path>//ConfirmObjectTakeNoOwn/No</b_path>

+<c_attribute></c_attribute>

+<d_old>

+                        No

+                </d_old>

+<e_new>

+                        Cancel

+                </e_new>

+<f_old_trans>

+                        아니오

+                </f_old_trans>

+<f_translation/></string><string><a_file>alerts.xml</a_file>

+<b_path>//ConfirmObjectTakeLockNoOwn/message</b_path>

+<c_attribute></c_attribute>

+<d_old>

+                        At least one object is locked.

+You do not own all of the objects you are taking.

+If you continue, next owner permissions will be

+applied to the objects and possibly restrict your

+ability to modify or copy them in the future.

+However, you can take the current selection.

+Are you sure you want to take these items?

+                </d_old>

+<e_new>

+                        At least one object is locked.

+You do not own all of the objects you are taking.

+If you continue, next owner permissions will be

+applied and possibly restrict your

+ability to modify or copy them.

+However, you can take the current selection.

+Are you sure you want to take these items?

+                </e_new>

+<f_old_trans>

+                        1개 ��� 오브�트가 잠겨 있습니다.

+가지려는 오브�트 중 �부가 귀하� 소유가 아닙니다.

+계�하면 오브�트� 다� 소유� 권한�

+�용�어 �후� 귀하가 수정하거나 복사할

+권한� 제한� 수 있습니다.

+하지만 현재 �하는 아�템� 선�할 수 있습니다.

+� 아�템� 소유 하시겠습니까?

+                </f_old_trans>

+<f_translation/></string><string><a_file>alerts.xml</a_file>

+<b_path>//ConfirmObjectTakeLockNoOwn/Yes</b_path>

+<c_attribute></c_attribute>

+<d_old>

+                        Yes

+                </d_old>

+<e_new>

+                        OK

+                </e_new>

+<f_old_trans>

+                        예

+                </f_old_trans>

+<f_translation/></string><string><a_file>alerts.xml</a_file>

+<b_path>//ConfirmObjectTakeLockNoOwn/No</b_path>

+<c_attribute></c_attribute>

+<d_old>

+                        No

+                </d_old>

+<e_new>

+                        Cancel

+                </e_new>

+<f_old_trans>

+                        아니오

+                </f_old_trans>

+<f_translation/></string><string><a_file>alerts.xml</a_file>

+<b_path>//DeedLandToGroup/message</b_path>

+<c_attribute></c_attribute>

+<d_old>

+                        By deeding this parcel, the group will be required

+to have and maintain sufficient land use credits.

+ 

+The purchase price of the land is not refunded to

+the owner. If a deeded parcel is sold, the sale

+price will be divided evenly among group members.

+ 

+Deed this [AREA] square meters of land to the group

+&apos;[GROUP_NAME]&apos;?

+                </d_old>

+<e_new>

+                        By deeding this parcel, the group will be required

+to have and maintain sufficient land use credits.

+ 

+The purchase price of the land is not refunded to

+the owner. If a deeded parcel is sold, the sale

+price will be divided evenly among group members.

+ 

+Deed this [AREA] m2 of land to the group

+&apos;[GROUP_NAME]&apos;?

+                </e_new>

+<f_old_trans>

+                        � 구�� 양�하는 � 있어서 � 그룹� 토지 사용�

+위한 충분한 신용� 있어야 합니다.

+ 

+토지 구매 가격� 소유주�게 환불�지

+않습니다. 양�� 구�� �매�는 경우 �매

+가격� 그룹 회��게 균등하게 분배�니다.

+ 

+[AREA]제곱미터� � 토지를 다� 그룹�게 양� 하시겠습니까?

+&apos;[GROUP_NAME]&apos;

+                </f_old_trans>

+<f_translation/></string><string><a_file>alerts.xml</a_file>

+<b_path>//DeedLandToGroup/Deed</b_path>

+<c_attribute></c_attribute>

+<d_old>

+                        Deed

+                </d_old>

+<e_new>

+                        OK

+                </e_new>

+<f_old_trans>

+                        양�

+                </f_old_trans>

+<f_translation/></string><string><a_file>alerts.xml</a_file>

+<b_path>//DeedLandToGroupWithContribution/message</b_path>

+<c_attribute></c_attribute>

+<d_old>

+                        By deeding this parcel, the group will be required

+to have and maintain sufficient land use credits.

+ 

+The deed will include a simultaneous land

+contribution to the group from &apos;[FIRST_NAME] [LAST_NAME]&apos;.

+ 

+The purchase price of the land is not refunded to

+the owner. If a deeded parcel is sold, the sale

+price will be divided evenly among group members.

+ 

+Deed this [AREA] square meters of land to the group

+&apos;[GROUP_NAME]&apos;?

+                </d_old>

+<e_new>

+                        By deeding this parcel, the group will be required

+to have and maintain sufficient land use credits.

+ 

+The deed will include a simultaneous land

+contribution to the group from &apos;[FIRST_NAME] [LAST_NAME]&apos;.

+ 

+The purchase price of the land is not refunded to

+the owner. If a deeded parcel is sold, the sale

+price will be divided evenly among group members.

+ 

+Deed this [AREA] m2 of land to the group

+&apos;[GROUP_NAME]&apos;?

+                </e_new>

+<f_old_trans>LALALA</f_old_trans>

+<f_translation/></string><string><a_file>alerts.xml</a_file>

+<b_path>//DeedLandToGroupWithContribution/Deed</b_path>

+<c_attribute></c_attribute>

+<d_old>

+                        Deed

+                </d_old>

+<e_new>

+                        OK

+                </e_new>

+<f_old_trans>

+                        양�

+                </f_old_trans>

+<f_translation/></string><string><a_file>alerts.xml</a_file>

+<b_path>//WelcomeChooseSex/message</b_path>

+<c_attribute></c_attribute>

+<d_old>

+                        Your character will appear in a moment.

+ 

+Use arrow keys to walk.

+ 

+Press the F1 key at any time for help or

+to learn more about [SECOND_LIFE]. 

+ 

+Please choose the male or female character.

+You can change your mind later.

+                </d_old>

+<e_new>

+                        Your character will appear in a moment.

+ 

+Use arrow keys to walk.

+ 

+Press the F1 key at any time for help or

+to learn more about [SECOND_LIFE]. 

+ 

+Please choose the male or female avatar.

+You can change your mind later.

+                </e_new>

+<f_old_trans>

+                        잠시 후 선�하신 �릭터가 나타납니다.

+ 

+화살표 키를 �용하여 걸� 수 있습니다.

+ 

+F1 키를 눌러 �움�� 보거나 

+[SECOND_LIFE]를 �세히 배울 수 있습니다.

+ 

+남성 �는 여성 �릭터를 선�해 주십시오.

+차후� 변경� 가능합니다.

+                </f_old_trans>

+<f_translation/></string><string><a_file>alerts.xml</a_file>

+<b_path>//KickUsersFromRegion/message</b_path>

+<c_attribute></c_attribute>

+<d_old>

+                        Teleport home all users in this region?

+                </d_old>

+<e_new>

+                        Teleport all Residents in this region home?

+                </e_new>

+<f_old_trans>

+                        � 지역 내 모든 사용�를 홈으로 텔리�트 하시겠습니까?

+                </f_old_trans>

+<f_translation/></string><string><a_file>alerts.xml</a_file>

+<b_path>//ReturnScriptedOnOthersLand/message</b_path>

+<c_attribute></c_attribute>

+<d_old>

+                        Are you sure you want to return all scripted objects owned by

+** [USER_NAME] **

+non all land but his/her own?

+                </d_old>

+<e_new>

+                        Are you sure you want to return all scripted objects owned by

+** [USER_NAME] **

+on all land in this region they do not own?

+                </e_new>

+<f_old_trans>

+                        사용�� 토지를 제외한 모든 토지�서

+** [USER_NAME] **

+소유� 모든 스�립트 오브�트를 반환 하시겠습니까?

+                </f_old_trans>

+<f_translation/></string><string><a_file>alerts.xml</a_file>

+<b_path>//ReturnScriptedOnOthersLand/Return</b_path>

+<c_attribute></c_attribute>

+<d_old>

+                        Return

+                </d_old>

+<e_new>

+                        OK

+                </e_new>

+<f_old_trans>

+                        반환

+                </f_old_trans>

+<f_translation/></string><string><a_file>alerts.xml</a_file>

+<b_path>//ReturnScriptedOnAllLand/message</b_path>

+<c_attribute></c_attribute>

+<d_old>

+                        Are you sure you want to return ALL scripted objects owned by

+** [USER_NAME] **

+non ALL LAND in this region?

+                </d_old>

+<e_new>

+                        Are you sure you want to return ALL scripted objects owned by

+** [USER_NAME] **

+on ALL LAND in this region?

+                </e_new>

+<f_old_trans>

+                        � 지역 내 모든 토지�서

+** [USER_NAME] **

+소유� 모든 스�립트 오브�트를 반환하시겠습니까?

+                </f_old_trans>

+<f_translation/></string><string><a_file>alerts.xml</a_file>

+<b_path>//ReturnScriptedOnAllLand/Return</b_path>

+<c_attribute></c_attribute>

+<d_old>

+                        Return

+                </d_old>

+<e_new>

+                        OK

+                </e_new>

+<f_old_trans>

+                        반환

+                </f_old_trans>

+<f_translation/></string><string><a_file>alerts.xml</a_file>

+<b_path>//InvalidTerrainBitDepth/message</b_path>

+<c_attribute></c_attribute>

+<d_old>

+                        Couldn&apos;t set region textures: 

+ 

+Terrain texture [TEXTURE_NUM] has an invalid bit depth of [TEXTURE_BIT_DEPTH].

+ 

+Replace texture [TEXTURE_NUM] with a 24 bit 512x512 or smaller image

+then click &quot;Set&quot; again.

+                </d_old>

+<e_new>

+                        Couldn&apos;t set region textures: 

+ 

+Terrain texture [TEXTURE_NUM] has an invalid bit depth of [TEXTURE_BIT_DEPTH].

+ 

+Replace texture [TEXTURE_NUM] with a 24-bit 512x512 or smaller image

+then click &quot;Apply&quot; again.

+                </e_new>

+<f_old_trans>

+                        지역 �스처를 설정할 수 없습니다: 

+ 

+지형 �스처 [TEXTURE_NUM]� 비트 수준 [TEXTURE_BIT_DEPTH]�(가) 유효하지 않습니다.

+ 

+�스처 [TEXTURE_NUM]�(를) 24비트� 512x512(�는 � 작�) �미지로 �체하고

+&quot;설정&quot;� 다시 �릭하십시오.

+                </f_old_trans>

+<f_translation/></string><string><a_file>alerts.xml</a_file>

+<b_path>//InvalidTerrainSize/message</b_path>

+<c_attribute></c_attribute>

+<d_old>

+                        Couldn&apos;t set region textures: 

+ 

+Terrain texture [TEXTURE_NUM] is too large at [TEXTURE_SIZE_X]x[TEXTURE_SIZE_Y]. 

+ 

+Replace texture [TEXTURE_NUM] with a 24 bit 512x512 or smaller image

+then click &quot;Set&quot; again.

+                </d_old>

+<e_new>

+                        Couldn&apos;t set region textures: 

+ 

+Terrain texture [TEXTURE_NUM] is too large at [TEXTURE_SIZE_X]x[TEXTURE_SIZE_Y]. 

+ 

+Replace texture [TEXTURE_NUM] with a 24-bit 512x512 or smaller image

+then click &quot;Apply&quot; again.

+                </e_new>

+<f_old_trans>

+                        지역 �스처를 설정할 수 없습니다: 

+ 

+지형 �스처 [TEXTURE_NUM]�(가) 너무 �니다([TEXTURE_SIZE_X]x[TEXTURE_SIZE_Y]). 

+ 

+�스처 [TEXTURE_NUM]�(를) 24비트� 512x512(�는 � 작�) �미지로 �체하고

+&quot;설정&quot;� 다시 �릭하십시오.

+                </f_old_trans>

+<f_translation/></string><string><a_file>alerts.xml</a_file>

+<b_path>//ConfirmBakeTerrain/Bake</b_path>

+<c_attribute></c_attribute>

+<d_old>

+                        Bake

+                </d_old>

+<e_new>

+                        OK

+                </e_new>

+<f_old_trans>

+                        저장

+                </f_old_trans>

+<f_translation/></string><string><a_file>alerts.xml</a_file>

+<b_path>//MaxAllowedAgentOnRegion/message</b_path>

+<c_attribute></c_attribute>

+<d_old>

+                        You can only have [MAX_AGENTS] allowed residents.

+                </d_old>

+<e_new>

+                        You can only have [MAX_AGENTS] Allowed Residents.

+                </e_new>

+<f_old_trans>

+                        귀하�게 허용�는 최대 주민 수는 [MAX_AGENTS]입니다.

+                </f_old_trans>

+<f_translation/></string><string><a_file>alerts.xml</a_file>

+<b_path>//MaxAllowedGroupsOnRegion/message</b_path>

+<c_attribute></c_attribute>

+<d_old>

+                        You can only have [MAX_GROUPS] allowed groups.

+                </d_old>

+<e_new>

+                        You can only have [MAX_GROUPS] Allowed Groups.

+                </e_new>

+<f_old_trans>

+                        귀하�게 허용�는 최대 그룹 수는 [MAX_GROUPS]입니다.

+                </f_old_trans>

+<f_translation/></string><string><a_file>alerts.xml</a_file>

+<b_path>//MaxBannedAgentsOnRegion/message</b_path>

+<c_attribute></c_attribute>

+<d_old>

+                        You can only have [MAX_BANNED] banned residents.

+                </d_old>

+<e_new>

+                        You can only have [MAX_BANNED] Banned Residents.

+                </e_new>

+<f_old_trans>

+                        귀하� 최대 금지 주민 수는 [MAX_BANNED]입니다.

+                </f_old_trans>

+<f_translation/></string><string><a_file>alerts.xml</a_file>

+<b_path>//MaxManagersOnRegion/message</b_path>

+<c_attribute></c_attribute>

+<d_old>

+                        You can only have [MAX_MANAGER] banned residents.

+                </d_old>

+<e_new>

+                        You can only have [MAX_MANAGER] Banned Residents.

+                </e_new>

+<f_old_trans>

+                        귀하� 최대 금지 주민 수는 [MAX_MANAGER]입니다.

+                </f_old_trans>

+<f_translation/></string><string><a_file>alerts.xml</a_file>

+<b_path>//OwnerCanNotBeDenied/message</b_path>

+<c_attribute></c_attribute>

+<d_old>

+                        Can&apos;t add estate owner to estate &apos;Access denied&apos; list.

+                </d_old>

+<e_new>

+                        Can&apos;t add estate owner to estate &apos;Banned Resident&apos; list.

+                </e_new>

+<f_old_trans>

+                        사유지 소유�는 사유지� &apos;출입 거부&apos; 목�� 추가� 수 없습니다.

+                </f_old_trans>

+<f_translation/></string><string><a_file>alerts.xml</a_file>

+<b_path>//FinishedRawDownload/message</b_path>

+<c_attribute></c_attribute>

+<d_old>

+                        Finished download of raw terrain file to: 

+[DOWNLOAD_PATH]

+                </d_old>

+<e_new>

+                        Finished download of raw terrain file to: 

+[DOWNLOAD_PATH].

+                </e_new>

+<f_old_trans>

+                        RAW 지형 파�� 다� 경로� 다운로드 완료했습니다: 

+[DOWNLOAD_PATH]

+                </f_old_trans>

+<f_translation/></string><string><a_file>alerts.xml</a_file>

+<b_path>//DownloadWindowsMandatory/message</b_path>

+<c_attribute></c_attribute>

+<d_old>

+                        A new version of [SECOND_LIFE] is available.

+[MESSAGE]

+ 

+You must download this update to use the system.

+                </d_old>

+<e_new>

+                        A new version of [SECOND_LIFE] is available.

+[MESSAGE]

+ 

+You must download this update to use [SECOND_LIFE].

+                </e_new>

+<f_old_trans>

+                        [SECOND_LIFE] 새 버전� 출시�었습니다.

+[MESSAGE]

+ 

+시스템� 사용하려면 � 업��트를 다운로드해야 합니다.

+                </f_old_trans>

+<f_translation/></string><string><a_file>alerts.xml</a_file>

+<b_path>//DownloadMacMandatory/message</b_path>

+<c_attribute></c_attribute>

+<d_old>

+                        A new version of [SECOND_LIFE] is available.

+[MESSAGE]

+

+You must download this update to use the system.

+ 

+Download to your Applications folder?

+                </d_old>

+<e_new>

+                        A new version of [SECOND_LIFE] is available.

+[MESSAGE]

+

+You must download this update to use [SECOND_LIFE].

+ 

+Download to your Applications folder?

+                </e_new>

+<f_old_trans>

+                        [SECOND_LIFE] 새 버전� 출시�었습니다.

+[MESSAGE]

+

+시스템� 사용하려면 � 업��트를 다운로드해야 합니다.

+ 

+Applications ��� 다운로드하시겠습니까?

+                </f_old_trans>

+<f_translation/></string><string><a_file>alerts.xml</a_file>

+<b_path>//DeedObjectToGroup/message</b_path>

+<c_attribute></c_attribute>

+<d_old>

+                        Deeding this object will cause the group to:

+* Receive money paid into the object

+                </d_old>

+<e_new>

+                        Deeding this object will cause the group to:

+* Receive L$ paid into the object

+                </e_new>

+<f_old_trans>

+                        � 오브�트 양� 시 그룹�게 발�하는 결과:

+* 오브�트� 대한 지불금� 수령함

+                </f_old_trans>

+<f_translation/></string><string><a_file>alerts.xml</a_file>

+<b_path>//AddClassified/message</b_path>

+<c_attribute></c_attribute>

+<d_old>

+                        Classified ads appear in the &apos;Classified&apos; section of the

+Search directory for one week.

+ 

+Fill out your ad, then click &apos;Publish...&apos; to add it to the

+directory.

+ 

+You&apos;ll be asked for a price to pay when clicking Publish.

+Paying more makes your ad appear higher in the list, and

+also appear higher when people search for keywords.

+                </d_old>

+<e_new>

+                        Classified ads appear in the &apos;Classified&apos; section of the

+Find directory for one week.

+ 

+Fill out your ad, then click &apos;Publish...&apos; to add it to the

+directory.

+ 

+You&apos;ll be asked for a price to pay when clicking Publish.

+Paying more makes your ad appear higher in the list, and

+also appear higher when people search for keywords.

+                </e_new>

+<f_old_trans>

+                        광고가 1주� �안 검색 디렉토리� &apos;광고&apos; 섹션�

+나타납니다.

+ 

+광고를 작성한 후 &apos;게시하기...&apos;를 �릭하여 디렉토리�

+추가합니다.

+ 

+게시하기를 �릭하면 지불할 가격� 묻는 메시지가 나타납니다.

+높� 가격� 지불할수� 광고가 목��서 � 높� 위치� 게재�고

+키워드 검색 결과�서 � 우선�으로 표시�니다.

+                </f_old_trans>

+<f_translation/></string><string><a_file>alerts.xml</a_file>

+<b_path>//WebLaunchForums/Gotopage</b_path>

+<c_attribute></c_attribute>

+<d_old>

+                        Go to page

+                </d_old>

+<e_new>

+                        OK

+                </e_new>

+<f_old_trans>

+                        페�지로 ��

+                </f_old_trans>

+<f_translation/></string><string><a_file>alerts.xml</a_file>

+<b_path>//WebLaunchSupport/Gotopage</b_path>

+<c_attribute></c_attribute>

+<d_old>

+                        Go to page

+                </d_old>

+<e_new>

+                        OK

+                </e_new>

+<f_old_trans>

+                        페�지로 ��

+                </f_old_trans>

+<f_translation/></string><string><a_file>alerts.xml</a_file>

+<b_path>//WebLaunchSupportWiki/Gotopage</b_path>

+<c_attribute></c_attribute>

+<d_old>

+                        Go to page

+                </d_old>

+<e_new>

+                        OK

+                </e_new>

+<f_old_trans>

+                        페�지로 ��

+                </f_old_trans>

+<f_translation/></string><string><a_file>alerts.xml</a_file>

+<b_path>//WebLaunchLSLGuide/message</b_path>

+<c_attribute></c_attribute>

+<d_old>

+                        Go to the LSL Guide for scripting help?

+                </d_old>

+<e_new>

+                        Go to the Scripting Guide for scripting help?

+                </e_new>

+<f_old_trans>

+                        스�립팅 �움�� 위해 LSL 가�드로 갑니까?

+                </f_old_trans>

+<f_translation/></string><string><a_file>alerts.xml</a_file>

+<b_path>//WebLaunchLSLGuide/Gotopage</b_path>

+<c_attribute></c_attribute>

+<d_old>

+                        Go to page

+                </d_old>

+<e_new>

+                        OK

+                </e_new>

+<f_old_trans>

+                        페�지로 ��

+                </f_old_trans>

+<f_translation/></string><string><a_file>alerts.xml</a_file>

+<b_path>//WebLaunchReleaseNotes/Gotopage</b_path>

+<c_attribute></c_attribute>

+<d_old>

+                        Go to page

+                </d_old>

+<e_new>

+                        OK

+                </e_new>

+<f_old_trans>

+                        페�지로 ��

+                </f_old_trans>

+<f_translation/></string><string><a_file>alerts.xml</a_file>

+<b_path>//ReturnToOwner/message</b_path>

+<c_attribute></c_attribute>

+<d_old>

+                        Are you sure you want to return the selected

+objects to their owners? Transferable deeded

+objects will be returned to their previous owners.

+(All objects returned will return to the folder they were last in.)

+ 

+*WARNING* No-transfer deeded objects will be deleted!

+                </d_old>

+<e_new>

+                        Are you sure you want to return the selected

+objects to their owners? Transferable deeded

+objects will be returned to their previous owners.

+ 

+*WARNING* No-transfer deeded objects will be deleted!

+                </e_new>

+<f_old_trans>

+                        선�한 오브�트를 소유주�게

+반환 하시겠습니까? 양��

+양� 가능 오브�트가 �전 소유��게 반환�니다.

+(반환�는 모든 오브�트는 최종 소� ��로 반환�니다.)

+ 

+*경고* 양�� 양� 불가능 오브�트는 삭제�니다.

+                </f_old_trans>

+<f_translation/></string><string><a_file>alerts.xml</a_file>

+<b_path>//ReturnToOwner/Return</b_path>

+<c_attribute></c_attribute>

+<d_old>

+                        Return

+                </d_old>

+<e_new>

+                        OK

+                </e_new>

+<f_old_trans>

+                        반환

+                </f_old_trans>

+<f_translation/></string><string><a_file>alerts.xml</a_file>

+<b_path>//ViewReleaseNotes/Gotopage</b_path>

+<c_attribute></c_attribute>

+<d_old>

+                        Go to page

+                </d_old>

+<e_new>

+                        OK

+                </e_new>

+<f_old_trans>

+                        페�지로 ��

+                </f_old_trans>

+<f_translation/></string><string><a_file>alerts.xml</a_file>

+<b_path>//GroupLeaveConfirmOfficer/Leave</b_path>

+<c_attribute></c_attribute>

+<d_old>

+                        Leave

+                </d_old>

+<e_new>

+                        OK

+                </e_new>

+<f_old_trans>

+                        탈퇴

+                </f_old_trans>

+<f_translation/></string><string><a_file>alerts.xml</a_file>

+<b_path>//GroupLeaveConfirmMember/Leave</b_path>

+<c_attribute></c_attribute>

+<d_old>

+                        Leave

+                </d_old>

+<e_new>

+                        OK

+                </e_new>

+<f_old_trans>

+                        탈퇴

+                </f_old_trans>

+<f_translation/></string><string><a_file>alerts.xml</a_file>

+<b_path>//RemoveItemWarn/message</b_path>

+<c_attribute></c_attribute>

+<d_old>

+                        Though permitted, deleting inventory may damage the

+object. Do you want to delete that inventory item?

+                </d_old>

+<e_new>

+                        Though permitted, deleting contents may damage the

+object. Do you want to delete that item?

+                </e_new>

+<f_old_trans>

+                        허용� 경우 �벤토리를 삭제하면 오브�트가 ��� 수

+있습니다. 아�템� 삭제하시겠습니까?

+                </f_old_trans>

+<f_translation/></string><string><a_file>alerts.xml</a_file>

+<b_path>//RemoveItemWarn/Yes</b_path>

+<c_attribute></c_attribute>

+<d_old>

+                        Yes

+                </d_old>

+<e_new>

+                        OK

+                </e_new>

+<f_old_trans>

+                        예

+                </f_old_trans>

+<f_translation/></string><string><a_file>alerts.xml</a_file>

+<b_path>//RemoveItemWarn/No</b_path>

+<c_attribute></c_attribute>

+<d_old>

+                        No

+                </d_old>

+<e_new>

+                        Cancel

+                </e_new>

+<f_old_trans>

+                        아니오

+                </f_old_trans>

+<f_translation/></string><string><a_file>alerts.xml</a_file>

+<b_path>//CantSetHome/message</b_path>

+<c_attribute></c_attribute>

+<d_old>

+                        Can&apos;t set home to here.

+Your home must be on land you or your group owns.

+                </d_old>

+<e_new>

+                        Can&apos;t set home to here.

+                </e_new>

+<f_old_trans>

+                        � 곳� 홈으로 설정할 수 없습니다.

+홈� 귀하나 귀하� 그룹� 소유한 토지� 있어야 합니다.

+                </f_old_trans>

+<f_translation/></string><string><a_file>alerts.xml</a_file>

+<b_path>//BusyModeSet/message</b_path>

+<c_attribute></c_attribute>

+<d_old>

+                        Busy mode set.

+Chat and instant messages will be hidden. Instant

+messages will get your busy reply. All teleportation

+and inventory offers will be declined.

+                </d_old>

+<e_new>

+                        Busy mode set.

+Chat and instant messages will be hidden. Instant

+messages will get your Busy mode response. All teleportation

+and inventory offers will be declined.

+                </e_new>

+<f_old_trans>

+                        다른 용무 중 모드가 설정�었습니다.

+채팅 � 메신저가 숨겨집니다. 메신저를

+받으면 귀하� 다른 용무 중 �답� 답변 �니다. 모든 텔리�트 � 아�템 제공� 거부�니다.

+                </f_old_trans>

+<f_translation/></string><string><a_file>alerts.xml</a_file>

+<b_path>//ChangeLindenEstate/ChangeEstate</b_path>

+<c_attribute></c_attribute>

+<d_old>

+                        Change Estate

+                </d_old>

+<e_new>

+                        OK

+                </e_new>

+<f_old_trans>

+                        사유지 변경

+                </f_old_trans>

+<f_translation/></string><string><a_file>alerts.xml</a_file>

+<b_path>//ChangeLindenAccess/message</b_path>

+<c_attribute></c_attribute>

+<d_old>

+                        You are about to change the access list for a Linden owned 

+estate (mainland, teen grid, orientation, etc.). 

+ 

+This is DANGEROUS and should only be done to invoke the 

+hack allowing objects/money to be transfered in/out of 

+a grid. 

+ 

+It will change thousands of regions and make the 

+spaceserver hiccup. 

+ 

+Proceed?

+                </d_old>

+<e_new>

+                        You are about to change the access list for a Linden owned 

+estate (mainland, teen grid, orientation, etc.). 

+ 

+This is DANGEROUS and should only be done to invoke the 

+hack allowing objects/L$ to be transfered in/out of 

+a grid. 

+ 

+It will change thousands of regions and make the 

+spaceserver hiccup. 

+                </e_new>

+<f_old_trans>

+                        귀하께서는 린든 소유� 사유지(메�랜드, 틴 그리드, 오리엔테�션 등)� 대한 

+접근 목�� 변경하려고 합니다. 

+ 

+�는 위험한 작업�며 오브�트/금액� 그리드�서 송수신할 수 있�� 

+핵� 불러내는 경우�만 수행할 수 

+있습니다. 

+ 

+�렇게 하면 수천가지� 지역� 변경�고 

+공간 서버가 �시�으로 중단� 수� 있습니다. 

+ 

+계�하시겠습니까?

+                </f_old_trans>

+<f_translation/></string><string><a_file>alerts.xml</a_file>

+<b_path>//ChangeLindenAccess/ChangeEstate</b_path>

+<c_attribute></c_attribute>

+<d_old>

+                        Change Estate

+                </d_old>

+<e_new>

+                        OK

+                </e_new>

+<f_old_trans>

+                        사유지 변경

+                </f_old_trans>

+<f_translation/></string><string><a_file>alerts.xml</a_file>

+<b_path>//EstateBannedAgentRemove/message</b_path>

+<c_attribute></c_attribute>

+<d_old>

+                        Stop denying access for this estate only or for [ALL_ESTATES]?

+                </d_old>

+<e_new>

+                        Remove this Resident from the ban list for  access for this estate only or for [ALL_ESTATES]?

+                </e_new>

+<f_old_trans>

+                        � 소유지� 대해서만 �는 [ALL_ESTATES]� 대한 접근 거부를 중단하시겠습니까?

+                </f_old_trans>

+<f_translation/></string><string><a_file>alerts.xml</a_file>

+<b_path>//EstateManagerAdd/message</b_path>

+<c_attribute></c_attribute>

+<d_old>

+                        Add estate manager for this estate only or for all your estates?

+                </d_old>

+<e_new>

+                        Add estate manager for this estate only or for [ALL_ESTATES]?

+                </e_new>

+<f_old_trans>

+                        � 사유지� 대해서만 �는 모든 사유지� 대해 사유지 관리�를 추가하시겠습니까?

+                </f_old_trans>

+<f_translation/></string><string><a_file>alerts.xml</a_file>

+<b_path>//EstateManagerRemove/message</b_path>

+<c_attribute></c_attribute>

+<d_old>

+                        Remove estate manager for this estate only or for all your estates?

+                </d_old>

+<e_new>

+                        Remove estate manager for this estate only or for [ALL_ESTATES]?

+                </e_new>

+<f_old_trans>

+                        � 사유지만 �는 내 모든 사유지 관리�를 제거합니까?

+                </f_old_trans>

+<f_translation/></string><string><a_file>alerts.xml</a_file>

+<b_path>//EstateKickUser/Kick</b_path>

+<c_attribute></c_attribute>

+<d_old>

+                        Kick

+                </d_old>

+<e_new>

+                        OK

+                </e_new>

+<f_old_trans>

+                        추방하기

+                </f_old_trans>

+<f_translation/></string><string><a_file>alerts.xml</a_file>

+<b_path>//EstateChangeCovenant/Change</b_path>

+<c_attribute></c_attribute>

+<d_old>

+                        Change

+                </d_old>

+<e_new>

+                        OK

+                </e_new>

+<f_old_trans>

+                        변경

+                </f_old_trans>

+<f_translation/></string><string><a_file>alerts.xml</a_file>

+<b_path>//PublishClassified/Publish</b_path>

+<c_attribute></c_attribute>

+<d_old>

+                        Publish

+                </d_old>

+<e_new>

+                        OK

+                </e_new>

+<f_old_trans>

+                        게시하기

+                </f_old_trans>

+<f_translation/></string><string><a_file>alerts.xml</a_file>

+<b_path>//ConfirmRestart/Restart</b_path>

+<c_attribute></c_attribute>

+<d_old>

+                        Restart

+                </d_old>

+<e_new>

+                        OK

+                </e_new>

+<f_old_trans>

+                        재시작

+                </f_old_trans>

+<f_translation/></string><string><a_file>alerts.xml</a_file>

+<b_path>//HelpRegionAllowDamage/message</b_path>

+<c_attribute></c_attribute>

+<d_old>

+                        Checking this box enables the health system across all parcels

+regardless of individual parcel settings. If this box is left

+unchecked, individual parcel owners will still be able to 

+activate the health system on their parcels.

+ 

+Default: off

+                </d_old>

+<e_new>

+                        If this box is checked, the health system across all parcels

+regardless of individual parcel settings. If this box is left

+unchecked, individual parcel owners will still be able to 

+activate the health system on their parcels.

+ 

+Default: off

+                </e_new>

+<f_old_trans>

+                        � ��를 선�하면 개별 구� 설정과 관계없� 모든 구��

+보건 시스템� 활성화 �니다. � ��가 선� 해제�

+경우�는 개별 구� 소유주가 �신� 구� 보건 시스템� 

+활성화할 수 있습니다.

+ 

+기본 설정: 꺼�

+                </f_old_trans>

+<f_translation/></string><string><a_file>alerts.xml</a_file>

+<b_path>//HelpRegionAgentLimit/message</b_path>

+<c_attribute></c_attribute>

+<d_old>

+                        Sets the maximum number of avatars allowed in this region.

+Note that the more avatars you have in one region, the worse 

+the performance can be.

+ 

+Default: 30

+                </d_old>

+<e_new>

+                        Sets the maximum number of avatars allowed in this region.

+Performance may vary depending on the

+number avatars present.

+ 

+Default: 40

+                </e_new>

+<f_old_trans>

+                        � 지역� 허용�는 최대 아바타 수를 설정합니다.

+한 지역� 아바타 수가 많�수� 

+성능� 저하�다는 �� 유�하십시오.

+ 

+기본 설정: 30

+                </f_old_trans>

+<f_translation/></string><string><a_file>alerts.xml</a_file>

+<b_path>//HelpRegionObjectBonus/message</b_path>

+<c_attribute></c_attribute>

+<d_old>

+                        The Object Bonus is a multiplier for primitives allowed on any given

+parcel. The range allowed is 1 to 10. Set at &apos;1&apos; each 512m2 parcel

+would be allowed 117 objects. Set at &apos;2&apos; each 512m2 parcel would be

+allowed 234, or twice as many, and so on. The max number of objects

+allowed per region remains 15,000 no matter what the value set for

+Object Bonus. Once this value is set, it should not be lowered until

+you are certain that changing it will not force return or deletion of

+the objects currently on parcels.

+ 

+Default: 1.0

+                </d_old>

+<e_new>

+                        The Object Bonus is a multiplier for primitives allowed on any given

+parcel. The range allowed is 1 to 10. Set at &apos;1&apos;, each 512m2 parcel

+is allowed 117 objects. Set at &apos;2&apos;, each 512m2 parcel is

+allowed 234, or twice as many, and so on. The max number of objects

+allowed per region remains 15,000 no matter what the

+Object Bonus is. once set, be aware that lowering the Object Bonus may cause

+objects to be returned or deleted. 

+ 

+Default: 1.0

+                </e_new>

+<f_old_trans>LALALA</f_old_trans>

+<f_translation/></string><string><a_file>alerts.xml</a_file>

+<b_path>//HelpRegionMaturity/message</b_path>

+<c_attribute></c_attribute>

+<d_old>

+                        Sets the maturity of the region, as shown in the upper right hand

+corner of the screen and in pop-up tips on the map.  Maturity

+also affects search results - residents can choose not to find

+content in Mature regions.

+ 

+The pop-up tips on the map will not change for 5 minutes, because 

+the system only updates map information periodically. 

+ 

+Default: PG

+                </d_old>

+<e_new>

+                        Sets the maturity of the region, as shown at the top

+                        of the screen and in pop-up tips on the map. This setting

+also affects search results - Residents can choose not to find

+content in Mature regions.

+ 

+It may take some time for this change to be reflected 

+on the map.

+ 

+Default: PG

+                </e_new>

+<f_old_trans>

+                        화면 우측 �단 코너와 지�� �업 �� 표시� 대로

+성�용 지역� 설정합니다.  성�용�

+검색 결과� �향� 줄 수 있으며 주민들� 성�용 지역� 컨�츠를 찾지 못하��

+선�할 수 있습니다.

+ 

+시스템� 주기�으로 지� 정보만 업��트하기 때문� 

+지�� �업 �� 5분 �안 변경�지 않습니다. 

+ 

+기본 설정: PG

+                </f_old_trans>

+<f_translation/></string><string><a_file>alerts.xml</a_file>

+<b_path>//HelpRegionRestrictPushObject/message</b_path>

+<c_attribute></c_attribute>

+<d_old>

+                        Sets the full region to restricted push permissions.

+Agents may only push themselves, or be pushed by scripts owned by

+the owner of a parcel, or that are set to the group of the parcel,

+assuming the parcel has a group set/deeded.

+Push refers to the llPushObject() LSL function.

+ 

+Default: Off

+                </d_old>

+<e_new>

+                        This checkbox sets the full region to restricted push permissions.

+When enabled, Residents may only be pushed by themselves

+or by the parcel&apos;s owner.

+(Push refers to the llPushObject() LSL function.)

+ 

+Default: Off

+                </e_new>

+<f_old_trans>

+                        전체 지역� 한정� �용 권한으로 설정합니다.

+��전트는 �신만� �용하거나 구� 소유주가 소유한 스�립트가 �용�거나

+�는 구�� 그룹� 설정� 스�립트로

+해당 구�� 그룹 설정/양�가 있는 것으로 추정합니다.

+밀기는 llPushObject() LSL 기능� �합니다.

+ 

+기본 설정: 꺼�

+                </f_old_trans>

+<f_translation/></string><string><a_file>alerts.xml</a_file>

+<b_path>//HelpParcelChanges/message</b_path>

+<c_attribute></c_attribute>

+<d_old>

+                        Sets whether or not parcels not owned by the estate owner

+can be joined or subdivided. 

+If this option is unchecked:

+ * Only estate owners or managers can join or subdivide parcels. 

+ * They may only join or subdivide parcels belonging to the owner, 

+       or to a group where they have the appropriate group powers.

+If this option is checked:

+ * All parcel owners can join or subdivide the parcels they own. 

+ * For group owned parcels, those with appropriate group powers

+       may join or subdivide parcels.

+ 

+Default: Checked

+                </d_old>

+<e_new>LALALA</e_new>

+<f_old_trans>LALALA</f_old_trans>

+<f_translation/></string><string><a_file>alerts.xml</a_file>

+<b_path>//RegionMaturityChange/message</b_path>

+<c_attribute></c_attribute>

+<d_old>

+                        The maturity rating for this region has been updated. 

+ 

+The world map, however, will take approximately 5 minutes 

+to update, because the system only updates map information 

+periodically.

+                </d_old>

+<e_new>

+                        The maturity rating for this region has been updated. 

+ 

+It may take some time for the change to be 

+reflected on the map.

+                </e_new>

+<f_old_trans>

+                        � �역� 대한 성�용 등급� 업��트�었습니다. 

+ 

+시스템� 주기�으로 지� 정보만 업��트하기 때문� 

+월드 지�를 업��트하려면 약 5분 정� 

+소요�니다.

+                </f_old_trans>

+<f_translation/></string><string><a_file>alerts.xml</a_file>

+<b_path>//HelpRegionDisableScripts/message</b_path>

+<c_attribute></c_attribute>

+<d_old>

+                        When sim performance is poor, a script may be to blame. Open the

+Statistics Bar (Ctrl-Shift-1). Look at the Simulator Physics FPS.

+If it is lower than 45 then open the &apos;Time&apos; panel located at the 

+bottom of the Stats Bar. If Script Time reads 25 ms or higher, click 

+the &apos;Get Top Scripts&apos; button. You will be given the name and location 

+of scripts that may be causing poor performance.

+ 

+Checking the &apos;Disable Scripts&apos; box and then pressing the &apos;Apply&apos; 

+button will temporarily disable all scripts in this region. You may 

+need to do this in order to travel to the location of a noted 

+&apos;top script&apos;. Once you have arrived at the location, investigate the 

+script to determine if it is causing the problem. You may want to 

+contact the owner of the script or delete or return the object. 

+Uncheck the &apos;Disable Script&apos; box and then &apos;Apply&apos; to reactivate 

+the scripts in the region.

+ 

+Default: off

+                </d_old>

+<e_new>LALALA</e_new>

+<f_old_trans>LALALA</f_old_trans>

+<f_translation/></string><string><a_file>alerts.xml</a_file>

+<b_path>//HelpRegionDisableCollisions/message</b_path>

+<c_attribute></c_attribute>

+<d_old>

+                        When sim performance is poor, physical objects may be to blame. 

+Open the Statistics Bar (Ctrl-Shift-1). Look at the Simulator 

+Physics FPS.  If it is lower than 45 then open the &apos;Time&apos; panel 

+located at the bottom of the Stats Bar. If Sim Time (Physics) 

+reads 20 ms or higher, click the &apos;Get Top Colliders&apos; button. 

+You will be given the name and location of physical objects 

+that may be causing poor performance.

+ 

+Checking the &apos;Disable Collisions&apos; box and then pressing the &apos;Apply&apos; 

+button will temporarily disable object-object collisions. You may 

+need to do this in order to travel to the location of a noted 

+&apos;top collider&apos;. Once you have arrived at the location, investigate the 

+object - is it constantly colliding with other objects? You may want to 

+contact the owner of the object or delete or return the object. 

+Uncheck the &apos;Disable Collisions&apos; box and then &apos;Apply&apos; to reactivate 

+collisions in the region.

+ 

+Default: off

+                </d_old>

+<e_new>LALALA</e_new>

+<f_old_trans>LALALA</f_old_trans>

+<f_translation/></string><string><a_file>alerts.xml</a_file>

+<b_path>//HelpRegionDisablePhysics/message</b_path>

+<c_attribute></c_attribute>

+<d_old>

+                        Disable Physics is similar to Disable Collisions, except all 

+physics simulation is disabled.  This means that not only will 

+objects stop colliding, but avatars will be unable to move. 

+ 

+This should only be used when Disable Collisions does not 

+give back enough performance to the region to investigate 

+a physics problem or &apos;Top Collider&apos;.

+ 

+Be sure to re-enable physics when you are done, or avatars 

+will continue to be unable to move. 

+ 

+Default: off

+                </d_old>

+<e_new>

+                        Disable Physics is similar to Disable Collisions, except all 

+physics simulation is disabled.  This means that not only will 

+objects stop colliding, but avatars will be unable to move. 

+ 

+This should only be used when Disable Collisions does not 

+give back enough performance to the region to investigate 

+a physics problem or Top Collider.

+ 

+Be sure to re-enable physics when you are done, or avatars 

+will continue to be unable to move. 

+ 

+Default: off

+                </e_new>

+<f_old_trans>LALALA</f_old_trans>

+<f_translation/></string><string><a_file>alerts.xml</a_file>

+<b_path>//HelpRegionTopColliders/message</b_path>

+<c_attribute></c_attribute>

+<d_old>

+                        Show a list of objects experiencing the greatest number 

+of potential object-object collisions.  These objects can 

+slow sim performance.  Select View &gt; Statistics Bar and 

+look under Simulator &gt; Time &gt; Sim Time (Physics) to see 

+if more than 20 ms is being spent in physics.

+                </d_old>

+<e_new>

+                        Show a list of objects experiencing the greatest number 

+of potential object-object collisions.  These objects can 

+slow performance.  Select View &gt; Statistics Bar and 

+look under Simulator &gt; Time &gt; Sim Time (Physics) to see 

+if more than 20 ms is being spent in physics.

+                </e_new>

+<f_old_trans>

+                        오브�트 간� 최고 수준� 충� 가능성� 경험하는 

+오브�트 목�� 표시합니다.  �러한 오브�트로 �해 

+Simulation 성능� �려질 수 있습니다.  물리�으로 20 ms �� 사용�었는지 여부를 확�하려면 

+&apos;보기 &gt; 통계보기&apos;를 선�하고 &apos;시뮬레�터 &gt; 

+시간 &gt; Simulation 시간(Physics)&apos;� 확�하십시오.

+                </f_old_trans>

+<f_translation/></string><string><a_file>alerts.xml</a_file>

+<b_path>//HelpRegionTopScripts/message</b_path>

+<c_attribute></c_attribute>

+<d_old>

+                        Show a list of objects spending the most time running 

+LSL scripts.  These objects can slow sim performance. 

+Select View &gt; Statistics Bar and look under 

+Simulator &gt; Time &gt; Script Time to see if more than 

+25 ms is being spent in scripts.

+                </d_old>

+<e_new>

+                        Show a list of objects spending the most time running 

+LSL scripts.  These objects can slow performance. 

+Select View &gt; Statistics Bar and look under 

+Simulator &gt; Time &gt; Script Time to see if more than 

+25 ms is being spent in scripts.

+                </e_new>

+<f_old_trans>

+                        LSL 스�립트 실행� 가장 많� 시간� 소모하는 오브�트� 목�� 

+표시합니다.  �러한 오브�트는 Simulation 성능� 저하시킬 수 있습니다. 

+스�립트�서 25 ms �� 사용�었는지 여부를 확�하려면 

+&apos;보기 &gt; 통계보기&apos;를 선�하고 &apos;시뮬레�터 &gt; 

+시간 &gt; 스�립트 시간&apos;� 확�하십시오.

+                </f_old_trans>

+<f_translation/></string><string><a_file>alerts.xml</a_file>

+<b_path>//HelpRegionRestart/message</b_path>

+<c_attribute></c_attribute>

+<d_old>

+                        Restart the server process running this region after a 

+two minute warning.  All residents in the region will be 

+disconnected.  The region will save its data, and should 

+come back up within 90 seconds. 

+ 

+Restarting the region will not fix most performance 

+problems, and should usually be used only when directed.

+                </d_old>

+<e_new>

+                        Restart the server process running this region after a 

+two minute warning.  All Residents in the region will be 

+disconnected.  The region will save its data, and should 

+come back up within 90 seconds. 

+ 

+Restarting the region will not fix most performance 

+problems, and should usually be used only when directed.

+                </e_new>

+<f_old_trans>

+                        잠시 기다린 후 � 지역� 실행하는 서버 처리를 재시작 합니다.지역� 모든 주민들� 

+ 연결 해제�니다.지역� 해당 지역 ��터를 저장하고 

+ 90 초 �내� �아 와야 합니다.

+ 

+지역� 재시작하면 대부분� 실행 

+ 문제들� 고칠 수 없고 지시 받는 경우�만 보통 �용� 수 있습니다.

+                </f_old_trans>

+<f_translation/></string><string><a_file>alerts.xml</a_file>

+<b_path>//HelpRegionTerrainRaise/message</b_path>

+<c_attribute></c_attribute>

+<d_old>

+                        This is the distance that parcel owners can raise 

+their terrain above the &apos;baked&apos; terrain default 

+height. 

+ 

+Default: 4

+                </d_old>

+<e_new>

+                        This is the distance in meters that parcel owners can raise 

+their terrain above the &apos;baked&apos; terrain default 

+height. 

+ 

+Default: 4

+                </e_new>

+<f_old_trans>

+                        �것� 저장� 지형� 기준 높� 

+��으로 지형� 낮출 수 있는 거리를 

+나타냅니다. 

+ 

+기본 설정: 4

+                </f_old_trans>

+<f_translation/></string><string><a_file>alerts.xml</a_file>

+<b_path>//HelpRegionTerrainLower/message</b_path>

+<c_attribute></c_attribute>

+<d_old>

+                        This is the distance that parcel owners can lower 

+their terrain below the &apos;baked&apos; terrain default 

+height. 

+ 

+Default: -4

+                </d_old>

+<e_new>

+                        This is the distance in meters that parcel owners can lower 

+their terrain below the &apos;baked&apos; terrain default 

+height. 

+ 

+Default: -4

+                </e_new>

+<f_old_trans>

+                        �것� 저장� 지형� 기준 높� 

+미만으로 지형� 낮출 수 있는 거리를 

+나타냅니다. 

+ 

+기본 설정: -4

+                </f_old_trans>

+<f_translation/></string><string><a_file>alerts.xml</a_file>

+<b_path>//HelpRegionUploadRaw/message</b_path>

+<c_attribute></c_attribute>

+<d_old>

+                        This button uploads a .RAW file to the region you are in. 

+The file must have the correct dimensions/number of channels: 

+RGB, 256x256 and 13 channels.  The best way to create a 

+terrain file is to download the existing RAW file.  A good 

+first step is to modify the first channel (land height), 

+and upload it. 

+ 

+The upload can take up to 45 seconds. Note that uploading a 

+terrain file *will not* move the objects that are on the land, 

+only the terrain itself and the permissions associated with the 

+parcels.  This can result in objects going underground. 

+ 

+For more information on editing region height fields, go to: 

+http://secondlife.com/tiki/tiki-index.php?page=RawTerrainFile

+                </d_old>

+<e_new>LALALA</e_new>

+<f_old_trans>LALALA</f_old_trans>

+<f_translation/></string><string><a_file>alerts.xml</a_file>

+<b_path>//HelpRegionDownloadRaw/message</b_path>

+<c_attribute></c_attribute>

+<d_old>

+                        This button downloads a file containing the height field data, 

+parcel dimensions, parcel for sale status and some parcel permissions 

+for this region. When opening the file in a program such as 

+Photoshop you must specify the document&apos;s dimensions which 

+are: RGB, 256x256 with 13 channels. This terrain file cannot 

+be opened in any other way. 

+ 

+For more information on editing region height fields, go to: 

+http://secondlife.com/tiki/tiki-index.php?page=RawTerrainFile

+                </d_old>

+<e_new>

+                        This button downloads a file containing the height field data, 

+parcel dimensions, parcel for sale status and some parcel permissions 

+for this region. When opening the file in a program such as 

+Photoshop you must specify the document&apos;s dimensions which 

+are: RGB, 256x256 with 13 channels. This terrain file cannot 

+be opened in any other way. 

+ 

+For more information on editing region height fields, consult F1 help.

+                </e_new>

+<f_old_trans>LALALA</f_old_trans>

+<f_translation/></string><string><a_file>alerts.xml</a_file>

+<b_path>//HelpRegionBakeTerrain/message</b_path>

+<c_attribute></c_attribute>

+<d_old>

+                        This button saves the current shape of the terrain as the 

+new default for the region. Once baked, the land can revert 

+to the saved shape whenever you or others use the Edit Terrain

+&apos;Revert&apos; option/tool. The baked terrain is also the middle 

+point for the terrain raise and lower limits.

+                </d_old>

+<e_new>

+                        This button saves the current shape of the terrain as the 

+new default for the region. Once baked, the land can revert 

+to the saved shape whenever you or others use the Edit Terrain

+&apos;Revert&apos; option. The baked terrain is also the middle 

+point for the terrain raise and lower limits.

+                </e_new>

+<f_old_trans>

+                        � 버튼� 누르면 현재 지형 모습� 지역� 새로운 

+기본 지형으로 저장�니다. 저장�후 본� �는 다른 사람� 

+토지 편집시 &apos;복구&apos; 버튼� �릭해 저장� 모습� ��릴 수있으며, �한 저장� 지형� 지형 높�기 � 낮추기 

+한계� 대한 기준 지�� �니다.

+                </f_old_trans>

+<f_translation/></string><string><a_file>alerts.xml</a_file>

+<b_path>//HelpEstateEstateManager/message</b_path>

+<c_attribute></c_attribute>

+<d_old>

+                        An estate manager is a resident to whom you have delegated 

+control of region and estate settings.  An estate manager 

+can change any setting in these panels, except for uploading, 

+downloading, and baking terrain.  In particular, they can 

+allow or ban residents from your estate.  

+ 

+Estate managers can only be added or removed by the owner 

+of the estate, not by each other.  Please only choose 

+residents you trust as estate managers, as you will be 

+ultimately responsible for their actions.

+                </d_old>

+<e_new>

+                        An estate manager is a Resident to whom you have delegated 

+control of region and estate settings.  An estate manager 

+can change any setting in these panels, except for uploading, 

+downloading, and baking terrain.  In particular, they can 

+allow or ban Residents from your estate.  

+ 

+Estate managers can only be added or removed by the owner 

+of the estate, not by each other.  Please only choose 

+Residents you trust as estate managers, as you will be 

+ultimately responsible for their actions.

+                </e_new>

+<f_old_trans>LALALA</f_old_trans>

+<f_translation/></string><string><a_file>alerts.xml</a_file>

+<b_path>//HelpEstateExternallyVisible/message</b_path>

+<c_attribute></c_attribute>

+<d_old>

+                        Sets whether residents who are on other estates can enter this

+                         estate without being on an access list.

+ 

+Default: on

+                </d_old>

+<e_new>

+                        This checkbox sets whether Residents who are on other estates can enter this

+                         estate without being on an access list.

+ 

+Default: on

+                </e_new>

+<f_old_trans>

+                        다른 사유지 내� 있는 주민들�

+    접근 권한 리스트� 올�있지 않아� � 사유지� 들어갈 수 있는지 여부를 설정합니다.

+ 

+기본 설정: 켜�

+                </f_old_trans>

+<f_translation/></string><string><a_file>alerts.xml</a_file>

+<b_path>//HelpEstateAllowDirectTeleport/message</b_path>

+<c_attribute></c_attribute>

+<d_old>

+                        When checked, allows residents to directly teleport to any 

+point in your estate.  When unchecked, residents teleport 

+to the nearest telehub. 

+ 

+Default: off

+                </d_old>

+<e_new>

+                        When checked, allows Residents to directly teleport to any 

+point in your estate.  When unchecked, Residents teleport 

+to the nearest telehub. 

+ 

+Default: off

+                </e_new>

+<f_old_trans>

+                        � 옵션� 선�하면 주민� 사용� 사유지� 모든 지�으로 

+�접 텔레�트할 수 있습니다.  � 옵션� 선�� 취소하면 주민� 가장 가까운 

+텔레허브로 텔레�트합니다. 

+ 

+기본 설정: 꺼�

+                </f_old_trans>

+<f_translation/></string><string><a_file>alerts.xml</a_file>

+<b_path>//HelpEstateAllowResident/message</b_path>

+<c_attribute></c_attribute>

+<d_old>

+                        If any resident is listed here, access to the estate will be 

+limited to residents on this list and groups listed below. 

+ 

+(If the estate is visible from the mainland, access cannot be 

+limited to a resident or group list, and these controls will be 

+disabled.  Only the &apos;access denied&apos; list will be used.)

+                </d_old>

+<e_new>

+                        Access to this estate will be limited to Residents 

+                        listed here and any groups below.  This setting is 

+                        only available when Visible from Mainland is 

+                        unchecked.

+                </e_new>

+<f_old_trans>

+                        사유지 사용권한� 목�� 있는 주민들과 아래 목��  그룹들로 제한�니다.

+ 

+(사유지를 메�랜드�서 확�할 수 있는 경우, 사용권한� 주민 �는 목��� 그룹으로 제한� 수 없고, �러한 제어는 비활성화 �니다. ‘접근 거부’ 목�만 사용�).

+                </f_old_trans>

+<f_translation/></string><string><a_file>alerts.xml</a_file>

+<b_path>//HelpEstateAllowGroup/message</b_path>

+<c_attribute></c_attribute>

+<d_old>

+                        If any group is listed here, access to the estate will be 

+limited to the groups on this list and residents specifically 

+allowed above. 

+ 

+(If the estate is visible from the mainland, access cannot be 

+limited to a resident or group list, and these controls will be 

+disabled.  Only the &apos;access denied&apos; list will be used.)

+                </d_old>

+<e_new>

+                        Access to this estate will be limited to groups 

+                        listed here and any Residents above.  This setting is 

+                        only available when Visible from Mainland is 

+                        unchecked.

+                </e_new>

+<f_old_trans>

+                        사유지 사용권한� 목��� 그룹들과 위� 특별히 허�� 주민들로 제한�니다. 

+ 

+(사유지를 메�랜드�서 확�할 수 있는 경우, 사용권한� 주민 �는 목��� 그룹으로 제한� 수 없고, �러한 제어는 비활성화 �니다. ‘접근 거부’ 목�만 사용�).

+                </f_old_trans>

+<f_translation/></string><string><a_file>alerts.xml</a_file>

+<b_path>//HelpEstateBanResident/message</b_path>

+<c_attribute></c_attribute>

+<d_old>

+                        Residents on this list are denied access to your estate, 

+regardless of the allow and group settings above. 

+ 

+Adding a resident to this list will remove them from 

+the allow list.

+                </d_old>

+<e_new>

+                        Residents on this list are denied access to your estate, 

+regardless of any other settings. 

+                </e_new>

+<f_old_trans>

+                        � 목�� 있는 주민들� 

+ 위� 허가와 그룹 설정� 관계없� 내 사유지 사용 권한� 거부�었습니다.

+ 

+� 목�으로 주민� 추가하면 

+ 허가 목��서 해당 주민� 제거�니다.

+                </f_old_trans>

+<f_translation/></string><string><a_file>alerts.xml</a_file>

+<b_path>//BuyOriginal/Buy</b_path>

+<c_attribute></c_attribute>

+<d_old>

+                        Buy

+                </d_old>

+<e_new>

+                        OK

+                </e_new>

+<f_old_trans>

+                        구매

+                </f_old_trans>

+<f_translation/></string><string><a_file>alerts.xml</a_file>

+<b_path>//BuyOriginalNoOwner/Buy</b_path>

+<c_attribute></c_attribute>

+<d_old>

+                        Buy

+                </d_old>

+<e_new>

+                        OK

+                </e_new>

+<f_old_trans>

+                        구매

+                </f_old_trans>

+<f_translation/></string><string><a_file>alerts.xml</a_file>

+<b_path>//BuyCopy/Buy</b_path>

+<c_attribute></c_attribute>

+<d_old>

+                        Buy

+                </d_old>

+<e_new>

+                        OK

+                </e_new>

+<f_old_trans>

+                        구매

+                </f_old_trans>

+<f_translation/></string><string><a_file>alerts.xml</a_file>

+<b_path>//BuyCopyNoOwner/Buy</b_path>

+<c_attribute></c_attribute>

+<d_old>

+                        Buy

+                </d_old>

+<e_new>

+                        OK

+                </e_new>

+<f_old_trans>

+                        구매

+                </f_old_trans>

+<f_translation/></string><string><a_file>alerts.xml</a_file>

+<b_path>//BuyContents/Buy</b_path>

+<c_attribute></c_attribute>

+<d_old>

+                        Buy

+                </d_old>

+<e_new>

+                        OK

+                </e_new>

+<f_old_trans>

+                        구매

+                </f_old_trans>

+<f_translation/></string><string><a_file>alerts.xml</a_file>

+<b_path>//BuyContentsNoOwner/Buy</b_path>

+<c_attribute></c_attribute>

+<d_old>

+                        Buy

+                </d_old>

+<e_new>

+                        OK

+                </e_new>

+<f_old_trans>

+                        구매

+                </f_old_trans>

+<f_translation/></string><string><a_file>alerts.xml</a_file>

+<b_path>//ConfirmPurchase/Confirm</b_path>

+<c_attribute></c_attribute>

+<d_old>

+                        Confirm

+                </d_old>

+<e_new>

+                        OK

+                </e_new>

+<f_old_trans>

+                        확�

+                </f_old_trans>

+<f_translation/></string><string><a_file>alerts.xml</a_file>

+<b_path>//ConfirmPurchasePassword/message</b_path>

+<c_attribute></c_attribute>

+<d_old>

+                        This transaction will:

+ 

+[ACTION]

+ 

+Are you sure you want to proceed with this purchase?

+Please re-enter your password and click Confirm.

+                </d_old>

+<e_new>

+                        This transaction will:

+ 

+[ACTION]

+ 

+Are you sure you want to proceed with this purchase?

+Please re-enter your password and click OK.

+                </e_new>

+<f_old_trans>

+                        거래는 다�과 같습니다:

+ 

+[ACTION]

+ 

+구매를 진행하시겠습니까?

+암호를 다시 입력하고 &apos;확�&apos;� �릭하십시오.

+                </f_old_trans>

+<f_translation/></string><string><a_file>alerts.xml</a_file>

+<b_path>//ConfirmPurchasePassword/ConfirmPurchase</b_path>

+<c_attribute></c_attribute>

+<d_old>

+                        Confirm Purchase

+                </d_old>

+<e_new>

+                        OK

+                </e_new>

+<f_old_trans>

+                        구매 확�

+                </f_old_trans>

+<f_translation/></string><string><a_file>alerts.xml</a_file>

+<b_path>//MoveInventoryFromObject/Move</b_path>

+<c_attribute></c_attribute>

+<d_old>

+                        Move

+                </d_old>

+<e_new>

+                        OK

+                </e_new>

+<f_old_trans>

+                        ��

+                </f_old_trans>

+<f_translation/></string><string><a_file>alerts.xml</a_file>

+<b_path>//MoveInventoryFromObject/Don&apos;tMove</b_path>

+<c_attribute></c_attribute>

+<d_old>

+                        Don&apos;t Move

+                </d_old>

+<e_new>

+                        Cancel

+                </e_new>

+<f_old_trans>

+                        �� 안 함

+                </f_old_trans>

+<f_translation/></string><string><a_file>alerts.xml</a_file>

+<b_path>//MoveInventoryFromScriptedObject/Move</b_path>

+<c_attribute></c_attribute>

+<d_old>

+                        Move

+                </d_old>

+<e_new>

+                        OK

+                </e_new>

+<f_old_trans>

+                        ��

+                </f_old_trans>

+<f_translation/></string><string><a_file>alerts.xml</a_file>

+<b_path>//MoveInventoryFromScriptedObject/Don&apos;tMove</b_path>

+<c_attribute></c_attribute>

+<d_old>

+                        Don&apos;t Move

+                </d_old>

+<e_new>

+                        Cancel

+                </e_new>

+<f_old_trans>

+                        �� 안 함

+                </f_old_trans>

+<f_translation/></string><string><a_file>alerts.xml</a_file>

+<b_path>//ClickActionNotPayable/message</b_path>

+<c_attribute></c_attribute>

+<d_old>

+                        Warning: The Pay Object click action has been set, but it 

+will only work if a script is added with a money() event. 

+This is because residents generally expect that objects 

+will react somehow when money is payed into them.

+                </d_old>

+<e_new>

+                        Warning: The Pay Object click action has been set, but it 

+will only work if a script is added with a money() event. 

+                </e_new>

+<f_old_trans>

+                        경고: 오브�트 지불 �릭 행�� 설정�었지만 

+스�립트가 money() �벤트와 함께 추가� 경우�만 작�합니다. 

+�는 주민들� �반�으로 오브�트� 비용� 지불� 때 

+오브�트가 반�할 것��고 예�하기 때문입니다.

+                </f_old_trans>

+<f_translation/></string><string><a_file>alerts.xml</a_file>

+<b_path>//ReplaceAttachment/Yes</b_path>

+<c_attribute></c_attribute>

+<d_old>

+                        Yes

+                </d_old>

+<e_new>

+                        OK

+                </e_new>

+<f_old_trans>

+                        예

+                </f_old_trans>

+<f_translation/></string><string><a_file>alerts.xml</a_file>

+<b_path>//ReplaceAttachment/No</b_path>

+<c_attribute></c_attribute>

+<d_old>

+                        No

+                </d_old>

+<e_new>

+                        Cancel

+                </e_new>

+<f_old_trans>

+                        아니오

+                </f_old_trans>

+<f_translation/></string><string><a_file>alerts.xml</a_file>

+<b_path>//BusyModePay/Yes</b_path>

+<c_attribute></c_attribute>

+<d_old>

+                        Yes

+                </d_old>

+<e_new>

+                        OK

+                </e_new>

+<f_old_trans>

+                        예

+                </f_old_trans>

+<f_translation/></string><string><a_file>alerts.xml</a_file>

+<b_path>//BusyModePay/No</b_path>

+<c_attribute></c_attribute>

+<d_old>

+                        No

+                </d_old>

+<e_new>

+                        Cancel

+                </e_new>

+<f_old_trans>

+                        아니오

+                </f_old_trans>

+<f_translation/></string><string><a_file>alerts.xml</a_file>

+<b_path>//ConfirmEmptyTrash/Yes</b_path>

+<c_attribute></c_attribute>

+<d_old>

+                        Yes

+                </d_old>

+<e_new>

+                        OK

+                </e_new>

+<f_old_trans>

+                        예

+                </f_old_trans>

+<f_translation/></string><string><a_file>alerts.xml</a_file>

+<b_path>//ConfirmEmptyTrash/No</b_path>

+<c_attribute></c_attribute>

+<d_old>

+                        No

+                </d_old>

+<e_new>

+                        Cancel

+                </e_new>

+<f_old_trans>

+                        아니오

+                </f_old_trans>

+<f_translation/></string><string><a_file>floater_about.xml</a_file>

+<b_path>/floater_about/credits_editor</b_path>

+<c_attribute></c_attribute>

+<d_old>Second Life is brought to you by a2, Aaron, Abishai, adrian, Alberto, Alex, Alexei, Alfred, Alice, Altruima, Amber, Anastasia, Andrea, Andrew, Andy, Annette, Anthony, Aura, Avi, Babbage, Beast, beez, Belinda, Ben, Benjamin, Benny, Betsy, Bill, Blue, Bo, Bob, Brad, Branka, Brent, Brian, Bruce, Bub, Bucky, Bunny, Burgess, Buttercup, Callum, Casino, Cat, Catherine, Chadrick, Char, Charity, Charlie, Chiyo, Chris, Christopher, Civic, Claudia, Cleopetra, Cole, ColeD, Colin, Colleen, Cornelius, Cory, Cube, Cupid, Cyan, Cyn, Dan, DanceStar, Daniel, Data, Dave, David, David2, Deana, Debra, Dee, Dek, Del, Dez, Don, Donovan, Dore, Doug, drunkensufi, Dummy, dustin, Eddie, Eileen, Elena, Elle, Emily, Eric, erika, Erin, Ethan, Evan, Eve, Everett, Firefly, Flashpoint, Fordak, Frank, Fred, Fritz, Frontier, Garry, George, Gia, Ginsu, Glenn, Gulliver, Guy, Hamlet, Haney, Harmony, Harry, Helen, Hello, Henrik, Heretic, Hermia, Holly, Hungry, Hunter, Ian, Icculus, Irfan, Iris, Isaac, Isabel, IsThat, Ivy, Izzy, Jack, Jacqui, Jake, James, Jane, Janet, Jaron, Jay, Jean, Jed, Jeff, Jennifer, Jeremy, Jeska, JeskaTest, Jesse, Jill, Jim, Jimbo, Joe, John, Jon, Jonathan, Joon, Jose, Joshua, Jp, June, Justin, Karen, Kari, Karinelson, Kelly, Kelvin, Ken, Kenny, Kent, Kevin, Kona, Kyle, LaughingMan, Lauren, Lawrence, Lee, Leopard, Leprechaun, Leviathania, Lexie, Leyla, Liana, Libby, Lightfoot, Lizzie, Lock, Logan, Loki, Louie, Lucy, Luke, Madhavi, Magellan, Magenta, Makiko, Marius, Mark, Martin, Matthew, Maurice, Mayor, Melanie, Meta, Mia, Michael, MichaelFrancis, Mick, Migyeong, Mikeb, MikeT, Milo, Mitch, Mogura, Monkey, Monroe, Morpheus, Natria, Neo, Nicolas, Nicole, Nigel, Noel, Nora, Nova, Otakon, Page, Pathfinder, Patsy, Paul, Peter, Philip, Phoenix, PierreLuc, Pilouk, Pony, Professor, Qarl, Rachelle, Ramzi, Ray, Realestate, Red, Rejean, Reuben, Rheya, Richard, Rika, Rob, Robin, Roosevelt, Ross, Runitai, Ruth, Ryan, Sabin, Sally, Sam, Sarah, Satoko, Sean, Secret, Sejong, Senator, Seth, Showme, Siobhan, Sky, Sleepy, Spike, Stefan, Stephanie, Stephany, Stephen, Steve, Stryfe, sturm, Sudhi, Sunil, Swiss, Sylvain, Tanya, Tbone, Teeny, Teeple, Teresa, Tesla, Tess, Tessa, Thomas, Thrax, Thumper, Tim, Tobin, Todd, Tofu, Tom, Torley, Tracy, Uncle, Varas, Vasudha, Vektor, Ventrella, Video, Viola, Walker, Warren, Wendy, Which, Xan, Xander, Xenon, Xtreme, Yedwab, Yohan, Yool, Yoz, Yuko, Zach, Zee, Zero and many others.

+

+Thank you to the following residents for helping to ensure that this is the best version yet: AlexandriaS Aabye, devilite Aabye, Dynamqting Aabye, hellebore Aabye, Maddog Aabye, Urru Aabye, mabare Abattoir, Didi Abdallah, Elwood Abernathy, Jake Abramovich, Schort Achterbahn, Divily Ackland, JadeCharlet Ackland, Kevin Acorn, Binvis Acronym, Robert Adelaide, Atte Aderdeen, KiVanyel Adria, Krillian Adria, Mandi Adria, Butch Adzebills, Beccaboo Aero, Akasha Aferdita, Nicole Aferdita, Nero Agnomen, Hay Ah, Oxoc Ah, Sironl Ah, evokue Ahn, nycbadboy Ahn, Taan Ahn, Cyres Aida, TalNova Aji, Illusion Akula, Xen Akula, Jessa Alba, Alba Albert, kernowed Albert, Blaine Albion, AnneMarie Alcott, Bo Alcott, Cindie Alcott, Cunundrum Alcott, fighter Alcott, Jarad Alcott, Marcello Aldwych, Xenia Alemany, CellMaster Alexander, Molly Alexander, Aerotisma Alexandre, Ghostofgoat Alexandre, Took Alexandre, Ty Alexandre, Christophe Perrin / Krisp Alexandre, Adec Alexandria, Kiwi Alfa, Rowr Aliev, aivlys Allen, asclepius Allen, Aveyond06 Allen, Calvin Allen, gayfrench Allen, gender Allen, Grayson Allen, Jak Allen, Jerdog Allen, MariahMarie Allen, Metzyn Allen, Misty26 Allen, moshetzi Allen, nayara Allen, NH Allen, Pegi Allen, Ponesco Allen, Rap4rag Allen, Safer Allen, sobroke Allen, Bethann Allstar, Sloan Almendros, Ogro Almodovar, Raymondo Alonzo, Rebeca Alonzo, Omega Alphabeta, Elirien Alturas, Rick Alvarado, Golam Amadeus, Kea Amarula, Ariella Amat, Popas Amat, xxjojxx Amat, Jamie Amdahl, Helyos Ames, julies Ames, Keisha Ames, Javz Amsterdam, Kathy Amsterdam, Twistaspliff Amsterdam, darian Anabuki, Dnali Anabuki, Wes Anaconda, Serra Anansi, Britney Anatine, pax Anatine, Ranya Anatine, sientaya Anatine, Siowen Anatine, Padu Andalso, Chanel Anderson, Donna Andrews, Trixie Angel, Macphisto Angelus, meQal Anna, Aznxer Antfarm, Karlo Antonelli, Maksimilian Antonelli, Vala Antonelli, Athoni Antonioni, klement Antwerp, lildeadgirl Antwerp, GeordieJohn Anubis, KatanaBlade Anubis, Diag Anzac, Lunarlie Anzac, Picker Apogee, Azuby Apparatchik, brianica Appin, SwedenArtSheepdogs Aquacade, CaSimone Aquitaine, Dexter Aquitaine, Pericat Aquitaine, Sunshine Araw, Bino Arbuckle, Evangeline Arcadia, Niles Argus, pe Argus, BenneDJezzerette Ariantho, Karmaticdragon Ariantho, Teren Aridian, Garcia Ariel, Ina Arkin, alva Arliss, Noriyoko Arliss, Harle Armistice, Avi Arrow, Ming Arrow, Rox Arten, Razitra Artizar, Mandy Asano, Ty Asano, Kristoff Asbrink, Skye Asbrink, Threasher Asbrink, Daniel Ash, Dion Ashby, Eva Ashby, Ravenal Ashby, TOPDIME Ashby, danielluh Ashton, Deb Ashton, ach Asp, cokeser Asp, lastping Asp, Posrednik Asp, Notypewell Astro, Nargus Asturias, SiRiS Asturias, yol Asturias, ZATZAi Asturias, Animus Asylum, Sang Asylum, SomethingReal Atkey, Dakota Atlanta, Irie Atlantis, Matt Attenborough, Nirva Attenborough, CaptJosh Au, Goren Auer, Jackamo Auer, Jonathan Auer, Tisdi Auer, Chris Auk, Raven Axon, Shawn Ay, TJ Ay, ares Ayres, Cazz Ayres, Eon Ayres, Laura Ayres, zoeba Ayres, Naomi Babcock, Eldrich Babeli, Adrianna Babenco, She Babenco, sterick Babenco, corto Babii, Dia Babii, EvilCutz Babii, Flooxx Babii, Girl Babii, Imraanos Babii, Iv Babii, Lizthebabe Babii, Torrence Babii, Chrystal Babii, Sara Bachman, dzb0 Bade, Doug Bagration, Hobbit Bagration, Abert Bailey, Bambi Bailey, EveNice Bailey, Kaliya Bailey, Kriz Bailey, Leen Bailey, Leonine Bailey, Minke Bailey, Nightjaxs Bailey, Peyton Bailey, Shan Bailey, Stevo Bailey, Tariv Bailey, cream Bailly, Ezekiel Bailly, Gianna Bailly, Hells Bain, Briauna Bainbridge, AnaSofia Bakalava, Jonas Bakalava, Micki Baker, Anita Balczo, Naomi Balczo, Nathan Balder, Bibi Balhaus, Sponz Balhaus, Ainsleigh Ballinger, Dimitry Ballinger, Miriam Ballinger, Rik Ballinger, Trey Ballinger, Zagor Ballinger, Zek Ballinger, Kilara Balnarring, Maya Balut, Franz Bamaisin, Manolo Bamboo, Yuki Bamboo, Oliver Bandit, Pirate Bandit, Outy Banjo, winkler Banjo, SabreWulf Banshee, Akeela Banting, Elke Banting, Arkesh Baral, Barber Barbarossa, Samantha Barbee, Aruk Barbosa, Ayahuasca Barbosa, Bastill Barbosa, Corleone Barbosa, Padrig Barbosa, Samakh Barbosa, seat Barbosa, Topper Barbosa, Thery Bardeen, Bridgitte Bardot, Nici Barley, Annie Barnard, Josse Barnard, DB Barnes, Kitty Barnett, Threshin Barnett, Amy Barnett, Scott Baron, Jeremy Barracuda, Verbuda Barragar, Daphne Barrett, Fenleab Barrett, Lindsey Barrett, Smiley Barry, Denise Barrymore, Manuela Barrymore, Nell Barrymore, Sensation Barrymore, BraadWorst Barth, XxRevelationxX Barthelmess, Fleur Bartlett, Marina Bartlett, Lucius Bartz, Mack Bartz, Astley Bascom, dolomite Bascom, Dags Basevi, Lena Basevi, crystal Basiat, SuezanneC Baskerville, Sweetheart Baskerville, Demi Bates, Demon Bates, kane Bates, Will Bates, ShadixBear Bathgate, Carlotta Batra, Bruce Batz, Silentborn Batz, Dominik Bauer, Logan Bauer, Boz Baxter, Camryn Baxter, diesus Baxter, Drett Baxter, Gazmanjones Baxter, Kiley Baxter, Schwenny Baxter, Shimboo Baxter, Stoffe Baxter, Diamond Baxter, Gruntos Baxter, BC Bayliss, Bibi Bayliss, Backly Beam, BigFoot Beam, JuJu Beam, nati Beam, Pelgrim Beam, ELLiebob Bean, LeatherElf1 Beat, Nikky Beat, Carl Beattie, Fe Beattie, sonoma Beatty, Henri Beauchamp, TimTam Beauchamp, Conrad Beaumont, Dieudonnee Beaumont, Kitten Beaumont, Lucilla Beaumont, Odina Beaumont, PCBRANDY Beaumont, PLASTOK Beaumont, Sheree Beaumont, Sweet Beaumont, Olivier Beaumont, Busybee Beaver, Chiheb Bechir, Caspian Beck, GoldenGamer Beck, icar Beck, Jigoes Beck, Matsumoto Beck, Millie Beck, Rhino Beck, Ronor Beck, ropland Beck, wai Beck, laurionna Beckenbauer, Jeffery Beckersted, Dominick Beckham, Druu Becloud, Holger Becloud, Duce Bedlam, Beach Beebe, Manicexpression Beebe, Nicolette Beebe, Feril Beeks, BillyJoe Beerbaum, Lola Beerbaum, Pimppdog Beerbaum, Baylee Beery, DrathnotT Behemoth, Malarthi Behemoth, phoenix Behemoth, Trinity Bekkers, Dioana Bellah, KissesRhawt Bellambi, Bream Bellman, Hazel Bellow, Milo Bellow, Corvette Beltran, Lefty Belvedere, Jaden Benavente, Bianca Bender, Jeremy Bender, Mercedes Benedek, Albert Benelli, Dodi Benelli, Emili Benelli, laurette Benelli, ninake Benelli, Evazion Benelli, Elaine Bennett, Izabella Bentham, Carol Bentley, Deedrick Benton, Joel Berblinger, Lord Berchot, Pele Berchot, Marimar Berchot, Melody Beresford, Brielle Bergbahn, chrissie Bergson, Kody Bergson, Bit Berjis, Kevin Bernal, Dorie Bernstein, mystic Berry, Razza Berry, Bella Bertone, Taylor Berzin, liz Bessie, Kekken Biberman, Nicolas Biddle, Halbert Bienenstich, terrycrow Bigwig, Jasmine Bijoux, Kala Bijoux, Dano Bikcin, enzo Bikcin, Angle Binder, Cuffs Binder, Roxtor Binder, Tom Binder, Agamemnon Bing, Chalander Bing, Gigi Bing, runeking3007 Bing, Monsieur Bingyi, Angelica Biondetti, Melissa Birge, reeneebob Birmingham, Anubis Bishop, Danica Bishop, Mowesy Bisiani, Marteas Biziou, Karla Bjornson, Roxie Bjornson, Travis Bjornson, Atlwolf Blabbermouth, Rice Black, Nathan Black, Amanda Blackmountain, Disstraction Blackthorne, Miriya Blackthorne, Teagan Blackthorne, Orko Blanchard, Neural Blankes, Random Blankes, Shaura Blazer, Nethermind Bliss, dayanne Boa, Denideny Boa, lecosutre Boa, naholc Boa, NITR0US Boa, Prana Boa, RS Boa, penelope Bobak, Bad Bobbysocks, Ryuujin Boccara, Joey Bock, Elkissa Bode, Annika Boehm, Babyblues Boffin, Snodude101101 Bogan, Dirk Bogart, Jily Bogart, Pompo Bombacci, Ascanio Bonetto, Bony Bonetto, Casanova Bonetto, Cuncittina Bonetto, Frede Bonetto, Ervee Bonne, Jolanda Bonne, Poppy Bonne, Becky Book, Bibi Book, Barney Boomslang, Sam Boomslang, Steeven Boorman, Rogue Borgnine, Summer Borgnine, Rafe Borrelly, Equitus Bosch, Peter van den Bosch, tessa Bosshart, Hermione Bossy, Mr Bossy, Rhiannon Bossy, Aspen Bossy, Marisela Bouchard, Tony Bouchard, Annita Boucher, Aster Boucher, Katy Boucher, Lisae Boucher, Router Boucher, Sneaky1 Boucher, Varak Boucher, DarkAlpha Bourne, Hastings Bournemouth, bend Bowie, Lucy Bowie, Casper Box, coolbimbo Box, Kittenna Box, Metaphor Box, Nemesis Box, Bell Boyd, Kelley Boyd, Sylar Boyd, WendyCat Boyd, Denis Boyle, Jennifer Boyle, melmuse Boyle, Alycia Bradley, jayne Bradley, Airie Braendle, Glitch Braess, Su Brando, Tybalt Brando, IntLibber Brautigan, Dante Breck, Carbon Breed, WitchFire Breed, Bella Brennan, erika Brenner, gaby Brenner, Talthybius Brevity, KitKat Brewster, Lindsey Breyer, Artemis Bright, Brigitte Bright, Donnie Bright, Lucas Bright, Oya Bright, Prentice Bright, Risa Bright, Starfire Bright, Beebo Brink, Marcus Brink, Emi Brissot, Ice Brodie, Luth Brodie, Sam Brodie, Chromal Brodsky, Tydomus Brodsky, Cage Brody, Darling Brody, Kurston Brody, Mike1A Brody, UserJesse Brody, Reese Brody, Faith Broek, Happy Broek, ShadowHunter Brokken, Jacey Brooks, Shake Brooks, Shary Brooks, Sigurd Brooks, Tate Brooks, Vanleen Brooks, BruTuS Broome, PastorD Broome, Sarita Broome, October Brotherhood, Elroy Brouwer, Neophyte Brouwer, Jebediah Brown, linda Brown, Schwartz Bruder, lupu Brule, Joshua Brynner, Linda Brynner, Southy Buckenburger, drifterr Bugaboo, Michelle Bumbo, Trixie Bumbo, Paul Bumi, Jitar Bunin, Kerian Bunin, Crystalmom Bunnyhug, Embrace Bunnyhug, Zues Burali, GiGi Burgess, Keith Burgess, Shawna Burgess, Bain Buridan, Sean Buridan, Chiccorosso Burke, Count Burks, Hinamori Burleigh, Atom Burma, Jasper Burma, Aleshanee Burnett, Dottie Burns, Ebro Burns, Skipper Burns, John Burns, Haroldthe Burrel, Big Burt, dubureau Burt, Keisha Burt, phill Burt, Janloo Burton, Madd Burton, Bowlalot Bury, Dreklore Bury, Jarek Bury, Jenni Bury, Lou Bury, Orlando Bury, Angel Butuzova, dodi Byrd, Enchtris Byrd, Tleva Caballero, Gayle Cabaret, Monique Cabaret, Adele Cagney, Cralyn Cagney, Caribbean Cahill, Darien Caldwell, Lily Caldwell, CFire Caldwell, Ciara Calhern, Karl Calhern, Cecil Calhoun, Tizzy Calliope, Hypatia Callisto, Raven Callisto, Fred Cameron, Meliana Cameron, Antonius Camus, Maddie Camus, Raskella Canadeo, Exotica Canadeo, Vessus Candour, Alexis Canetti, Silvio Canetti, Talia Canetti, bragan Canning, Charenthia Canning, Reeda Canning, Vannesh Cannoli, Changurr Cao, Chilli Cao, Dorian Cao, RosyLee Cao, steve319 Cao, Contamina Capalini, Cougard Capalini, Kirsti Capalini, Lindichka Capalini, Lyla Capalini, JohnMAC Carbenell, snake Carbenell, Capri Carbetta, Sophia Carducci, Kid Cardway, Icould Careless, Aurore Carlberg, Brumia Carlberg, Bruni Carlberg, Brandie Carlos, Jenny Carlos, Avalon Carmona, Moana Carmona, Ashelia Carnell, Rain Carnell, CJ Carnot, Madison Carnot, Julie Carpathea, HALOCAT Carr, coolmaria Carroll, karyme Carroll, Leila Carroll, Crisii Carter, cyrielle Carter, isidore Carter, Missi Carter, Shatara Carter, Tristan Carthage, Aemilia Case, Baby Case, Jenn Cassady, Kittygloom Cassady, Charlotte Cassavetes, Holly Cassavetes, Anthony Cassini, Supertell Cassini, Wietse Cassini, Just Cattaneo, Mandy Cattaneo, Aleicester Catteneo, arthuraleksandravicius Cavan, Maximus Cazalet, Quellin Ceawlin, dMetria Cela, Spidey Cela, Arcadia Ceres, wanderer Cerveau, Aaron Cerveau, Marky Chaffe, Stefani Chaffe, The Chaffe, Becca Chambers, Lexis Chambers, Inigo Chamerberlin, Shion Chandrayaan, Ibrisse Chantilly, MaryAnne Chantilly, Cool Chaparral, guy2 Chaplin, Iadwen Chaplin, Lillyann Chaplin, wllmn Chaplin, Marsha Chapman, Caspar Chapman, Dominique Charles, Chilly Charlton, Pammie Charming, Total Chastity, Arohee Chatnoir, Papillon Chatnoir, Barry Cheeky, coldFuSion Cheeky, Nyla Cheeky, Ryan Cheeky, Aggressor Cheetah, Ronald Cheevers, Michelle Chernov, Maggy Chestnut, Cam Chevalier, Eleonore Chevalier, Kelly Chevalier, Mauries Chevalier, Ozzy Chevalier, Rayvendell Chevalier, Swampy Chevalier, Cheesemuncher Chickenwing, Kaltezar Chickenwing, milespeed Chihuly, Coolkama Childs, Michelle Childs, Nicole Childs, SimonRaven Chippewa, Albert Choche, Annetha Christensen, Jennifer Christensen, Zell Christensen, Herman Christiansen, Haifeng Chu, Francis Chung, tyana Chung, Sundance Churchill, Anubis Cioc, Corpierro Cioc, Dwayne Cioc, Knibbel Cioc, Slowhand Citylights, PonygirlSarah Clapper, Jim Clark, Jacob Clark, Jo A Clark, Angelos Clary, Biffle Clary, lilly733 Clary, Rui Clary, William Clary, Otto Clave, Arahan Claveau, Neil Claxton, Mimi Claymore, Pete Claymore, Sam Clayton, Blank Cleanslate, Deckheard Cleanslate, Electron Cleanslate, Spirit Cleanslate, Willow Cleanslate, Kovu Cleaver, Bell Clellon, Covisha Clift, EBCY Clift, Iumi Cline, pizzaguy Clutterbuck, knightrider Clymer, Exia Coage, Brenda Coakes, Lindsay Coakes, Lyndka Cochrane, Ceinwen Coen, Oneil Coen, Mahogony Coffee, Mark Coffee, Lisbeth Cohen, Melayna Colasanti, holly Coldstream, Moon Cole, Shiden Coledale, Castalia Collingwood, JUNKIE Colman, Silver Colman, Stahi Columbia, SweetAbe Columbia, CC Columbo, Charity Colville, Isabeau Conacher, Deb Cone, emili0 Congrejo, MarioDaniel Congrejo, Jazzy Connell, Jenika Connolly, Cooper Conover, Garn Conover, Mara Conover, Myles Cooper, Angelina Coorara, Valentine Coppens, psyco Coppola, Tremleh Coppola, Venus Coppola, Chiana Cordeaux, Sensuality Cordeaux, Clarissa Cordoso, Methos Corinthian, Tylerferland Cork, Caleb Corleone, Montana Corleone, Sparkey Corleone, Zoey Corleone, Achtai Coronet, Count Coronet, Dweedle Coronet, jjccc Coronet, Ron Coronet, Caterina Cortes, Letitia Cortes, Marcella Cortes, Martinelli Cortes, Raven Cortes, Soopafly Cortes, Grazel Cosmo, Athena Cosmos, Cally Cosmos, Annyssa Cosmos, Bunny Costello, Zelitor Costello, Lionel Cournoyer, Sasha Cowen, Carl Crabe, Lyssa Craig, micke Craig, Mel Cramer, Tee Cramer, Avil Creeggan, Bunch Creeggan, CronoCloud Creeggan, NewYorkCityDJ Cremorne, Shalori Cremorne, Artik Crimson, Bliss Crimson, Daffodil Crimson, Raul Crimson, Shaoti Crimson, Trevor Crimson, Rex Cronon, Ace Crosby, Linnrenate Crosby, DaRealNeo Crossing, Wark Cruyff, Silver Csak, Eulalia Cuddihy, Lauralynne Cuddihy, Rammstig Cummings, Rita Cummings, Fremont Cunningham, Jinger Curie, RICX Curie, Betty Curry, Marissa Curtis, Mercurion Curtiss, Juan Cusack, Sanderman Cyclone, Marek Czervik, Alreania DaSilva, Dnel DaSilva, Seph DaSilva, Kelly Dabney, dorothyann07 Dae, Frax Dae, Frost Dae, Syryne Dae, Oddy Dae, 1Time Daehlie, Sinead Daehlie, TRACI Daehlie, Dante Daffodil, Limey Daffodil, stripey Daffodil, Atomik Dagger, Bloodsoaked Dagger, Coca Dagger, Colera Dagger, J4ck Dagger, Jaune Dagger, leigha Dagger, Silver1 Dagger, Alexander Dagmar, Simeon Dagmar, Dweezle Dagostino, Ginoo7 Dagostino, Joka Dagostino, Rachid Dagostino, Sinatra Dagostino, DR Dahlgren, Alexandra Daikon, Devious Dailey, Natalie Dailey, Sukit Dailey, Zoya Dailey, Nad Dal, Rudra Dal, Robert Dale, Coventina Dalgleish, Salvador Dalgleish, Anya Daligdig, Nyterious Daligdig, yvette Daligdig, Kylie Dallin, Angel Damask, Phantom Damask, QatanI Damdin, Bekka Damone, Pashin Damone, Vaekraun Damone, Zoraya Damone, elmoono Dana, Mary Dana, ml Dana, Rezzer Dancer, Shrug Dangle, Guttstein, Daniel, Bubba Daniels, Dinky Daniels, Kiana Daniels, marcel Daniels, Rosey Daniels, Sara Daniels, VictoriaRose Daniels, Ignacio Dannunzio, SlimD Dannunzio, williamae Dannunzio, Chriss Darkes, Digit Darkes, Tanooki Darkes, Bree Darling, Chasity Darling, Darra Darling, Val Darracq, Diana Darragh, Ryan Darragh, Bane Darrow, Bree Darrow, Ivy Darrow, cuddles Dassin, Leeloo Dassin, Dachine Daviau, Gyllian Daviau, Leben Daviau, Serioto Daviau, Willow Daviau, Allison David, JamieZel David, Todd David, Casey Davidson, LaNikki Davis, Whispering Dawn, Lady Dawson, Helen Dayton, Ryan Dayton, Ooh Dazy, Woopsy Dazy, Brighid DeCuir, eZekiel DeCuir, Link DeCuir, nath DeCuir, Rhys DeCuir, siliconegirl DeCuir, spring DeCuir, Iron DeCuir, Escort DeFarge, Archangelo DeSantis, Aubrey DeSantis, Gustav DeSantis, Hippy DeSantis, Ilana DeSantis, Sutara DeSantis, Undina DeSantis, Axienne DeVaux, Dana DeVaux, Kitty DeVaux, Mindy DeVaux, Krystal DeVinna, Krystalynn DeVinna, Magenta DeVinna, Manuela DeVinna, Spike Deakins, Debbes Dean, Korben Dean, Dogbert Debevec, Savannah Debs, emily Decatur, Heiko Decatur, Zorena Deckard, Andrea Decosta, Dolly Decosta, Esperenza Decosta, Kruppen Decosta, larrykin Decosta, PhoenixRose Decosta, Sophy Decosta, Twinsen Decosta, Vladimir Decosta, Duxster Deere, Maxim Deharo, Summerbreeze Deharo, Matti Deigan, DeeAnn Dejavu, Gina Dejavu, Shai Delacroix, alexis Delcon, Ashly Delcon, Kane Delcon, Dante Deledda, Lady Deledda, Jega Delgado, Alicia Delphin, Darek Deluca, Lestat Demain, Nuka Demain, Allissa Demar, Lilyanah Demar, Aeleen Demina, Blowing Demina, Kalm Demina, Sarias Demina, Skeddles Demina, Sweet Demina, Alida Demontrond, Redux Dengaku, J. Derby, Cristell Deschanel, Ivey Deschanel, SinaMaria Deschanel, Elisabeth Desideri, Monique Desideri, Bartiloux Desmoulins, Hazel Desmoulins, Isis Desmoulins, Phoenix Desmoulins, Jon Desmoulins, Dino Despres, Samantha Despres, Snowflake Despres, Bones Detritus, Neo Devoix, Bre Dharma, Showshawna Dharma, Mike DiPrima, Winter DiPrima, Gongree Diage, Azure Diamond, Styles Diamond, Maike Dibou, Klaus Dieffenbach, Xavier Dieffenbach, Lordfly Digeridoo, Selkit Diller, Tari Dilley, Kelly Dilweg, Werewolf Dingo, Darkharmony Dingson, Knud Dingson, Jewel Dinkin, Mecha Dinosaur, Savonna Dinova, Amina Diplomat, FuZzY Diqui, Crimson Divine, Lizbeth Divine, Cryptid Divisadero, Destiny Divisadero, Montsho Division, Gryphon Dix, Kittybird Dix, Hope Dixon, CadiWolf Dobbs, Darling Doboy, Nicole Docherty, Ralph Doctorow, Odo Dod, nik385 Doesburg, sam Doigts, Elea Dollinger, Miche Dollinger, Severina Dollinger, Eric Domela, Krysta Domela, Franky Donaldo, Duntroon Donburi, Tricia Donovan, Sabrina Doolittle, DeDe Doowangle, Dinghy Doowangle, Phoebe Doowangle, Ratzfatz Dorado, Jessalicious Dorance, RJaNator Dorance, Kalemika Dougall, Fi Douglas, Norelyn Douglas, Aerrett Dovgal, Wendy Dovgal, Alex Drago, MAGWolf Drago, Lupo Drake, Palanth Drake, Aryanna Draken, Drinkin Draken, Kaylan Draken, Maddy Draken, nixkuroi Draken, Thornpaw Draken, Sinjo Drakes, James001 Dryke, Nameless Dryke, Roberta Ducatillon, Helke Duettmann, Moni Duettmann, Kyla Duke, Esence Dulce, Manuella Dulce, Ric Dulce, Shannel Dulce, Xander Dumont, Lionna Dumouriez, Marko Duncan, Duncan, Lyre Dunia, Cyndari Dunn, Garth Dunn, Sugababe Duport, Taylorholic Durant, Vixie Durant, Julie Durant, Drew Dwi, Ribbon Dye, Michelle Dzieciol, shngy Dzieciol, Jeffrey Earp, Umbrella Ebi, Adi Eccleston, Bazzerbill Eccleston, Dragon Eccleston, chawna Eclipse, Minolin Eclipse, Valkyrie Eclipse, Joi Edelman, Alx Edman, Daniella Edman, Saskia Edman, Storm Edman, Cory Edo, Tommy Ehrler, Stephe Ehrler, Edred Einarmige, Hope Eldrich, Kai Eldrich, Winter Eldrich, Thunder Electric, Ezmerelda Electricteeth, Hostile Electricteeth, Kris Electricteeth, Loki Eliot, rudy2zday Eliot, Shaydin Eliot, Iris Ellison, Enigma Elswit, Tim Ely, Darkling Elytis, Delu Elytis, Happy Elytis, Jessica Elytis, Bernd Emmons, Kellie Emmons, Robbert Emmons, Bean Emoto, dick Encore, Andy Enfield, Fuzionor Engawa, Hethr Engel, RH Engel, Digital Enigma, Kahlest Enoch, Lex Enoch, Oran Enoch, Ryal Enoch, Wobmongle Enoch, Wyatt Enoch, Pea Enzyme, Antony Epin, Sapphire Epin, DBDigital Epsilon, Shoshana Epsilon, FallenAngel Erato, Renton Eretz, Mo Eriksen, 64Y80Y Eros, tommy Eros, Nicola Escher, Zak Escher, Salvatore Esposito, Quinevere Essex, Zed Essex, Fabian Etchegaray, Psyche Etoile, Byanex Etzel, CrimsonWings Eun, Deckard Eun, Arwen Eusebio, Anastacia Evans, buttonlynn Evans, Rose Evans, Romeo Evelyn, Sephiroth Everidge, Patriiick Ewing, Trey Ewing, Vivian Ewing, Xwing Ewing, Zha Ewry, SirZarath Excelsior, Zorrita Express, Hierophant Extraordinaire, Blanche Fabre, Annie Fackler, Wolfgang Fackler, Amy Faddoul, Shukran Fahid, Garth FairChang, Brooke Fairplay, TOmmy Fairplay, Vixen Fairplay, Bobby Fairweather, Darlean Fairymeadow, Gotobug Fairymeadow, Heathie Fairymeadow, Meleni Fairymeadow, Moon Fairymeadow, Odysseus Fairymeadow, rob Fairymeadow, Taylkusha Fairymeadow, Crystal Falcon, WhiteAngel Falcon, VetteMan Falken, Evilpony Fallon, Fernand Fapp, Sasuke Fapp, Roen Fardel, Dariush Fargis, Jenn Fargis, Mandy Farina, Kokoro Fasching, Madison Fasching, Ben Fassbinder, Leo Fastback, Rikky Faulds, STEEL Faulds, Equino Faulkland, Flynn Faulkland, High Faulkland, Arda Fauna, Elvis Faust, Benelli Federal, Forest Federko, Belle Fegte, Danny Feingold, Luc Feingold, Bing Fell, Darky Fellini, Jaze Fellini, Sacha Fellini, paulie Femto, Ynot Fenua, Fau Ferdinand, Soren Ferlinghetti, Meri Fermi, Boxter Ferraris, Danamea Ferraris, Duilho Ferraris, Fred33 Ferraris, LeekySean Ferraris, Letizia Ferraris, Marlowe Ferraris, Wanted Ferraris, Xavier Ferraris, Feff Ferrer, Thomas Ferris, Nakala Fetisov, Astrin Few, Chosen Few, Ahh Fiddlesticks, Chantal Fielding, Caleb Fierrens, Patrice Fierrens, sam Fieseler, NutZ Figaro, summer Figaro, Leumia Figgis, Mae Figtree, Maldavius Figtree, Ravovich Figtree, Morgana Fillion, Brett Finsbury, sofia Finsbury, Jazmina Firefly, sasha Fischer, william Fish, Nadia Fisher, StevenSDF Fisher, Carol A . Fisher, Dimitri Fisseux, Manni Fitzgerald, Freddie Fitzroy, Phineas Flagstaff, Ante Flan, Braden Flanagan, BrettEbay Flanagan, Echo Flanagan, Knute Flanagan, Kristjan Flanagan, LilyRose Flanagan, Meril Flanagan, Lulu Flasheart, Jolie Fleury, Clitoria Flint, Fifi Flintlock, Frostie Flora, Kitto Flora, Chriss Florio, Arlen Flossberg, Angel Fluffy, Emilyuk Fluffy, Frurry Fluno, Faedra Flytrap, Brieg Foden, Annette Fonda, Katina Fonda, Raymond Fonda, Marcos Fonzarelli, Yuri Fonzarelli, CrystalShard Foo, etoile16 Food, Kim Food, Kode Forager, Vodka Forager, Wendy Forager, Lucien Forcella, Maela Forcella, Olli Forcella, Violet Forcella, Clarissa Forder, darkdog Forder, Hans Forder, Jango3234 Forder, Olli Forder, Naryu Forester, FaustTiger Forte, Richie Forte, BMFC Forwzy, Erick Forwzy, SusNy Foss, Sanford Foulon, Iwana Fouquet, Kae Fox, Raudf Fox, Wolfie Fox, Phli Foxchase, Kityn Foxley, MollyBrown Foxley, Qua Frampton, Ice Franchini, Nicolas Franchini, Soizie Franciosa, Samson Francis, Nequam Frangilli, Andreas Frankfurter, PreWired Frankfurter, Diane Franklin, Cappy Frantisek, Romano Frascati, DeMits Frederix, Mel Fredriksson, Sune Fredriksson, Tina Fredriksson, Fastfreddy Freeloader, Sammar Freeman, Kitty Freund, Jorgen Friis, Zorin Frobozz, mdbobbitt Frobozz, Chris Frontenac, Foolish Frost, Asriazh Frye, Patti Frye, Phish Frye, Nobody Fugazi, Simba Fuhr, Snugglebunny Fuhr, fallendream Furse, Jamie Furst, Cherise Gagliano, Laura Gagliano, Gammy Gainey, Gazz Galatea, Govindira Galatea, Rizpah Galatea, Amber Galbraith, Mandy Galileo, william Galileo, David Gall, LoLa Galland, Zach Ganache, Casey Gandini, Edgar Gantenbein, Jonx Gao, Soso Gao, Madison Gardner, Silver Garfield, Michelle Garrigus, Nerdmaster Garrigus, Jarik Garsztka, Svoboda Garsztka, Salkin Gascoigne, Roger Gaspara, Buttlock Gasser, Pud Gasser, Zina Gasser, Prince Gausman, livingdead Ge, Josh Geesink, Tolly Geest, Georgina Geewhiz, Chris Geiger, Sabine Geiger, Samuel Geiger, Tristessa Geiger, Joe Gemini, Mielle Gemini, Misty Gentil, Sanna Georgette, Phoenix Gerhadsen, Mic Ghia, Salores Ghia, Loskobosko Giacomin, Susanne Giffen, Lazarus Giha, Micah Giha, Merry Gildea, Summer Gildea, Brittany Giles, Rayy Giles, sevron Giles, Gattz Gilman, Rori Gilmour, SunQueen Ginsberg, Rockwell Ginsberg, Intolerable Ginsburg, Junie Ginsburg, Enrico Giove, Krystal Giove, Annie Giovinazzo, Cat Gisel, Constantine Giugiaro, Io Giugiaro, Persimmon Gjellerup, Lorna Gladstone, Toby Gladstone, Dale Glass, Gellan Glenelg, EmmaBella Glimmer, louise Glimmer, Gianna Glitter, Melyissa Glitterbuck, Victoria Glushenko, Wolf Goalpost, Chris Gobo, Xerses Goff, Sturdus Goldblatt, Nigel Goldflake, Major Golding, Master Goldkey, Zho Golem, Stylez Gomez, Carlos Gomez, Alecydoss Gontermann, Skyler Goode, Valentine Goode, Odd Goodfellow, Dragyn Goodliffe, Hank Goodliffe, Livinda Goodliffe, Robertt Goodliffe, Daphne Goodnight, Sean Gorham, Ledje Gorky, Emma Gould, Amaze Grace, Lagerstone Graff, Harper Grainger, Andy Grant, Carrie Grant, LauraLOral Granville, AlphaOmega Graves, Ebon Graves, Kyrii Graves, Leeloo Graves, Bosco Gray, Dez Gray, Renegade Gray, Summer Gray, Aries Graysmark, Edian Graysmark, Scotty Grayson, Mantis Grebe, Kelly Green, cara Greene, Kimber Greene, Mystical Greene, Raven Greene, Soilent Greene, Matthew Greene, Soilent Greene, Roberta Greenfield, ShayLee Greenspan, Dax Greer, Angel Gregg, Kyleigh Gregg, Sophie Greggan, Deanna Gregoire, StylynProfylyn Gretzky, Farallon Greyskin, Kraal Griffith, Xavier Griffith, Jacomo Grigg, Sylvie Grizot, bodyman72 Grot, Damian Grot, MarieCaroline Grumiaux, Mozo Grumiaux, Oceane Grumiaux, Jadem Gruppman, Gracie Grut, Jennie Grut, Mhaijik Guillaume, Frog Gulick, RacerX Gullwing, Enktan Gully, Gilly Gully, Woozie Gumshoe, Teddy Gumsing, Stephane Gunawan, Alienbear Gupte, Boroondas Gupte, mcgeeb Gupte, Elise Guyot, Jamal Guyot, Lawyer Guyot, Thiago Guyot, Arwen Gymnast, denniswo1993 Gymnast, Lukes Gymnast, Miki Gymnast, Sizoark Gynoid, Markiss Haas, Pepper Haas, Arkanys Hadlee, Apollo Haight, Lord Haight, Fawn Hailey, Kaelin Hailey, Gaelle Halasy, ISIS Halberd, Meg Halberd, Zander Halberd, Arnold Halderman, Malarwen Hall, Ken Hall, Jonah2cd Hallard, Saii Hallard, Trixie Hallard, Doris Haller, Destina Halley, Susiee Hamilton, IBMTapeGuy Hammerer, Lighten Hammerer, VEVER Hammerer, Alison Hamsun, Fawn Hana, leah Hana, Darknite Hand, Emperors Hand, nefertiti71 Handrick, Rodney Handrick, Delerium Hannibal, leanhaumshee Hannya, jingle Hansen, Mattie Hansen, Terry Hansen, Vox Hansen, Filo Hapmouche, Gustavus Hapmouche, Nounouch Hapmouche, Adrian Harbinger, Kami Harbinger, StormCrow Harbinger, CherryBomb Hare, Den Hare, Omegasun Harford, ricky Harford, ricky Harford, Harley, Jenna Harley, Kristina Harley, Natasha Harlow, Hummer Harmison, Allen Harrington, Tessa Harrington, Joker Harris, Shanti Harris, Dagon Harrison, J0NATHAN Harrop, Kerinauu Hartunian, Kyentay Hartunian, Rav Hartunian, Ski Harvey, Tuesday Harvey, Xylo Hasp, Betina Hatfield, Gina Hatfield, Calamity Hathaway, Dorian Hathaway, Duncan Hathaway, Xavier Hathaway, Jack Hathor, Kamilah Hauptmann, Pam Havercamp, swift Havercamp, Griselda Hawes, kwanita Hawks, Ravenis Hawks, BenG Hax, el33t Hax, Juicy Hax, Macx Hax, Meta Hax, Mikka Hax, Mokona512 Hax, Mr8ball Hax, Prophet Hax, Rina Hax, Slober Hax, Starbuck Hax, Takehiro4 Hax, Kyle Hayashi, Ashrilyn Hayashida, Eriko Hayashida, August Hayek, Milton Hayek, Ronnie Hayes, Max Hazlehurst, Sorsaran Hazlehurst, Grath Hazlitt, Violet Hazlitt, April Heaney, Aquela Hearn, jefferey Heart, Kalyrra Heart, Marissa Heart, Taina Heart, TLC Heart, Tori Heart, Dana Hebert, Trimzi Hedges, AmazedBlue Hegel, Dagmar Heideman, r0bin Helsinki, Moira Henley, Ursa Henley, Joharr Hennah, Daviana Hennesy, GJ Hennesy, jens Hennesy, Karl Herber, mistydawn Herbst, Donatella Hermano, Robins Hermano, Ekib Hern, Greves Heron, Jagged Heron, Christel Herzbrun, le Herzog, Reverend Herzog, Elektra Hesse, SweetDesire Heston, Cotton Hicks, Zack Hicks, Kevyn Hienke, Tristan Hienzman, Devin Hill, Wendy Hill, Tensai Hilra, Valek Hin, Adolph Hinkle, Timothy Hinkle, YoCo Hird, Amber Hirvi, Dagon Hitchcock, Heather Hitchcock, Noah Hitchcock, Sianna Hock, Dominique Hofmann, Holly Hofmann, Ganador Holgado, Brookston Holiday, Davidd Holmer, Sam Holyoke, Alexander Homewood, atory Homewood, dabadguy Homewood, Ed Homewood, Huge Homewood, Meesha Homewood, tilstad Homewood, Cremi Honey, Laura Honey, Sandling Honey, Honey, Haos Honua, Vudu Hoodoo, Dallas Horsefly, Lucy Horton, SJ Horton, Homer Horwitz, naty Hotaling, Traceysvideos Hotger, DaQueenB Houston, Natasha Houston, Tia Houston, Hughes Howard, Meg Howe, Edward Howton, Falllen Howton, Pepto Hoyer, Sabrina Hoyer, LadyAbigail Hubbard, Kristopher Hudson, Nikita Hudson, Titus Hudson, XLR8RRICK Hudson, Holly Huffhines, Bella Hugo, Haole Hula, Sard Huldschinsky, Neran Hull, Anastasia Humphrey, October Hush, Silent Hush, Ctarr Huszar, ac14 Hutson, Dex Hutton, Fox Hwasung, Johanna Hyacinth, White Hyacinth, Adrianna Hyde, DJ Hyde, Ty Hyland, Adeline Hynes, Cathy Hynes, DeepSweet Hynes, Psykeeper Hynes, Sexy Hynes, Ares Hyun, Emperor Hyun, melodie Hyun, slayer Hyun, Puck Ida, Weary Ida, Anne Idler, Ruby Idora, Bryan Idziak, Six Igaly, elfi Independent, Spike Independent, Veilofunknown Independent, Bryndi Ingersoll, Ingrid Ingersoll, Noelyci Ingmann, Andrew Ingrassia, Dale Innis, Foxy Innis, Vern Innis, 111Mc Innis, Cloud Insoo, MEtoo Insoo, Quinn Iredell, Rebekah Iredell, Lucien Ireton, Maggie Ireton, Austin Ironclad, DavidJames Irwin, Roy Irwin, Xavier Irwin, Esmee Isbell, Miyu Ishii, Billy Islander, Misa Itamae, Magnum Iuga, Akasha Ivory, Juliana Ivory, WHITEMAGIC Ivory, Gazometr Ivory, Indigo Izumi, Kami Izumi, Salazar Jack, Gunslinger Jackalope, Sutton Jacks, Casandra Jackson, Dernard Jackson, Dougal Jacobs, Lone Jacobs, Sydney Jacobs, jefftlse Jacobus, jose007 Jacobus, justine Jacobus, LampLighter Jacobus, Micha Jacobus, Jadge Jacobus, Enchant Jacques, Victoria Jacques, Dreamweaver Jae, Gregoire James, Kizza James, Vienna James, Barry Jannings, Bianca Jannings, Gwen Jannings, Juappa Jannings, Paisley Jannings, Coos Jansma, Fernandinho Jansma, Griffioen Jansma, Jiire Jansma, IsisLynn Janus, Theobaise Janus, Conway Jarrico, DylanJr Jarrico, Quest Jarrico, erba Jarvis, Jeagerman Javelin, Alan Jay, Lopp Jay, harpo Jedburgh, Craig Jeffries, Alexis Jenns, Bimbie Jenns, XanXan Jervil, Alexander Jessop, Gelenas Jessop, RodneyLee Jessop, Tataniya Jessop, Amethyst Jetaime, Kooky Jetaime, Sapphire Jetaime, Tempest Jewel, Vampirella Jewel, Elia Jewell, Josey Jewell, Shaolin Jewell, Sheeba Jewell, Stefu Jewell, Uma Jewell, Rosslin Jiang, alex Jimenez, Forest Joffe, John Jogiches, Dyani Johin, Musashi Johin, Major Johnson, Dean Johnson, Peter Johnson, Thomas Carson Johnson, Janet Jones, Jason Jones, Bedo Jonze, Elaine Jorgensen, Osiloa Jorgensen, Mariah Jubilee, Sam Jubilee, Ada Jun, Chenak Jun, Ferris Jun, kelyane Jun, Takeshi Jun, Tommi Jun, Phoebe Juneau, Grace Juniper, icandi Juno, Kimo Junot, isha Juran, Orchid Juran, Torsten Juran, Krzywol Kaczmarek, Sakura Kagekiyo, Meni Kaiousei, Fritz Kakapo, Esdrael Kamachi, Kathy Kamenev, Darsuky Kaminski, Rebecca Kaminski, Digital Kaos, Kappa Kappa, Leah Kappa, Gapple Kappler, Cristalle Karami, Toledo Karas, Tina Karlfeldt, Angelina Karura, Samara Kasshiki, Kitty Katscher, Lonetree Katscher, Goldie Katsu, Shamir Katsu, Lacey Kavanagh, Scrooge Kavanagh, Faye Kawabata, Ninja Kawabata, Onimusho Kawaguichi, Brad Kazakov, Ida Keen, Jeff Kelley, Kyle Kelley, An Kellner, Cindy Kellner, Kean Kelly, Tony Kembla, KaliCat Kennedy, Fred Kenorland, Sharon Kent, Nils Kenzo, Rase Kenzo, Tammy Kenzo, Tyci Kenzo, chica Keon, Benja Kepler, Gust Kepler, KittyKatt Kerensky, anton Keynes, Ipenda Keynes, Malevolyn Keynes, Ayumi Khorana, Hoshi Kiama, Nekorina Kiama, Aurillius Kidd, Bare Kidd, Billboard Kidd, Blurple Kidd, Cade Kidd, Ekerilar Kidd, FFS Kidd, Lazarus Kidd, Lea Kidd, MidnightRush Kidd, Mittens Kidd, Morliona Kidd, Neilly Kidd, Kim Kienzle, RJ Kikuchiyo, Gail Kilara, Fish Kilby, zeelee Kindley, Montez King, Dax Kirkorian, Myoukitsune Kirkorian, Szandor Kirkorian, Cmtccmoi Kish, Kia Kish, DaQbet Kish, Coca Kit, Developer Kit, pronto Kit, Sunshine Kit, ssjkriccolo Kitchensink, Reisuki Kitsune, Tengu Kitsune, AngelEyes Kittinger, Devilish Kitty, Kitty, Panther Kitty, Daaneth Kivioq, Praseodymium Kivioq, Sonya Kivioq, Emily Kleene, Buejien Klees, Princess Klees, SaltySugar Klees, Parrish Kline, ProfessorKindly Kline, Chelsay Knibber, Victoria Knight, Raspitomaru Knopfli, Cocoanut Koala, Akiko Koba, Bryan Koba, dawood Koba, Izen Koba, Nebur Koba, Taran Koba, Pamela Koenig, Neo Koga, BlackOut Kohime, Jazzie Kohime, Naa Kohime, Seriuskid Kohime, Wandale Kohime, Zana Kohime, Zerosix Kohime, Maucat Koi, Dagmar Kojishi, Chroma Kolache, Icey Kolache, Kornscope Komachi, Bri Koolhaas, KamaSutra Koolhaas, Katya Koolhaas, Trylle Korda, Corrine Korobase, Navajo Korvin, Pasha Korvin, David Kostolany, quintin Kostolany, Tasha Kostolany, Amy Kotobide, Zaphod Kotobide, KYWLDCT Kovacs, LillyEliska Kralomoc, Joseph Krams, Fumon Kubo, LudwigVan Kubrick, Anagras Kuhn, Selina Kuhn, Tal Kuhn, Finora Kuncoro, Maya Kupferberg, Jana Kurelek, Shika Kuri, Yo0gy Kuri, Endo Kurosawa, Tatsuki Kurosawa, MrBill Kurri, Albert Kwak, Kwakkelde Kwak, Duckling Kwak, Kasey Kyger, Kaimi Kyomoon, Stelard Kyomoon, Kyo Kyong, Emm Laa, Keera Laasonen, Delvendez Laborde, Raban Laborde, Amodeus Labrada, Louisa Labrada, Sweeten Lacey, Fiachra Lach, Eliv Lachman, Flykiwi Lachman, Charlie Laffer, LarryS Laffer, Sasha Lafleur, OxLukexO Lagan, Shadow Lagan, Tilianna Lagan, Jaye Lahtoh, Davoid Lake, Fairlight Lake, Thomas Lake, Veronique Lalonde, Leticia Lambeau, Maleia Lambeau, Cross Lament, Drakon Lameth, Misch Lameth, Caeleigh Lamington, Nedrick Lamont, essayn Lamont, Dwayne Lancaster, Hiram Lancaster, Carlton Lane, Christo83 Lane, DOO Lane, Niket Lane, Roughtoe Lane, Taylor Lane, Ami Lang, Emily Lang, Ruadh Langwarrin, Sasha Lapointe, Garrett Laramide, TBA Lardner, Beverly Larkin, Marcoh Larsen, Vanessa Larsen, bjf25 Larsson, curL Larsson, Garsson Larsson, Jondolarr Larsson, Justicar Larsson, Quinn Larsson, redshoedave Larsson, Tod Larsson, lea Laryukov, Renate Laryukov, Benny Lassally, Khristen Lassard, Josh Latrell, Lacey Latrell, Shari Latrell, Casper Laughton, Kory Laughton, Lisa Launay, Sasha Launay, Areyn Laurasia, Crystaleen Laval, Moirae Laval, Sascha Laval, Slasha Laval, Tiberius Laval, Shadow Laviolette, Velarissa Laviolette, Zeus Laws, Snaptick Laxness, wtf Laxness, Carrie Laysan, Norton Lazarno, Candide LeMay, Dustin LeMay, Shelly LeMay, Antionette LeShelle, Hayden LeShelle, Kristian LeShelle, Monika LeShelle, Mysti LeShelle, Shaklin LeShelle, Shavaii LeShelle, Lord Leafblower, Kinjry Legend, UniqueRose Legend, Jonny Legien, Lillia Lehane, Renae Leigh, KeiAira Leigh, Casper Leinhardt, MiaLily Lelouch, Adriana Lemieux, Keiki Lemieux, Ginger Lemmon, Heather Lemmon, JohnnyMac Lemmon, Lenni Lemuria, Bubba Leonard, Spyder Leroy, Aral Levitt, DarionMonkee Levitt, Quiana Levitt, Angharad Lewellen, AngelEyes Lewis, Cookie Lewis, JonnyImpala Lewis, Ekka Li, Jesa Li, Anark Liebknecht, KUieTSToRm Lightcloud, Lincoln Lightfoot, Nicola Lightfoot, Shaman Lightstone, Nika Lightworker, April Lilliehook, Joi Lilliehook, Kimi Lilliehook, LAPDHOLLYWOOD2000 Lilliehook, Lindy Lilliehook, Shayne Lilliehook, Skywil Lilliehook, Neo Linden, Amber Linden, Guy Linden, Teeple Linden, Marck Lindman, NoSpy Lindman, Rahduhlac Lineker, Evangeline Ling, Kailani Ling, Karyll Ling, Lexus Ling, moon Ling, Wai Ling, Samantha Lingiuan, CyberonX Link, Laynie Link, SLurl Link, Aphrodisiack Lisle, Petunia Liveoak, Eithnie Llanfair, Jennifer Llanfair, Pami Llewelyn, Gwyneth Llewelyn, Kiten Lobo, Paul Lobo, Khrome Lock, Brett Logan, Dragger Lok, Pavig Lok, Sera Lok, May Loll, Lola Lollipop, SweetTasting Lollipop, Nikee London, Trinity London, Dogan Lonergan, Rod Longcloth, Excalibur Longstaff, Apolonique Loon, Austyn Loon, Danyhael Loon, Goreki Loon, Huligo Loon, Jaffred Loon, LouisS Loon, Luke Loon, mahee Loon, Ruthless Loon, Melina Loonie, rasta Lopez, Lydiah Lorentz, Stellar Losangeles, Blackie Lotus, Misha Lotus, Alysia Loudon, Grace Loudon, grumble Loudon, Kate Loudon, kimmie Loveless, LadyMacbrat Loveless, Ally Lovell, Dixii Lovell, Darb2rad Lowe, Lozzie Lowe, Trip Lowe, Andrek Lowell, Jaraziah Lowell, Lissa Lowell, Stryfe Lowell, Leland Lowell, Leonardo Lowey, Stagger Lowey, Strabo Lowey, Raen Lu, Laurie Lubezki, MissJean Lubezki, Lucia Lucero, Lee Ludd, Franchises Lulu, Jayden Lulu, Kitten Lulu, mona Lumet, Alienor Lumiere, Michi Lumin, Wolf Lumin, Grumpy Lumley, Sian Lumley, HamSuiJe Lumpen, Laguna Luna, Starbella Luna, Ashley Lundquist, Theosta Lunt, Cliothe Luo, Lincoln Lupino, Bronwyn Lurra, Mineki Lurra, MYMistress Lusch, Linnae Lusso, Natalie Lustre, Rose Luxemburg, Helena Lycia, AG Lykin, Lhlilith Lykin, Niko Lykin, Logan Lyne, Jacques Lytton, Kianeira MacDiarmid, Apple MacKay, Melissa MacKay, Bailey Mackenzie, Maxx Mackenzie, Rose Mackie, Ee Maculate, Gaetan Maculate, Ravarian Maculate, Adrian Maddaloni, yearning Maddaloni, Ava Maddux, Flezix Maddux, Karamel Madison, Allure Madonna, Mannie Madonna, Sitearm Madonna, Mario Madsen, Mitzy Madsen, Ben Maersk, Lillian Maertens, Turk Maertens, Stephanie Magnolia, Lonique Magojiro, WarKirby Magojiro, Loki Mahana, Vinny Mahana, Semiramis Mahina, Shadow Mahoney, Rissa Maidstone, Tynana Maidstone, Angel Majestic, Jeremy Majestic, StarFire Majestic, Tiara Majestic, One Maktoum, Lana Maladay, Marzipan Maladay, Missy Malaprop, Ordinal Malaprop, Void Malaprop, Natasha Malibu, Rygel Malick, Ali Maltz, Leena Maltz, Cage Mandala, Synthalor Mandelbrot, Zeppelin Mandelbrot, Esteban Manen, Kawaii Manga, Mailee Manga, Nathalie Manga, Yinato Manga, Mya Mantis, Madame Maracas, Maisa Maracas, Domino Marama, Panama Marama, Charm March, SallyWoelfin March, Markel Marchionne, AdriAnne Margulis, Edgware Marker, Tika Market, AiSenshi Market, Lizbeth Marlowe, Queue Marlowe, Joana Maroon, Grey Marquette, Adrianna Marquez, Jeremy Marquez, Shirley Marquez, Christian Marquez, Dax Mars, Dnate Mars, Xandi Mars, Sarah Marsi, Garmon Martin, Sean Martin, SignpostMarv Martin, Brittany Martinek, Sweet Martini, ElDraque Martov, Aminom Marvin, Edwin Marvin, Meatnik Marvin, Zanza Marx, bollit Masala, Nguai Masala, Satya Masala, team23 Mascot, Tyler Mason, NAM Massey, Minasojo Massiel, Gatto Mastroianni, Checho Masukami, SlavegirlPaula Masukami, Hellsing Matador, Femina Matahari, Leoki Matahari, Rosa Mathieson, Violet Mathieson, MikVik Mathilde, Jonathan Mathy, Ernesto Matova, Selenia Matova, Meltharas Matsukaze, lordneg Matzerath, Memnoch Matzerath, Dedric Mauriac, Kezz Mauriac, Wolruf Mauvaise, coyote Maverick, Martin Maxwell, jericka May, Jeza May, Mellony May, Lauri Mayfair, EnCore Mayne, revochen Mayne, amaya Mayo, Hellmanns Mayo, Jima Mayo, Kion Mayo, Kisho Mayo, Mo9a7i Mayo, Neobe Mayo, Salazar Mayo, Sat Mayo, Scotto Mayo, William Mayo, Gino McAllister, Masion McAllister, Wallace McAllister, DarlinNikki McAlpine, Hawk McAlpine, Inga McAlpine, Lex McArdle, Maggie McArdle, Joshua McCallister, Keegan McCallister, Bradford McCann, Ella McCann, Flox McCarey, Jezzie McCellan, David E . McClure, Cash McConachie, Cathal McConachie, Tad McConachie, Aodhan McDunnough, Drew McDunnough, Artie McFly, Minnie McGann, Sabine McGettigan, Poppet McGimsie, Carole McGuire, Tegwenn McKenna, Shaemus McLaglen, ShirleyM McLaglen, Dirty McLean, HoseQueen McLean, Billibob McLeod, Cari McLeod, Innes McLeod, Jaenae McLeod, Slate McLeod, Troy McLuhan, Anya McMahon, DoGGo McMahon, Hutch McMahon, Iras McMahon, Jian McMahon, Jimama McMahon, Kouki McMahon, Sioban McMahon, Akie McMillan, laika McMillan, Lauris McMillan, Marteze McMillan, Maye McMillan, Nicholas McMillan, Radikal McMillan, Tammi McMillan, Jax McNally, Arwyn Meadowbrook, Waterflower Meadowbrook, Ima Mechanique, Nber Medici, Chandra Meehan, Geo Meek, Earane Meiji, Jessica Meiklejohn, Emiko Meili, penelope Meili, Luz Melbourne, Marti Melnik, MenuBar Memorial, Aitor Mendes, Mona Mendes, Jay Menges, Kimmie Menges, Lennart Menges, Margaret Menges, Mikel Menjou, VzNevada Menoptra, Merselus Mensing, Leia Mercy, SAPPHIRE Mercy, Sofie Mercy, ozadakan Meriman, Sandycd Meriman, Washington1985 Meriman, Infiniview Merit, Nanashe Merkur, Ayahuasca Merlin, Craischen Merlin, devillover Merlin, Faer Merlin, Jarros Merlin, Jolie Merlin, Kejo Merlin, Mario4 Merlin, Sarah Merlin, Silas Merlin, Wizard01 Merlin, Telitha Merlin, Vrrgo Merlin, Rocky Merosi, Luxe Merrienboer, Lance Mertel, Angus Mesmer, MysElf Messmer, Lonny Miasma, Utopar Michinaga, MTC Mielziner, Enysy Mikita, Celeste Miles, Giovani Miles, Guli Miles, Mars Miles, Noah Miles, RobWest Miles, Subzero Miles, DALLAS Milestone, Jane Milev, Jesper Milev, MMz Milev, YumYum Milk, Belle Milland, Berri Milland, Joanne Milland, Vicky Miller, Samantha Miller, Calvin Millions, Envy Millions, Lusty Millions, Versu Millionsofus, AsteroidS Mills, Emixam Mills, Goodstuff Mills, Guntrinkyt Mills, Isabella Mills, Landen Mills, Noelle Mills, Sand Mills, Djarno Mills, Mandee Milner, Haika Milo, Mankud Milo, Slobodan Milosz, Eliezer Mimistrobell, Amoret Mineff, Little Ming, Mako Minogue, Mandee Minogue, Milena Minogue, Sylfie Minogue, Manon Mirabeau, Tygeria Mirabeau, leliel Mirihi, Cmdr Misfit, disisme Misfit, fangy Misfit, Grim Misfit, RedWolf Misfit, Michal Mishin, Robby Mission, Shawn Mission, Haravikk Mistral, Thom Mistral, Sertories Mitchell, Temporal Mitra, Bphero Mizser, Stolar Mohr, DarkWulf Mokeev, Nemo Mokeev, sharon Mokeev, Sech Molinari, lara Molinaro, MARIOS Molinaro, James Mommsen, Sierra Monnett, Joan Monstre, Cattra Montagne, Galadhriel Montagne, AnnaMarie Montgomery, Christine Montgomery, Mariah Montgomery, Shawna Montgomery, Jemima Moo, Jihashi Moo, Moonie Moo, Wiske Moo, Borgie Moody, DOA Moody, Makinzie Moody, Preciousse Moody, Bit Moody, Luna Moody, ziphren Moonflower, Axl Moonlight, FxyLdy Moonlight, Stormy Moonlight, Lichtje Moonsoo, Astryd Moore, Haze Moore, Walker Moore, wiseman Moore, Zak Moore, Mordechai Moose, JMM Morahan, Kayleigh Morahan, Cyndi Moran, Marcus Moreau, Kathy Morellet, Violet Morellet, Heather Morenz, Maggie Morgan, Newbie1canobe Morgan, Sumar Morgan, Bella Morico, Ornella Morigi, Eagle Morris, Amanda Morrison, Maeyanie Mosienko, Svetlana Mosienko, Trinity Mostel, Risa Mosuke, Falcon Mountain, NEWB Mountain, Windy Mountain, KittenAnne Mousehold, Minky Mousehold, Lawna Mower, Pure Moxie, webeagle Moy, Buckaroo Mu, Nye Mu, Kara Muir, Robert Muir, Criscad Muni, Jean Munro, Pranay Munro, Nobu Murakami, Shar Murakami, Yumi Murakami, Arrekusu Muromachi, Sasameyuki Muromachi, Usagi Musashi, Spiritfire Musketeer, Questyn Myhre, Myst Mysterio, Vincent Nacon, Fox Nadir, Morgana Nagorski, Sari Naheed, Yasmin Nakamichi, Aibyou Nakamura, Aluviel Nakamura, Kyriani Nakamura, Madeea Nakamura, Masao Nakamura, Misao Nakamura, Tammi Nakamura, Tanabata Nakamura, Nawtakune Nakatani, rich Nasu, Lev Nedkov, Coal Nelson, Shiharizad Nelson, Laurah Nemeth, Beladonna Nephilim, Lianna Nephilim, Seraph Nephilim, Sari Neruda, Tiberious Neruda, otakup0pe Neumann, Wilhelm Neumann, Chet Neurocam, Draconis Neurocam, Cenji Neutra, Lex Neva, Prokofy Neva, BC Nevadan, Seagel Neville, Judi Newall, Killian Newall, Si Newall, Roenik Newell, Jos Newman, Lynda Newman, MadCat Newman, Weaver Newman, Ian Newt, Ribblet Newt, ninjafoo Ng, Raideur Ng, William Niangao, Gao Niangao, Lori Nicholas, Pravda Nicholas, Evangeline Nichols, Joella Nico, Morpheus Nieder, Titzalina Nieder, Blaze Nielsen, Angelus Nielson, Lazaros Nikolaidis, lincoln Nikolaidis, Tiruviel Nikolaidis, Kenn Nilsson, Lib Nilsson, Jokyr Nimbus, Tateru Nino, Jyotsna Nishi, lloll Nishi, Roxas Nishi, Tuote Nishi, Katlene Niven, Kari Niven, Thegamer Nixdorf, May Noarlunga, Jo Noe, DesrAw Noel, Jacindia Noel, Jaz Noel, MelodyRose Noel, Mi Noel, Paden Noel, Ricky Noel, Sunno Noel, Ono Noh, Tuach Noh, Feras Nolan, Jane Nolan, Harald Nomad, Helen Nomura, Lolita Nomura, Richard Noonan, Aenea Nori, Aulin Normandy, Kat Normandy, Zebra North, Stephen Northport, Galare Novi, KittyMarie Novi, Soo Novi, Elia Nozaki, lynsey Nozaki, Rini Nozaki, Kinzo Nurmi, Yasmin Nurmi, Kyran Nyak, Lauren Nykvist, Karma Oates, Alice Obscure, Honeymoon Obscure, Mikhail Obscure, Origin Obscure, Dementia Obviate, Lucius Obviate, Mootly Obviate, TripleXXXTex Obviate, Vanessa Obviate, Vitis Obviate, Sieben Ochs, Avery Oddfellow, Clinton Oddfellow, Maczter Oddfellow, Sempervirens Oddfellow, Tashie Oddfellow, Wagahai Oddfellow, CarlinRae Odell, Johnny Odell, Liny Odell, Lucifer Odell, vanler Odets, Foxb Oe, Kiwini Oe, Natalie Oe, Eddy Ofarrel, Mylinn Ofeq, Roundabout Ogee, Bannock Ogg, Behemoth Ogre, Anju Oh, BlackCinders Oh, Canoe Oh, Crippy Oh, Dakotah Oh, Day Oh, Doo Oh, Feander Oh, Heady Oh, Job Oh, kyushudan Oh, Lila Oh, Luxura Oh, MrSim Oh, OHYES Oh, Oury Oh, Qyty Oh, Santa Oh, Svn Oh, Volta Oh, xepadd Oh, isla Oh, Angelina Ohara, Troy Oherlihy, Yasuragi Okame, Rephaim Okina, Sven Okonomi, benyamin Olaria, EvlDesire Oliver, Brightly Olivier, Renton Olivier, Gary Olson, Christopher Omega, Hamncheese Omlet, Joseph Omlet, Libuse Ondricek, luminye Onizuka, Miyuki Onmura, Toshiro Onmura, Hotaru Onomatopoeia, Isis Ophelia, Orchid Ophelia, Stumbelina Ophelia, Roberto Oppewall, Anthony Opus, Spaceman Opus, Vakis Oranos, Koop Orbit, Sammy Ormsby, Cal Orr, Usra Ostrich, Nikki Osumi, Ariel Otafuku, kevin Oto, CJ Oto, Ann Otoole, Patrice Otoole, Abyssin Otoro, Omega Otsuzum, Teravus Ousley, Straitjacket Overlord, Szegey Oxberger, LemonYellow Oxide, Tabitha Oxide, Rianne Ozsvar, Coyote Pace, Hare Pace, Dargon Pacer, Piero Padar, Zasha Padar, Chav Paderborn, Edison Paderborn, Otenth Paderborn, RC Paderborn, Sylvia Paderborn, Chandra Page, Lili Page, Raven Page, Web Page, AnneJoy Paine, DravenLee Paine, Isobella Paine, Larva Paine, Lushious Paine, Thomas42 Paine, Cesar Pakula, Federico Palen, Monica Palen, Diana Palmer, sense Palmer, Crazy Pangaea, Sacha Pangaea, Upinthe Panhandle, Simbiant Paperclip, Drea Paperdoll, Pannie Paperdoll, raymon Paperdoll, jaesung Papp, JohnJ Papp, Alec Paragon, Cliff Paris, Vertigo Paris, Blue Parisi, serena Parisi, JR Parker, Kora Parker, Prawnyloks Parker, Etheria Parrott, Tommy Parrott, Selaras Partridge, Sexy Partridge, Maegen Parvenu, Francie Pasternak, Mr Pasternak, Eloise Pasteur, sandhya2 Patel, Bruce Patton, Penny Patton, Dave Patton, Haole Pau, Andy Paul, LanNoire Paul, Nolte, Paul, Nicholi Pavlova, shadow Pawpaw, Cuffman Payne, Deseri Payne, Gypsy Paz, LupineFox Paz, Shy Peart, Tamara Peart, Pontias Peck, Robin Peel, Elum Pegler, Kotek Pekli, Pulp Pekli, Reaser Pencer, Caliandris Pendragon, Hiro Pendragon, Jopsy Pendragon, Darren Pennell, Mideon Pennell, Powell Pera, Stanley Pera, Tajma Pera, FlipperPA Peregrine, Jennyfur Peregrine, Alana Perenti, MaxPerfect Perenti, Revolution Perenti, MoonGazer Perhaps, Brooklyn Perinal, Shawk Pertwee, Drakior Perun, Charm Perway, Jubilee Pessoa, Riley Pessoa, Tristram Petion, Aline Petrov, Larry Petrov, PantzerHamzter Petshop, scott Petshop, Foxy Petunia, Inara Pey, Tony Pey, Brathak Pfeffer, Henrick Pfeffer, Jack Pfeffer, Marlo Pfeffer, Resi Pfeffer, Lum Pfohl, TACK Pfohl, rren Pfohl, Psyke Phaeton, Sangi Phaeton, Don Pharaoh, Topdog Pharaoh, Anderson Philbin, Philb Philbin, Ridge Phillips, Maximus Phlox, Careltje Phoenix, Winter Phoenix, Ummm Pickles, Piper Picnic, Loki Pico, Hawk Pidgeon, followmeimthe Piedpiper, Alin Piek, Ricky Piek, angelwithahintoflife Pierterson, Elsibeth Pierterson, Marod Pierterson, Noshi Pierterson, Shanel Pierterson, Natasha Pike, Joshua Pilote, Adeline Pinion, Miguel Pinion, Quinn Pinion, Peach Pink, Tisha Pink, Lulu Pink, alice Pinkerton, Getty Pinkerton, Apple Pinkney, Becky Pippen, Tam Pippen, sandra Pitney, Trish Pitney, Max Pitre, Hawk Pitts, Spritely Pixel, Chel Pixie, HotBuns Pixie, Mina Pixie, Mcplane Planer, simon Planer, Guy Plasma, Halogen Plasma, Mathias Plasma, Phill Plasma, White Platini, Phoenix Platthy, Gallia Plubeau, Corki Plunkett, PollyD Plunkett, Asalynda Pluto, Evgeniy Podolsky, OTTONE Pogelmann, Henry Poindexter, Phoebe Poitier, Rowan Poitier, Rigorus Poitier, Stephen Pollock, Mishka Pomeray, Kuatum Poole, Karina Popinjay, Francesca Poppy, Hot Poppy, Shelly Portello, Anthony Portsmouth, Ian Portsmouth, HackPatooey Posthorn, JohnnyD Posthorn, Madison Posthorn, Antitese Poulot, Uccello Poultry, Tanarus Pow, Frederic Prevost, Bill Priestly, Dit Priestly, Phil Priestman, Rachelle Priestman, Sage Priestman, Simone Prieto, Wundur Primbee, Jacob Primeau, Twilight Primeau, Beautifull Princess, Creamyyy Princess, Graciella Princess, Lyna Princess, Theo Prinz, Krono Pro, Don Proost, Games Prototype, Melissa Prunes, Pie Psaltery, Danger Pugilist, Lily Pussycat, LoL Pye, PITTACOS Pye, Prize Pyle, Reese Qian, Ash Qin, Jen Qinan, milesmess Qinan, Quino Quaggy, Starsitter Quality, Algeard Quamar, Flack Quartermass, Marcus Quartermass, Shaggy Quimby, Laura Quimby, Memir Quinn, Amy Quirk, Edge Qunhua, HeinzJoachim Qunhua, Tsing Qunhua, brooke Ra, Dael Ra, Knightsof Ra, Mayo Ra, Roger Raabe, Sharven Raabe, Sail Racer, Supra Racer, Ada Radius, Rob Raffke, Rayne Ragowski, Starfoxtj4 Rail, mantitaur2 Rainbow, Sparkly Rainbow, Andromeda Raine, musicteacher Rampal, Hoyle Rang, Hermione Ranger, jurnal Ranger, Horgus Rasmuson, Trend Rasmuson, Whoosh Rasmuson, Rascal Ratelle, Eriss Rau, Morugai Rau, Ozhika Rau, slave Rau, Awsoonn Rawley, Marie Rawley, Guy Raymaker, JAC Raymaker, PlanetThoughts Raymaker, Rogier Raymaker, Trident Raymaker, Xoren Raymaker, Ranaa Raymond, Rowena Rearwin, Londyn Reatequi, Neo Rebus, Bekka Redgrave, Etude Redgrave, Lyn Redgrave, Publicist Redgrave, Wingless Redgrave, Allie Ree, Jon Ree, Thyna Ree, Zi Ree, Todd Reed, RhaRha Rees, Alex Regent, Alexander Regent, Cat Rehula, Timoteo Reifsnider, Sirus Reiner, Trilobite Reisman, ali Reiter, Ruben Reiter, Fenrir Reitveld, EmpressNever Rejected, Maya Remblai, Kapu Ren, Atticus Renoir, catsrounds Renoir, Cedric Renoir, Julion Renoir, karman Renoir, Sim Renoir, Isabela Repine, MysticalCeCe Repine, Sissimaid Resistance, Tom Reuven, Beagle Revolution, Xin Revolution, Keex Rexroth, Ordos Reymont, Roz Reynolds, CJ Rezillo, Rena Rhea, Hiroaki Rhino, Curious Rhode, Lexy Rhode, Natriumcitrate Rhode, Toshi Rhode, Pam Ribble, Gia Richard, Gigly Richez, Hutton Richez, Renae Richez, Ronald Richez, Roxi Richez, Jimbo Richez, Josh Rident, Finncaev Riederer, Aeryn Riel, INK Rinkitink, Puck Rinkitink, Riki Rinkitink, Edoardo Ritt, Bibi Riva, Eche Riverview, helloau Riverview, Liam Roark, Angela Robertson, Jay Robson, Brooks Rocco, Marth Rocco, Mo Rocco, Wolf Rocco, dartagnan29 Rockett, marco Rockett, Monida Rockett, ortaga Rockett, Raziel Rockett, Anastasia Roelofs, Stormy Roentgen, Hector Roffo, Ricci Roffo, Tonio Roffo, Picaro Roffo, IvanTwin Rogers, Chrisje100 Rojyo, Rowana Rolland, Shine Rolls, Iris Ronmark, Jacques Ronmark, Phil Ronzoni, Keishii Roo, MattyMcHatton Roo, Kimika Rookwood, Prego Rosca, Rayne Rosca, Uber Rosca, Felix Rosenberg, Amethyst Rosencrans, Alejandro Rosenthal, Davian Rosenthal, Edgar Rosenthal, Seth Rosetta, Alustriel Rosewood, Arenae Rosewood, Fury Rosewood, Gwendelyn Rosewood, Kira Rosewood, liz Rosewood, Oriene Rosewood, Lashelle Rosse, Roodvosje Rosse, Rose Rosse, Rico Rosse, Jonah Rossini, Milordino Rossini, Sparrow Rossini, Yira Rossini, Zanah Rossini, zina Rossini, Francaldo Rotunno, Reckless Rotunno, Excel Rousselot, mica Rousselot, Lexie Rovio, Alexandra Rucker, Lilith Ruff, Stina Ruff, Aragorn Runo, Kragelund Runo, Rinziq Runo, ViRi Runo, Distilled1 Rush, Jordann Russell, Kryton Russell, Miyaki, Russell, Brent Russell, Revons Rutabaga, Rocky Rutabaga, FEZ Rutherford, Darcy Rutledge, Jo Ruttenberg, Odo Ruttenberg, Theodorrick Ruttenberg, Artix Ruxton, Armand Ryan, Zakeir Rydell, Cathy Ryder, McCall Ryder, Inarra Saarinen, Kai Sabena, Sarie Sabena, Alissa Sabre, Arcticfire Sabre, BamBam Sachertorte, kai Sachertorte, Umphrey Sachs, Mila Sadovnycha, Proxima Saenz, Lynne Sage, Cheloxchile2006 Saiman, Milo Saintlouis, Natasia Saintlouis, Trinity Saintlouis, Rollergirl Saiz, Nyoko Salome, Scandinavian Salomon, Agarash Salsman, Rayne Saltair, Horus Salubrius, Solta Salyut, Nicola Samiam, Aleg Sandell, angeltf Sands, Balkan Sands, Charmaign Sands, Check Sands, Damien Sands, Orika Sands, Other Sands, Padraic Sands, Sotos Sands, Taira Sands, Cloudia Sani, Carinthia Sansome, Allasandra Santos, Rosell Santos, Solanghe Sarlo, Ishara Sartre, Charles Sassoon, Damian Saule, Jesse Sautereau, Natalia Sawley, Billie Scaggs, Mordecai Scaggs, Roz Scaggs, Socaliwag Scaggs, Johannason Scarborough, Jim Schack, Norm Schack, Fatz Scheflo, MissKitten Schildhauer, Nelson Schmo, Werner Schnabel, Tammye Schneider, Frank Schneider, Funk Schnook, cleopatras Schnyder, mylife Schnyder, ScOrPiOn Schnyder, Count Schridde, Kircheis Schroeder, Julia Schulze, Anita Schwartzman, Cornelious Schwartzman, Etrius Schwartzman, Dr Scofield, Joe Scofield, RyanAva Scofield, Kira Scott, Six Seale, Sterremare Seale, Dallas Seaton, Star Seaton, Spurs Seattle, Elio Seelowe, Jaden Seelowe, Moira Seelowe, Teleio Seferis, Artemus Seifert, Gouranga Seiling, Alyrae Seitan, Grace Selene, Maureen Selene, amandaelisabeth Sellers, Chelsey Sellers, Fashion Sellers, Novellium Sellers, Kerutsen Sellery, Semolina Semaphore, ice Semple, Daisy Semyorka, Roxy Semyorka, DarkStar Senior, River Senyurt, Singular Seoul, James Seraph, Jesrad Seraph, Liv Serf, Tears Serf, Neon Serge, Magnum Serpentine, Jazzy Serra, Aiyana Serrurier, Coelacanth Seurat, Jean Severine, Landreu Severine, Gitana Sevier, Elizabell Sewell, johni Seymour, nayeli Shabazz, Talena Shabazz, Princess Shalala, Robbie Shamroy, Dimas Shan, Lancer Shan, Nae Shan, onlyyou Shan, Shango Shan, Spirit Shan, Jumpda Shark, DigiKatt Shaw, Steffi Shenlin, Afon Shepherd, Clair Shepherd, Eastern Shepherd, LadyLeah Shepherd, Lexis Shepherd, Siddhartha Shepherd, Taran Shepherd, Valentin Shepherd, Jieux Shepherd, Delicious Sheridan, LauraAnne Sheridan, Remco Sheridan, Aki Shichiroji, Todedoz Shichiroji, BlckCobra Shikami, Mary Shikami, Seven Shikami, Thomas Shikami, Szia Shilova, lisalove Shimada, Yoyo Shinobu, Tarrant Shipman, Kitsuribami Shirabyoshi, Amber Shirakawa, AmySue Shirakawa, Kanna Shirakawa, Shelectra Shirakawa, CJ Shojo, Felix Sholokhov, VonFoxFire Sholokhov, Renegade Shriner, Alexandra Shu, Bung Shu, Ddevine Shuftan, emmakael Shuftan, Skipper Shutt, Jaime Sicling, Ko Sicling, Lucien Sidek, Ulrich Sidran, Darlene Sieyes, Darling Sieyes, sparkles Sieyes, Mjren Silvera, Apotheus Silverman, HVX Silverstar, Nirven Silverstar, Rocco Silverstar, Tamar Silverstar, Rosie Simca, Drvid Simoni, Dragos Simons, barnowlgirl Sinatra, Cheyanne Sinatra, marilsdb Sinatra, Nanceee Sinatra, Quiet Sinatra, Vent Sinatra, Frosty Sinatra, Misty Singer, Katie Singh, Sydney Singh, Philo Sion, followingwaves Sirbu, Saya Sirbu, Don Sivocci, Danielle Skall, Hegemon Skall, JASMINE Skall, Mykal Skall, Dovryn Skall, Arathorn Slade, Artakan Slade, djsunz Slade, Eleana Slade, Erica Slade, Jupiter Slade, Kronikz Slade, Methosmv Slade, piro Slade, Snapeslove Slade, Sys Slade, TylerSnk Slade, Wylee Slade, ZirQ Slade, Xabax Slade, Malik Slapstick, Coug Sleeper, Kenny Sleeper, Lucia Slippery, Adrian Sloane, Alistair Sloane, Rysz Sloane, Angel Slocombe, PrinceDK Slunce, Flo Slunce, Tatiana Smagulov, badboy1331 Smalls, Brat Smalls, EDhardy Smalls, Lomgren Smalls, DonAmon Smirnov, Andrew Smith, Elliott Smith, Mikal Snakeankle, Esch Snoats, Eian Snook, Pavee Snook, floe Snookums, kramer Snookums, Rach Snookums, Jonboy Snye, fionn Soderstrom, miguel Soderstrom, Bellisima Sodwind, Dafydd Sodwind, Scott69 Sodwind, Shipper Sodwind, Ilianexsi Sojourner, Shirokuro Sojourner, The Sojourner, Wiccan Sojourner, Elijah Sol, Lara Sola, Vanilla Sola, Silvari Soleil, David23 Something, DolphPun Somme, Rhyph Somme, aewyn Sondergaard, Kali Sonic, Packard Sonic, Jayman Sonnenblume, Pippen Sonnenblume, Esichs Sonnerstein, Sylvia Sonoda, ASCLEPIUS Soon, Tecumseh Soon, Julia Soothsayer, Shadowspawn Soothsayer, Tindallia Soothsayer, RJ Source, Akemi Soy, Aln Soy, Aaron Soyer, Tsuno Soyinka, Oz Spade, Ellen Spark, karlynn Sparkle, Kaylie Sparkle, TruHeart Sparkle, Dave Sparrow, slyflower Sparrow, Flapjack Spatula, Cheyenne Spearmann, Jester Spearmann, JewelKicker Spearmann, Data Spectre, Rai Speculaas, Sin Speculaas, Thornne Speculaas, Ehdward Spengler, mo Spengler, Wesley Spengler, Datentyp Sperber, Niko Sperber, Giuseppe Spicoli, Snakeye Spicoli, Marcus Spire, Setori Spire, Crackervelli Spitteler, Naughty Spitteler, Studders101 Spitteler, Yojne Spitteler, ScaryMary Spitz, Geezer Spoonhammer, GutterBlood Spoonhammer, Tour Spoonhammer, Sheet Spotter, tree Sprawl, Kitty Sprocket, Alan Standish, Fox Standish, Clive Stanwell, Alexis Stapovic, Hippyjim Starbrook, Missy Starbrook, Thunder Starbrook, Babydoll Stardust, Birdy Stardust, Johannes Starostin, Ariana Starr, Funk Starr, eltee Statosky, Hanako Stawberry, Micheal Steadham, Blueman Steele, sugar Steele, Jennifer Steele, Golda Stein, Tyler Stein, Uber Stein, Bernd Steinhardt, Whisper Stella, Hjoerdis Stenvaag, Timmy Stepford, LaserFingers Steptoe, Athena Sterling, Selvina Sterling, Hunter Stern, Ocmer Sternberg, Jabath Steuart, Sylvia Steuben, Bracin Stevenson, Sammmy Stewart, Skeeter Stiglitz, Lily Stilman, Nisaa Stilman, Quick Stilman, Spaydar Stine, Unger Stine, Sherrade Stirling, Till Stirling, Juggernaut Stoklitsky, Meret Stonebender, Argent Stonecutter, Gearsawe Stonecutter, Kayla Stonecutter, Liquids Stonewall, Nevera Stooge, Matthew Stork, Sam Stork, Neotoy Story, AllieKat Stovall, Krystal Straaf, Kyrus Straaf, Laars Straaf, Niccia Straaf, Aloe Stradling, egbert Stradling, Lotus Stradling, SlyFox Stradling, Eristic Strangelove, Thaumata Strangelove, Valiant Strangelove, Salome Strangelove, Erica Strauss, Zinger Strauss, Gabrielle Street, Artistniko Streeter, Bruce82 Streeter, Builder Streeter, dast Streeter, Hans Streeter, Stilette Streeter, Darzus Strutt, Bluto Stubbs, Olivier Sturges, Kharie Su, Rexx Su, Vudu Suavage, Silverrain Sucettes, Siyu Suen, Zack Suen, Linnian Sugar, Sierra Sugar, Stacey Sugar, Jodie Suisei, Koto Sukra, Takira Sukra, Ravanne Sullivan, Rik Sullivan, Sofi Sullivan, Joffi Sumbula, BrightAngel Summers, Kiyana Summers, Eclipsed Sun, Shinshinto Sungsoo, Angel Sunset, Warord Suntzu, DalE Supply, ivan Supply, Frictionless Surface, Brightwing Surtees, David Surtees, Georges Susa, Caterina Susanti, Fatima Susanti, Owen Susanto, Caliburn Susanto, Kevin Susenko, Forseti Svarog, Kinga Svarog, Batman Swenholt, Flame Swenholt, Shyressa Swenholt, Earle Swenson, Harvey Swenson, Kevin Swenson, Anastasia Swindlehurst, Liz Swindlehurst, Swein Swindlehurst, Verrenus Swindlehurst, Christain Switchblade, Guy Szondi, Nonlucid Szondi, Sagmumu Szondi, XVenomX Szymborska, CaelThunderwing Tackleberry, Mitzi Tackleberry, Ayla Tae, Maya Tae, Princess Tae, Carsten Taft, Gigs Taggart, Aphrodite Tagore, Lynn Tagore, Jenna Taira, Zephora Taiyou, Rusmi Taka, Kaimen Takahe, Akina Takakura, Sabina Takakura, Tao Takashi, Cornelius Tal, Dolmere Talamasca, Kelindra Talamasca, Sabane Talamasca, Tod69 Talamasca, Bad Tamale, Kitchkinet Tamale, Dany Tammas, kym Tammas, Phoming Tammas, sasha Tammas, Alina Tamura, Janu Tamura, Karetta Tamura, Melli Tamura, Morina Tamura, Snake Tamura, Valentina Tamura, Rutain Tandino, Tracy Tani, Jolt Tank, Rachel Tapioca, Ilyara Tardis, Jaxx Tardis, Aaron Tardis, Sim Tatham, Tobi Taurog, Joey Tavoularis, John Taylor, Jeffrey Temin, Enabran Templar, Crymzon Tempura, Jehan Tendaze, Angel Tengu, Arctic Tenk, Ginevro Tenk, OolBatar Tenk, Sally Tenk, Storchi Tenk, Bloodsong Termagant, Cubey Terra, Lynn Terra, Niles Theas, Sterre Theas, Lost Thereian, Osprey Therian, Lukas Thetan, Larson Thibaud, Redd Thielt, Tana Thielt, Thongshaman Thirroul, Millie Thompson, Brooke Thurston, Lisa Thyben, Bengal Tiger, RavenAnn Tiger, Terrigo Tiger, Sable Till, Soraya Till, Zayn Till, Trixie Timtam, immortal Tiramisu, Matthew Todd, Watermelon Tokyo, Amily Toland, Prijian Toland, Wigger Toland, Wym Toland, Shaia Toll, harathoi Toman, EH Tomcat, Pawz Tomcat, nicky Tomsen, Olyntchen Tomsen, Siul Tomsen, Zukini Tomsen, Darkover Tone, JazzySweet Tone, Tea Tone, Shelly Toonie, Tristan Torgeson, Katie Tornado, manufr Torok, Drew Torres, Xavier Tosung, Benjamin Tower, TJ Tower, Coquine Tracy, Fintaya Tracy, Herman Tracy, killer Tracy, Marcel Tran, Cabal Trautman, Nadja Travanti, Steve Trenchard, Grimm Trenchmouth, Neogrinch Trenchmouth, Scarlet Trenton, input Trilam, Debbie Trilling, Dahlia Trimble, TrainingDay Trimble, Candy Tripp, FeelGood Tripp, Nate Tripp, Skalligrim Tripp, stimpy Tripp, Michael Tripsa, Orion Tristan, Sam Troell, Celebrity Trollop, MaidHeather Trollop, Roberto Trotter, Tipsey Troughton, Lucille Trudeau, Paul Trudeau, arthus Truffaut, Chambord Truffaut, Siss Truss, Boshiken Tsuki, Sindy Tsure, Dante Tucker, ImAOzGrl Tucker, Scott Tucker, BabyAlice Tulip, Bryce Tully, Pixie Tungl, Lyr Tuppakaka, Hawthorn Tuque, Omei Turnbull, Victor Tuxing, Cloe Twang, Twill Tymets, Andrew Tyson, Lyndyn Tzara, Ilyushin Tzedek 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.

+

+

+Steve *really* needs a vacation

+</d_old>

+<e_new>LALALA</e_new>

+<f_old_trans>LALALA</f_old_trans>

+<f_translation/></string><string><a_file>floater_lsl_guide.xml</a_file>

+<b_path>/script ed float</b_path>

+<c_attribute>title</c_attribute>

+<d_old>Dynamic Help</d_old>

+<e_new>LSL Wiki</e_new>

+<f_old_trans>�� �움�</f_old_trans>

+<f_translation/></string><string><a_file>floater_mute.xml</a_file>

+<b_path>/mute floater/Mute resident...</b_path>

+<c_attribute>label</c_attribute>

+<d_old>Mute resident...</d_old>

+<e_new>Mute Resident...</e_new>

+<f_old_trans>차단할 주민</f_old_trans>

+<f_translation/></string><string><a_file>floater_mute.xml</a_file>

+<b_path>/mute floater/Mute resident...</b_path>

+<c_attribute>label_selected</c_attribute>

+<d_old>Mute resident...</d_old>

+<e_new>Mute Resident...</e_new>

+<f_old_trans>차단할 주민</f_old_trans>

+<f_translation/></string><string><a_file>floater_preferences.xml</a_file>

+<b_path>/Preferences/About...</b_path>

+<c_attribute>label</c_attribute>

+<d_old>About...</d_old>

+<e_new>About</e_new>

+<f_old_trans>ì •ë³´...</f_old_trans>

+<f_translation/></string><string><a_file>floater_preferences.xml</a_file>

+<b_path>/Preferences/About...</b_path>

+<c_attribute>label_selected</c_attribute>

+<d_old>About...</d_old>

+<e_new>About</e_new>

+<f_old_trans>ì •ë³´...</f_old_trans>

+<f_translation/></string><string><a_file>menu_viewer.xml</a_file>

+<b_path>/Main Menu/Tools/Select Tool</b_path>

+<c_attribute>label</c_attribute>

+<d_old>Select Tool</d_old>

+<e_new>Bug Reporting</e_new>

+<f_old_trans>�구 선�</f_old_trans>

+<f_translation/></string><string><a_file>notify.xml</a_file>

+<b_path>//ObjectGiveItem/message</b_path>

+<c_attribute></c_attribute>

+<d_old>

+                        An object named [OBJECTFROMNAME] owned by [FIRST] [LAST] has given you a [OBJECTTYPE] named &apos;[OBJECTNAME]&apos;.

+                </d_old>

+<e_new>

+                        An object named [OBJECTFROMNAME] owned by [FIRST] [LAST] has given you a [OBJECTTYPE] named [OBJECTNAME].

+                </e_new>

+<f_old_trans>

+                        [FIRST] [LAST] 소유� 오브�트 [OBJECTFROMNAME]�(가) 당신�게 &apos;[OBJECTNAME]&apos;(�)�는 [OBJECTTYPE]�(를) 주었습니다.

+                </f_old_trans>

+<f_translation/></string><string><a_file>notify.xml</a_file>

+<b_path>//ObjectGiveItemUnknownUser/message</b_path>

+<c_attribute></c_attribute>

+<d_old>

+                        An object named [OBJECTFROMNAME] owned by (an unknown user) has given you a [OBJECTTYPE] named &apos;[OBJECTNAME]&apos;.

+                </d_old>

+<e_new>

+                        An object named [OBJECTFROMNAME] owned by (an unknown user) has given you a [OBJECTTYPE] named [OBJECTNAME].

+                </e_new>

+<f_old_trans>

+                        알 수 없는 사용� 소유� 오브�트 [OBJECTFROMNAME]�(가) 당신�게 &apos;[OBJECTNAME]&apos;(�)�는 [OBJECTTYPE]�(를) 주었습니다.

+                </f_old_trans>

+<f_translation/></string><string><a_file>panel_group.xml</a_file>

+<b_path>/GroupInfo/btn_refresh</b_path>

+<c_attribute>label_selected</c_attribute>

+<d_old>Refresh from server</d_old>

+<e_new>Refresh</e_new>

+<f_old_trans>서버로부터 새로 고침</f_old_trans>

+<f_translation/></string><string><a_file>panel_group_general.xml</a_file>

+<b_path>/general_tab/group_name_editor</b_path>

+<c_attribute></c_attribute>

+<d_old>

+                Type your new group name here

+        </d_old>

+<e_new></e_new>

+<f_old_trans>

+                새 그룹 �름� 여기� 입력

+        </f_old_trans>

+<f_translation/></string><string><a_file>panel_preferences_popups.xml</a_file>

+<b_path>/popups/text_box2</b_path>

+<c_attribute></c_attribute>

+<d_old>

+                Show popups:

+        </d_old>

+<e_new>

+                Offers of notecards, textures and landmarks:

+        </e_new>

+<f_old_trans>

+                허용� �업:

+        </f_old_trans>

+<f_translation/></string><string><a_file>panel_status_bar.xml</a_file>

+<b_path>/status/BalanceText</b_path>

+<c_attribute></c_attribute>

+<d_old>

+                L$

+        </d_old>

+<e_new>

+                Loading...

+        </e_new>

+<f_old_trans>

+                L$

+        </f_old_trans>

+<f_translation/></string>

+</strings>

diff --git a/linden/indra/newview/skins/xui/ko/notify.xml b/linden/indra/newview/skins/xui/ko/notify.xml
index b1817d2..dccdcdd 100644
--- a/linden/indra/newview/skins/xui/ko/notify.xml
+++ b/linden/indra/newview/skins/xui/ko/notify.xml
@@ -2,7 +2,7 @@
 <notifications>
         <notify name="SystemMessageTip">
                 <message name="message">
-                        [메시지]
+                        [MESSAGE]
                 </message>
         </notify>
         <notify name="Cancelled">
@@ -17,44 +17,54 @@
         </notify>
         <notify name="CancelledAttach">
                 <message name="message">
-                        부착 취소
+                        착용 취소
                 </message>
         </notify>
         <notify name="ReplacedMissingWearable">
                 <message name="message">
-                        분실� �복/신체 부위를 기본 설정으로 �체했습니다.
+                        없는 �복/신체 부위를 기본 설정으로 대체했습니다.
                 </message>
         </notify>
         <notify name="FriendOnline">
                 <message name="message">
-                        [LAST] [FIRST]�(가) 온��입니다
+                        [FIRST] [LAST]님 온��
                 </message>
         </notify>
         <notify name="FriendOffline">
                 <message name="message">
-                        [LAST] [FIRST]�(가) 오프��입니다
+                        [FIRST] [LAST]님 오프��
+                </message>
+        </notify>
+        <notify name="AddSelfFriend">
+                <message name="message">
+                        사용� �신� 친구로 추가할 수 없습니다.
                 </message>
         </notify>
         <notify name="UploadingAuctionSnapshot">
                 <message name="message">
-                        게임 중 � 웹사�트 스냅샷 업로드 중...
-(약 5분 소요.)
+                        �월드 � 웹사�트 스냅샷 업로드 중...
+(약 5분 소요)
+                </message>
+        </notify>
+        <notify name="UploadPayment">
+                <message name="message">
+                        업로드를 위해 L$[AMOUNT]�(를) 지불하셨습니다.
                 </message>
         </notify>
         <notify name="UploadingSnapshot">
                 <message name="message">
-                        게임 중 스냅샷 업로드 중...
-(1분 내외 소요.)
+                        �월드 스냅샷 업로드 중...
+(1분 내외 소요)
                 </message>
         </notify>
         <notify name="UploadWebSnapshotDone">
                 <message name="message">
-                        웹 사�트 스냅샷� 업로드 완료했습니다.
+                        웹 사�트 스냅샷 업로드를 완료했습니다.
                 </message>
         </notify>
         <notify name="UploadSnapshotDone">
                 <message name="message">
-                        게임 중 스냅샷 업로드 완료
+                        �월드 스냅샷 업로드 완료
                 </message>
         </notify>
         <notify name="TerrainDownloaded">
@@ -74,29 +84,30 @@
         </notify>
         <notify name="UnableToLoadGesture">
                 <message name="message">
-                        제스처 로딩� 실패했습니다.
+                        제스처 로드� 실패했습니다.
 다시 시�해 주십시오.
                 </message>
         </notify>
         <notify name="InventoryLoaded">
                 <message name="message">
-                        보관함� 로드�었습니다.
+                        �벤토리가 로드�었습니다.
                 </message>
         </notify>
         <notify name="LandmarkMissing">
                 <message name="message">
-                        지역표시가 ��터베�스� 없습니다.
+                        랜드마�가 ��터베�스� 없습니다.
                 </message>
         </notify>
         <notify name="UnableToLoadLandmark">
                 <message name="message">
-                        지역 표시 로딩� 실패했습니다.  다시 시�해 주십시오.
+                        랜드마� 로드� 실패했습니다.  다시 시�해 주십시오.
                 </message>
         </notify>
         <notify name="CapsKeyOn">
                 <message name="message">
                         Caps Lock 키가 켜져 있습니다.
-password� �향� 주므로 Caps Lock 키를 꺼야 합니다.
+�로 �해 입력한 암호가 잘못� 암호로 나타날 수 있으며
+� 키를 꺼야 합니다.
                 </message>
         </notify>
         <notify name="NotecardMissing">
@@ -106,12 +117,12 @@ password� �향� 주므로 Caps Lock 키를 꺼야 합니다.
         </notify>
         <notify name="NotecardNoPermissions">
                 <message name="message">
-                        노트카드를 볼 권한� 없습니다.
+                        노트카드를 볼 권한� 부족합니다.
                 </message>
         </notify>
         <notify name="UnableToLoadNotecard">
                 <message name="message">
-                        노트카드 로딩� 실패했습니다.
+                        참고카드 로드� 실패했습니다.
 다시 시�해 주십시오.
                 </message>
         </notify>
@@ -122,19 +133,19 @@ password� �향� 주므로 Caps Lock 키를 꺼야 합니다.
         </notify>
         <notify name="ScriptNoPermissions">
                 <message name="message">
-                        스�립트를 볼 권한� 없습니다.
+                        스�립트를 볼 권한� 부족합니다.
                 </message>
         </notify>
         <notify name="UnableToLoadScript">
                 <message name="message">
-                        스�립트 로딩� 실패했습니다.  다시 시�해 주십시오.
+                        스�립트 로드� 실패했습니다.  다시 시�해 주십시오.
                 </message>
         </notify>
         <notify name="IncompleteInventory">
                 <message name="message">
-                        제공하는 전체 컨�츠는 아�
+                        제공한 전체 컨�츠는 아�
 로컬�서 사용할 수 없습니다. 몇 분 후� 해당 아�템�
-다시 제공하십시오.
+다시 제공해 보십시오.
                 </message>
         </notify>
         <notify name="CannotModifyProtectedCategories">
@@ -144,40 +155,40 @@ password� �향� 주므로 Caps Lock 키를 꺼야 합니다.
         </notify>
         <notify name="CannotRemoveProtectedCategories">
                 <message name="message">
-                        보호� 카테고리는 삭제할 수 없습니다.
+                        보호� 카테고리는 제거할 수 없습니다.
                 </message>
         </notify>
         <notify name="OfferedCard">
                 <message name="message">
-                        명함� [LAST] [FIRST] � 제공했습니다
+                        프로필� [LAST][FIRST]�게 제공했습니다.
                 </message>
         </notify>
         <notify name="OfferedFriendship">
                 <message name="message">
-                        우정� [LAST] [FIRST]� 제공했습니다
+                        [LAST][FIRST]�게 우정� 제공했습니다.
                 </message>
         </notify>
         <notify name="UnableToBuyWhileDownloading">
                 <message name="message">
-                        아�템 ��터를 다운로드하는 �안�는 구매할 수 없습니다.
+                        오브�트 ��터를 다운로드하는 �안�는 구입할 수 없습니다.
 다시 시�해 주십시오.
                 </message>
         </notify>
         <notify name="UnableToLinkWhileDownloading">
                 <message name="message">
-                        아�템 ��터를 다운로드하는 �안�는 연결할 수 없습니다.
+                        오브�트 ��터를 다운로드하는 �안�는 연결할 수 없습니다.
 다시 시�해 주십시오.
                 </message>
         </notify>
         <notify name="CannotBuyObjectsFromDifferentOwners">
                 <message name="message">
-                        �시� 다른 여러 소유주로부터 아�템� 구입할 수 없습니다.
-하나� 아�템� 선�하십시오.
+                        �시� 다른 여러 소유주로 부터 오브�트를 구입할 수 없습니다.
+1개� 오브�트를 선�하십시오.
                 </message>
         </notify>
         <notify name="ObjectNotForSale">
                 <message name="message">
-                        아�템� 매물로 표시�지 않습니다.
+                        오브�트가 매물로 표시�지 않습니다.
                 </message>
         </notify>
         <notify name="EnteringGodMode">
@@ -187,22 +198,22 @@ password� �향� 주므로 Caps Lock 키를 꺼야 합니다.
         </notify>
         <notify name="LeavingGodMode">
                 <message name="message">
-                        God mode 종료, 레벨 [LEVEL]
+                        God 모드 종료, 레벨[LEVEL]
                 </message>
         </notify>
         <notify name="CopyFailed">
                 <message name="message">
-                        복사 권한� 부족하여 복사를 하지 못함
+                        복사 권한� 없어 복사하지 못했습니다.
                 </message>
         </notify>
         <notify name="InventoryAccepted">
                 <message name="message">
-                        [NAME]�(가) 보관함� 수�했습니다.
+                        [NAME]님� 아�템 제공� 수�했습니다.
                 </message>
         </notify>
         <notify name="InventoryDeclined">
                 <message name="message">
-                        [NAME]�(가) 보관함� 거부했습니다.
+                        [NAME]님� 아�템 제공� 거부했습니다.
                 </message>
         </notify>
         <notify name="ObjectMessage">
@@ -212,40 +223,40 @@ password� �향� 주므로 Caps Lock 키를 꺼야 합니다.
         </notify>
         <notify name="CallingCardAccepted">
                 <message name="message">
-                        명함� 수��었습니다.
+                        프로필� 수��었습니다.
                 </message>
         </notify>
         <notify name="CallingCardDeclined">
                 <message name="message">
-                        명함� 거부�었습니다.
+                        프로필� 거부�었습니다.
                 </message>
         </notify>
         <notify name="TeleportToLandmark">
                 <message name="message">
-                        본토� �착했으므로 화면 우측 하단� 있는 보관함 버튼� �릭한 다� 경계 표시 ��를 선�하여 위치 &apos;[NAME]&apos;�게 텔레�팅할 수 있습니다.
-지역 표시를 �블 �릭하고 텔레�팅� �릭하여 ��합니다.
+                        메�랜드� �착했으므로 화면 우측 하단� 있는 �벤토리 버튼� �릭한 다� 랜드마� ��를 선�하여 위치 &apos;[NAME]&apos;(�)게 텔레�팅할 수 있습니다.
+랜드마�를 �블 �릭하고 텔레�팅� �릭하여 ��합니다.
                 </message>
         </notify>
         <notify name="TeleportToPerson">
                 <message name="message">
-                        본토� �착했으므로 화면 우측 하단� 있는 보관함 버튼� �릭한 다� 명함 ��를 선�하여 주민 &apos;[NAME]&apos;�게 연�할 수 있습니다.
+                        메�랜드� �착했으므로 화면 우측 하단� 있는 �벤토리 버튼� �릭한 다� 프로필 ��를 선�하여 주민 &apos;[NAME]&apos;�게 연�할 수 있습니다.
 카드를 �블 �릭한 다� 메신저를 �릭하고 메시지를 입력합니다.
                 </message>
         </notify>
         <notify name="CantSelectLandFromMultipleRegions">
                 <message name="message">
                         서버 경계를 넘어 토지를 선�할 수 없습니다.
-작� 토지를 선�하�� 하십시오.
+작� 면�� 선�하십시오.
                 </message>
         </notify>
         <notify name="GenerticNotify">
                 <message name="message">
-                        [메시지]
+                        [MESSAGE]
                 </message>
         </notify>
         <notify name="GroupVote">
                 <message name="message">
-                        [NAME]�(가) 다�� 투표하�� 제안했습니다.
+                        [NAME]님� 투표를 제안했습니다:
 [MESSAGE]
                 </message>
                 <option name="VoteNow">
@@ -257,7 +268,7 @@ password� �향� 주므로 Caps Lock 키를 꺼야 합니다.
         </notify>
         <notify name="GroupElection">
                 <message name="message">
-                        [NAME]�(가) 투표를 시작했습니다.
+                        [NAME]님� 선거를 시작했습니다:
 [MESSAGE]
                 </message>
                 <option name="VoteNow">
@@ -269,12 +280,12 @@ password� �향� 주므로 Caps Lock 키를 꺼야 합니다.
         </notify>
         <notify name="SystemMessage">
                 <message name="message">
-                        [메시지]
+                        [MESSAGE]
                 </message>
         </notify>
         <notify name="EventNotification">
                 <message name="message">
-                        �벤트 알림�:
+                        �벤트 알림:
  
 [NAME]
 [DATE]
@@ -291,10 +302,10 @@ password� �향� 주므로 Caps Lock 키를 꺼야 합니다.
         </notify>
         <notify name="TransferObjectsHighlighted">
                 <message name="message">
-                        � 구�� 구매��게 양�� � 구��
-모든 아�템� 강조 표시�었습니다.
+                        � 구� 구매��게 양��는 � 구� 내�
+모든 오브�트가 강조 표시�니다.
  
-* 양�할 나무와 잔디는 강조 표시�지 않았습니다.
+* 양��는 나무와 잔디는 강조 표시�지 않습니다.
                 </message>
                 <option name="Done">
                         완료
@@ -302,75 +313,74 @@ password� �향� 주므로 Caps Lock 키를 꺼야 합니다.
         </notify>
         <notify name="DeactivatedGesturesTrigger">
                 <message name="message">
-                        ��한 트리거로 비활성화한 제스처:
-[NAME]
+                        ��한 바로 가기로 �해 비활성� 제스처:
+[NAMES]
                 </message>
         </notify>
         <notify name="InventoryNetworkCorruption">
                 <message name="message">
-                        네트워� ��으로 보관함를 로드할 수 없습니다. �것� 네트워� 연결� 좋지 않다는 것� �미합니다.
+                        네트워� ��으로 �벤토리를 로드할 수 없습니다. �는 네트워� 연결� 좋지 않다는 것� �미합니다.
                 </message>
         </notify>
         <notify name="NoQuickTime">
                 <message name="message">
                         Apple� QuickTime 소프트웨어가 사용�� 시스템� 설치�지 않았습니다.
-스트리� 미디어를 지�하는 구�� 스트리� 미디어�서 보려면 QuickTime 사�트(http://www.apple.com/quicktime)로 가서 QuickTime 플레�어를 설치해야 합니다.
+스트리� 미디어를 지�하는 구�� 스트리� 미디어를 보려면 QuickTime 사�트(http://www.apple.com/quicktime)로 가서 QuickTime 플레�어를 설치해야 합니다.
                 </message>
         </notify>
         <notify name="OwnedObjectsReturned">
                 <message name="message">
-                        토지� 선�한 구�� 아�템� 
-사용�� 보관함으로 반환�었습니다.
+                        선�한 구�내� 본� 소유� 오브�트가 
+보관함으로 반환�었습니다.
                 </message>
         </notify>
         <notify name="OtherObjectsReturned">
                 <message name="message">
-                        토지� 선�한 구�� 아�템 중
-[LAST] [FIRST]�(가) 소유한 것�
-소유주� 보관함으로 반환�었습니다.
+                        선�� 구�� 오브�트 중 소유주 
+[LAST][FIRST]�(가) 소유한 것�
+소유주� 보관함으로 반환 �었습니다.
                 </message>
         </notify>
         <notify name="OtherObjectsReturned2">
                 <message name="message">
-                        토지� 선�한 구�� 아�템 중 
-주민 &apos;[NAME]&apos;�(가) 소유한 것�
-소유주�게 반환�었습니다.
+                        토지� 선�� 구��서  &apos;[NAME]&apos;�(가) 소유한 오브�트가
+소유주�게 반환 �었습니다.
                 </message>
         </notify>
         <notify name="GroupObjectsReturned">
                 <message name="message">
-                        그룹 [GROUPNAME]와(과) 공유한 선�� 토지 구�� 아�템� 소유주� 보관함으로 다시 �아갔습니다.
-양�� 양� 가능 아�템� �전 소유주�게 반환�었습니다.
-그룹�게 양�� 비양�성 아�템� 삭제�었습니다.
+                        토지� 선�� 구��서 그룹 [GROUPNAME]와(과) 공유한 오브�트가 소유주� 보관함으로 반환 �었습니다.
+양�� 양� 가능 오브�트가 �전 소유주�게 반환 �었습니다.
+그룹�게 양�� 비양�성 오브�트가 삭제 �었습니다.
                 </message>
         </notify>
         <notify name="UnOwnedObjectsReturned">
                 <message name="message">
-                        선�한 구�� 아�템 중 사용�가 소유하지 않� 것� 아�템� 소유주�게 반환�었습니다.
+                        선�한 구�� 오브�트 중 본� 소유물� 않� 것� 오브�트� 소유주�게 반환 �었습니다.
                 </message>
         </notify>
         <notify name="NotSafe">
                 <message name="message">
                         � 토지는 �미지 활성화 지역입니다(&apos;안전하지 않�&apos;).
-여기�는 �미지를 받� 수 있으며, 죽으면 홈 으로 텔레�팅�니다.
+� 지역�서는 �미지를 입� 수 있으며, 죽으면 홈으로 텔레�트�니다.
                 </message>
         </notify>
         <notify name="NoFly">
                 <message name="message">
                         � 토지는 비행 비활성화 지역입니다(&apos;비행 금지&apos;).
-여기�서는 비행할 수 없습니다.
+여기서는 비행할 수 없습니다.
                 </message>
         </notify>
         <notify name="PushRestricted">
                 <message name="message">
-                        � 토지는 &apos;llPushObject 제한&apos; 구역 입니다.
-토지를 소유하지 않았다면 여기�서 다른 사람� �용할 수 없습니다.
+                        � 토지는 &apos;llPushObject 제한&apos; 구역입니다.
+토지를 소유하지 않았다면 � 지역�서 다른 주민�게 �용할 수 없습니다.
                 </message>
         </notify>
         <notify name="NoBuild">
                 <message name="message">
-                        � 토지는 건축 비활성화 지역입니다(&apos;건축 금지&apos;).
-여기�서는 아�템� 제작할 수 없습니다.
+                        � 토지는 만들기 비활성화 지역입니다(&apos;만들기 금지&apos;).
+오브�트를 제작할 수 없습니다.
                 </message>
         </notify>
         <notify name="ScriptsStopped">
@@ -380,20 +390,20 @@ password� �향� 주므로 Caps Lock 키를 꺼야 합니다.
         </notify>
         <notify name="ScriptsNotRunning">
                 <message name="message">
-                        � �역�서는 스�립트가 �용�지 않습니다.
+                        � 지역�서는 스�립트가 �용�지 않습니다.
                 </message>
         </notify>
         <notify name="NoOutsideScripts">
                 <message name="message">
                         � 토지는 외부 스�립트 비활성화 지역입니다
-(&apos;외부 스�립트 없�&apos;).
-토지 소유주가 소유한  스�립트를 제외하고 외부 스�립트를 실행하지 않습니다.
-.
+(&apos;외부 스�립트 금지&apos;).
+토지 소유주가 소유한 스�립트를 제외하고 외부 스�립트는 실행�지 않습니다.
                 </message>
         </notify>
         <notify name="ApproveURL">
                 <message name="message">
-                        어떤 사물� �신� 표면� 다� 웹 페�지를 표시하려 합니다.
+                        오브�트� 표면� 다� 웹 페�지를 표시합니다.
+[URL]
                 </message>
                 <option name="LoadPage">
                         페�지 로드
@@ -404,49 +414,49 @@ password� �향� 주므로 Caps Lock 키를 꺼야 합니다.
         </notify>
         <notify name="ClaimPublicLand">
                 <message name="message">
-                        현재 지역�서는 공공 토지만 권리 설정할 수 있습니다.
+                        현재 지역�서는 공유지�만 권리 설정�할 수 있습니다.
                 </message>
         </notify>
         <notify name="ObjectGiveItem">
                 <message name="message">
-                        [LAST] [FIRST]�(가) 소유한 [OBJECTFROMNAME](�)�는 �름� 아�템� 사용��게 &apos;[OBJECTNAME]&apos;(�)�는 �름� [OBJECTTYPE]�(를) 주었습니다.
+                        [FIRST] [LAST] 소유� 오브�트 [OBJECTFROMNAME]�(가) 당신�게 &apos;[OBJECTNAME]&apos;(�)�는 [OBJECTTYPE]�(를) 주었습니다.
                 </message>
                 <option name="Keep">
                         유지
                 </option>
                 <option name="Discard">
-                        버리기
+                        취소
                 </option>
                 <option name="Mute">
-                        �소거
+                        차단
                 </option>
         </notify>
         <notify name="ObjectGiveItemUnknownUser">
                 <message name="message">
-                        (알려지지 않� 사용�)가 소유한 [OBJECTFROMNAME](�)�는 �름� 아�템� 사용��게 &apos;[OBJECTNAME]&apos;(�)�는 �름� [OBJECTTYPE]�(를) 주었습니다.
+                        알 수 없는 사용� 소유� 오브�트 [OBJECTFROMNAME]�(가) 당신�게 &apos;[OBJECTNAME]&apos;(�)�는 [OBJECTTYPE]�(를) 주었습니다.
                 </message>
                 <option name="Keep">
                         유지
                 </option>
                 <option name="Discard">
-                        버리기
+                        취소
                 </option>
                 <option name="Mute">
-                        �소거
+                        차단
                 </option>
         </notify>
         <notify name="UserGiveItem">
                 <message name="message">
-                        [NAME]�(가) &apos;[OBJECTNAME]&apos;��는 [OBJECTTYPE]� 주었습니다.
+                        [NAME]님� &apos;[OBJECTNAME]&apos;(�)�는 [OBJECTTYPE]�(를) 주었습니다.
                 </message>
                 <option name="Keep">
                         유지
                 </option>
                 <option name="Discard">
-                        버리기
+                        취소
                 </option>
                 <option name="Mute">
-                        �소거
+                        차단
                 </option>
         </notify>
         <notify name="GodMessage">
@@ -457,62 +467,66 @@ password� �향� 주므로 Caps Lock 키를 꺼야 합니다.
         </notify>
         <notify name="JoinGroup">
                 <message name="message">
-                        [메시지]
+                        [MESSAGE]
                 </message>
                 <option name="Join">
-                        참여
+                        가입
                 </option>
                 <option name="Decline">
-                        ê±°ì ˆ
+                        거부
                 </option>
         </notify>
         <notify name="JoinGroupOfficerNoFee">
                 <message name="message">
-                        [NAME)가 귀하를 멤버로 가입 초청했습니다.
+                        [NAME]님� 귀하를
+그룹 운�진으로 가입하�� 초대했습니다.
 � 그룹� 참여하는 비용� 없습니다.
  
 [MESSAGE]
                 </message>
                 <option name="Join">
-                        참여
+                        가입
                 </option>
                 <option name="Decline">
-                        ê±°ì ˆ
+                        거부
                 </option>
         </notify>
         <notify name="JoinGroupMember">
                 <message name="message">
-                        [NAME]�(가) 귀하를 멤버로
-가입 초청했습니다.
-� 그룹� 가입하려면 가입 수수료 L$[COST]�(를) 지불해야 합니다
+                        [NAME]님� 귀하를
+그룹 회�으로 가입하�� 초대했습니다.
+� 그룹� 가입하려면 가입 수수료 L$[COST]를 지불해야 합니다.
  
 [MESSAGE]
                 </message>
                 <option name="Join">
-                        참여
+                        가입
                 </option>
                 <option name="Decline">
-                        ê±°ì ˆ
+                        거부
                 </option>
         </notify>
         <notify name="JoinGroupMemberNoFee">
                 <message name="message">
-                        [NAME]�(가) 귀하를 멤버로
-가입 초청했습니다.
+                        [NAME]님� 
+그룹 회�으로 가입하�� 초대했습니다.
 � 그룹� 참여하는 비용� 없습니다.
  
-[MESSAGES]
+[MESSAGE]
                 </message>
                 <option name="Join">
-                        참여
+                        가입
                 </option>
                 <option name="Decline">
-                        ê±°ì ˆ
+                        거부
                 </option>
         </notify>
         <notify name="OfferTeleport">
                 <message name="message">
-                        [NAME] 님께서 텔레�트를 제안 하셨습니다:[MESSAGE]
+                        [NAME]님� �신� 위치로
+귀하를 텔레�트하려고 제안했습니다:
+ 
+[MESSAGE]
                 </message>
                 <option name="Teleport">
                         텔리�트
@@ -535,61 +549,60 @@ password� �향� 주므로 Caps Lock 키를 꺼야 합니다.
         </notify>
         <notify name="OfferFriendship">
                 <message name="message">
-                        [NAME]�(가) 우정� 제공하고 있습니다.
- 
-지��서 서로 추�할 수 있으며
-온�� �태를 업��트
-받게 �니다.
+                        [NAME]님� 우정� 제안합니다.
+      
+      기본�으로 사용�는 
+서로� 온�� �태를 확�할 수 있습니다.
                 </message>
                 <option name="Accept">
                         ��
                 </option>
                 <option name="Decline">
-                        ê±°ì ˆ
+                        거부
                 </option>
         </notify>
         <notify name="FriendshipAccepted">
                 <message name="message">
-                        [NAME]�(가) 우정� 수�했습니다.
+                        [NAME]님� 우정� 수�했습니다.
                 </message>
         </notify>
         <notify name="FriendshipDeclined">
                 <message name="message">
-                        [NAME]�(가) 우정� 거부했습니다.
+                        [NAME]님� 우정� 거부했습니다.
                 </message>
         </notify>
         <notify name="OfferCallingCard">
                 <message name="message">
-                        [LAST] [FIRST]�(가) 명함� 제공하고 있습니다.
-�로� 보관함� �마�를 추가하여
-� 주민과 신�하게 IM할 수 있습니다.
+                        [FIRST] [LAST]님� 프로필� 제공합니다.
+�벤토리� �마�를 추가하여 � 주민�게
+신�하게 메신저를 보낼 수 있습니다.
                 </message>
                 <option name="Accept">
                         ��
                 </option>
                 <option name="Decline">
-                        ê±°ì ˆ
+                        거부
                 </option>
         </notify>
         <notify name="RegionRestartMinutes">
                 <message name="message">
-                        지역� [MINUTES]분 �내� 재시작�니다.
+                        지역� [MINUTES] 분 �내� 다시 시작�니다.
 � 지역� 남� 경우 로그아웃�니다.
                 </message>
         </notify>
         <notify name="RegionRestartSeconds">
                 <message name="message">
-                        지역� [SECONDS]초 �내� 재시작�니다.
+                        지역�[SECONDS] 초 �내� 다시 시작�니다.
 � 지역� 남� 경우 로그아웃�니다.
                 </message>
         </notify>
         <notify name="LoadWebPage">
                 <message name="message">
-                        웹 페�지 [URL]�(를) 로드하시겠습니까?
+                        웹 페�지[URL](�)를 로드합니까?
  
 [MESSAGE]
  
-대� 사물: [OBJECTNAME], 소유주: [NAME]?
+대� 오브�트: [OBJECTNAME], 소유�: [NAME]?
                 </message>
                 <option name="Gotopage">
                         페�지로 ��
@@ -601,28 +614,28 @@ password� �향� 주므로 Caps Lock 키를 꺼야 합니다.
         <notify name="FailedToLoadWearableUnnamed">
                 <message name="message">
                         [TYPE]�(를) 로드하지 못했습니다.
-� 아�템� 구입한 �매��게 알리십시오.
+� 오브�트� �매��게 알리십시오.
                 </message>
         </notify>
         <notify name="FailedToLoadWearable">
                 <message name="message">
-                        [DESC](�)�는 �름� [TYPE]�(를) 로드하지 못했습니다.
-� 아�템� 구입한 �매��게 알리십시오.
+                        [DESC](�)�는 [TYPE]�(를) 로드하지 못했습니다.
+� 오브�트를 구입한 �매��게 알리십시오.
                 </message>
         </notify>
         <notify name="FailedToFindWearableUnnamed">
                 <message name="message">
-                        ��터베�스�서 [TYPE]�(를) 찾치 못했습니다.
+                        ��터베�스�서 [TYPE]�(를) 찾지 못했습니다.
                 </message>
         </notify>
         <notify name="FailedToFindWearable">
                 <message name="message">
-                        ��터베�스�서 [DESC](�)�는 �름� [TYPE]�(를) 찾치 못했습니다.
+                        ��터베�스�서 [DESC](�)�는 [TYPE]�(를) 찾지 못했습니다.
                 </message>
         </notify>
         <notify name="ScriptTakeMoney">
                 <message name="message">
-                        린든달러(L$)  �출
+                        사용�로부터 린든 달러(L$) 가져오기
                 </message>
         </notify>
         <notify name="ActOnControlInputs">
@@ -642,7 +655,7 @@ password� �향� 주므로 Caps Lock 키를 꺼야 합니다.
         </notify>
         <notify name="AttachToYourAvatar">
                 <message name="message">
-                        �신� 아바타� 부착
+                        �신� 아바타� 착용
                 </message>
         </notify>
         <notify name="ReleaseOwnership">
@@ -652,12 +665,12 @@ password� �향� 주므로 Caps Lock 키를 꺼야 합니다.
         </notify>
         <notify name="LinkAndDelink">
                 <message name="message">
-                        다른 사물과� 연결 � 연결 해제
+                        다른 오브�트와� 연결 � 연결 해제
                 </message>
         </notify>
         <notify name="AddAndRemoveJoints">
                 <message name="message">
-                        다른 사물과 함께 추가 � 삭제
+                        다른 오브�트와 함께 추가 � 삭제
                 </message>
         </notify>
         <notify name="ChangePermissions">
@@ -677,10 +690,10 @@ password� �향� 주므로 Caps Lock 키를 꺼야 합니다.
         </notify>
         <notify name="ScriptQuestion">
                 <message name="message">
-                        &apos;[OBJECTNAME]&apos;, 아�템 소유주 &apos;[NAME]&apos;, 해주시겠습니까:
+                        &apos;[OBJECTNAME]&apos; 오브�트(&apos;[NAME]&apos;님 소유)가 다�� �합니다:
  
 [QUESTIONS]
-OK입니까??
+괜찮습니까?
                 </message>
                 <option name="Yes">
                         예
@@ -691,7 +704,7 @@ OK입니까??
         </notify>
         <notify name="ScriptDialog">
                 <message name="message">
-                        [LAST] [FIRST]� &apos;[TITLE]&apos;
+                        [FIRST] [LAST]님� &apos;[TITLE]&apos;
 [MESSAGE]
                 </message>
                 <option name="Ignore">
@@ -709,93 +722,102 @@ OK입니까??
         </notify>
         <notify name="FirstBalanceIncrease">
                 <message name="message">
-                        L$[AMOUNT] 린든달러를 받으셨습니다. 아�템�나 다른 유저가 당신�게 L$를 지불할 것입니다. 본�� 린든달러 밸런스는 스�린� 오른쪽 �단� 보여 집니다 .
+                        L$[AMOUNT]�(를) 수령하셨습니다.
+오브�트 �매 � 다른 사용�� 기부로 린든달러(L$)를 벌 수 있습니다.
+화면� 우측 �단 코너� 현재 소유 잔고가
+표시�니다.
                 </message>
         </notify>
         <notify name="FirstBalanceDecrease">
                 <message name="message">
-                        L$[AMOUNT]� 지불했습니다.
-잔액� 화면� 우측 �단 코너� 
-표시�어 있습니다.
+                        L$[AMOUNT]�(를) 결제하셨습니다.
+화면� 우측 �단 코너� 현재 소유 잔고가 
+표시�니다.
                 </message>
         </notify>
         <notify name="FirstSit">
                 <message name="message">
-                        앉아 있습니다.
-화살표 키(�는 AWSD)를 사용하여 시�를 변경합니다.
-&apos;서기&apos; 버튼� �릭하여 �어섭니다.
+                        앉아 있는 �안
+화살표 키(�는 AWSD)를 사용하여 시�� 변경합니다.
+�어서려면 &apos;서기&apos; 버튼� �릭합니다.
                 </message>
         </notify>
         <notify name="FirstMap">
                 <message name="message">
-                        지�를 �릭하고 �어 스�롤합니다.
-�블�릭하여 텔리�트 합니다.
-오른쪽� 컨트롤� 사용하여 사물� 찾고
-다양한 배경� 표시합니다.
+                        지�를 �릭하고 �어 스�롤 합니다.
+�블 �릭하여 텔레�트합니다.
+오른쪽� 컨트롤� 사용하여 오브�트를 찾고
+다른 배경� 표시합니다.
                 </message>
         </notify>
         <notify name="FirstBuild">
                 <message name="message">
-                        새로운 아�템� [SECOND_LIFE]�서 제작할 수 있습니다.
+                        새로운 오브�트를 [SECOND_LIFE]�서 제작할 수 있습니다.
 왼쪽 �단� �구를 사용하여 제작하고 
-Ctrl �는 Alt를 누른 �태�서 신�하게 �구를 전환하십시오.
-Esc를 눌러 제작하기를 중지합니다.
+Ctrl �는 Alt 키를 누른 �태�서 신�하게 �구를 전환하십시오.
+제작� 중단하려면 Esc 키를 누르십시오.
                 </message>
         </notify>
         <notify name="FirstLeftClickNoHit">
                 <message name="message">
-                        마우스 왼쪽� �릭하면 특별 아�템과 �호작용합니다. 
-마우스 ��터가 �모양으로 바뀌면 
-해당 아�템과 �호작용� 할 수 있습니다.  
+                        마우스 왼쪽 �릭하여 특정� 오브�트와 �호작용 합니다. 
+마우스 ��터가 �으로 바뀌면
+오브�트와 �호작용할 수 있습니다.  
 마우스 오른쪽� �릭하면 사용할 수 있는 메뉴가 나타납니다.
                 </message>
         </notify>
         <notify name="FirstTeleport">
                 <message name="message">
-                        방금 텔레�트 �었습니다. 
-목�지�서 가장 가까운 Infohub� 있습니다.
+                        방금 텔레�트�었습니다. 
+목�지�서 가장 가까운 ��허브� 있습니다.
 목�지는 � 빨간색 표지로 표시�어 있습니다.
                 </message>
         </notify>
         <notify name="FirstOverrideKeys">
                 <message name="message">
-                        �� 키는 아�템��해 조정�고 있습니다.  
-화살표 키 �는 AWSD를 사용하여 아�템� 움�임� 확�하십시오.  
-�부 아�템(�같� 아�템)� 사용하려면 마우스 시�� �용해야 합니다. 
-마우스 시�� �용 하려면 &apos;M&apos;� 누릅니다.
+                        �제 오브�트� �해 �� 키가 조정�니다.  
+화살표 키 �는 AWSD 키를 사용하여 오브�트� 움�임� 확�하십시오.  
+�부 오브�트(예: �)를 사용하려면 1�칭시�� �용해야 합니다. 
+1�칭 시�� �용하려면 &apos;M&apos;� 누르십시오.
                 </message>
         </notify>
         <notify name="FirstAppearance">
                 <message name="message">
-                        외형 편집중 입니다.  
-시�를 회전하고 줌하려면 화살표 키를 사용하십시오. 
-작업� 완료했으면 &apos;전체 저장&apos;� 
-눌러 외양� 저장하고 종료합니다.  
-외형� 언제나 편집할 수 있습니다.
+                        내 모습� 편집하는 중입니다.  
+시�를 회전하고 확대/축소하려면 화살표 키를 사용하십시오. 
+�나면 &apos;모� 저장&apos;� 눌러 
+모습� 저장하고 종료하십시오.  
+내 모습� 언제든지 편집할 수 있습니다.
                 </message>
         </notify>
         <notify name="FirstInventory">
                 <message name="message">
-                        �곳� 사물, 노트카드, 기타 소유물� 보관하는 보관함 입니다.
-* 아�템 �는 복장 ��를 입으려면 �신� 아바타�게 드래그 합니다.
-* 아�템� 보관함으로부터 꺼내려면 땅으로 드래그 합니다.
-* 노트카드를 �으려면 �블�릭합니다.
+                        �곳� 오브�트, 참고카드, 기타 소유물� 보관하는 �벤토리 입니다.
+* 오브�트 �는 복장 ��를 입으려면 �신� 아바타로 드래그합니다.
+* 오브�트를 �벤토리로 부터 꺼내려면 땅으로 드래그합니다.
+* 노트 카드를 �으려면 �블�릭합니다.
                 </message>
         </notify>
         <notify name="FirstSandbox">
                 <message name="message">
-                        �곳� Sandbox 지역입니다.
-여기� 제작, 배치� 아�템� � �역� 떠난 후� 삭제� 수 있으며
-해당 �역� 삭제검열�  매 [HOURS]시간마다 태�양 시간으로 [TIME]AM� 시작�니다.
+                        �곳� 샌드박스 지역입니다.
+여기� 남겨진 오브�트는 
+정기�으로 정리� 후 삭제� 수 있습니다. 화면 �단� 지역명 옆� 정보를 참조하십시오.
  
-Sandbox 지역� �하지 않으며 기호로 표시�니다.
+샌드박스 지역� 샌드박스 알림 사�� 있습니다.
                 </message>
         </notify>
         <notify name="FirstFlexible">
                 <message name="message">
-                        � 사물� 신축성� 있습니다. 
-신축성� 있는 사물� 실제로 신축성� 없� 수 있으며 
-신축성 확�란� 체� 표시가 있� 경우 반드시 유령�어야 합니다 .
+                        � 오브�트는 신축성� 있습니다. 
+신축성� 있는 오브�트는 물리� �향� 없으며 
+신축성 체�가 �어 있� 경우 반드시 팬텀�어야 합니다.
+                </message>
+        </notify>
+        <notify name="MaxListSelectMessage">
+                <message name="message">
+                        � 목��서 최대 [MAX_SELECT]개� 아�템�
+선�할 수 있습니다.
                 </message>
         </notify>
 </notifications>
diff --git a/linden/indra/newview/skins/xui/ko/panel_avatar.xml b/linden/indra/newview/skins/xui/ko/panel_avatar.xml
index c15d06e..baf1a04 100644
--- a/linden/indra/newview/skins/xui/ko/panel_avatar.xml
+++ b/linden/indra/newview/skins/xui/ko/panel_avatar.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="utf-8" standalone="yes" ?>
 <panel name="Panel Avatar">
         <tab_container name="tab">
-                <panel label="2nd Life" name="2nd Life">
+                <panel label="온��" name="2nd Life">
                         <text name="CaptionTextAcctInfo">
                                 [ACCTTYPE]
 [PAYMENTINFO]
@@ -13,31 +13,25 @@
                                 무료 시험 사용
                         </text>
                         <text name="AcctTypeCharterMember">
-                                설립 멤버
+                                설립 회�
                         </text>
                         <text name="AcctTypeEmployee">
-                                Linden Lab ��
+                                린든랩 ��
                         </text>
                         <text name="PaymentInfoUsed">
-                                사용한 지불 정보
+                                사용한 결제수단
                         </text>
                         <text name="PaymentInfoOnFile">
-                                파�� 지불 정보
+                                결제수단 등��
                         </text>
                         <text name="NoPaymentInfoOnFile">
-                                파�� 지불 정보 없�
+                                결제수단 미등��
                         </text>
                         <text name="Name:">
                                 �름:
                         </text>
                         <text name="online_yes">
-                                온��: 예
-                        </text>
-                        <text name="online_no">
-                                온��: 아니오
-                        </text>
-                        <text name="online_unknown">
-                                온��: 알려지지 않�
+                                현재 온��
                         </text>
                         <text name="label">
                                 탄�:
@@ -46,17 +40,18 @@
                                 계정:
                         </text>
                         <text name="partner_label"
-                             tool_tip="Second Life 파트너. �세한 설정 방법� www.secondlife.com/partner를 참고하십시오">
+                             tool_tip="세컨드��프 파트너. �세한 설정 방법� www.secondlife.com/partner를 참고함">
                                 파트너:
                         </text>
+                        <button label="?" label_selected="?" name="partner_help" />
                         <line_editor name="partner_edit"
-                             tool_tip="Second Life 파트너. �세한 설정 방법� www.secondlife.com/partner를 참고하십시오">
-                                [LAST] [FIRST]
+                             tool_tip="세컨드��프 파트너. �세한 설정 방법� www.secondlife.com/partner를 참고함">
+                                [FIRST] [LAST]
                         </line_editor>
                         <text name="Photo:">
                                 사진:
                         </text>
-                        <texture_picker label="" name="img" tool_tip="�릭해 그림� 선�하십시오" />
+                        <texture_picker label="" name="img" tool_tip="그림� 선�하려면 �릭 하십시오." />
                         <text name="Ratings:">
                                 등급:
                         </text>
@@ -64,130 +59,136 @@
                                 그룹:
                         </text>
                         <text name="About:">
-                                소개:
+                                ì •ë³´:
                         </text>
                         <text name="(500 chars)">
-                                (500 글�)
+                                (250�)
                         </text>
                         <text name="Give item:">
-                                아�템 제공:
+                                아�템 주기:
                         </text>
                         <text name="Give inventory"
-                             tool_tip="보관함 아�템� � 사람�게 주려면 여기 떨어뜨립니다.">
-                                저장고 아�템� 여기 드롭하십시오.
+                             tool_tip="�벤토리 아�템� 여기� 놓아 � 사람�게 �니다.">
+                                아�템� 여기 드롭하세요.
                         </text>
                         <check_box label="웹� 게시" name="allow_publish"
                              tool_tip="내 프로필 정보를 웹� 게시." />
                         <button label="?" label_selected="?" name="?" />
-                        <button label="지�� 표시하기" label_selected="지�� 표시하기"
-                             name="Show on Map" />
-                        <button label="텔리�트 제공..." label_selected="텔리�트 제공..."
+                        <button label="지�� 표시" label_selected="지�� 표시" name="Show on Map" />
+                        <button label="텔레�트 제공.." label_selected="텔레�트 제공.."
                              name="Offer Teleport..." />
-                        <button label="지불..." label_selected="지불..." name="Pay..." />
-                        <button label="메신저..." label_selected="메신저..." name="Instant Message..." />
-                        <button label="�소거" label_selected="�소거" name="Mute" />
+                        <button label="�가…" label_selected="�가…" name="Rate..." />
+                        <button label="지불…" label_selected="지불…" name="Pay..." />
+                        <button label="메신저…" label_selected="메신저…" name="Instant Message..." />
+                        <button label="차단" label_selected="차단" name="Mute" />
                 </panel>
                 <panel label="웹" name="WebProfile">
-                        <button label="집" label_selected="집" name="home" />
-                        <button label="Load" label_selected="Load" name="load"
-                             tool_tip="Load this profile page with embedded web browser." />
-                        <button label="Open..." label_selected="Open..." name="open"
-                             tool_tip="Open this profile page in your default external web browser." />
+                        <button label="홈" label_selected="홈" name="home" />
+                        <button label="불러오기" label_selected="불러오기" name="load"
+                             tool_tip="웹 브�우저로 � 프로필 페�지를 로드합니다." />
+                        <button label="열기…" label_selected="열기…" name="open"
+                             tool_tip="내 기본 외부 웹 브�우저�서 � 프로필 페�지를 엽니다." />
                         <button label="?" label_selected="?" name="web_profile_help" />
-                        <check_box label="Automatically load web profiles" name="auto_load"
-                             tool_tip="Automatically load ALL profile webpages without asking first." />
+                        <check_box label="웹 프로필 ��으로 불러오기" name="auto_load"
+                             tool_tip="사용��게 확�하지 않고 웹 프로필� ��으로 불러옵니다." />
                         <text name="status_text">
                                 완료
                         </text>
                 </panel>
                 <panel label="관심사항" name="Interests">
                         <text name="I Want To:">
-                                �하는 것:
+                                내 관심사:
                         </text>
-                        <check_box label="짓기" name="chk0" />
-                        <check_box label="살펴보기" name="chk1" />
-                        <check_box label="만나기" name="chk2" />
-                        <check_box label="취�한다" name="chk6" />
+                        <check_box label="만들기" name="chk0" />
+                        <check_box label="�험" name="chk1" />
+                        <check_box label="만남" name="chk2" />
+                        <check_box label="구�" name="chk6" />
                         <check_box label="그룹" name="chk3" />
                         <check_box label="구매" name="chk4" />
                         <check_box label="�매" name="chk5" />
                         <check_box label="ê³ ìš©" name="chk7" />
                         <text name="Skills:">
-                                기술:
+                                내 기술:
                         </text>
                         <check_box label="�스처" name="schk0" />
                         <check_box label="건축" name="schk1" />
                         <check_box label="�벤트 계�" name="schk2" />
                         <check_box label="모��" name="schk3" />
                         <check_box label="스�립팅" name="schk4" />
-                        <check_box label="맞춤 �릭터" name="schk5" />
+                        <check_box label="아바타 개발" name="schk5" />
                         <text name="Languages:">
-                                Languages:
+                                언어:
                         </text>
                 </panel>
                 <panel label="관심장소" name="Picks">
                         <text name="Tell everyone about your favorite places in Second Life.">
-                                사람들한테 Second Life�서 마�� 드는 장소� 대해 얘기하세요.
+                                세컨드��프�서 가장 �겨찾는 장소� 대해 알려주십시오.
                         </text>
-                        <button label="신규..." label_selected="신규..." name="New..." />
+                        <button label="신규…" label_selected="신규…" name="New..." />
                         <button label="삭제..." label_selected="삭제..." name="Delete..." />
+                        <text name="loading_text">
+                                로딩 중…
+                        </text>
                 </panel>
                 <panel label="ê´‘ê³ " name="Classified">
                         <text name="Place an ad in Second Life&apos;s classified listings.">
-                                Second Life&apos; 광고지� 광고를 게재합니다.
+                                세컨드��프  광고 목�� 광고 내기
                         </text>
-                        <button label="신규..." label_selected="신규..." name="New..." />
+                        <button label="신규…" label_selected="신규…" name="New..." />
                         <button label="삭제..." label_selected="삭제..." name="Delete..." />
+                        <text name="loading_text">
+                                로딩 중…
+                        </text>
                 </panel>
-                <panel label="1st Life" name="1st Life">
+                <panel label="오프��" name="1st Life">
                         <text name="Photo:">
                                 사진:
                         </text>
-                        <texture_picker label="" name="img" tool_tip="�릭해 그림� 선�하십시오" />
+                        <texture_picker label="" name="img" tool_tip="그림� 선�하려면 �릭 하십시오." />
                         <text name="Info:">
-                                ì •ë³´:
+                                ì •ë³´
                         </text>
                         <text name="(250 chars)">
-                                (250 글�)
+                                (125�)
                         </text>
                 </panel>
                 <panel label="나� 메모" name="My Notes">
                         <text name="label">
-                                � 공간� �용해 � 사람� 대한 노트를 기�하십시오.  진행중� 거래,
-공� 프로�트 등� 진행 �황� 기�하십시오. � 노트는 귀하만
-보실 수 있습니다.  � 사람�나 다른 사람들� 노트를 볼 수 없습니다.
+                                � 공란� 사용하여 � 사람� 관한 참고 정보를 기�합니다.  진행 중�
+거래, 공� 프로�트 등� 추�합니다. 사용�는 �러한
+참고 정보만 볼 수 있습니다.  � 사람� 참고 정보를 볼 수 없으며 다른 사람들� 마찬가지입니다.
                         </text>
                 </panel>
         </tab_container>
         <button label="확�" label_selected="확�" name="OK" />
         <button label="취소" label_selected="취소" name="Cancel" />
-        <button label="쫓아내기" label_selected="쫓아내기" name="Kick" />
-        <button label="�결" label_selected="�결" name="Freeze"
+        <button label="추방하기" label_selected="추방하기" name="Kick" />
+        <button label="ì „ì²´" label_selected="ì „ì²´" name="Freeze"
              tool_tip="� 주민� 움�임 � 채팅 중지." />
-        <button label="�결 해제" label_selected="�결 해제" name="Unfreeze"
+        <button label="고정 해제" label_selected="고정 해제" name="Unfreeze"
              tool_tip="주민 해�" />
         <button label="CSR" label_selected="CSR" name="csr_btn"
              tool_tip="현재 주민� 위한 고� 서비스 �구 열기" />
         <text name="ShowOnMapNonFriend">
                 지��� 위치를 표시.
-우정� 형성하지 않았기 때문�
-비활성화 �었습니다.
+우정� 맺지 않았기 때문�
+비활성화�었습니다.
         </text>
         <text name="ShowOnMapFriendOffline">
                 지��� 위치를 표시.
-온�� �태가 아니므로 비활성화 �었습니다.
+온�� �태가 아니므로 비활성화�었습니다.
         </text>
         <text name="ShowOnMapFriendOnline">
-                지��� 위치를 표시
+                지��� 위치를 표시.
         </text>
         <text name="TeleportGod">
-                현재 위치로 텔레�팅.
+                현재 위치로 텔레�트
         </text>
         <text name="TeleportPrelude">
-                현재 위치로 텔레�팅� 제공합니다.
+                내 위치로 텔레�트를 제공합니다.
 오리엔테�션 아�랜드를 종료할 때까지 비활성화�니다.
         </text>
         <text name="TeleportNormal">
-                현재 위치로 텔레�팅� 제공합니다.
+                내 위치로 텔레�팅� 제공합니다.
         </text>
 </panel>
diff --git a/linden/indra/newview/skins/xui/ko/panel_avatar_classified.xml b/linden/indra/newview/skins/xui/ko/panel_avatar_classified.xml
index fcda31e..ca337a7 100644
--- a/linden/indra/newview/skins/xui/ko/panel_avatar_classified.xml
+++ b/linden/indra/newview/skins/xui/ko/panel_avatar_classified.xml
@@ -4,22 +4,22 @@
              tool_tip="�름� 문장 부호가 아닌 문� �는 숫�로 시작�어야 합니다." />
         <line_editor name="location_editor"
              tool_tip="현재 광고� 대한 위치를 현재 위치로 설정합니다." />
-        <button label="장소 설정" name="set_location_btn" />
+        <button label="현위치 등�" name="set_location_btn" />
         <button label="텔리�트" name="classified_teleport_btn" />
         <button label="지�" name="classified_map_btn" />
         <combo_box label="" name="classified_category_combo" />
         <check_box label="성�용" name="classified_mature_check" />
         <text name="classified_info_text"
-             tool_tip="광고� 대한 지불액� 높�수� 목��서 � 위� 표시�니다.">
-                게재 광고: 게시 예정
+             tool_tip="광고� 대한 지불액� 높�수� 목�� �위� 표시�니다.">
+                게재 광고: 게시예정
         </text>
         <text name="click_through_text"
              tool_tip="광고가 게재� �후 � 버튼� �릭한 전체 수.">
                 �릭:
         </text>
-        <button label="게시..." name="classified_update_btn" />
+        <button label="게시하기…" name="classified_update_btn" />
         <check_box label="매주 �� 갱신" name="auto_renew_check" />
         <text name="ad_placed_paid">
-                광고 공고:  [DATE], 광고 기제를 위해 L$[AMT] 지불.
+                게재 광고: [DATE], 게재 비용 L$[AMT]를 지불했습니다.
         </text>
 </panel>
diff --git a/linden/indra/newview/skins/xui/ko/panel_avatar_pick.xml b/linden/indra/newview/skins/xui/ko/panel_avatar_pick.xml
index edca112..89afde4 100644
--- a/linden/indra/newview/skins/xui/ko/panel_avatar_pick.xml
+++ b/linden/indra/newview/skins/xui/ko/panel_avatar_pick.xml
@@ -1,10 +1,10 @@
 <?xml version="1.0" encoding="utf-8" standalone="yes" ?>
 <panel name="Pick" title="선�">
-        <button label="장소 설정" name="set_location_btn" />
+        <button label="현위치 등�" name="set_location_btn" />
         <button label="텔리�트" name="pick_teleport_btn" />
-        <button label="지�� 표시하기" name="pick_map_btn" />
+        <button label="지�� 표시" name="pick_map_btn" />
         <text name="sort_order_text">
-                ì •ë ¬:
+                분류:
         </text>
-        <check_box label="켜�" name="enabled_check" />
+        <check_box label="활성화�" name="enabled_check" />
 </panel>
diff --git a/linden/indra/newview/skins/xui/ko/panel_chat_bar.xml b/linden/indra/newview/skins/xui/ko/panel_chat_bar.xml
index b61c498..f494366 100644
--- a/linden/indra/newview/skins/xui/ko/panel_chat_bar.xml
+++ b/linden/indra/newview/skins/xui/ko/panel_chat_bar.xml
@@ -1,10 +1,12 @@
 <?xml version="1.0" encoding="utf-8" standalone="yes" ?>
 <panel name="chat">
-        <button label="기�" label_selected="기�" name="History" />
-        <line_editor name="Chat Editor"
-             tool_tip="Enter를 눌러 �하고, Ctrl-Enter를 눌러 소리칩니다." />
-        <button label="�하기" label_selected="�하기" name="Say" />
-        <button label="소리 치기" label_selected="소리 치기" name="Shout" />
+        <button label="기�" label_selected="기�" name="History"
+             tool_tip="대화 내용� 보려면 여기를 �릭하십시오." />
+        <line_editor label="채팅하려면 여기를 �릭하십시오." name="Chat Editor"
+             tool_tip="Enter를 눌러 �하고, Ctrl-Enter를 눌러 외칩니다." />
+        <button label="�하기" label_selected="�하기" name="Say" tool_tip="(Enter 키)" />
+        <button label="외치기" label_selected="외치기" name="Shout"
+             tool_tip="(Ctrl-Enter 키)" />
         <combo_box label="제스처" name="Gesture">
                 <combo_item name="Gestures">
                         제스처
diff --git a/linden/indra/newview/skins/xui/ko/panel_classified.xml b/linden/indra/newview/skins/xui/ko/panel_classified.xml
index b432b3d..72b5c03 100644
--- a/linden/indra/newview/skins/xui/ko/panel_classified.xml
+++ b/linden/indra/newview/skins/xui/ko/panel_classified.xml
@@ -6,7 +6,7 @@
              tool_tip="현재 광고� 대한 위치를 현재 위치로 설정합니다." />
         <button label="설정" name="set_location_btn" />
         <button label="텔리�트" name="classified_teleport_btn" />
-        <button label="지�� 표시하기" name="classified_map_btn" />
+        <button label="지�� 표시" name="classified_map_btn" />
         <button label="프로필" name="classified_profile_btn" />
         <check_box label="성�용" name="classified_mature_check" />
         <combo_box label="" name="classified_category_combo" />
diff --git a/linden/indra/newview/skins/xui/ko/panel_event.xml b/linden/indra/newview/skins/xui/ko/panel_event.xml
index b2eab19..4e57bec 100644
--- a/linden/indra/newview/skins/xui/ko/panel_event.xml
+++ b/linden/indra/newview/skins/xui/ko/panel_event.xml
@@ -13,10 +13,10 @@
                 (없�)
         </text>
         <text name="event_mature_label">
-                성�용 컨�츠:
+                성�용 컨�츠
         </text>
         <text name="event_mature">
-                (알려지지 않�)
+                (알 수 없�)
         </text>
         <text name="event_date_label">
                 날짜:
@@ -31,19 +31,19 @@
                 (없�)
         </text>
         <text name="event_runby_label">
-                실행 프로그램:
+                실행�:
         </text>
         <text name="event_runby">
                 (없�)
         </text>
         <text name="event_location_label">
-                장소:
+                위치:
         </text>
         <text name="event_location">
                 (없�)
         </text>
         <text name="event_cover_label">
-                커버 비용:
+                처리 비용:
         </text>
         <text name="event_cover">
                 (없�)
@@ -52,7 +52,7 @@
                 설명:
         </text>
         <button label="텔리�트" name="teleport_btn" />
-        <button label="지�� 표시하기" name="map_btn" />
-        <button label="알림" name="notify_btn" />
-        <button label="�벤트 �성..." name="create_event_btn" />
+        <button label="지�� 표시" name="map_btn" />
+        <button label="알려주기" name="notify_btn" />
+        <button label="�벤트 만들기..." name="create_event_btn" />
 </panel>
diff --git a/linden/indra/newview/skins/xui/ko/panel_group.xml b/linden/indra/newview/skins/xui/ko/panel_group.xml
index 5e6fc76..5957e12 100644
--- a/linden/indra/newview/skins/xui/ko/panel_group.xml
+++ b/linden/indra/newview/skins/xui/ko/panel_group.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8" standalone="yes" ?>
-<panel name="GroupInfo" title="GroupInfo">
+<panel name="GroupInfo" title="그룹 정보">
         <text name="default_needs_apply_text">
                 현재 탭� �용�지 않� 변경 사항� 있습니다.
         </text>
@@ -9,6 +9,6 @@
         <button label="�용" label_selected="�용" name="btn_apply" />
         <button label="취소" label_selected="취소" name="btn_cancel" />
         <button label="확�" label_selected="확�" name="btn_ok" />
-        <button label="서버로부터 새로 고침"
-             label_selected="서버로부터 새로 고침" name="btn_refresh" />
+        <button label="새로 고침" label_selected="서버로부터 새로 고침"
+             name="btn_refresh" />
 </panel>
diff --git a/linden/indra/newview/skins/xui/ko/panel_group_finder.xml b/linden/indra/newview/skins/xui/ko/panel_group_finder.xml
index 1f86588..68ed91b 100644
--- a/linden/indra/newview/skins/xui/ko/panel_group_finder.xml
+++ b/linden/indra/newview/skins/xui/ko/panel_group_finder.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8" standalone="yes" ?>
-<panel name="GroupInfoFinder" title="GroupInfoFinder">
+<panel name="GroupInfoFinder" title="그룹 정보 찾기">
         <text name="default_needs_apply_text">
                 현재 탭� �용�지 않� 변경 사항� 있습니다.
         </text>
diff --git a/linden/indra/newview/skins/xui/ko/panel_group_general.xml b/linden/indra/newview/skins/xui/ko/panel_group_general.xml
index 0fe05b6..d427ddb 100644
--- a/linden/indra/newview/skins/xui/ko/panel_group_general.xml
+++ b/linden/indra/newview/skins/xui/ko/panel_group_general.xml
@@ -1,9 +1,11 @@
 <?xml version="1.0" encoding="utf-8" standalone="yes" ?>
-<panel label="�반사항" name="general_tab">
+<panel label="�반" name="general_tab">
         <text name="help_text">
-                �반 탭�는 본 그룹, 소유주 � 가시권내 멤버, �반 그룹 환경 설정, 멤버 옵션 등� 대한 �반�� 정보가 �함�어 있습니다.
+                �반 탭�는 본 그룹, 소유주 � 가시권내 회�, �반
+그룹 환경 설정, 회� 옵션 등� 대한 
+�반�� 정보가 �함�어 있습니다.
 
-�세한 �움�� 마우스를 옵션 위로 가져가면 표시�니다
+마우스를 옵션 위로 가져가면 �세한 �움�� 표시�니다.
         </text>
         <button label="?" label_selected="?" name="help_button" />
         <line_editor name="group_name_editor">
@@ -16,23 +18,23 @@
                 설립�
         </text>
         <text name="founder_name">
-                (대기)
+                (대기 중)
         </text>
         <text name="group_charter_label">
                 그룹 설립 조항
         </text>
-        <texture_picker label="그룹 휘장" name="insignia"
-             tool_tip="�릭해 그림� 선�하십시오" />
+        <texture_picker label="로고" name="insignia"
+             tool_tip="그림� 선�하려면 �릭 하십시오." />
         <text_editor name="charter">
                 그룹 설립 조항
         </text_editor>
-        <button label="ê²°í•©(L$0)" label_selected="ê²°í•©(L$0)" name="join_button" />
+        <button label="가입(L$0)" label_selected="가입(L$0)" name="join_button" />
         <button label="�세 보기" label_selected="�세 보기" name="info_button" />
         <text>
-                소유주 � 가시권내 멤버
+                소유� � 가시권 내 회�
         </text>
         <text>
-                (소유�는 굵� 글씨로 표시)
+                (소유주는 굵� 글씨로 표시)
         </text>
         <name_list name="visible_members">
                 <column label="Member Name" name="name" />
@@ -40,36 +42,36 @@
                 <column label="Last Login" name="online" />
         </name_list>
         <text name="incomplete_member_data_str">
-                멤버 ��터를 가져오는 중
+                회� ��터를 가져오는 중
         </text>
         <text name="confirm_group_create_str">
-                � 그룹� �성하는 �는 L$100� 비용� 듭니다. 
-그룹 변경� L$100를 지불할 �사가 있습니까?
+                � 그룹� �성하려면 L$100가 듭니다. 
+� 그룹� 만드는 � L$100를 지불할 �사가 있는지 잘 ��해 보십시오.
         </text>
         <text>
                 그룹 환경 설정
         </text>
         <panel name="preferences_container">
                 <check_box label="그룹 목�� 표시하기" name="show_in_group_list"
-                     tool_tip="Sets whether this group shows up in the Search Groups   window and in member profiles." />
+                     tool_tip="그룹 검색 창과 회� 프로파�� � 그룹� 표시할지 여부를 설정합니다." />
                 <check_box label="웹� 게시" name="publish_on_web"
-                     tool_tip="본 그룹� 정보를 웹� 게시할 수 있�지 설정합니다." />
-                <check_box label="등� 열기" name="open_enrollement"
-                     tool_tip="Sets whether this group allows new members to join   without being invited." />
-                <check_box label="신청 수수료: L$&quot;" name="check_enrollment_fee"
-                     tool_tip="그룹� 가입하려면 가입 수수료를 내야하는지 설정합니다." />
+                     tool_tip="그룹� 정보를 웹� 게시할 수 있�지 여부를 설정합니다." />
+                <check_box label="�유 가입" name="open_enrollement"
+                     tool_tip="새로운 회�� 초대 받지 않고� 가입� 허용할지 여부를 설정합니다." />
+                <check_box label="가입비: L$" name="check_enrollment_fee"
+                     tool_tip="그룹� 가입하기 위해 가입 수수료를 내야 하는지 여부를 설정합니다." />
                 <spinner name="spin_enrollment_fee"
-                     tool_tip="New members must pay this fee to join the group when   Enrollment Fee is checked." />
-                <check_box label="성�용" name="mature"
-                     tool_tip="그룹 정보를 성�용으로 간주할지를 설정합니다." />
+                     tool_tip="신청 수수료를 선�한 경우 그룹� 참여하려면 새로운 회�� � 수수료를 지불해야 합니다." />
+                <check_box label="성� 그룹" name="mature"
+                     tool_tip="그룹 정보를 성� 전용으로 간주할지를 여부를 설정합니다." />
                 <panel name="title_container">
                         <text name="active_title_label">
-                                내 활성 타�틀
+                                보여질 타�틀
                         </text>
                         <combo_box name="active_title"
                              tool_tip="Sets the title that appears in your avatar&apos;s name tag   when this group is active." />
                 </panel>
-                <check_box label="그룹 통지 수령" name="receive_notices"
-                     tool_tip="Sets whether you want to receive Notices from this group.   Uncheck this box if this group is spamming you." />
+                <check_box label="그룹 공지 수령" name="receive_notices"
+                     tool_tip="그룹으로부터 공지를 수신할지를 여부를 설정합니다.   본 그룹� 스팸 메�� 보낼 경우 � ��를 선� 해제합니다." />
         </panel>
 </panel>
diff --git a/linden/indra/newview/skins/xui/ko/panel_group_invite.xml b/linden/indra/newview/skins/xui/ko/panel_group_invite.xml
index 1796be7..47a39f7 100644
--- a/linden/indra/newview/skins/xui/ko/panel_group_invite.xml
+++ b/linden/indra/newview/skins/xui/ko/panel_group_invite.xml
@@ -1,20 +1,20 @@
 <?xml version="1.0" encoding="utf-8" standalone="yes" ?>
-<panel label="맴버 초대" name="invite_panel">
+<panel label="회� 초대" name="invite_panel">
         <text>
-                귀하� 그룹� 초대할 
-주민� 여러명 선�할 수 있습니다. &apos;사람 
+                여러 주민� 선�하여 
+그룹� 초대할 수 있습니다. &apos;주민 
 선�기 열기&apos;를 �릭하여 시작합니다.
         </text>
         <button label="사람 선�기 열기" name="add_button" tool_tip="" />
         <name_list name="invitee_list"
-             tool_tip="Hold the Ctrl key and click resident names  to multi-select." />
-        <button label="목��서 선� 아�템 제거" name="remove_button"
-             tool_tip="위�서 선�한 주민� 초청 목��서 삭제합니다." />
+             tool_tip="여러 명� 선�하기 위해서는 Ctrl 키를 누르고 �름� �릭하면 �니다." />
+        <button label="목��서 선� 오브�트 제거" name="remove_button"
+             tool_tip="위�서 선�한 주민� 초대 목��서 제거합니다." />
         <text>
-                할당할 역할� 선�하십시오:
+                할당할 역할� 선� 하십시오:
         </text>
         <combo_box name="role_name"
              tool_tip="Choose from the list of Roles you  are allowed to assign members to." />
-        <button label="초청장 전송" name="ok_button" />
+        <button label="초대장 전송" name="ok_button" />
         <button label="취소" name="cancel_button" />
 </panel>
diff --git a/linden/indra/newview/skins/xui/ko/panel_group_land_money.xml b/linden/indra/newview/skins/xui/ko/panel_group_land_money.xml
index 0a0e86c..77f9301 100644
--- a/linden/indra/newview/skins/xui/ko/panel_group_land_money.xml
+++ b/linden/indra/newview/skins/xui/ko/panel_group_land_money.xml
@@ -1,11 +1,10 @@
 <?xml version="1.0" encoding="utf-8" standalone="yes" ?>
-<panel label="토지 &amp;린든 달러" name="land_money_tab">
+<panel label="토지 &amp; L$" name="land_money_tab">
         <text name="help_text">
-                그룹� 소유한 구�� 기여 세부 사항과 함께 
-열거�니다. � 사용 토지가 � 기여보다
-작거나 같으면 경고가
-표시�니다. 기�, 세부 사항 � 매매 탭�
-그룹� 재정� 대한 정보를 제공합니다.
+                그룹� 소유한 구�� 기여 세부사항과 함께 열거�니다. � 사용 토지가 � 기여보다 
+ 작거나 같으면 경고가 
+ 표시�니다.기�, 세부 사항 � 매매 탭� 
+ 그룹� 재정� 대한 정보를 제공합니다.
         </text>
         <button label="?" name="help_button" />
         <text name="cant_view_group_land_text">
@@ -23,43 +22,42 @@
                 <column label="Area" name="area" />
                 <column label="" name="hidden" />
         </scroll_list>
-        <button label="지�� 표시하기" label_selected="지�� 표시하기"
-             name="map_button" />
+        <button label="지�� 표시" label_selected="지�� 표시" name="map_button" />
         <text name="total_contributed_land_label">
                 � 기여:
         </text>
         <text name="total_contributed_land_value">
-                0 �방 미터
+                0 제곱미터
         </text>
         <text name="total_land_in_use_label">
-                사용중� � 토지:
+                사용 중� 토지:
         </text>
         <text name="total_land_in_use_value">
-                0 �방 미터
+                0 제곱미터
         </text>
         <text name="land_available_label">
-                가용 토지:
+                미사용중� 토지:
         </text>
         <text name="land_available_value">
-                0 �방 미터
+                0 제곱미터
         </text>
         <text name="your_contribution_label">
-                귀하� 기여:
+                기여:
         </text>
         <text name="your_contribution_max_value_append">
                 �방 미터
         </text>
         <text name="your_contribution_max_value">
-                (대기)
+                (대기 중)
         </text>
         <text name="group_over_limit_text">
-                그룹 멤버는 사용 중� 토지를 지�하기 위해 � 많� 토지 신용� 기여해야 합니다.
+                그룹 회�� 사용 중� 토지를 지�하기 위해 � 많� 토지 신용� 기여해야 합니다.
         </text>
         <text name="group_money_heading">
-                그룹 L$
+                그룹 린든달러(L$)
         </text>
         <tab_container name="group_money_tab_container">
-                <panel label="Planning" name="group_money_planning_tab">
+                <panel label="보고서" name="group_money_planning_tab">
                         <text_editor name="group_money_planning_text">
                                 컴퓨팅...
                         </text_editor>
@@ -70,17 +68,17 @@
                         </text_editor>
                         <button label="&lt; �전" label_selected="&lt; �전" name="earlier_details_button"
                              tool_tip="시간� 거슬러 갑니다" />
-                        <button label="나중� &gt;" label_selected="나중� &gt;"
+                        <button label="나중�&gt;" label_selected="나중�&gt;"
                              name="later_details_button" tool_tip="시간� 앞서 갑니다" />
                 </panel>
-                <panel label="�매" name="group_money_sales_tab">
+                <panel label="�매내역" name="group_money_sales_tab">
                         <text_editor name="group_money_sales_text">
                                 컴퓨팅...
                         </text_editor>
                         <button label="&lt; �전" label_selected="&lt; �전" name="earlier_sales_button"
                              tool_tip="시간� 거슬러 갑니다" />
-                        <button label="나중� &gt;" label_selected="나중� &gt;"
-                             name="later_sales_button" tool_tip="시간� 앞서 갑니다" />
+                        <button label="나중�&gt;" label_selected="나중�&gt;" name="later_sales_button"
+                             tool_tip="시간� 앞서 갑니다" />
                 </panel>
         </tab_container>
 </panel>
diff --git a/linden/indra/newview/skins/xui/ko/panel_group_notices.xml b/linden/indra/newview/skins/xui/ko/panel_group_notices.xml
index 10ff12f..9682eea 100644
--- a/linden/indra/newview/skins/xui/ko/panel_group_notices.xml
+++ b/linden/indra/newview/skins/xui/ko/panel_group_notices.xml
@@ -1,22 +1,23 @@
 <?xml version="1.0" encoding="utf-8" standalone="yes" ?>
 <panel label="공지" name="notices_tab">
         <text name="help_text">
-                공지는 메시지를 방송하거나 첨부한 아�템� 전송하여 그룹 사��서 �사소통� 빨리 
-할 수 있는 방법입니다. 공지는 공지를 
-받� 수 있는 역할� 가진 그룹 멤버�게만 
-전송�니다. �반 탭�서 
-공지를 � 수 있습니다.
+                공지는 메시지를 방송하거나 첨부한 아�템� 전송하여 
+ 그룹 사��서 �사소통� 빨리 
+ 할 수 있는 방법입니다.공지는 
+ 공지를 받� 수 있는 역할� 가진 그룹 회��게만 
+ 전송�니다.�반 탭�서 
+ 공지를 � 수 있습니다.
         </text>
         <text name="no_notices_text">
                 과거 공지가 없습니다.
         </text>
         <button label="?" label_selected="?" name="help_button" />
         <text name="lbl">
-                그룹 공지 아카�브
+                그룹 공지
         </text>
         <text name="lbl2">
                 공지는 30� �안 보관�니다. 보려는 공지를 다��서 �릭하십시오.
-새로운 공지를 수령한 경우 &apos;목� 새로고침&apos; 버튼� �릭하십시오.
+새로운 공지를 수령한 경우 &apos;새로고침&apos; 버튼� �릭하십시오.
         </text>
         <scroll_list name="notice_list">
                 <column label="" name="icon" />
@@ -25,51 +26,50 @@
                 <column label="Date" name="date" />
         </scroll_list>
         <text name="notice_list_none_found">
-                찾� 것� 없습니다.
+                발견�지 않�.
         </text>
-        <button label="새 공지 �성" label_selected="새 공지 �성"
+        <button label="새 공지 만들기" label_selected="새 공지 만들기"
              name="create_new_notice" />
-        <button label="목� 새로 고침" label_selected="목� 새로 고침"
+        <button label="새로 고침" label_selected="목� 새로 고침"
              name="refresh_notices" />
-        <panel label="새 공지 �성" name="panel_create_new_notice">
+        <panel label="새 공지 만들기" name="panel_create_new_notice">
                 <text name="lbl">
-                        공지 �성
+                        공지 만들기
                 </text>
                 <text name="lbl2">
-                        공지를 전송하려면 제목� 입력해야 합니다. 아�템� 보관함�서
-� 패�까지 �어와 통지� 
-추가할 수 있습니다. 첨부한 아�템� 복사 � 전송� 가능해야 하며,
-��를 전송할 수는 없습니다.
+                        공지를 전송하려면 제목� 입력해야 합니다. �벤토리�서 � 창으로
+아�템� 드래그하여 공지 작성창� 단� 아�템� 첨부할 수 
+있습니다. 첨부한 아�템� 복사 � 전송할 수 있지만
+전체 ��를 전송할 수는 없습니다.
                 </text>
                 <text name="lbl3">
-                        주제:
+                        제목:
                 </text>
                 <text name="lbl4">
                         메시지:
                 </text>
                 <text name="lbl5">
-                        첨부:
+                        ì°©ìš©:
                 </text>
-                <button label="부착물 삭제" label_selected="부착물 삭제"
+                <button label="착용물 삭제" label_selected="착용물 삭제"
                      name="remove_attachment" />
                 <button label="공지 전송" label_selected="공지 전송" name="send_notice" />
-                <panel name="drop_target2"
+                <panel name="drop_target"
                      tool_tip="Drag an inventory item onto the message box to send it with the notice. You must have permission to copy and transfer the object to send it with the notice." />
         </panel>
-        <panel label="지난 통보 보기" name="panel_view_past_notice">
+        <panel label="과거 공지 보기" name="panel_view_past_notice">
                 <text name="lbl">
-                        보관� 공지
+                        공지 보관함
                 </text>
                 <text name="lbl2">
-                        새로운 공지를 전송하려면 위� &apos;새 공지 작성&apos; 버튼� �릭하십시오.
+                        새로운 공지를 전송하려면 위� &apos;새 공지 만들기&apos; 버튼� �릭하십시오.
                 </text>
                 <text name="lbl3">
-                        주제:
+                        제목:
                 </text>
                 <text name="lbl4">
                         메시지:
                 </text>
-                <button label="부착물 열기" label_selected="부착물 열기"
-                     name="open_attachment" />
+                <button label="첨부 열기" label_selected="첨부 열기" name="open_attachment" />
         </panel>
 </panel>
diff --git a/linden/indra/newview/skins/xui/ko/panel_group_roles.xml b/linden/indra/newview/skins/xui/ko/panel_group_roles.xml
index 74db0e2..0a9070a 100644
--- a/linden/indra/newview/skins/xui/ko/panel_group_roles.xml
+++ b/linden/indra/newview/skins/xui/ko/panel_group_roles.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8" standalone="yes" ?>
-<panel label="멤버 � 역할" name="roles_tab">
+<panel label="회� � 역할" name="roles_tab">
         <text name="default_needs_apply_text">
                 현재 하위 탭� �용�지 않� 변경 사항� 있습니다.
         </text>
@@ -12,10 +12,11 @@
         <button label="?" name="help_button" />
         <panel name="members_header">
                 <text name="static">
-                        멤버 � 역할
+                        회� � 역할
                 </text>
                 <text name="static2">
-                        그룹 멤버�게 능력과 역할� 할당�었습니다. � 설정� � 나� 구성과 융통성� 갖출 수 있�� 간편한 사용� 지정� 가능합니다.
+                        그룹 회��게 권한과 역할� 할당�었습니다. � 설정�
+� 나� 구성과 융통성� 위해 사용� 지정� 가능합니다.
                 </text>
         </panel>
         <panel name="roles_header">
@@ -23,29 +24,29 @@
                         ì—­í• 
                 </text>
                 <text name="role_properties_modifiable">
-                        다� 역할� 선�하십시오.  �름, 설명 � 멤버 타�틀� 수정할 수 있습니다.
+                        다� 역할� 선�하십시오.  �름, 설명 � 회� 타�틀� 수정할 수 있습니다.
                 </text>
                 <text name="role_properties_not_modifiable">
-                        다� 역할� 선�하여 특성, 멤버 � 허용� 능력� 확�하십시오.
+                        다� 역할� 선�하여 특성, 회� � 허용� 권한� 확�하십시오.
                 </text>
                 <text name="role_actions_modifiable">
-                        역할� 능력� 할당할 수 있습니다.
+                        역할� 권한� 할당할 수 있습니다.
                 </text>
                 <text name="role_actions_not_modifiable">
-                        할당� 능력� 볼 수는 있지만 수정할 수는 없습니다.
+                        할당� 권한� 볼 수 있지만 수정할 수는 없습니다.
                 </text>
         </panel>
         <panel name="actions_header">
                 <text name="static">
-                        능력
+                        권한
                 </text>
                 <text name="static2">
-                        능력� 대한 설명� 보고 능력� 실행할 수 있는 역할 � 멤버를 
+                        권한� 대한 설명� 보고 권한� 실행할 수 있는 역할 � 회�� 
 볼 수 있습니다.
                 </text>
         </panel>
         <tab_container name="roles_tab_container">
-                <panel label="맴버" name="members_sub_tab" tool_tip="Members">
+                <panel label="회�" name="members_sub_tab" tool_tip="Members">
                         <button label="검색" name="search_button" />
                         <button label="모� 표시" name="show_all_button" />
                         <name_list name="member_list">
@@ -53,12 +54,12 @@
                                 <column label="Donated Tier" name="donated" />
                                 <column label="Last Login" name="online" />
                         </name_list>
-                        <button label="새로운 사람 초대 ..." name="member_invite" />
+                        <button label="새로운 사람 초대…" name="member_invite" />
                         <button label="그룹�서 강퇴" name="member_eject" />
                         <text name="help_text">
-                                멤버�게 할당� 역할� 추가 �는 삭제하거나  
-Control 키를 누르고 해당 �름� �릭하여
-여러 멤버를 선�할 수 있습니다.
+                                회��게 할당� 역할� 추가 �는 제거할 수 있습니다. 
+                                Ctrl 키를 누른 �태로 해당하는 회� �름� �릭하면
+                                여러 회�� 선�할 수 있습니다.
                         </text>
                 </panel>
                 <panel label="ì—­í• " name="roles_sub_tab">
@@ -69,13 +70,15 @@ Control 키를 누르고 해당 �름� �릭하여
                                 <column label="Title" name="title" />
                                 <column label="Members" name="members" />
                         </scroll_list>
-                        <button label="새 역할 �성…" name="role_create" />
+                        <button label="새 역할 �성 …" name="role_create" />
                         <button label="역할 삭제" name="role_delete" />
                         <text name="help_text">
-                                역할�는 타�틀� 있으며 멤버가 할 수 있는 능력 목�� 있습니다. 멤버는 하나 ��� 역할� 소�� 수 있습니다. 한 그룹� 모든 사람 � 소유주 역할� �함하여 최고 10가지� 역할까지 가질 수 있습니다
+                                역할�는 회�� 수행할 수 있는 권한� 타�틀과 허가 목�� 있습니다.회�들� 한 가지 ��� 역할� 
+ �할 수 있습니다.한 그룹� 모든 사람 � 소유주 역할� �함하여 
+ 최고 10가지� 역할까지 가질 수 있습니다.
                         </text>
                 </panel>
-                <panel label="능력" name="actions_sub_tab">
+                <panel label="권한" name="actions_sub_tab">
                         <button label="검색" name="search_button" />
                         <button label="모� 표시" name="show_all_button" />
                         <scroll_list name="action_list" tool_tip="Select an Ability to view more details.">
@@ -83,8 +86,8 @@ Control 키를 누르고 해당 �름� �릭하여
                                 <column label="" name="action" />
                         </scroll_list>
                         <text name="help_text">
-                                능력� 역할� 가진 멤버가 � 그룹 내�서
-특정한 �� 할 수 있게 해�니다. 능력� 종류는 다양합니다.
+                                권한� 역할 회�� � 그룹 내 특정 작업� 수행할
+수 있�� 허용합니다. 권한� 종류는 다양합니다.
                         </text>
                 </panel>
         </tab_container>
@@ -93,7 +96,7 @@ Control 키를 누르고 해당 �름� �릭하여
                         할당� 역할
                 </text>
                 <text name="static2">
-                        허용� 능력
+                        허용� 권한
                 </text>
                 <scroll_list name="member_assigned_roles">
                         <column label="" name="checkbox" />
@@ -119,20 +122,20 @@ Control 키를 누르고 해당 �름� �릭하여
                         타�틀
                 </text>
                 <line_editor name="role_title">
-                        (대기)
+                        (대기 중)
                 </line_editor>
                 <text_editor name="role_description">
-                        (대기)
+                        (대기 중)
                 </text_editor>
                 <text name="static4">
-                        할당� 멤버
+                        할당� 회�
                 </text>
                 <text name="static5"
-                     tool_tip="현재 선�한 역할� 능력 목�� 수행할 수 있습니다.">
-                        허용� 능력
+                     tool_tip="현재 선�� 역할� 수행할 수 있는 권한 목�입니다.">
+                        허용� 권한
                 </text>
-                <check_box label="멤버가 표시�었습니다" name="role_visible_in_list"
-                     tool_tip="Sets whether members of this role are visible in the General tab   to people outside of the group." />
+                <check_box label="회�� 표시�었습니다." name="role_visible_in_list"
+                     tool_tip="역할� 회�� �반 탭�서 그룹 밖� 사람들�게 보�는지 여부를 설정합니다." />
                 <scroll_list name="role_allowed_actions"
                      tool_tip="For Details of each Allowed Ability see the Abilities tab.">
                         <column label="" name="icon" />
@@ -145,13 +148,13 @@ Control 키를 누르고 해당 �름� �릭하여
                         설명
                 </text>
                 <text_editor name="action_description">
-                        � 기능� &apos;� 그룹�서 멤버 강퇴&apos;입니다. 소유주만 다른 소유주를 탈퇴 시킬 수 있습니다.
+                        � 기능� &apos;� 그룹�서 회� 축출&apos;입니다. 소유주만 다른 소유주를 탈퇴 시킬 수 있습니다.
                 </text_editor>
                 <text name="static2">
-                        능력� �함한 역할
+                        권한� �함한 역할
                 </text>
                 <text name="static3">
-                        능력� 가진 멤버
+                        권한� 가진 회�
                 </text>
         </panel>
 </panel>
diff --git a/linden/indra/newview/skins/xui/ko/panel_group_voting.xml b/linden/indra/newview/skins/xui/ko/panel_group_voting.xml
index 255a480..d18865a 100644
--- a/linden/indra/newview/skins/xui/ko/panel_group_voting.xml
+++ b/linden/indra/newview/skins/xui/ko/panel_group_voting.xml
@@ -1,11 +1,11 @@
 <?xml version="1.0" encoding="utf-8" standalone="yes" ?>
-<panel label="제안서" name="voting_tab">
+<panel label="제안" name="voting_tab">
         <text name="help_text">
                 그룹 제안� 그룹� ��사항� 알고
 그룹� 어떻게 ��하는지를 파악하는 �
-사용할 수 있습니다. �절한 권한� 
-있다면 제안� �성, 제안 공개,
-제안�대한 투표, 과거� 제안� 볼 수 있습니다.
+사용할 수 있습니다.�절한 권한� 있다면
+제안� �성하고,
+제안� 대한 투표와 과거� 제안� 볼 수 있습니다.
         </text>
         <button label="?" name="help_button" />
         <text name="proposal_header">
@@ -15,21 +15,21 @@
                 그룹 제안 열기
         </text>
         <text name="proposals_header_create_txt">
-                제안 �성
+                제안 만들기
         </text>
         <text name="proposals_header_vote_txt">
                 제안 투표
         </text>
         <text name="empty_proposal_txt">
-                �성하려는 제안� 비어 있습니다.  제안� �성하기 전� 작성하십시오.
+                만들려는 제안� 비어 있습니다.  제안� 만들기 전� 작성하셔야 합니다.
         </text>
         <text name="proposal_instructions">
-                투표하려는 제안� �블 �릭하거나 제안 �성� 눌러 새로운 제안� �성합니다.
+                투표하려는 제안� �블 �릭하거나 만들기를 눌러 새로운 제안� �성합니다.
         </text>
         <text name="proposal_lbl">
-                제안서:
+                제안:
         </text>
-        <button label="제안 �성" label_selected="제안 �성" name="btn_proposal" />
+        <button label="제안 만들기" label_selected="제안 만들기" name="btn_proposal" />
         <button label="제안 보기" label_selected="제안 보기"
              name="btn_view_proposal_item" />
         <button label="목� 보기" label_selected="목� 보기"
@@ -40,7 +40,7 @@
         <spinner name="quorum"
              tool_tip="선거 결과가 효력� 발휘하려면 � #명� 투표 ��� 필요합니다." />
         <text name="quorum_text">
-                � 그룹 멤버 x명 중.
+                � 그룹 회� x명 중.
         </text>
         <text name="duration_lbl">
                 기간:
@@ -55,10 +55,10 @@
                 만장�치
         </radio_group>
         <text name="start_lbl">
-                투표 시작:
+                투표 시작�:
         </text>
         <text name="end_lbl">
-                투표 종료:
+                투표 종료�:
         </text>
         <button label="제안 제출" label_selected="제안 제출" name="btn_submit" />
         <button label="취소" label_selected="취소" name="btn_cancel" />
@@ -69,7 +69,7 @@
                 그룹 투표 기�
         </text>
         <text name="instructions">
-                과거� 투표를 �블 �릭하거나 하나를 선�하고 항목 보기를 �릭하여 결과를 봅니다.
+                지난 투표를 �블 �릭하거나 하나를 선�하고 결과보기를 �릭하여 결과를 봅니다.
         </text>
         <text name="history_list_lbl">
                 과거� 투표                                                         투표 종료
diff --git a/linden/indra/newview/skins/xui/ko/panel_land_covenant.xml b/linden/indra/newview/skins/xui/ko/panel_land_covenant.xml
index 10e5b46..1dc1268 100644
--- a/linden/indra/newview/skins/xui/ko/panel_land_covenant.xml
+++ b/linden/indra/newview/skins/xui/ko/panel_land_covenant.xml
@@ -1,39 +1,39 @@
 <?xml version="1.0" encoding="utf-8" standalone="yes" ?>
-<panel name="Covenant" title="계약 조항">
+<panel name="Covenant" title="시행 규칙">
         <text name="region_name_lbl">
                 지역:
         </text>
         <text name="region_name_text">
-                (알려지지 않�)
+                (알 수 없�)
         </text>
         <text name="estate_name_lbl">
-                소유지:
+                사유지:
         </text>
         <text name="estate_name_text">
-                (알려지지 않�)
+                (알 수 없�)
         </text>
         <text name="estate_owner_lbl">
-                소유지 소유�:
+                사유지 소유�:
         </text>
         <text name="estate_owner_text">
-                (알려지지 않�)
+                (알 수 없�)
         </text>
         <text name="resellable_clause">
-                � 지역�서 구입한 토지는 재�매할 수 없는 경우� 있습니다.
+                � 지역�서 구매한 토지는 재�매 할 수 없는 경우� 있습니다.
         </text>
         <text name="changeable_clause">
-                � 지역�서 구입한 토지는 결합 �는 분할 할 수 없는 경우� 있습니다.
+                � 지역�서 구매한 토지는 결합 �는 분할 할 수 없는 경우� 있습니다.
         </text>
         <text name="can_resell">
-                � 지역�서 구입한 토지는 재�매할 수 있습니다.
+                � 지역�서 구매한 토지는 재�매 할 수 있습니다.
         </text>
         <text name="can_not_resell">
-                � 지역�서 구입한 토지는 재�매할 수 없습니다.
+                � 지역�서 구매한 토지는 재�매 할 수 없습니다.
         </text>
         <text name="can_change">
-                � 지역�서 구입한 토지는 결합 �는 분할 할 수 있습니다.
+                � 지역�서 구매한 토지는 결합 �는 분할 가능 합니다.
         </text>
         <text name="can_not_change">
-                � 지역�서 구입한 토지는 결합 �는 분할 할 수 없습니다.
+                � 지역�서 구매한 토지는 결합 �는 분할 불가능 합니다.
         </text>
 </panel>
diff --git a/linden/indra/newview/skins/xui/ko/panel_login.xml b/linden/indra/newview/skins/xui/ko/panel_login.xml
index 4fb89cd..591a859 100644
--- a/linden/indra/newview/skins/xui/ko/panel_login.xml
+++ b/linden/indra/newview/skins/xui/ko/panel_login.xml
@@ -7,35 +7,35 @@
                 �름:
         </text>
         <text name="last_name_text">
-                성:
+                성
         </text>
         <text name="password_text">
-                암호:
+                비밀번호:
         </text>
         <text name="start_location_text">
                 시작 위치:
         </text>
         <combo_box name="start_location_combo">
                 <combo_item name="MyHome">
-                        우리 집
+                        홈
                 </combo_item>
                 <combo_item name="MyLastLocation">
-                        내 최후 위치
+                        최종 방문지
                 </combo_item>
-                <combo_item name="&lt;Typeregionname&gt;">
+                <combo_item name="Typeregionname">
                         &lt;지역명 입력&gt;
                 </combo_item>
         </combo_box>
-        <check_box label="암호 저장하기" name="remember_check" />
+        <check_box label="비밀번호 기억" name="remember_check" />
         <text name="full_screen_text">
-                로그�하면 뷰어는 전체 화면으로 표시�니다.
+                로그�할 때 뷰어� 전체 화면� 표시�니다.
         </text>
-        <button label="신규 계정..." label_selected="신규 계정..."
+        <button label="신규 계정" label_selected="신규 계정"
              name="new_account_btn" />
-        <button label="ì—°ê²°" label_selected="ì—°ê²°" name="connect_btn" />
-        <button label="환경 설정..." label_selected="환경 설정..."
+        <button label="환경 설정" label_selected="환경 설정"
              name="preferences_btn" />
-        <button label="�내기" label_selected="�내기" name="quit_btn" />
+        <button label="ì—°ê²°" label_selected="ì—°ê²°" name="connect_btn" />
+        <button label="종료" label_selected="종료" name="quit_btn" />
         <text name="version_text">
                 1.23.4 (5)
         </text>
diff --git a/linden/indra/newview/skins/xui/ko/panel_media_remote.xml b/linden/indra/newview/skins/xui/ko/panel_media_remote.xml
index 8cec895..a1e0c36 100644
--- a/linden/indra/newview/skins/xui/ko/panel_media_remote.xml
+++ b/linden/indra/newview/skins/xui/ko/panel_media_remote.xml
@@ -1,13 +1,13 @@
 <?xml version="1.0" encoding="utf-8" standalone="yes" ?>
 <panel name="music_remote">
-        <text type="string" length="1" name="text">
-                �� 제어
+        <text type="string" length="6" name="text">
+                �화
         </text>
+        <volume_slider name="volume_slider"
+             tool_tip="� 슬���를 사용하여 볼륨� 변경" />
         <button label="" label_selected="" name="stop_btn" tool_tip="미디어 중지" />
         <button label="" label_selected="" name="play_btn"
              tool_tip="미디어 스트림 재�" />
         <button label="" label_selected="" name="pause_btn"
              tool_tip="미디어 스트림 �시 정지" />
-        <volume_slider name="volume_slider"
-             tool_tip="� 슬���를 사용하여 볼륨� 변경" />
 </panel>
diff --git a/linden/indra/newview/skins/xui/ko/panel_music_remote.xml b/linden/indra/newview/skins/xui/ko/panel_music_remote.xml
index 3ec3a0f..c1c8bc5 100644
--- a/linden/indra/newview/skins/xui/ko/panel_music_remote.xml
+++ b/linden/indra/newview/skins/xui/ko/panel_music_remote.xml
@@ -1,13 +1,13 @@
 <?xml version="1.0" encoding="utf-8" standalone="yes" ?>
 <panel name="music_remote">
-        <text type="string" length="1" name="text">
-                �악 제어
+        <text type="string" length="6" name="text">
+                �악
         </text>
+        <volume_slider name="volume_slider"
+             tool_tip="� 슬���를 사용하여 볼륨� 변경" />
         <button label="" label_selected="" name="stop_btn" tool_tip="미디어 중지" />
         <button label="" label_selected="" name="play_btn"
              tool_tip="미디어 스트림 재�" />
         <button label="" label_selected="" name="pause_btn"
              tool_tip="미디어 스트림 �시 정지" />
-        <volume_slider name="volume_slider"
-             tool_tip="� 슬���를 사용하여 볼륨� 변경" />
 </panel>
diff --git a/linden/indra/newview/skins/xui/ko/panel_overlaybar.xml b/linden/indra/newview/skins/xui/ko/panel_overlaybar.xml
index 39e7a73..143fc26 100644
--- a/linden/indra/newview/skins/xui/ko/panel_overlaybar.xml
+++ b/linden/indra/newview/skins/xui/ko/panel_overlaybar.xml
@@ -1,14 +1,14 @@
 <?xml version="1.0" encoding="utf-8" standalone="yes" ?>
 <panel name="overlay">
-        <button label="IM 수령" label_selected="IM 수령" name="IM Received"
-             tool_tip="대기 중� 메세지가 있습니다. 메신지를 확� 하시려면 메신저 버튼� �릭 하십시요." />
+        <button label="메신저 수령" label_selected="메신저 수령" name="IM Received"
+             tool_tip="대기 중� 메시지가 있습니다. 메신지를 확� 하시려면 메신저 버튼� �릭하십시오." />
         <button label="용무 없�으로 설정" label_selected="용무 없�으로 설정"
              name="Set Not Busy"
-             tool_tip="채팅과 메신저가 숨겨져 있습니다. 여기를 �릭하여 용무 없�으로 설정합니다." />
+             tool_tip="채팅과 메신저가 숨겨져 있습니다. 다른 용무 중� 해제하려면 여기를 �릭하십시오." />
         <button label="키 해제" label_selected="키 해제" name="Release Keys"
-             tool_tip="스�립트가 키를 제어했습니다. 여기를 �릭하여 키를 해제하십시오." />
-        <button label="마우스 시�" label_selected="마우스 시�" name="Mouselook"
-             tool_tip="보기를 조정할 때 마우스를 사용합니다. �� 있다면 �릭할 때 �게 �니다." />
+             tool_tip="스�립트� �해 키가 제어�니다. 설정� 해제하려면 여기를 �릭하십시오." />
+        <button label="1�칭 시�" label_selected="1�칭 시�" name="Mouselook"
+             tool_tip="마우스를 사용하여 보기를 조정합니다. �� 있는 경우 �릭하면 발사�니다." />
         <button label="서기" label_selected="서기" name="Stand Up"
-             tool_tip="서려면 여기를 �릭하십시오." />
+             tool_tip="�어서려면 여기를 �릭하십시오." />
 </panel>
diff --git a/linden/indra/newview/skins/xui/ko/panel_place.xml b/linden/indra/newview/skins/xui/ko/panel_place.xml
index 9a64055..b88ba33 100644
--- a/linden/indra/newview/skins/xui/ko/panel_place.xml
+++ b/linden/indra/newview/skins/xui/ko/panel_place.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8" standalone="yes" ?>
 <panel name="Place" title="장소">
         <button label="텔리�트" name="teleport_btn" />
-        <button label="지�� 표시하기" name="map_btn" />
-        <button label="ìž…ì°°..." name="auction_btn" />
+        <button label="지�� 표시" name="map_btn" />
+        <button label="ì‹ ì²­..." name="auction_btn" />
 </panel>
diff --git a/linden/indra/newview/skins/xui/ko/panel_place_small.xml b/linden/indra/newview/skins/xui/ko/panel_place_small.xml
index 9a64055..b88ba33 100644
--- a/linden/indra/newview/skins/xui/ko/panel_place_small.xml
+++ b/linden/indra/newview/skins/xui/ko/panel_place_small.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8" standalone="yes" ?>
 <panel name="Place" title="장소">
         <button label="텔리�트" name="teleport_btn" />
-        <button label="지�� 표시하기" name="map_btn" />
-        <button label="ìž…ì°°..." name="auction_btn" />
+        <button label="지�� 표시" name="map_btn" />
+        <button label="ì‹ ì²­..." name="auction_btn" />
 </panel>
diff --git a/linden/indra/newview/skins/xui/ko/panel_preferences_audio.xml b/linden/indra/newview/skins/xui/ko/panel_preferences_audio.xml
index d44243f..fd6e8b3 100644
--- a/linden/indra/newview/skins/xui/ko/panel_preferences_audio.xml
+++ b/linden/indra/newview/skins/xui/ko/panel_preferences_audio.xml
@@ -4,35 +4,33 @@
                 �소거:
         </text>
         <check_box label="오디오 �소거" name="disable audio" />
-        <check_box label="창� 최소화할 때 오디오 �소거" name="mute_when_minimized" />
+        <check_box label="창� 최소화 할 때 오디오 �소거" name="mute_when_minimized" />
         <text type="string" length="1" name="streaming_text">
                 스트리�:
         </text>
-        <check_box
-             label="가능한 경우 스트리� �악 재�(� 많� 대역� 사용)"
+        <check_box label="스트리� �악 재�(� 많� 대역� 사용)"
              name="streaming_music" />
-        <check_box
-             label="가능한 경우 스트리� 비디오 재�(� 많� 대역� 사용)"
+        <check_box label="스트리� 비디오 재�(� 많� 대역� 사용)"
              name="streaming_video" />
         <text type="string" length="1" name="system_volume_text">
                 사운드 효과:
         </text>
         <text type="string" length="1" name="wind_volume_text">
-                바람� 양:
+                바람 소리:
         </text>
         <text type="string" length="1" name="footsteps_volume_text">
-                발�국 볼륨:
+                발�국 소리:
         </text>
         <text type="string" length="1" name="ui_volume_text">
-                UI 볼륨:
+                메뉴 효과�:
         </text>
-        <spinner label="L$ 변화 임계값" name="L$ Change Threshold" />
-        <spinner label="건강 변화 임계값" name="Health Change Threshold" />
+        <spinner label="L$ 변화 알림" name="L$ Change Threshold" />
+        <spinner label="건강변화 알림" name="Health Change Threshold" />
         <text type="string" length="1" name="doppler_effect_text">
                 �플러 효과:
         </text>
         <text type="string" length="1" name="distance_factor_text">
-                거리 요�:
+                거리 설정:
         </text>
         <text type="string" length="1" name="rolloff_factor_text">
                 롤오프 요�:
@@ -42,16 +40,16 @@
         </text>
         <radio_group name="bitrate">
                 <radio_item type="string" length="1" name="32kbps">
-                        32 kbps
+                        32kbps
                 </radio_item>
                 <radio_item type="string" length="1" name="64kbps">
-                        64 kbps
+                        64kbps
                 </radio_item>
                 <radio_item type="string" length="1" name="96kbps">
-                        96 kbps
+                        96kbps
                 </radio_item>
                 <radio_item type="string" length="1" name="128kbps">
-                        128 kbps
+                        128kbps
                 </radio_item>
         </radio_group>
 </panel>
diff --git a/linden/indra/newview/skins/xui/ko/panel_preferences_chat.xml b/linden/indra/newview/skins/xui/ko/panel_preferences_chat.xml
index 3e00922..358d551 100644
--- a/linden/indra/newview/skins/xui/ko/panel_preferences_chat.xml
+++ b/linden/indra/newview/skins/xui/ko/panel_preferences_chat.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="utf-8" standalone="yes" ?>
 <panel label="채팅" name="chat">
         <text type="string" length="1" name="text_box">
-                채팅 글� �기:
+                글� �기:
         </text>
         <radio_group name="chat font size">
                 <radio_item type="string" length="1" name="radio">
@@ -15,39 +15,37 @@
                 </radio_item>
         </radio_group>
         <text type="string" length="1" name="text_box2">
-                채팅 색:
+                글� 색:
         </text>
         <color_swatch label="시스템" name="system" />
         <color_swatch label="사용�" name="users" />
-        <color_swatch label="사물" name="objects" />
-        <color_swatch label="ê±°í’ˆ" name="background" />
-        <color_swatch label="URLs" name="links" />
+        <color_swatch label="오브�트" name="objects" />
+        <color_swatch label="��선" name="background" />
+        <color_swatch label="URL" name="links" />
         <text type="string" length="1" name="text_box3">
-                채팅 콘솔:
+                콘솔:
         </text>
-        <spinner label="�후 채팅 페�드" name="fade_chat_time" />
+        <spinner label="채팅창 사��" name="fade_chat_time" />
         <text type="string" length="1" name="text_box4">
                 (ì´ˆ)
         </text>
         <text type="string" length="1" name="text_box5">
                 (#í–‰)
         </text>
-        <slider label="불투명�" name="console_opacity" />
+        <slider label="투명�" name="console_opacity" />
         <text type="string" length="1" name="text_box6">
-                채팅 옵션:
+                옵션:
         </text>
-        <check_box label="채팅� (재시작 후) 전체 화면� 사용합니다"
-             name="chat_full_width_check" />
-        <check_box label="�아오기 누른 후 채팅창 닫기"
-             name="close_chat_on_return_check" />
-        <check_box label="화살표는 채팅시 아바타 움��는� 사용"
+        <check_box label="전체화면 사용(재시작 필요)" name="chat_full_width_check" />
+        <check_box label="Enter 키 누른 후 채팅창 닫기" name="close_chat_on_return_check" />
+        <check_box label="화살표 키는 채팅시 아바타를 움��는� 사용"
              name="arrow_keys_move_avatar_check" />
-        <check_box label="채팅� 타임스탬프 표시하기" name="show_timestamps_check" />
+        <check_box label="채팅 시간 표시하기" name="show_timestamps_check" />
         <text type="string" length="1" name="text_box7">
                 ��선 채팅:
         </text>
         <check_box label="��선 표시하기" name="bubble_text_chat" />
-        <slider label="불투명�" name="bubble_chat_opacity" />
+        <slider label="투명�" name="bubble_chat_opacity" />
         <text type="string" length="1" name="text_box8">
                 스�립트 오류:
         </text>
diff --git a/linden/indra/newview/skins/xui/ko/panel_preferences_general.xml b/linden/indra/newview/skins/xui/ko/panel_preferences_general.xml
index 801f02c..d6bfebf 100644
--- a/linden/indra/newview/skins/xui/ko/panel_preferences_general.xml
+++ b/linden/indra/newview/skins/xui/ko/panel_preferences_general.xml
@@ -1,19 +1,39 @@
 <?xml version="1.0" encoding="utf-8" standalone="yes" ?>
-<panel label="�반사항" name="general_panel">
-        <check_box label="로그� 화면� 시작 위치 표시" name="show_location_checkbox" />
-        <check_box label="내 화면� 내 �름 숨기기" name="show_my_name_checkbox" />
-        <check_box label="내 그룹 타�틀 숨기기" name="show_my_title_checkbox" />
+<panel label="�반" name="general_panel">
+        <combo_box name="location_combobox">
+                <combo_item name="MyHome">
+                        홈
+                </combo_item>
+                <combo_item name="MyLastLocation">
+                        최종 방문지
+                </combo_item>
+        </combo_box>
+        <check_box label="로그� 화면� 시작위치 표시" name="show_location_checkbox" />
+        <radio_group name="fade_out_radio">
+                <radio_item type="string" length="1" name="Never">
+                        안함
+                </radio_item>
+                <radio_item type="string" length="1" name="Temporarily">
+                        임시로 표시
+                </radio_item>
+                <radio_item type="string" length="1" name="Always">
+                        항�
+                </radio_item>
+        </radio_group>
+        <check_box label="내 화면�서 내 �름 숨기기" name="show_my_name_checkbox" />
+        <check_box label="내 그룹명 숨기기" name="show_my_title_checkbox" />
         <check_box label="작� 아바타 �름" name="small_avatar_names_checkbox" />
-        <check_box label="온�� 친구 공지 표시" name="friends_online_notify_checkbox" />
+        <color_swatch label="" name="effect_color_swatch"
+             tool_tip="색 관리기를 열려면 �릭 하십시오." />
+        <spinner label="�리비움 시간초과:" name="afk_timeout_spinner" />
+        <check_box label="온�� 친구 보여주기" name="friends_online_notify_checkbox" />
         <check_box label="미니 지� 회전" name="rotate_mini_map_checkbox" />
-        <check_box label="린든달러 지출과 기부 통보"
-             name="notify_money_change_checkbox" />
-        <check_box label="다� 시작할 때 그래픽 하드웨어를 �� �지"
+        <check_box label="L$ 지출과 기부 알려주기" name="notify_money_change_checkbox" />
+        <check_box label="다� 시작할 때 그래픽 하드웨어 �� �지"
              name="probe_hardware_checkbox"
-             tool_tip="Second Life는 사용�� 하드웨어� 따� �부 그래픽 설정� ��으로 구성합니다.  새로운 하드웨어를 설치하려는 경우 Second Life가 �를 다시 �지하�� 해야 합니다." />
-        <check_box label="기본 시스템 색 피커 사용"
-             name="use_system_color_picker_checkbox"
-             tool_tip="Second Life�서 제공하는 것 대신 기본 시스템 컬러 피커를 사용합니다." />
+             tool_tip="세컨드��프는 사용�� 하드웨어� 따� �부 그래픽 설정� ��으로 구성합니다.  새로운 하드웨어를 설치하려는 경우, 세컨드��프가 �를 다시 �지하�� 해야 합니다." />
+        <check_box label="시스템 색 관리 사용" name="use_system_color_picker_checkbox"
+             tool_tip="세컨드��프�서 제공하는 것 대신 기본 시스템 색관리를 사용합니다." />
         <text type="string" length="1" name="start_location_textbox">
                 시작 위치:
         </text>
@@ -27,57 +47,55 @@
                 ì´ˆ
         </text>
         <text type="string" length="1" name="crash_report_textbox">
-                충� 신고:
+                오류 보고:
         </text>
         <text type="string" length="1" name="language_textbox">
                 언어:
         </text>
         <text type="string" length="1" name="language_textbox2">
-                (새로운 효과를 위해서는 재시�� 필요합니다.)
+                (재시� 필요)
         </text>
-        <radio_group name="fade_out_radio">
-                <radio_item type="string" length="1" name="Never">
-                        않함
-                </radio_item>
-                <radio_item type="string" length="1" name="Temporarily">
-                        임시로 보기
-                </radio_item>
-                <radio_item type="string" length="1" name="Always">
-                        항�
-                </radio_item>
-        </radio_group>
-        <color_swatch label="" name="effect_color_swatch"
-             tool_tip="�릭해 색 피커를 여십시오" />
-        <spinner label="�리비움 시간초과:" name="afk_timeout_spinner" />
         <text name="region_name_prompt">
                 &lt;지역명 입력&gt;
         </text>
         <combo_box name="crash_behavior_combobox">
                 <combo_item type="string" length="1" name="Askbeforesending">
-                        전송하기 전� 확�
+                        보내기 전� 확�
                 </combo_item>
                 <combo_item type="string" length="1" name="Alwayssend">
-                        항� 전송
+                        항� 보내기
                 </combo_item>
                 <combo_item type="string" length="1" name="Neversend">
-                        전송 안 함
+                        보내지 않�
                 </combo_item>
         </combo_box>
         <combo_box name="language_combobox">
+                <combo_item type="string" length="1" name="System Default Language">
+                        시스템 기본값
+                </combo_item>
                 <combo_item type="string" length="1" name="English">
-                        �어
+                        �어(English)
+                </combo_item>
+                <combo_item type="string" length="1" name="Chinese">
+                        중국어(Chinese) – 베타
                 </combo_item>
                 <combo_item type="string" length="1" name="Deutsch(German)">
-                        Deutsch (German)
+                        ��어(German) – 베타
+                </combo_item>
+                <combo_item type="string" length="1" name="French">
+                        불어(French) – 베타
                 </combo_item>
                 <combo_item type="string" length="1" name="(Japanese)">
-                        日本語 (Japanese)
+                        �본어 (Japanese) - Beta
                 </combo_item>
                 <combo_item type="string" length="1" name="(Korean)">
-                        한국어 (Korean)
+                        한국어 (Korean) - Beta
                 </combo_item>
-                <combo_item type="string" length="1" name="Chinese">
-                        중국어
+                <combo_item type="string" length="1" name="Portugese">
+                        �르투갈어 –베타
+                </combo_item>
+                <combo_item type="string" length="1" name="Spanish">
+                        Español (스페�어) - 베타
                 </combo_item>
         </combo_box>
 </panel>
diff --git a/linden/indra/newview/skins/xui/ko/panel_preferences_graphics1.xml b/linden/indra/newview/skins/xui/ko/panel_preferences_graphics1.xml
index cf2fd31..f00beb1 100644
--- a/linden/indra/newview/skins/xui/ko/panel_preferences_graphics1.xml
+++ b/linden/indra/newview/skins/xui/ko/panel_preferences_graphics1.xml
@@ -1,27 +1,29 @@
 <?xml version="1.0" encoding="utf-8" standalone="yes" ?>
 <panel label="그래픽" name="Display panel">
-        <combo_box name="aspect_ratio">
-                <combo_item type="string" length="1" name="4:3(StandardCRT)">
-                        4:3 (표준 CRT)
-                </combo_item>
-                <combo_item type="string" length="1" name="5:4(1280x1024LCD)">
-                        5:4 (1280x1024 LCD)
-                </combo_item>
-                <combo_item type="string" length="1" name="16:9(Widescreen)">
-                        16:9 (와�드 스�린)
-                </combo_item>
-        </combo_box>
         <text type="string" length="1" name="text">
                 디스플레� 해��:
         </text>
+        <check_box label="하나� 창�서 실행" name="windowed mode" />
         <text type="string" length="1" name="Fullscreen Aspect Ratio:">
                 전체 화면 비율:
         </text>
         <text type="string" length="1" name="(width / height)">
-                (� / 높�)
+                (�/높�)
         </text>
+        <combo_box name="aspect_ratio">
+                <combo_item type="string" length="1" name="4:3(StandardCRT)">
+                        4:3(표준 CRT)
+                </combo_item>
+                <combo_item type="string" length="1" name="5:4(1280x1024LCD)">
+                        5:4(1280x1024 LCD)
+                </combo_item>
+                <combo_item type="string" length="1" name="16:9(Widescreen)">
+                        16:9(와�드스�린)
+                </combo_item>
+        </combo_box>
+        <check_box label="�� �지" name="aspect_auto_detect" />
         <text type="string" length="1" name="UI Size:">
-                UI �기:
+                메뉴창 기본 �기:
         </text>
         <text type="string" length="1" name="(meters, lower is faster)">
                 (미터, 낮�수� 빠름)
@@ -29,13 +31,11 @@
         <text type="string" length="1" name="text2">
                 디스플레� 옵션:
         </text>
-        <check_box label="하나� 창�서 실행" name="windowed mode" />
-        <check_box label="�� �지" name="aspect_auto_detect" />
-        <check_box label="해�� �립 �기 조절 사용" name="ui_auto_scale" />
-        <check_box label="아바타를 마우스 시�� 표시" name="avfp" />
-        <spinner label="그리기 거리:" name="draw_distance" />
+        <check_box label="해�� �립 스케� 사용" name="ui_auto_scale" />
+        <spinner label="렌�� 거리 제한:" name="draw_distance" />
+        <check_box label="1�칭 시�으로 시작" name="avfp" />
         <text name="resolution_format">
-                [RES_X] x [RES_Y]
+                [RES_X]x[RES_Y]
         </text>
         <text name="aspect_ratio_text">
                 [NUM]:[DEN]
diff --git a/linden/indra/newview/skins/xui/ko/panel_preferences_graphics2.xml b/linden/indra/newview/skins/xui/ko/panel_preferences_graphics2.xml
index 9f56b3a..06c3ec1 100644
--- a/linden/indra/newview/skins/xui/ko/panel_preferences_graphics2.xml
+++ b/linden/indra/newview/skins/xui/ko/panel_preferences_graphics2.xml
@@ -1,23 +1,23 @@
 <?xml version="1.0" encoding="utf-8" standalone="yes" ?>
-<panel label="그래픽 세부사항" name="Display panel 3">
+<panel label="그래픽 디테�" name="Display panel 3">
         <text type="string" length="1" name="text">
-                셰��:
+                ���:
         </text>
-        <check_box label="범프매핑 � 광� 사용" name="bumpshiny" />
-        <check_box label="잔물결 사용" name="ripple" />
-        <check_box label="아바타 베르�스 프로그램" name="avatarvp" />
+        <check_box label="범프매핑 � 광� 보�기" name="bumpshiny" />
+        <check_box label="잔물결 보�기" name="ripple" />
+        <check_box label="아바타 버�스 프로그램" name="avatarvp" />
         <text type="string" length="1" name="Avatar Rendering:">
                 아바타 렌��:
         </text>
         <radio_group name="Avatar Appearance">
                 <radio_item type="string" length="1" name="Normal">
-                        �반�임
+                        �반
                 </radio_item>
                 <radio_item type="string" length="1" name="Bump">
-                        Bump Mapped
+                        범프 맵
                 </radio_item>
                 <radio_item type="string" length="1" name="Cloth">
-                        Bump Mapped &amp; �류
+                        범프 맵 &amp; 옷�
                 </radio_item>
         </radio_group>
         <text type="string" length="1" name="Lighting Detail:">
@@ -25,10 +25,10 @@
         </text>
         <radio_group name="lighting detail radio">
                 <radio_item type="string" length="1" name="SunMoon">
-                        해와 달
+                        �연광만 표시
                 </radio_item>
                 <radio_item type="string" length="1" name="LocalLights">
-                        근접 지역 광
+                        근접 광� 표시
                 </radio_item>
         </radio_group>
         <text type="string" length="1" name="Terrain Detail:">
@@ -43,15 +43,15 @@
                 </radio_item>
         </radio_group>
         <text type="string" length="1" name="Object Mesh Detail:">
-                아�템 메쉬 세부 사항:
+                오브�트 메쉬  디테�:
         </text>
         <text type="string" length="1" name="Flexible Mesh Detail:">
-                신축성 있는 메쉬 세부 사항:
+                플렉시블 메쉬 디테�:
         </text>
         <text type="string" length="1" name="Tree Mesh Detail:">
-                나무 메쉬 세부 사항:
+                나무 메쉬 디테�:
         </text>
         <text type="string" length="1" name="Avatar Mesh Detail:">
-                아바타 메쉬 세부 사항:
+                아바타 메쉬 디테�:
         </text>
 </panel>
diff --git a/linden/indra/newview/skins/xui/ko/panel_preferences_graphics3.xml b/linden/indra/newview/skins/xui/ko/panel_preferences_graphics3.xml
index 81874ff..c03812d 100644
--- a/linden/indra/newview/skins/xui/ko/panel_preferences_graphics3.xml
+++ b/linden/indra/newview/skins/xui/ko/panel_preferences_graphics3.xml
@@ -1,23 +1,22 @@
 <?xml version="1.0" encoding="utf-8" standalone="yes" ?>
-<panel label="그래픽 고급사항" name="Display panel 2">
+<panel label="그래픽 고급 사항" name="Display panel 2">
         <text type="string" length="1" name="Filtering:">
                 필터�:
         </text>
-        <check_box label="�방성 필터�(켜질 경우 �려�)" name="ani" />
+        <check_box label="Anisotropic 필터�(사용시 �려�)" name="ani" />
         <spinner label="�마:" name="gamma" />
         <text type="string" length="1" name="(brightness, lower is brighter)">
-                (�기, 낮�수� ��, 0=기본 설정 사용)
+                (�기, 낮� 수� ��, 기본 설정값 0)
         </text>
         <spinner label="야간 �기:" name="nighttime_brightness" />
         <text type="string" length="1" name="(higher is brighter, 1.0 is default)">
-                (높�수� ��, 1.0� 기본 설정)
+                (높� 수� ��, 기본 설정값 1.0)
         </text>
-        <text type="string" length="1" name="AGP Graphics Card:">
-                AGP 그래픽 카드:
+        <text type="string" length="1" name="Enable VBO:">
+                VBO 사용:
         </text>
-        <check_box label="AGP 사용(AGP 그래픽 카드를 사용할 경우 빨��)"
-             name="agp"
-             tool_tip="활성화할 경우 성능� 저하�고 표준 PC 그래픽 카드를 사용할 경우 � 많� �� 쓰게�니다." />
+        <check_box label="OpenGL 버�스 버� 오브�트 사용" name="vbo"
+             tool_tip="활성화하면 OpenGL 드��버� 오류가 발�할 수 있습니다." />
         <text type="string" length="1" name="Graphics Card Memory:">
                 그래픽 카드 메모리:
         </text>
@@ -41,11 +40,11 @@
                         512MB
                 </radio_item>
         </radio_group>
-        <spinner label="안개 거리 비율:" name="fog" />
-        <spinner label="최대 조� 수:" name="particles" />
+        <spinner label="안개 ��:" name="fog" />
+        <spinner label="최대 파티� 수:" name="particles" />
         <spinner label="복장 구성 제한:" name="comp limit"
              tool_tip="디스플레�할 최근 변경 복장� 수" />
         <text type="string" length="1" name="(lower is faster)">
-                (낮�수� 빠름)
+                (낮� 수� 빠름)
         </text>
 </panel>
diff --git a/linden/indra/newview/skins/xui/ko/panel_preferences_im.xml b/linden/indra/newview/skins/xui/ko/panel_preferences_im.xml
index 3f4d55d..54e2dac 100644
--- a/linden/indra/newview/skins/xui/ko/panel_preferences_im.xml
+++ b/linden/indra/newview/skins/xui/ko/panel_preferences_im.xml
@@ -1,19 +1,23 @@
 <?xml version="1.0" encoding="utf-8" standalone="yes" ?>
 <panel label="메신저" name="im">
         <text type="string" length="1" name="text_box">
+                프로필 온�� �태:
+        </text>
+        <check_box label="친구들�게 내 온�� �태 알림" name="online_visibility" />
+        <text type="string" length="1" name="text_box2">
                 메신저 옵션:
         </text>
         <text name="log_in_to_change">
                 로그�하여 변경
         </text>
-        <check_box label="IM� �메�([EMAIL])로 전송" name="send_im_to_email" />
-        <check_box label="채팅 기�� 메신저 �함" name="include_im_in_chat_history" />
-        <check_box label="메신저� 타임스탬프 표시하기" name="show_timestamps_check" />
-        <check_box label="Log Instant Messages" name="log_instant_messages" />
-        <check_box label="Log Chat" name="log_chat" />
-        <check_box label="Show end of last IM conversation" name="log_show_history" />
-        <button label="Change Path" label_selected="Change Path" name="log_path_button" />
-        <text type="string" length="1" name="text_box2">
-                다른 용무 중 모드 대�:
+        <check_box label="쪽지를 �메�([EMAIL])로 전송" name="send_im_to_email" />
+        <check_box label="채팅 기�� 쪽지 �함" name="include_im_in_chat_history" />
+        <check_box label="메신저� 채팅 시간 표시하기" name="show_timestamps_check" />
+        <check_box label="메신저 쪽지 저장" name="log_instant_messages" />
+        <check_box label="채팅 저장" name="log_chat" />
+        <check_box label="지난 대화 보여주기" name="log_show_history" />
+        <button label="경로 변경" label_selected="경로 변경" name="log_path_button" />
+        <text type="string" length="1" name="text_box3">
+                부재중 답변:
         </text>
 </panel>
diff --git a/linden/indra/newview/skins/xui/ko/panel_preferences_input.xml b/linden/indra/newview/skins/xui/ko/panel_preferences_input.xml
index e960d48..befc9b4 100644
--- a/linden/indra/newview/skins/xui/ko/panel_preferences_input.xml
+++ b/linden/indra/newview/skins/xui/ko/panel_preferences_input.xml
@@ -1,24 +1,25 @@
 <?xml version="1.0" encoding="utf-8" standalone="yes" ?>
-<panel label="카메� 뷰 조정" name="Input panel">
+<panel label="입력장치/카메�" name="Input panel">
         <text type="string" length="1" name=" Mouselook Options:">
-                마우스 시� 옵션:
+                1�칭 시� 옵션:
         </text>
         <text type="string" length="1" name=" Mouse Sensitivity:">
                 마우스 민�성:
         </text>
+        <check_box label="마우스 반전" name="invert mouse" />
         <text type="string" length="1" name=" Auto Fly Options:">
                 �� 비행 옵션:
         </text>
+        <check_box label="PageUp/Down 키로 �착륙" name="automatic fly" />
         <text type="string" length="1" name=" Camera Options:">
                 카메� 옵션:
         </text>
         <text type="string" length="1" name="Camera Springiness:">
                 카메� 신축성:
         </text>
-        <check_box label="마우스 반전" name="invert mouse" />
-        <check_box label="위로 올리고 아래로 내려 비행/착륙" name="automatic fly" />
-        <check_box label="�� 편집 카메� 움�임" name="edit camera movement"
-             tool_tip="편집 모드를 시작하거나 종료할 때 카메� �� 위치 설정� 사용" />
-        <check_box label="�� 외양 카메� 움�임" name="appearance camera movement"
+        <check_box label="��편집 카메� 움�임" name="edit camera movement"
+             tool_tip="편집 모드를 시작하거나 종료할 때 카메� �� 위치 설정 사용" />
+        <check_box label="내 모습 변경시 카메� �� 설정"
+             name="appearance camera movement"
              tool_tip="편집 모드� 때 카메� �� 위치 설정 사용" />
 </panel>
diff --git a/linden/indra/newview/skins/xui/ko/panel_preferences_network.xml b/linden/indra/newview/skins/xui/ko/panel_preferences_network.xml
index 9ba9638..e1210fb 100644
--- a/linden/indra/newview/skins/xui/ko/panel_preferences_network.xml
+++ b/linden/indra/newview/skins/xui/ko/panel_preferences_network.xml
@@ -4,24 +4,17 @@
                 최대 대역�:
         </text>
         <text type="string" length="1" name="text_box2">
-                kbps(초당 킬로바�트)
+                kbps (kilobits per second)
         </text>
-        <text type="string" length="1" name="text_box3">
-                디스� �시 �기:
+        <text type="string" length="1" name="cache_size_label_l">
+                디스� �시 �기(MB):
         </text>
-        <radio_group name="disk cache">
-                <radio_item type="string" length="1" name="radio">
-                        50 MB
-                </radio_item>
-                <radio_item type="string" length="1" name="radio2">
-                        200 MB
-                </radio_item>
-                <radio_item type="string" length="1" name="radio3">
-                        500 MB
-                </radio_item>
-                <radio_item type="string" length="1" name="radio4">
-                        1000 MB
-                </radio_item>
-        </radio_group>
-        <button label="�시 비우기" label_selected="�시 비우기" name="clear_cache" />
+        <button label="�시 비우기" name="clear_cache" />
+        <text type="string" length="1" name="cache_location_label">
+                디스� �시 위치:
+        </text>
+        <button label="설정" label_selected="설정" name="set_cache" />
+        <button label="초기화" label_selected="설정" name="reset_cache" />
+        <check_box label="사용� 지정 �트" name="connection_port_enabled" />
+        <spinner label="�트 번호:" name="connection_port" />
 </panel>
diff --git a/linden/indra/newview/skins/xui/ko/panel_preferences_popups.xml b/linden/indra/newview/skins/xui/ko/panel_preferences_popups.xml
index 22a9e66..87b9c1e 100644
--- a/linden/indra/newview/skins/xui/ko/panel_preferences_popups.xml
+++ b/linden/indra/newview/skins/xui/ko/panel_preferences_popups.xml
@@ -1,14 +1,13 @@
 <?xml version="1.0" encoding="utf-8" standalone="yes" ?>
 <panel label="�업" name="popups">
         <text type="string" length="1" name="text_box">
-                �업 표시 금지:
+                �업 차단:
         </text>
-        <button label="� �업 켜기" label_selected="� �업 켜기"
-             name="enable_popup" />
+        <button label="�업 보기" label_selected="�업 보기" name="enable_popup" />
         <text type="string" length="1" name="text_box2">
-                �업 표시하기:
+                허용� �업:
         </text>
-        <button label="&apos;다�� 표시&apos; 대화 재설정..."
-             label_selected="&apos;다�� 표시&apos; 대화 재설정..."
+        <button label="나중� 알림&apos; 초기화…"
+             label_selected="나중� 알림&apos; 초기화…"
              name="reset_dialogs_btn" />
 </panel>
diff --git a/linden/indra/newview/skins/xui/ko/panel_region_covenant.xml b/linden/indra/newview/skins/xui/ko/panel_region_covenant.xml
index d4a9fd2..b9e8341 100644
--- a/linden/indra/newview/skins/xui/ko/panel_region_covenant.xml
+++ b/linden/indra/newview/skins/xui/ko/panel_region_covenant.xml
@@ -1,52 +1,52 @@
 <?xml version="1.0" encoding="utf-8" standalone="yes" ?>
-<panel label="계약 조항" name="Covenant">
+<panel label="시행 규칙" name="Covenant">
         <text name="covenant_help_text">
-                계약 정보를 변경하면 소유지� 모든 구�� 표시�니다.
+                시행 규칙 정보를 변경하면 사유지 내 모든 구�� 표시 �니다.
         </text>
         <text name="region_name_lbl">
                 지역:
         </text>
         <text name="region_name_text">
-                (알려지지 않�)
+                (알 수 없�)
         </text>
         <text name="estate_name_lbl">
-                소유지:
+                사유지:
         </text>
         <text name="estate_name_text">
-                (알려지지 않�)
+                (알 수 없�)
         </text>
         <text name="covenent_instructions">
-                노트카드를 드래그드�해서 
-� 소유지� 대한 계약 조항�
+                노트카드를 �어다 놓아서
+� 사유지� 대한 시행 규칙�
 변경합니다.
         </text>
         <button label="?" name="covenant_help" />
-        <button label="재설정" name="reset_covenant" />
+        <button label="초기화" name="reset_covenant" />
         <text name="estate_owner_lbl">
-                소유지 소유�:
+                사유지 소유�:
         </text>
         <text name="estate_owner_text">
-                (알려지지 않�)
+                (알 수 없�)
         </text>
         <text name="resellable_clause">
-                � 지역�서 구입한 토지는 재�매할 수 없는 경우� 있습니다.
+                � 지역�서 구매한 토지는 재�매 할 수 없는 경우� 있습니다.
         </text>
         <text name="changeable_clause">
-                � 지역�서 구입한 토지는 결합 �는 분할 할 수 없는 경우� 있습니다.
+                � 지역�서 구매한 토지는 결합 �는 분할 할 수 없는 경우� 있습니다.
         </text>
         <text_editor name="covenant_editor">
-                로딩중...
+                로딩 중…
         </text_editor>
         <text name="can_resell">
-                � 지역�서 구입한 토지는 재�매할 수 있습니다.
+                � 지역�서 구매한 토지는 재�매 할 수 있습니다.
         </text>
         <text name="can_not_resell">
-                � 지역�서 구입한 토지는 재�매할 수 없습니다.
+                � 지역�서 구매한 토지는 재�매 할 수 없습니다.
         </text>
         <text name="can_change">
-                � 지역�서 구입한 토지는 결합 �는 분할 할 수 있습니다.
+                � 지역�서 구매한 토지는 결합 �는 분할 가능 합니다.
         </text>
         <text name="can_not_change">
-                � 지역�서 구입한 토지는 결합 �는 분할 할 수 없습니다.
+                � 지역�서 구매한 토지는 결합 �는 분할 불가능 합니다.
         </text>
 </panel>
diff --git a/linden/indra/newview/skins/xui/ko/panel_region_debug.xml b/linden/indra/newview/skins/xui/ko/panel_region_debug.xml
index 8baaee1..abe8d8d 100644
--- a/linden/indra/newview/skins/xui/ko/panel_region_debug.xml
+++ b/linden/indra/newview/skins/xui/ko/panel_region_debug.xml
@@ -1,32 +1,29 @@
 <?xml version="1.0" encoding="utf-8" standalone="yes" ?>
-<panel label="버그 제거" name="Debug">
+<panel label="디버그" name="Debug">
         <text name="region_text_lbl">
                 지역:
         </text>
         <text name="region_text">
-                알려지지 않�
+                알 수 없�
         </text>
         <check_box label="스�립트 �기" name="disable_scripts_check"
-             tool_tip="� 지역내 모든 스�립트를 �니다" />
+             tool_tip="� 지역 내 모든 스�립트 �기" />
         <button label="?" name="disable_scripts_help" />
         <check_box label="충� �기" name="disable_collisions_check"
-             tool_tip="� 지역내 비아바타 충�� �니다" />
+             tool_tip="� 지역 내 비아바타 충� �기" />
         <button label="?" name="disable_collisions_help" />
-        <check_box label="물리 �기" name="disable_physics_check"
-             tool_tip="� 지역내 모든 물리� 현�� �니다" />
+        <check_box label="물리엔진 �기" name="disable_physics_check"
+             tool_tip="� 지역 내 모든 물리엔진 �기" />
         <button label="?" name="disable_physics_help" />
         <button label="�용" name="apply_btn" />
         <button label="아바타 선�..." name="choose_avatar_btn" />
-        <button
-             label="다른 사람 소유 토지�� 아바타 소유 스�립트 사물 반환"
-             name="return_scripted_other_land_btn" />
-        <button label="아바타 소유 스�립트 사물 전체 반환"
-             name="return_scripted_all_btn" />
-        <button label="탑 컬��� 가져오기..." name="top_colliders_btn"
-             tool_tip="최고 수준� 충� 가능성� 경험하는 아�템 목�" />
+        <button label="스�립트 오브�트 제거" name="return_scripted_other_land_btn" />
+        <button label="모든 스�립트 오브�트 제거" name="return_scripted_all_btn" />
+        <button label="대용량 콜��� 보기…" name="top_colliders_btn"
+             tool_tip="충� 가능한 최�위 오브�트 목�" />
         <button label="?" name="top_colliders_help" />
-        <button label="탑 스�립트 가져오기..." name="top_scripts_btn"
-             tool_tip="스�립트 실행� 가장 많� 시간� 소모하는 아�템 목�" />
+        <button label="대용량 스�립트 보기…" name="top_scripts_btn"
+             tool_tip="스�립트 실행� 가장 많� 시간� 소모하는 오브�트 목�" />
         <button label="?" name="top_scripts_help" />
         <button label="지역 재시작" name="restart_btn"
              tool_tip="2분간 카운트다운한 후 지역� 재시작합니다" />
diff --git a/linden/indra/newview/skins/xui/ko/panel_region_estate.xml b/linden/indra/newview/skins/xui/ko/panel_region_estate.xml
index 96588c5..86b7c2a 100644
--- a/linden/indra/newview/skins/xui/ko/panel_region_estate.xml
+++ b/linden/indra/newview/skins/xui/ko/panel_region_estate.xml
@@ -1,63 +1,63 @@
 <?xml version="1.0" encoding="utf-8" standalone="yes" ?>
-<panel label="소유지" name="Estate">
+<panel label="사유지" name="Estate">
         <text name="estate_help_text">
-                � 탭 내용� 변경할 경우 소유지내 전체 지역� �향� 미칩니다.
+                � 탭�서 설정� 변경하면 사유지 내 모든 지역� �용 �니다.
         </text>
         <text name="estate_text">
-                소유지:
+                사유지:
         </text>
         <text name="estate_name">
-                (알려지지 않�)
+                (알 수 없�)
         </text>
         <text name="owner_text">
-                소유주:
+                소유�:
         </text>
         <text name="estate_owner">
-                (알려지지 않�)
+                (알 수 없�)
         </text>
         <text name="estate_manager_label">
-                소유지 관리�:
+                사유지 관리�:
         </text>
         <button label="?" name="estate_manager_help" />
         <button label="추가..." name="add_estate_manager_btn" />
-        <button label="제거..." name="remove_estate_manager_btn" />
-        <check_box label="세계 시간 사용" name="use_global_time_check" />
+        <button label="제거…" name="remove_estate_manager_btn" />
+        <check_box label="표준시� 사용" name="use_global_time_check" />
         <button label="?" name="use_global_time_help" />
-        <check_box label="고정 태양" name="fixed_sun_check" />
+        <check_box label="태양 고정" name="fixed_sun_check" />
         <button label="?" name="fixed_sun_help" />
         <slider label="단계" name="sun_hour_slider" />
-        <check_box label="본토�서 가시권내" name="externally_visible_check" />
+        <check_box label="�반 공개" name="externally_visible_check" />
         <button label="?" name="externally_visible_help" />
-        <check_box label="여기서 본토는 가시권내" name="mainland_visible_check" />
-        <button label="?" name="mainland_visible_help" />
-        <check_box label="�접 텔리�트 허용" name="allow_direct_teleport" />
+        <check_box label="�접 텔레�트 허용" name="allow_direct_teleport" />
         <button label="?" name="allow_direct_teleport_help" />
         <text name="region_text_lbl">
-                지불 �태� 액세스 거부:
+                지불 �태별로 출입 거부
+        </text>
+        <check_box label="결제수단 미등�� 출입 거부" name="deny_anonymous" />
+        <check_box label="결제수단 등�� 출입 거부" name="deny_identified" />
+        <check_box label="결제수단 사용� 출입 거부" name="deny_transacted" />
+        <text name="abuse_email_text">
+                [Abuse E-mail Beta]
         </text>
-        <check_box label="파�� 미지불 정보 거부" name="deny_anonymous" />
-        <check_box label="파�� 지불 정보 거부" name="deny_identified" />
-        <check_box label="사용한 지불 정보 거부" name="deny_transacted" />
         <button label="�용" name="apply_btn" />
         <text name="allow_resident_label">
-                허용 주민:
+                허용� 주민:
         </text>
         <button label="?" name="allow_resident_help" />
         <button label="추가..." name="add_allowed_avatar_btn" />
-        <button label="제거..." name="remove_allowed_avatar_btn" />
+        <button label="제거…" name="remove_allowed_avatar_btn" />
         <text name="allow_group_label">
-                허용 그룹:
+                허용� 그룹:
         </text>
         <button label="?" name="allow_group_help" />
         <button label="추가..." name="add_allowed_group_btn" />
-        <button label="제거..." name="remove_allowed_group_btn" />
+        <button label="제거…" name="remove_allowed_group_btn" />
         <text name="ban_resident_label">
-                금지 주민:
+                출입금지� 주민:
         </text>
         <button label="?" name="ban_resident_help" />
         <button label="추가..." name="add_banned_avatar_btn" />
-        <button label="제거..." name="remove_banned_avatar_btn" />
-        <button label="소유지� 메시지 보내기..." name="message_estate_btn" />
-        <button label="소유지�서 사용� 쫓아내기..."
-             name="kick_user_from_estate_btn" />
+        <button label="제거…" name="remove_banned_avatar_btn" />
+        <button label="사유지� 메시지 보내기…" name="message_estate_btn" />
+        <button label="추방하기…" name="kick_user_from_estate_btn" />
 </panel>
diff --git a/linden/indra/newview/skins/xui/ko/panel_region_general.xml b/linden/indra/newview/skins/xui/ko/panel_region_general.xml
index c4e84fc..69b8b30 100644
--- a/linden/indra/newview/skins/xui/ko/panel_region_general.xml
+++ b/linden/indra/newview/skins/xui/ko/panel_region_general.xml
@@ -4,13 +4,13 @@
                 지역:
         </text>
         <text name="region_text">
-                알려지지 않�
+                알 수 없�
         </text>
-        <check_box label="테�� 금지" name="block_terraform_check" />
+        <check_box label="지형 변경 금지" name="block_terraform_check" />
         <button label="?" name="terraform_help" />
         <check_box label="비행 금지" name="block_fly_check" />
         <button label="?" name="fly_help" />
-        <check_box label="�해 �수" name="allow_damage_check" />
+        <check_box label="�미지 허용" name="allow_damage_check" />
         <button label="?" name="damage_help" />
         <check_box label="밀기 한정" name="restrict_pushobject" />
         <button label="?" name="restrict_pushobject_help" />
@@ -20,14 +20,14 @@
         <button label="?" name="parcel_changes_help" />
         <spinner label="��전트 제한" name="agent_limit_spin" />
         <button label="?" name="agent_limit_help" />
-        <spinner label="사물 보너스" name="object_bonus_spin" />
+        <spinner label="오브�트 보너스" name="object_bonus_spin" />
         <button label="?" name="object_bonus_help" />
-        <text label="만기�" name="access_text">
+        <text label="성�용" name="access_text">
                 성�용:
         </text>
         <combo_box label="성�용" name="access_combo">
                 <combo_item name="PG">
-                        PG(보호� 지� 필요)
+                        미성�
                 </combo_item>
                 <combo_item name="Mature">
                         성�용
@@ -35,8 +35,8 @@
         </combo_box>
         <button label="?" name="access_help" />
         <button label="�용" name="apply_btn" />
-        <button label="사용� 1� 집으로 텔리�트하기..." name="kick_btn" />
-        <button label="모든 사용� 집으로 텔리�트하기..." name="kick_all_btn" />
-        <button label="지역� 메시지 보내기..." name="im_btn" />
-        <button label="텔리허브 관리..." name="manage_telehub_btn" />
+        <button label="한 명� 사용�를 홈으로 텔리�트..." name="kick_btn" />
+        <button label="모든 사용�를 홈으로 텔리�트..." name="kick_all_btn" />
+        <button label="사유지� 메시지 보내기…" name="im_btn" />
+        <button label="텔레허브 관리…" name="manage_telehub_btn" />
 </panel>
diff --git a/linden/indra/newview/skins/xui/ko/panel_region_terrain.xml b/linden/indra/newview/skins/xui/ko/panel_region_terrain.xml
index fdec2e4..4cc8f57 100644
--- a/linden/indra/newview/skins/xui/ko/panel_region_terrain.xml
+++ b/linden/indra/newview/skins/xui/ko/panel_region_terrain.xml
@@ -4,24 +4,24 @@
                 지역:
         </text>
         <text name="region_text">
-                알려지지 않�
+                알 수 없�
         </text>
         <spinner label="수면 높�" name="water_height_spin" />
         <button label="?" name="water_height_help" />
-        <spinner label="지형 높�기 한계" name="terrain_raise_spin" />
+        <spinner label="지형 높� 제한" name="terrain_raise_spin" />
         <button label="?" name="terrain_raise_help" />
-        <spinner label="지형 낮추기 한계" name="terrain_lower_spin" />
+        <spinner label="지형 깊� 제한" name="terrain_lower_spin" />
         <button label="?" name="terrain_lower_help" />
-        <check_box label="소유지 태양 사용" name="use_estate_sun_check" />
+        <check_box label="사유지 전용 태양 사용" name="use_estate_sun_check" />
         <button label="?" name="use_estate_sun_help" />
-        <check_box label="고정 태양" name="fixed_sun_check" />
+        <check_box label="태양 고정" name="fixed_sun_check" />
         <button label="?" name="fixed_sun_help" />
         <slider label="단계" name="sun_hour_slider" />
         <button label="�용" name="apply_btn" />
         <button label="RAW 지형 다운로드..." name="download_raw_btn"
              tool_tip="관리�는 제외, 소유주만 �용 가능" />
         <button label="?" name="download_raw_help" />
-        <button label="RAW 지형 업로드..." name="upload_raw_btn"
+        <button label="RAW 지형 업로드…" name="upload_raw_btn"
              tool_tip="관리�는 제외, 소유주만 �용 가능" />
         <button label="?" name="upload_raw_help" />
         <button label="지형 저장" name="bake_terrain_btn"
diff --git a/linden/indra/newview/skins/xui/ko/panel_region_texture.xml b/linden/indra/newview/skins/xui/ko/panel_region_texture.xml
index 50303b7..6443b36 100644
--- a/linden/indra/newview/skins/xui/ko/panel_region_texture.xml
+++ b/linden/indra/newview/skins/xui/ko/panel_region_texture.xml
@@ -1,16 +1,16 @@
 <?xml version="1.0" encoding="utf-8" standalone="yes" ?>
-<panel label="그�운드 �스처" name="Textures">
+<panel label="지면 �스처" name="Textures">
         <text name="region_text_lbl">
                 지역:
         </text>
         <text name="region_text">
-                알려지지 않�
+                알 수 없�
         </text>
-        <text name="base_texture_text">
-                기본 �스처(128x128, 24 비트 .tga 파� 필요)
+        <text name="detail_texture_text">
+                지역 �스처(512x512, 24비트 .tga 파� 필요)
         </text>
         <text name="height_text_lbl">
-                1(ì €)
+                1(낮�)
         </text>
         <text name="height_text_lbl2">
                 2
@@ -19,37 +19,22 @@
                 3
         </text>
         <text name="height_text_lbl4">
-                4(ê³ )
-        </text>
-        <text name="detail_texture_text">
-                기본 �스처(512x512, 24 비트 .tga 파� 필요)
+                4(높�)
         </text>
         <text name="height_text_lbl5">
-                1(ì €)
+                �스처 �승 범위
         </text>
         <text name="height_text_lbl6">
-                2
+                남서
         </text>
         <text name="height_text_lbl7">
-                3
+                �서
         </text>
         <text name="height_text_lbl8">
-                4(ê³ )
+                �남
         </text>
         <text name="height_text_lbl9">
-                �스처 �승 범위
-        </text>
-        <text name="height_text_lbl10">
-                남서
-        </text>
-        <text name="height_text_lbl11">
-                서�
-        </text>
-        <text name="height_text_lbl12">
-                남�
-        </text>
-        <text name="height_text_lbl13">
-                ��
+                ��
         </text>
         <spinner label="낮�" name="height_start_spin_0" />
         <spinner label="낮�" name="height_start_spin_1" />
@@ -59,14 +44,14 @@
         <spinner label="높�" name="height_range_spin_1" />
         <spinner label="높�" name="height_range_spin_2" />
         <spinner label="높�" name="height_range_spin_3" />
-        <text name="height_text_lbl14">
-                � 값� 위 �스처� 혼합 범위를 나타냅니다.
+        <text name="height_text_lbl10">
+                � 값들� 위 �스처� 혼합 범위를 나타냅니다.
         </text>
-        <text name="height_text_lbl15">
-                미터 단위로 측정�며, 최저값� �스� #1� 최대 높�입니다,
+        <text name="height_text_lbl11">
+                미터법으로 측정하여 최저 값� �스처 1번� 최고 높��임
         </text>
-        <text name="height_text_lbl16">
-                그리고 높� 값� �스처 #4� 최소 높�입니다.
+        <text name="height_text_lbl12">
+                최고 값� �스처 4번� 최저 높�입니다.
         </text>
         <button label="�용" name="apply_btn" />
 </panel>
diff --git a/linden/indra/newview/skins/xui/ko/panel_scrolling_param.xml b/linden/indra/newview/skins/xui/ko/panel_scrolling_param.xml
index 7eb3202..39162f2 100644
--- a/linden/indra/newview/skins/xui/ko/panel_scrolling_param.xml
+++ b/linden/indra/newview/skins/xui/ko/panel_scrolling_param.xml
@@ -1,10 +1,10 @@
 <?xml version="1.0" encoding="utf-8" standalone="yes" ?>
 <panel name="LLScrollingPanelParam">
         <text type="string" length="1" name="Loading...">
-                로딩중...
+                로딩 중…
         </text>
         <text type="string" length="1" name="Loading...2">
-                로딩중...
+                로딩 중…
         </text>
         <button label="" label_selected="" name="less" />
         <button label="" label_selected="" name="more" />
diff --git a/linden/indra/newview/skins/xui/ko/panel_settings_chat.xml b/linden/indra/newview/skins/xui/ko/panel_settings_chat.xml
index 548988f..aac33de 100644
--- a/linden/indra/newview/skins/xui/ko/panel_settings_chat.xml
+++ b/linden/indra/newview/skins/xui/ko/panel_settings_chat.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="utf-8" standalone="yes" ?>
 <panel name="chat" title="대화">
         <text>
-                채팅 글� �기:
+                글� �기:
         </text>
         <radio_group name="chat font size">
                 <radio_item>
@@ -15,16 +15,16 @@
                 </radio_item>
         </radio_group>
         <text>
-                채팅 색:
+                글� 색:
         </text>
         <color_swatch label="시스템" name="system" />
         <color_swatch label="사용�" name="users" />
-        <color_swatch label="사물" name="objects" />
-        <color_swatch label="ê±°í’ˆ" name="background" />
+        <color_swatch label="오브�트" name="objects" />
+        <color_swatch label="��선" name="background" />
         <text>
-                채팅 콘솔:
+                콘솔:
         </text>
-        <spinner label="�후 채팅 페�드" name="fade_chat_time" />
+        <spinner label="채팅창 사��" name="fade_chat_time" />
         <text>
                 (ì´ˆ)
         </text>
@@ -32,22 +32,20 @@
         <text>
                 (#í–‰)
         </text>
-        <slider label="불투명�" name="console_opacity" />
+        <slider label="투명�" name="console_opacity" />
         <text>
-                채팅 옵션:
+                옵션:
         </text>
-        <check_box label="채팅� (재시작 후) 전체 화면� 사용합니다"
-             name="chat_full_width_check" />
-        <check_box label="�아오기 누른 후 채팅창 닫기"
-             name="close_chat_on_return_check" />
-        <check_box label="화살표는 채팅시 아바타 움��는� 사용"
+        <check_box label="전체화면 사용(재시작 필요)" name="chat_full_width_check" />
+        <check_box label="Enter 키 누른 후 채팅창 닫기" name="close_chat_on_return_check" />
+        <check_box label="화살표 키는 채팅 시 아바타를 움�임"
              name="arrow_keys_move_avatar_check" />
-        <check_box label="채팅� 타임스탬프 표시하기" name="show_timestamps_check" />
+        <check_box label="채팅 시간 표시하기" name="show_timestamps_check" />
         <text>
                 ��선 채팅:
         </text>
         <check_box label="��선 표시하기" name="bubble_text_chat" />
-        <slider label="불투명�" name="bubble_chat_opacity" />
+        <slider label="투명�" name="bubble_chat_opacity" />
         <text>
                 스�립트 오류:
         </text>
diff --git a/linden/indra/newview/skins/xui/ko/panel_settings_im.xml b/linden/indra/newview/skins/xui/ko/panel_settings_im.xml
index f520066..985f2f6 100644
--- a/linden/indra/newview/skins/xui/ko/panel_settings_im.xml
+++ b/linden/indra/newview/skins/xui/ko/panel_settings_im.xml
@@ -3,11 +3,11 @@
         <text>
                 메신저 옵션:
         </text>
-        <check_box label="�메�로 메신저 메시지 보내기" name="send_im_to_email"
-             tool_tip="secondlife.com�서 �메� 주소 변경." />
-        <check_box label="채팅 기�� 메신저 �함" name="include_im_in_chat_history" />
-        <check_box label="메신저� 타임스탬프 표시하기" name="show_timestamps_check" />
+        <check_box label="쪽지를 �메�로 전송" name="send_im_to_email"
+             tool_tip="secondlife.com�서 �메� 주소 변경" />
+        <check_box label="채팅 기�� 쪽지 �함" name="include_im_in_chat_history" />
+        <check_box label="메신저� 채팅 시간 표시하기" name="show_timestamps_check" />
         <text>
-                다른 용무 중 모드 대�:
+                부재중 답변:
         </text>
 </panel>
diff --git a/linden/indra/newview/skins/xui/ko/panel_settings_msgbox.xml b/linden/indra/newview/skins/xui/ko/panel_settings_msgbox.xml
index d3e4ff2..6924e8b 100644
--- a/linden/indra/newview/skins/xui/ko/panel_settings_msgbox.xml
+++ b/linden/indra/newview/skins/xui/ko/panel_settings_msgbox.xml
@@ -1,12 +1,11 @@
 <?xml version="1.0" encoding="utf-8" standalone="yes" ?>
 <panel label="�업" name="popups" title="�업">
         <text>
-                �업 표시 금지:
+                �업 차단:
         </text>
-        <button label="� �업 켜기" name="enable_popup" />
+        <button label="�업 보기" name="enable_popup" />
         <text>
-                �업 표시하기:
+                허용� �업:
         </text>
-        <button label="&apos;다�� 표시&apos; 대화 재설정..."
-             name="reset_dialogs_btn" />
+        <button label="나중� 알림&apos; 초기화…" name="reset_dialogs_btn" />
 </panel>
diff --git a/linden/indra/newview/skins/xui/ko/panel_settings_network.xml b/linden/indra/newview/skins/xui/ko/panel_settings_network.xml
index b2ffd9e..30d2f8c 100644
--- a/linden/indra/newview/skins/xui/ko/panel_settings_network.xml
+++ b/linden/indra/newview/skins/xui/ko/panel_settings_network.xml
@@ -5,53 +5,53 @@
         </text>
         <slider label="" name="max_bandwidth" />
         <text>
-                kbps(초당 킬로바�트)
+                kbps (kilobits per second)
         </text>
         <text>
                 디스� �시 �기:
         </text>
         <radio_group name="disk cache">
                 <radio_item>
-                        50 MB
+                        50MB
                 </radio_item>
                 <radio_item>
-                        200 MB
+                        200MB
                 </radio_item>
                 <radio_item>
-                        500 MB
+                        500MB
                 </radio_item>
                 <radio_item>
-                        1000 MB
+                        1000MB
                 </radio_item>
         </radio_group>
         <button label="�시 비우기" name="clear_cache" />
         <text>
-                프�시 설정:
+                프�시 구성:
         </text>
-        <check_box label="프�시 사용" name="proxy_enabled" tool_tip="프�시 설정" />
+        <check_box label="프�시 사용" name="proxy_enabled"
+             tool_tip="프�시 구성 지정" />
         <text>
                 프�시:
         </text>
-        <line_editor name="proxy_address"
-             tool_tip="사용하고� 하는 프�시� �름 �는 IP 주소" />
+        <line_editor name="proxy_address" tool_tip="사용할 프�시 �름 �는 IP 주소" />
         <text>
                 �트:
         </text>
-        <line_editor name="proxy_port" tool_tip="사용하고� 하는 프�시� �트 번호" />
+        <line_editor name="proxy_port" tool_tip="사용할 프�시� �트 번호" />
         <text>
-                Socks:
+                양�:
         </text>
         <radio_group name="socks_4_5">
                 <radio_item>
-                        Socks v4
+                        양� v4
                 </radio_item>
                 <radio_item>
-                        Socks v5
+                        양� v5
                 </radio_item>
         </radio_group>
         <text>
                 프�시 없�:
         </text>
         <line_editor name="proxy_exclusions"
-             tool_tip="사용하기를 �치 않는 프�시� �름 �는 IP 주소" />
+             tool_tip="다�� 대해 프�시를 사용하지 않� �름 �는 IP 주소" />
 </panel>
diff --git a/linden/indra/newview/skins/xui/ko/panel_settings_web.xml b/linden/indra/newview/skins/xui/ko/panel_settings_web.xml
index 1e76ffc..b60b43c 100644
--- a/linden/indra/newview/skins/xui/ko/panel_settings_web.xml
+++ b/linden/indra/newview/skins/xui/ko/panel_settings_web.xml
@@ -1,52 +1,50 @@
 <?xml version="1.0" encoding="utf-8" standalone="yes" ?>
 <panel name="web" title="웹">
-        <check_box
-             label="외부 웹브�우저 사용(파�어�스, 사파리, �터넷 �스플로러)"
+        <check_box label="외부 웹 브�우저 사용(Firefox, Safari, Internet Explorer)"
              name="external_browser_check"
-             tool_tip="�움�, 웹�� 등� 외부 웹브�우저를 사용하십시오.\n전체 화면 모드�서는 권장하지 않습니다." />
+             tool_tip="�움�, 웹 �� 등� 경우 외부 웹 브�우저를 사용하십시오.\n전체 화면� 실행 중� 경우�는 권장�지 않습니다." />
         <text>
-                브�우저 홈페�지:
+                프�우저 홈페�지:
         </text>
         <line_editor name="home_page"
-             tool_tip="최초로 Second Life 브�우저를 열 때 방문하는 웹페�지" />
+             tool_tip="세컨드��프 브�우저를 열 때 처�으로 방문하는 웹 페�지" />
         <text>
-                프�시 설정:
+                프�시 구성:
         </text>
-        <check_box label="내부 웹브�우저용 프�시 사용" name="proxy_enabled"
-             tool_tip="내부 웹브�우저용 프�시 설정" />
+        <check_box label="내부 웹 브�우저� 대해 프�시 사용" name="proxy_enabled"
+             tool_tip="내부 웹 브�우저� 대한 프�시 구성 지정" />
         <text>
                 프�시:
         </text>
-        <line_editor name="proxy_address"
-             tool_tip="사용하고� 하는 프�시� �름 �는 IP 주소" />
+        <line_editor name="proxy_address" tool_tip="사용할 프�시 �름 �는 IP 주소" />
         <text>
                 �트:
         </text>
-        <line_editor name="proxy_port" tool_tip="사용하고� 하는 프�시� �트 번호" />
+        <line_editor name="proxy_port" tool_tip="사용할 프�시� �트 번호" />
         <text>
-                Socks:
+                양�:
         </text>
         <radio_group name="socks_4_5">
                 <radio_item>
-                        Socks v4
+                        양� v4
                 </radio_item>
                 <radio_item>
-                        Socks v5
+                        양� v5
                 </radio_item>
         </radio_group>
         <text>
-                프�시 없�:
+                다� 프�시 없�:
         </text>
         <line_editor name="proxy_exclusions"
-             tool_tip="사용하기를 �치 않는 프�시� �름 �는 IP 주소" />
-        <check_box label="사물 관련 웹페�지 표시하기(시험중, 재시작 필요)"
+             tool_tip="다�� 대해 프�시를 사용하지 않� �름 �는 IP 주소" />
+        <check_box
+             label="오브�트�서 웹 페�지 표시(시험용, 컴퓨터를 다시 시작해야 함)"
              name="web_pages_on_prims_check" />
         <text>
-                신뢰 사�트:
-(로그�해야 보실 수 있습니다)
+                트러스트� 사�트:
+(로그�하여 보기)
         </text>
         <button label="추가" name="add_trusted" />
-        <line_editor name="trusted_site_entry"
-             tool_tip="신뢰 목�� 추가하고� 하는 사�트" />
+        <line_editor name="trusted_site_entry" tool_tip="신용 목�� 추가할 사�트" />
         <button label="제거" name="rem_trusted" />
 </panel>
diff --git a/linden/indra/newview/skins/xui/ko/panel_status_bar.xml b/linden/indra/newview/skins/xui/ko/panel_status_bar.xml
index fdcde45..a9d8f5b 100644
--- a/linden/indra/newview/skins/xui/ko/panel_status_bar.xml
+++ b/linden/indra/newview/skins/xui/ko/panel_status_bar.xml
@@ -1,13 +1,14 @@
 <?xml version="1.0" encoding="utf-8" standalone="yes" ?>
 <panel name="status">
         <text type="string" length="1" name="ParcelNameText"
-             tool_tip="본�� 서있는 곳� 랜드� �름� About Land를 �릭 해서 확� 가능 합니다.">
+             tool_tip="현재 서있는 토지 구�� �름. 토지 소개를 보려면 �릭합니다.">
                 구� �름 여기� 입력
         </text>
-        <text type="string" length="1" name="BalanceText" tool_tip="계정 잔고">
-                L$&quot;
+        <text type="string" length="1" name="BalanceText" tool_tip="잔고">
+                L$
         </text>
-        <button label="" label_selected="" name="buycurrency" tool_tip="화� 구매" />
+        <button label="" label_selected="" name="buycurrency"
+             tool_tip="린든달러(L$) 구매" />
         <text type="string" length="12" name="TimeText" tool_tip="현재 시간(태�양 표준시)">
                 12:00 AM
         </text>
@@ -17,10 +18,10 @@
         <text type="string" length="1" name="HealthText" tool_tip="ê±´ê°•">
                 100%
         </text>
-        <button label="" label_selected="" name="fly" tool_tip="비행 금지" />
-        <button label="" label_selected="" name="build" tool_tip="건축 금지" />
-        <button label="" label_selected="" name="scripts" tool_tip="스�립트 금지" />
-        <button label="" label_selected="" name="restrictpush" tool_tip="llPushObject 한정" />
+        <button label="" label_selected="" name="fly" tool_tip="비행 안함" />
+        <button label="" label_selected="" name="build" tool_tip="만들기 안함" />
+        <button label="" label_selected="" name="scripts" tool_tip="스�립트 없�" />
+        <button label="" label_selected="" name="restrictpush" tool_tip="llPushObject  한정" />
         <button label="" label_selected="" name="buyland" tool_tip="현재 구� 구매" />
         <text name="packet_loss_tooltip">
                 패킷 �실
diff --git a/linden/indra/newview/skins/xui/ko/panel_toolbar.xml b/linden/indra/newview/skins/xui/ko/panel_toolbar.xml
index 43daa56..30e9ced 100644
--- a/linden/indra/newview/skins/xui/ko/panel_toolbar.xml
+++ b/linden/indra/newview/skins/xui/ko/panel_toolbar.xml
@@ -1,19 +1,19 @@
 <?xml version="1.0" encoding="utf-8" standalone="yes" ?>
 <panel name="panel_toolbar">
-        <button label="메신저" name="im_btn"
-             tool_tip="친구�게 메신저로 연�하기." />
+        <button label="메신저" name="im_btn" tool_tip="친구들과 메신저 하기." />
         <button label="채팅" name="chat_btn"
-             tool_tip="부근 사람들과 대화를 나눕니다. 채팅� �릭한 후 히스토리� 누르면 �전 채팅 내용� 볼 수 있습니다." />
-        <button label="친구들" name="friends_btn" tool_tip="친구 찾아 연�." />
+             tool_tip="부근 사람들과 대화를 나눕니다. (입력)" />
+        <button label="친구" name="friends_btn"
+             tool_tip="친구를 찾아 �야기합니다." />
         <button label="비행" label_selected="비행 중지" name="fly_btn"
-             tool_tip="비행 시작. 위 아래 위치 조정� E/C �는 PgUp/PgDn� 사용하십시오." />
+             tool_tip="비행 시작. 위, 아래로 비행하려면 E/C �는 PgUp/PgDn� 사용하십시오." />
         <button label="스냅샷" name="snapshot_btn"
-             tool_tip="디스� �는 보관함� 스�린샷 저장." />
+             tool_tip="디스� �는 �벤토리� 스�린샷 저장." />
         <button label="검색" name="directory_btn"
-             tool_tip="장소, �벤트, 사람, 그리고 � 많� 것� 찾으실 수 있습니다." />
-        <button label="짓기" name="build_btn" tool_tip="새 사물 �성." />
-        <button label="미니 지�" name="radar_btn"
-             tool_tip="내 주위 �역 지�. (Ctrl-Shift-M)" />
-        <button label="지�" name="map_btn" tool_tip="세계 지�. (Ctrl-M)" />
-        <button label="저장고" name="inventory_btn" tool_tip="내 아�템. (Ctrl-I)" />
+             tool_tip="장소, �벤트, 사람, � �세히 등� 검색할 수 있습니다." />
+        <button label="만들기" name="build_btn" tool_tip="새 오브�트기" />
+        <button label="미니지�" name="radar_btn"
+             tool_tip="내 주변 �역� 지� (Ctrl-Shift-M)" />
+        <button label="지�" name="map_btn" tool_tip="월드 지� (Ctrl-M)" />
+        <button label="�벤토리" name="inventory_btn" tool_tip="아�템. (Ctrl-I)" />
 </panel>
diff --git a/linden/indra/newview/skins/xui/ko/panel_top_pick.xml b/linden/indra/newview/skins/xui/ko/panel_top_pick.xml
index 4bd676a..021ef61 100644
--- a/linden/indra/newview/skins/xui/ko/panel_top_pick.xml
+++ b/linden/indra/newview/skins/xui/ko/panel_top_pick.xml
@@ -2,9 +2,9 @@
 <panel name="Pick" title="선�">
         <button label="설정" name="set_location_btn" />
         <button label="텔리�트" name="pick_teleport_btn" />
-        <button label="지�� 표시하기" name="pick_map_btn" />
+        <button label="지�� 표시" name="pick_map_btn" />
         <text name="sort_order_text">
-                ì •ë ¬:
+                분류:
         </text>
-        <check_box label="켜�" name="enabled_check" />
+        <check_box label="활성화�" name="enabled_check" />
 </panel>
diff --git a/linden/indra/newview/skins/xui/ko/role_actions.xml b/linden/indra/newview/skins/xui/ko/role_actions.xml
index 7e2a285..848393e 100644
--- a/linden/indra/newview/skins/xui/ko/role_actions.xml
+++ b/linden/indra/newview/skins/xui/ko/role_actions.xml
@@ -1,183 +1,183 @@
 <?xml version="1.0" encoding="utf-8" standalone="yes" ?>
 <role_actions>
         <action_set
-             description="�러한 능력� 그룹 멤버를 추가하고 삭제하는 능력� �함�며 초대 없� 새 맴버를 가입시킬 수 있습니다."
+             description="�러한 권한� 그룹 회�� 추가하고 삭제하는 권한� �함�며 초대 없� 새 회�� 가입시킬 수 있습니다."
              name="Membership">
                 <action description="� 그룹� 사람들 초대"
-                     longdescription="Members  &amp; Roles tab� 서브 �� Members안�서 &apos;Invite New Person...&apos; 버튼� 선�해서 다른사람 초청할 수 있습니다."
+                     longdescription="회� � 역할 탭 &gt; 회� 하위 탭� 있는 &apos;새로운 사람 초대’ 버튼� 사용하여 � 그룹� 사람들� 초대합니다."
                      name="member invite" />
-                <action description="� 그룹�서 멤버 강퇴"
-                     longdescription="Members &amp; Roles tab 안�서Member ��서 &apos;Eject From Group&apos;버튼으로 본 구룹�서 회� 강제 탈퇴 시킬수 있습니다. 구룹� 소유�는 구룹�공� 소유�를 제외한 다른 회�들� 강제 탈퇴 시킬수 있습니다 . 만약 본��Everyone Role� �해 있다면 &apos;Remove Members from Roles&apos; 권한�  있는 Owner로 �해 그룹�서 강제 탈퇴 당할 수 있습니다. Roles로부터 회�� 강제 탈퇴 시키기 위해서는 &apos;Remove Members from Roles&apos;  권한�  있어야 합니다."
+                <action description="� 그룹�서 회� 강퇴"
+                     longdescription="회� � 역할 탭 &gt; 회� 하위 탭�서 &apos;그룹�서 강퇴&apos; 버튼� 사용하여 � 그룹�서 회� 강퇴를 수행합니다. 소유주는 다른 소유주를 제외한 모든 사람� 추방할 수 있습니다. 소유주가 아닌 회�� 경우�는 모든 사람 역할� �한 경우�만 그룹�서 강퇴�며 다른 역할� 경우�는 추방�지 않습니다. 회�� 역할�서 제거하려면 &apos;역할�서 회� 삭제&apos; 권한� 있어야 합니다."
                      name="member eject" />
                 <action
-                     description="&apos;�유 신청&apos;� 열고 &apos;가입 수수료&apos; 변경"
-                     longdescription="Toggle &apos;Open Enrollment&apos; 는 새로운 회�� 초청 없� 가입 시키는 기능입니다. 그리고, &apos;Signup Fee&apos;를 General tab � Group Preferences section �서 바꾸실 수 있습니다."
+                     description="&apos;�유 가입&apos; 토글 � &apos;가입 수수료&apos; 변경"
+                     longdescription="초대 없� 새 회�� 가입시키려면 &apos;�유 가입&apos;� 토글하고 �반 탭� 그룹 환경 설정 섹션�서 &apos;가입 수수료&apos;를 변경합니다."
                      name="member options" />
         </action_set>
         <action_set
-             description="�러한 능력�는 그룹 역할� 추가, 삭제 � 변경하는 능력과, 역할� 멤버를 추가 � 삭제하며 역할� 능력� 할당하는 능력� �함�니다."
+             description="�러한 권한�는 그룹 역할� 추가, 삭제 � 변경, 특정 역할� 회�� 추가 � 삭제하며 특정 역할� 다른 권한� 할당하는 것� �함합니다."
              name="Roles">
                 <action description="새 역할 �성"
-                     longdescription="Members &amp; Roles tab &gt; Roles sub-tab �서 새로운 Role 만들기."
+                     longdescription="회� � 역할 탭 &gt; 역할 하위 탭�서 새 역할� �성합니다."
                      name="role create" />
                 <action description="역할 삭제"
-                     longdescription="Members &amp; Roles tab &gt; Roles sub-tab �서 Roles삭제하기."
+                     longdescription="회� � 역할 탭 &gt; 역할 하위 탭�서 역할� 삭제합니다."
                      name="role delete" />
-                <action description="역할 �름, 타�틀, 설명 등� 변경"
-                     longdescription="Role선�후 Members &amp; Roles tab &gt; Roles sub-tab �서 �름, 타�틀,설명� 수정 할 수 있습니다."
+                <action description="역할 �름, 타�틀 � 설명 변경"
+                     longdescription="역할� 선�한 후 회� � 역할 탭 &gt; 역할 하위 탭 맨 아래�서 역할 �름, 타�틀 � 설명� 변경합니다."
                      name="role properties" />
-                <action description="멤버�게 할당�� 역할 할당"
-                     longdescription="Members &amp; Roles tab &gt; Members sub-tab �Assigned Roles섹션�서 Assign Members to Roles. � 권한� 맴버들� 회�들� role� 추가시킬 수 있습니다."
+                <action description="회��게 할당�� 역할 할당"
+                     longdescription="회� � 역할 탭 &gt; 회� 하위 탭� 할당� 역할 섹션�서 회��게 역할� 할당합니다. � 권한� 가진 회�� 할당�가 �미 �해 있는 역할�만 회�� 추가할 수 있습니다."
                      name="role assign member limited" />
-                <action description="멤버�게 모든 역할 할당"
-                     longdescription="Members &amp; Roles tab &gt; Members sub-tab � Assigned Roles�서 Any Role� 회�들 부여하기. *주�* 본Role� Ability를 가진 회�� �기 �신�게 �한 소유주가 아닌 다른 회�들�게 부여할 수 있습니다. 본Ability는 신중히 �용 하셔야 합니다."
+                <action description="회��게 모든 역할 할당"
+                     longdescription="회� � 역할 탭 &gt; 회� 하위 탭� 할당� 역할 섹션�서 회��게 모든 역할 할당� 수행합니다. *경고* � 권한� 가진 역할 회�� 소유�가 아닌 다른 회� � �기 �신�게 현재 보유한 권한 ��� 역할� 할당하여 소유�� 필�하는 권한� 가지�� 할 수 있습니다. � 권한� 할당하기 전� 현재 �태� 대해 �해 해야 합니다."
                      name="role assign member" />
-                <action description="역할�서 멤버 삭제"
-                     longdescription="Members &amp; Roles tab &gt; Members sub-tab �Assigned Roles section�Roles�서 회�� 삭제 할 수 있습니다.  단 owner는 삭제 � 수 없습니다."
+                <action description="역할�서 회� 삭제"
+                     longdescription="회� � 역할 탭 &gt; 회� 하위 탭� 할당� 역할�서 회�들로부터 역할 제거. 소유�들� 제거� 수 없�."
                      name="role remove member" />
-                <action description="역할� 능력� 할당 � 삭제"
-                     longdescription="Members &amp; Roles tab &gt; Roles sub-tab � Allowed Abilities 섹션�� Roles � Assign and Remove Abilities. *주�* 본Role� Ability를 가진 회�� �기 �신�게 �한 소유주가 아닌 다른 회�들�게 부여할 수 있습니다"
+                <action description="역할� 권한� 할당 � 삭제"
+                     longdescription="회� � 역할 탭 &gt; 역할 하위 탭� 허용� 권한 섹션�서 역할� 권한� 할당 � 삭제합니다. *경고* � 권한� 가진 역할 회�� 소유�가 아닌 다른 회� � �기 �신�게 모든 권한� 할당하여 소유�� 필�하는 권한� 가지�� 할 수 있습니다. � 권한� 할당하기 전� 현재 �태� 대해 �해 해야 합니다."
                      name="role change actions" />
         </action_set>
         <action_set
-             description="�러한 능력�는 공공 가시성, 설립 조항, 휘장 변경과 같� 그룹� 신분� 수정할 능력� �함�니다."
+             description="�러한 권한�는 공공 가시성, 설립 조항, 휘장 변경과 같� 그룹� 신분� 수정할 권한� �함�니다."
              name="Group Identity">
                 <action
-                     description="설립조항, 휘장, &apos;웹� 게시&apos;, 그룹 정보�서 �반�� 볼 수 있는 멤버 등� 변경합니다."
-                     longdescription="특권, 기장, &apos;웹 발행&apos;, Group Information 안�서 공공�으로 보여지는 맴버 수정� General tab�서 할 수 있습니다."
+                     description="설립 조항, 로고, &apos;웹� 게시&apos;, 그룹 정보� 표시�는 회� 등� 변경합니다."
+                     longdescription="설립 조항, 로고, &apos;웹� 게시&apos;, 그룹 정보� 표시�는 회� 등� 변경합니다. �반 탭�서 수행합니다."
                      name="group change identity" />
         </action_set>
         <action_set
-             description="�러한 능력�는 � 그룹� 소유� 토지를 양�, 수정 � �매하는 능력� �함�니다. 토지 소개 창� 가려면 토지� �부를 마우스 오른쪽으로 �릭하고 &apos;토지 소개...&apos;를 선�하거나 메뉴 바�서 구� 정보를 �릭합니다."
+             description="�러한 권한�는 � 그룹 소유 토지를 양�, 수정 � �매하는 권한� �함�니다. 토지 소개 창� 가려면 토지� �부를 마우스 오른쪽 �릭하고 &apos;토지 소개...&apos;를 선�하거나 메뉴 바�서 구� 정보를 �릭합니다."
              name="Parcel Management">
-                <action description="토지 양� � 그룹� 토지 구매"
-                     longdescription="About Land &gt; General tab �서 그룹� 위한 토지� 양�와 구매."
+                <action description="토지 양� � 그룹� 위한 토지 구매"
+                     longdescription="토지를 양�하고 그룹� 위한 토지를 구매합니다. 토지 소개 &gt; �반 탭�서 수행합니다."
                      name="land deed" />
-                <action description="린든 주지사�게 토지를 �기"
-                     longdescription="Land &gt; General tab �서Governor Linden제외 하기. *주�* 본Ability 로 Role내� 모든 맴버들� About Land�서 단체소유� 토지를 버릴 수 있습니다. �매없� Linden소유로 복귀! 본Ability는신중히 �용 하셔야 합니다."
+                <action description="린든�게 토지 버리기"
+                     longdescription="린든�게 토지를 버립니다. *경고* � 권한� 가진 역할 회�� 토지 소개 &gt; �반 탭�서 그룹 소유� 토지를 �매하지 않고 버려 린든 소유로 ��릴 수 있습니다. � 권한� 할당하기 전� 현재 �태� 대해 �해해야 합니다."
                      name="land release" />
                 <action description="토지 �매 정보 설정"
-                     longdescription="�매 정보를 위한 토지 . *주�*본Role� Ability를 가진 모든 회��About Land &gt; General tab�서 구룹소유� 토지를 �매할 수 있습니다! 본Ability는 신중히 �용 하셔야 합니다."
+                     longdescription="토지 �매 정보 설정 *경고* 역할� � 권한� 있는 회�� 토지 소개 &gt; �반 탭� 사용하여 �하는 대로 그룹 소유 토지를 �매할 수 있습니다! � 권한� 할당하기 전� 현재 �태� 대해 �해해야 합니다."
                      name="land set sale info" />
                 <action description="구� 분할 � 결합"
-                     longdescription="Subdivide and join parcels. This is done by right-clicking the ground, &apos;Edit Terrain&apos;, and dragging your mouse on the land to make a selection. To subdivide, select what you want to split and click &apos;Subdivide...&apos;. To join, select two or more contiguous parcels and click &apos;Join...&apos;. "
+                     longdescription="구� 분할 � 결합. �렇게 하려면 토지, &apos;지형 편집&apos;� 마우스 오른쪽 버튼으로 �릭하고 선�할 토지로 마우스를 드래그하십시오. 구�� 분할하려면 분할할 구�� 선�하고 &apos;세분…&apos;� �릭합니다. 구�� 결합하려면 2개 ��� �접한 구�� 선�하고 &apos;결합…&apos;� �릭합니다. "
                      name="land divide join" />
         </action_set>
         <action_set
-             description="�러한 능력�는 구� �름 � 게시 설정, 연�처 찾기, 착륙 지� � 텔리�트 경로 옵션 등� 변경할 능력� �함�니다."
+             description="�러한 권한�는 구� �름 � 게시 설정, 연�처 찾기, 착륙 지� � 텔리�트 경로 옵션 등� 변경할 수 있는 권한� �함�니다."
              name="Parcel Identity">
-                <action description="&apos;장소 찾기&apos;를 토글하고 카테고리 설정"
-                     longdescription="About Land &gt; Options tab �서 Toggle &apos;Show in Find Places&apos;를 �대로 �체 하고 parcel� 카테고리를 셋팅 함."
+                <action description="&apos;장소 찾기&apos;를 토글 � 카테고리 설정"
+                     longdescription="토지 소개 &gt; 옵션 탭�서 &apos;장소 찾기&apos;를 토글하고 구�� 카테고리를 설정합니다."
                      name="land find places" />
                 <action description="구� �름, 설명, &apos;웹� 게시&apos; 설정 변경"
-                     longdescription="About Land &gt; Options tab �서 parcel �름, 설명, &apos;웹 발행&apos; 셋팅 수정 하기."
+                     longdescription="구� �름, 설명 � &apos;웹� 게시&apos;� 대한 설정� 변경합니다. 토지 소개 &gt; 옵션 탭�서 수행합니다."
                      name="land change identity" />
-                <action description="착륙 지� � 텔레�트 경로 설정"
-                     longdescription="About Land &gt; Options tab�서 구룹소유� parcel� 대해서, 본Role� Ability를 가진 회��텔리�트를 위한 랜딩 ��트를 지정할 수 있습니다. � 한 차후� 컨트롤� 위해 텔리�트 루팅� 셋팅 할 수 있습니다."
+                <action description="텔레�트 �착지 � 텔레�트 경로 설정"
+                     longdescription="그룹 소유 구��서, 역할� � 권한� 있는 회�� 수신 텔레�트� �착지를 설정하고, 향후 제어할 수 있는 텔레�트 착신 전환� 설정할 수 있습니다. �는 토지 소개 &gt; 옵션 탭�서 �루어 집니다."
                      name="land set landing point" />
         </action_set>
         <action_set
-             description="�러한 기능�는 &apos;아�템 �성’, &apos;지형 편집&apos;, �악과 미디어 설정과 같� 구� 옵션� �향� 주는 능력� �함�니다."
+             description="�러한 기능�는 &apos;오브�트 만들기’, &apos;지형 편집&apos;, �악과 미디어 설정과 같� 구� 옵션� �향� 주는 권한� �함�니다."
              name="Parcel Settings">
                 <action description="�악 � 미디어 설정 변경"
-                     longdescription="About Land &gt; Media tab �서 스트리� �악 과 무비 셋팅 바꾸기"
+                     longdescription="토지 소개 &gt; 미디어 탭�서 스트리� �악 � ��� 설정� 변경합니다."
                      name="land change media" />
                 <action description="&apos;지형 편집&apos; 토글"
-                     longdescription="Toggle &apos;Edit Terrain&apos;. *주�* About Land &gt; Options tab &gt; Edit Terrain �서 본�� 토지� 대한 형태나 Linden�물� 위치를 수정할 수 있습니다. 본Ability는 신중히 �용 하셔야 합니다. Editing terrain � About Land &gt; Options tab�서 �대로 �체 �니다"
+                     longdescription="&apos;지형 편집&apos; 토글. *경고* 토지 소개 &gt; 옵션 탭 &gt; 지형 편집 기능� 사용하면 다른 모든 사람들� 귀하� 토지 모습� 변형하여 린든 시설� 배치 � ��할 수 있습니다. � 권한� 할당하기 전� 현재 �태� 대해 �해해야 합니다. 지형 편집 기능� 토지 소개 &gt; 옵션 탭�서 전환할 수 있습니다."
                      name="land edit" />
-                <action description="토지 소개 &gt; 옵션 설정� 토글"
-                     longdescription="About Land &gt; Options tab�서 Toggle &apos;Safe (no damage)&apos;, &apos;Fly&apos;과 다른 사용�들�게 그룹 소유� 토지� 대해 &apos;Create Objects&apos;, &apos;Edit Terrain&apos;, &apos;Create Landmarks&apos;, and &apos;Run Scripts&apos; � 가능하게 한다"
+                <action description="토지 소개 &gt; 옵션 설정 토글"
+                     longdescription="안전(�미지 없�)&apos;, &apos;비행&apos;� 토글하면 다른 주민들� 토지 소개 &gt; 옵션 탭�서 그룹� 소유한 토지� 대해 &apos;오브�트 만들기&apos;, &apos;지형 편집&apos; � &apos;스�립트 실행&apos; 기능� 사용할 수 있습니다."
                      name="land options" />
         </action_set>
         <action_set
-             description="�러한 능력�는 멤버가 그룹 소유� 구��서 제약� 우회할 수 있는 능력� �함�니다."
+             description="�러한 권한�는 회�� 그룹 소유� 구��서 제약� 우회할 수 있는 권한� �함�니다."
              name="Parcel Powers">
                 <action description="&apos;지형 편집&apos; 항� 허용"
-                     longdescription="About Land  &gt; Options tab�서 꺼져 있는 경우��Role� Ability를 가진 회�� 구룹소유parcel� 지형� 수정할 수 있습니다."
+                     longdescription="역할� � 권한� 있는 회�� 토지 소개 &gt; 옵션 탭�서 꺼져 있어� 그룹 소유 구��서 오브�트를 편집할 수 있습니다."
                      name="land allow edit land" />
                 <action description="&apos;비행&apos; 항� 허용"
-                     longdescription="About Land &gt; Options tab�서 꺼져 있는 경우��Role� Ability를 가진 회�� 구룹소유parcel�서 비행할 수 있습니다."
+                     longdescription="역할� � 권한� 있는 회�� 토지 소개 &gt; 옵션 탭�서 꺼져 있어� 그룹 소유 구��서 비행할 수 있습니다."
                      name="land allow fly" />
-                <action description="&apos;아�템 제작&apos; 항� 허용"
-                     longdescription="About Land &gt; Options tab�서 꺼져 있는 경우��Role� Ability를 가진 회�� 구룹소유� 아�템� 만들 수 있습니다."
+                <action description="&apos;오브�트 만들기&apos; 항� 허용"
+                     longdescription="역할� � 권한� 있는 회�� 토지 소개 &gt; 옵션 탭�서 꺼져 있어� 그룹 소유 구��서 오브�트를 만들 수 있습니다."
                      name="land allow create" />
-                <action description="&apos;경계 표시 �성&apos; 항� 허용"
-                     longdescription="About Land &gt; Options tab�서 꺼져 있는 경우�� 본Role� Ability를 가진 회�� 구룹소유parcel� 경계표시 할 수 있습니다."
+                <action description="&apos;랜드마� 만들기&apos; 항� 허용"
+                     longdescription="역할� � 권한� 있는 회�� 토지 소개 &gt; 옵션 탭�서 꺼져 있어� 그룹 소유 구��서 랜드마� 할 수 있습니다."
                      name="land allow landmark" />
-                <action description="그룹 토지� &apos;�곳� 집으로 설정&apos; 허용"
-                     longdescription="본Role� Ability를 가진 회�� 구룹소유parcel�서 World menu &gt; Set Home to Here 를 사용할 수 있습니다.(본 구룹으로� 토지 셋�나 �여)."
+                <action description="그룹 토지� &apos;�곳� 홈으로 설정&apos; 허용"
+                     longdescription="역할� � 권한� 있는 회�� � 그룹� 양�� 구��서 월드 메뉴 &gt; �곳� 홈으로 설정� �용할 수 있습니다."
                      name="land allow set home" />
         </action_set>
         <action_set
-             description="�러한 능력�는 주민 정지 � 강퇴를 �함하여 그룹� 소유한 구�� 대한 액세스를 허용 �는 제한하는 능력� �함�니다."
+             description="�러한 권한�는 주민 �결 � 강퇴를 �함하여 그룹 소유 구�� 대한 접근� 허용 �는 제한하는 것� �함�니다."
              name="Parcel Access">
-                <action description="구� 액세스 목� 관리"
-                     longdescription="About Land &gt; Access tab�서 parcel 소유 리스트 관리 하기."
+                <action description="구� 사용 권한 목� 관리"
+                     longdescription="토지 소개 &gt; 사용 권한 탭� 구� 사용 권한 목� 관리"
                      name="land manage allowed" />
-                <action description="구� 금지 목� 관리"
-                     longdescription="About Land  &gt; Ban tab �서 parcel 금지 리스트 관리 하기."
+                <action description="구� 차단 목� 관리"
+                     longdescription="토지 소개 &gt; 차단 탭� 있는 구� 차단 목�� 관리합니다."
                      name="land manage banned" />
-                <action description="구� &apos;패스 �매...&apos; 설정 변경"
-                     longdescription="About Land &gt; Access tab �서 parcel &apos;Sell passes...&apos; 셋팅 수정 하기"
+                <action description="구� &apos;임시 통행권 �매&apos; 설정 변경"
+                     longdescription="토지 소개 &gt; 사용 권한 탭�서 구� &apos;임시 통행권 �매&apos; 설정� 변경합니다."
                      name="land manage passes" />
                 <action description="구�� 주민 강퇴 � 정지"
-                     longdescription="Role� Ability를 가진 회�� 구룹소유parcel�서 unwelcome 주민들� 마우스 오른쪽 �릭후 More�서 &apos;Eject&apos;나 &apos;Freeze..&apos;를 통해 관리 할수 있습니다."
+                     longdescription="역할� � 권한� 있는 회�� 그룹 소유 구��서 환�하지 않는 주민� 마우스 오른쪽 �릭, � 보기&gt;, ‘추방’, �는 ‘�결’� 선�하여 해당 주민� 처리할 수 있습니다."
                      name="land admin" />
         </action_set>
         <action_set
-             description="�러한 능력�는 멤버가 사물과 장소를 반환하고 린든 시설들� 삭제할 수 있는 기능� �함�니다. 멤버가 쓰레기를 청소하고 조경할 때 유용하지만 반환 아�템� 대해 취소를 할 수 없으므로 주�해서 사용해야 합니다."
+             description="�러한 권한�는 회�� 오브�트와 장소를 반환하고 린든 시설들� 삭제할 수 있는 기능� �함�니다. 회�� 쓰레기를 청소하고 조경할 때 유용하지만 반환 오브�트� 대해 취소를 할 수 없으므로 주�해서 사용해야 합니다."
              name="Parcel Content">
-                <action description="그룹 소유� 아�템 반환"
-                     longdescription="About Land &gt; Objects tab�서 아�템들� 구룹� �해 소유� 구룹소유� parcel들로 ��릴 수 있습니다."
+                <action description="Return objects owned by group"
+                     longdescription="토지 소개 &gt; 오브�트 탭� 있는 그룹 소유� 오브�트를 그룹 소유 구�� 반환합니다."
                      name="land return group owned" />
-                <action description="그룹� 설정� 아�템 반환"
-                     longdescription="About Land &gt; Objects tab�서 아�템들� 구룹� 셋팅� 구룹소유� parcel들로 ��릴 수 있습니다."
+                <action description="그룹� 설정� 오브�트 반환"
+                     longdescription="토지 소개 &gt; 오브�트 탭�서 그룹� 설정� 오브�트를 그룹 소유 구�� 반환합니다."
                      name="land return group set" />
-                <action description="비그룹 아�템 반환"
-                     longdescription="About Land &gt; Objects tab �서 아�템들� 비구룹� 구룹소유� parcel들로 ��릴 수 있습니다."
+                <action description="비그룹 오브�트 반환"
+                     longdescription="토지 소개 &gt; 오브�트 탭� 있는 비그룹� 오브�트를 그룹 소유 구�� 반환합니다."
                      name="land return non group" />
-                <action description="린든 시설� 사용한 �경"
-                     longdescription="Landscaping ability 로 Linden 나무, 화초, 잔디를 제 배치 하거나 움�� 수 있습니다. Linden 나무, 화초, 잔디를는 본��inventory&apos;s Library 내�Objects�� �서 찾� 수 있습니다. �는 �접 제작할 수 있습니다."
+                <action description="린든 �물� 사용한 조경"
+                     longdescription="린든 나무, �물, 잔디� 조경 권한. �러한 아�템� �벤토리� ��브러리 &gt; 오브�트 ��� 있거나 �접 만들 수 있습니다."
                      name="land gardening" />
         </action_set>
         <action_set
-             description="These Abilities include powers to deed, modify, and sell group-owned objects. These changes are done in the Edit Tools &gt; General Tab. Right-click an object and Edit to see its settings. "
+             description="�러한 권한�는 그룹 소유 오브�트를 양�, 수정, �매하는 권한� �함�니다. �러한 변경� '편집 �구 &gt; �반 탭'�서 수행�니다. 오브�트를 마우스 오른쪽 �릭하고 '편집'� 선�해 설정� 봅니다."
              name="Object Management">
-                <action description="그룹�게 아�템 양�"
-                     longdescription="Edit Tools &gt; General Tab �서 그룹� 아�템 양�."
+                <action description="그룹�게 오브�트 양�"
+                     longdescription="편집 �구 &gt; �반 탭�서 오브�트를 그룹� 양�합니다."
                      name="object deed" />
-                <action description="그룹 소유 사물 조작(��, 복사, 수정)"
-                     longdescription="Edit Tools &gt; General Tab�서 구룹소유� 아�템 조작하기(��, 복사, 수정)"
+                <action description="그룹 소유 오브�트 조작(��, 복사, 수정)"
+                     longdescription="�구 편집 �반 탭� 있는 그룹 소유 오브�트를 조작합니다(��, 복사, 수정)."
                      name="object manipulate" />
-                <action description="그룹 소유 아�템� �매 아�템 으로 설정"
-                     longdescription="Edit Tools &gt; General tab�서 �매를 위한 구룹소유� 아�템� 셋하기."
+                <action description="그룹 소유 오브�트를 �매로 설정"
+                     longdescription="편집 �구 &gt; �반 탭�서 그룹 소유 오브�트를 �매 오브�트로 설정하십시오."
                      name="object set sale" />
         </action_set>
         <action_set
-             description="�러한 능력�는 멤버가 그룹 부채를 지불하고 그룹 배당금� 수령해야 하며 그룹 계정 기�� 대한 액세스를 제한하는 능력� �함�니다."
+             description="�러한 권한�는 회�� 그룹 부채를 지불하고 그룹 배당금� 수령해야 하며 그룹 계정 기�� 대한 접근� 제한하는 권한� �함�니다."
              name="Accounting">
-                <action description="그룹 부채 지불 � 그룹 배당금 수령"
-                     longdescription="Members in a Role with this Ability will automatically pay group liabilities and receive group dividends. This means they will receive a portion of group-owned land sales which are distributed daily, as well as contribute towards things like parcel listing fees. "
+                <action description="그룹 부채 지불과 그룹 배당금 수령"
+                     longdescription="역할� � 권한� 있는 회�� 그룹 부채를 �� 지불하고 그룹 배당금� 수령합니다. �는 회�� 그룹 소유 토지 �매�서 매� 분배�는 �정 부분� 수령하고 구� 게재 비용 등� 기부함� �미합니다. "
                      name="accounting accountable" />
         </action_set>
         <action_set
-             description="�러한 능력�는 멤버가 그룹 통지를 전송, 수령 � 볼 수 있게 하는 능력� �함�니다."
+             description="�러한 권한�는 회�� 그룹 통지를 전송, 수령 � 볼 수 있게 하는 것� �함�니다."
              name="Notices">
                 <action description="공지 전송"
-                     longdescription="Group Information &gt; Notices tab �서 본Role� Ability를 가진 회�� 공지를 보낼수 있습니다."
+                     longdescription="역할� � 권한� 있는 회��  그룹 정보 &gt; 공지 탭�서 공지를 발송할 수 있습니다."
                      name="notices send" />
                 <action description="공지 수령 � 과거 공지 보기"
-                     longdescription="Notices in Group Information &gt; Notices tab�서 본 Role� Ability를 가진 회�� 공지를 받거나 열람, 공고 할수 있습니다."
+                     longdescription="역할� � 권한� 있는 회�� 공지를 수령하고 그룹 정보 &gt; 공지 탭�서 지난 공지 사항� 볼 수 있습니다."
                      name="notices receive" />
         </action_set>
         <action_set
-             description="�러한 능력�는 멤버가 제안� 설정하고 제안� 투표하며 투표 기�� 볼 수 있게 하는 능력� �함�니다."
+             description="�러한 권한�는 회�� 제안� 설정하고 제안� 투표하며 투표 기�� 볼 수 있게 하는 것� �함�니다."
              name="Proposals">
-                <action description="제안 �성"
-                     longdescription="Group Information  &gt; Proposals tab �서 Role� Ability를 가진 회�� 투표 가능한 프로�절� 만들수 있습니다."
+                <action description="제안 만들기"
+                     longdescription="역할� � 권한� 있는 회�� 그룹 정보 &gt; 제안 탭�서 투표 가능한 제안� 만들 수 있습니다."
                      name="proposal start" />
                 <action description="제안� 투표"
-                     longdescription="Group Information &gt; Proposals tab�서 본Role� Ability를 가진 회�� 프로�절� 투표할 수 있습니다."
+                     longdescription="역할� � 권한� 있는 회�� 그룹 정보 &gt; 제안 탭�서 제안� 관한 투표를 할 수 있습니다."
                      name="proposal vote" />
         </action_set>
 </role_actions>
diff --git a/linden/indra/newview/viewer.cpp b/linden/indra/newview/viewer.cpp
index b71c6f2..2f05754 100644
--- a/linden/indra/newview/viewer.cpp
+++ b/linden/indra/newview/viewer.cpp
@@ -1856,7 +1856,44 @@ void main_loop()
                         {
                                 LLFastTimer t2(LLFastTimer::FTM_SLEEP);
                                 bool run_multiple_threads = gSavedSettings.getBOOL("RunMultipleThreads");
+
+                                // yield some time to the os based on command line option
+                                if(gYieldTime)
+                                {
+                                        ms_sleep(gYieldMS);
+                                }
+
+                                // yield cooperatively when not running as foreground window
+                                if (   gNoRender
+                                                || !gViewerWindow->mWindow->getVisible()
+                                                || !gFocusMgr.getAppHasFocus())
+                                {
+                                        // Sleep if we're not rendering, or the window is minimized.
+                                        S32 milliseconds_to_sleep = llclamp(gSavedSettings.getS32("BackgroundYieldTime"), 0, 1000);
+                                        // don't sleep when BackgroundYieldTime set to 0, since this will still yield to other threads
+                                        // of equal priority on Windows
+                                        if (milliseconds_to_sleep > 0)
+                                        {
+                                                ms_sleep(milliseconds_to_sleep);
+                                                // also pause worker threads during this wait period
+                                                gTextureCache->pause();
+                                                gImageDecodeThread->pause();
+                                        }
+                                }
                                 
+                                if (gRandomizeFramerate)
+                                {
+                                        ms_sleep(rand() % 200);
+                                }
+
+                                if (gPeriodicSlowFrame
+                                        && (gFrameCount % 10 == 0))
+                                {
+                                        llinfos << "Periodic slow frame - sleeping 500 ms" << llendl;
+                                        ms_sleep(500);
+                                }
+
+
                                 const F64 min_frame_time = 0.0; //(.0333 - .0010); // max video frame rate = 30 fps
                                 const F64 min_idle_time = 0.0; //(.0010); // min idle time = 1 ms
                                 const F64 max_idle_time = run_multiple_threads ? min_idle_time : .005; // 5 ms
@@ -1874,30 +1911,6 @@ void main_loop()
                                         {
                                                 ms_sleep(llmin(io_pending/100,100)); // give the vfs some time to catch up
                                         }
-                                        if (   gNoRender
-                                                   || !gViewerWindow->mWindow->getVisible()
-                                                   || !gViewerWindow->getActive()
-                                                   || gViewerWindow->mWindow->getMinimized() )
-                                        {
-                                                // Sleep if we're not rendering, or the window is minimized.
-                                                ms_sleep(20);
-                                        }
-                                        else
-                                        {
-//                                              ms_sleep(1); // sleep at least 1 ms
-                                        }
-                                        
-                                        if (gRandomizeFramerate)
-                                        {
-                                                ms_sleep(rand() % 200);
-                                        }
-
-                                        if (gPeriodicSlowFrame
-                                                && (gFrameCount % 10 == 0))
-                                        {
-                                                llinfos << "Periodic slow frame - sleeping 500 ms" << llendl;
-                                                ms_sleep(500);
-                                        }
 
                                         F64 frame_time = frameTimer.getElapsedTimeF64();
                                         F64 idle_time = idleTimer.getElapsedTimeF64();
@@ -3957,12 +3970,6 @@ void idle()
                 gAudiop->idle(max_audio_decode_time);
         }
 
-        // yield some time to the os if we are supposed to.
-        if(gYieldTime)
-        {
-                ms_sleep(gYieldMS);
-        }
-
         // Handle shutdown process, for example, 
         // wait for floaters to close, send quit message,
         // forcibly quit if it has taken too long
@@ -6302,7 +6309,7 @@ void cleanup_app()
 
         llinfos << "Cleaning Up" << llendflush;
 
-        LLKeyframeMotion::flushKeyframeCache();
+        LLKeyframeDataCache::clear();
         
         // Must clean up texture references before viewer window is destroyed.
         LLHUDObject::cleanupHUDObjects();
@@ -6334,6 +6341,8 @@ void cleanup_app()
         delete gGlobalEconomy;
         gGlobalEconomy = NULL;
 
+        LLNotifyBox::cleanup();
+
         llinfos << "Global stuff deleted" << llendflush;
 
 #if !LL_RELEASE_FOR_DOWNLOAD
@@ -6423,8 +6432,7 @@ void cleanup_app()
 
         // Clean up selection managers after UI is destroyed, as UI
         // may be observing them.
-        delete gSelectMgr;
-        gSelectMgr = NULL;
+        LLSelectMgr::cleanupGlobals();
 
         LLViewerObject::cleanupVOClasses();
                 
@@ -6445,8 +6453,7 @@ void cleanup_app()
                 llwarns << "Remaining references in the volume manager!" << llendflush;
         }
 
-        delete gParcelMgr;
-        gParcelMgr = NULL;
+        LLViewerParcelMgr::cleanupGlobals();
 
         delete gViewerStats;
         gViewerStats = NULL;
@@ -6562,8 +6569,12 @@ void cleanup_app()
         delete gVFS;
         gVFS = NULL;
         
+        LLCurl::cleanup();
+
         // This will eventually be done in LLApp
         LLCommon::cleanupClass();
+
+        end_messaging_system();
 }
 
 const std::string& getLoginURI()
diff --git a/linden/indra/newview/viewer_manifest.py b/linden/indra/newview/viewer_manifest.py
index 2f4eb7c..d22a7b5 100755
--- a/linden/indra/newview/viewer_manifest.py
+++ b/linden/indra/newview/viewer_manifest.py
@@ -148,6 +148,7 @@ class WindowsManifest(ViewerManifest):
 
                 # Mozilla runtime DLLs (CP)
                 if self.prefix(src="../../libraries/i686-win32/lib_release", dst=""):
+                        self.path("freebl3.dll")
                         self.path("gksvggdiplus.dll")
                         self.path("js3250.dll")
                         self.path("nspr4.dll")
@@ -410,6 +411,7 @@ class Linux_i686Manifest(LinuxManifest):
                         self.end_prefix("res-sdl")
 
                 self.path("featuretable_linux.txt")
+                self.path("secondlife-i686.supp")
 
                 self.path("app_settings/mozilla-runtime-linux-i686")
 
@@ -431,6 +433,8 @@ class Linux_i686Manifest(LinuxManifest):
                         self.path("libelfio.so")
                         self.path("libuuid.so", "libuuid.so.1")
                         self.path("libSDL-1.2.so.0")
+                        self.path("libtcmalloc.so.0")
+                        self.path("libstacktrace.so.0")
 #                        self.path("libllkdu.so", "../bin/libllkdu.so") # llkdu goes in bin for some reason
                         self.end_prefix("lib")
 
diff --git a/linden/indra/win_updater/updater.cpp b/linden/indra/win_updater/updater.cpp
index 8f162ec..45a488e 100644
--- a/linden/indra/win_updater/updater.cpp
+++ b/linden/indra/win_updater/updater.cpp
@@ -168,16 +168,6 @@ int WINAPI get_url_into_file(WCHAR *uri, char *path, int *cancelled)
                 }
 #endif
 
-                if (!data)
-                {
-#if _DEBUG
-                        fprintf(logfile,"InternetReadFile Returned NULL data, bytes_read = %d.\n",bytes_read);
-                        fflush(logfile);
-#endif
-                // ...an error occurred
-                        return FALSE;
-                }
-                
 #if _DEBUG
                 fprintf(logfile,"Reading Data, bytes_read = %d\n",bytes_read);
                 fflush(logfile);
diff --git a/linden/libraries/include/llmozlib.h b/linden/libraries/include/llmozlib.h
index 9327fee..755818b 100644
--- a/linden/libraries/include/llmozlib.h
+++ b/linden/libraries/include/llmozlib.h
@@ -1,4 +1,4 @@
-/** 

+/**

  * @file llmozlib.h

  * @brief Linden Lab Mozilla wrapper.

  *

@@ -110,9 +110,13 @@ class LLMozLib
                 static LLMozLib* getInstance();

 

                 // housekeeping

-                bool init( std::string appBaseDirIn, std::string profileDirIn );

+                bool init( std::string applicationDirIn, std::string componentDirIn, std::string profileDirIn );

                 bool reset();

+                bool setHttpProxy( bool enabledIn, std::string addressIn, int portIn );

                 bool clearCache();

+                bool enableCookies( bool enabledIn );

+                bool clearAllCookies();

+                bool enablePlugins( bool enabledIn );

                 int getLastError();

                 const std::string getVersion();

                 void setBrowserAgentId( std::string idIn );