Fixed merge conflicts, propagated the _stat usage for windows in floaterlocalassetbrowse.cpp

36 files changed, 610 insertions, 90 deletions

diff --git a/linden/indra/cmake/00-Common.cmake b/linden/indra/cmake/00-Common.cmake
index c6b6858..d1f379c 100644
--- a/linden/indra/cmake/00-Common.cmake
+++ b/linden/indra/cmake/00-Common.cmake
@@ -169,7 +169,23 @@ if (LINUX)
       add_definitions(-fno-stack-protector)
     endif (NOT STANDALONE)
     if (${ARCH} STREQUAL "x86_64")
-       add_definitions( -DLINUX64=1 )
+       add_definitions( -DLINUX64=1
+                        #this rather needs to be done elsewhere
+                        #anyway these are the flags for the 64bit releases:
+                        -DLL_VECTORIZE=1
+                        -O2
+                        -fomit-frame-pointer
+                        -pipe 
+                        -mmmx
+                        -msse
+                        -mfpmath=sse
+                        -msse2
+                        -ffast-math
+                        -ftree-vectorize
+                        -fweb -fexpensive-optimizations
+                        -frename-registers
+                        )
+
     endif (${ARCH} STREQUAL "x86_64")
   endif (VIEWER)
 
diff --git a/linden/indra/cmake/ViewerMiscLibs.cmake b/linden/indra/cmake/ViewerMiscLibs.cmake
index 4a62ebd..7fe1040 100644
--- a/linden/indra/cmake/ViewerMiscLibs.cmake
+++ b/linden/indra/cmake/ViewerMiscLibs.cmake
@@ -4,9 +4,9 @@ include(Prebuilt)
 if (NOT STANDALONE)
   use_prebuilt_binary(libuuid)
   use_prebuilt_binary(vivox)
-   if(LINUX64)
+   if(LINUX AND ${ARCH} STREQUAL "x86_64")
      use_prebuilt_binary(32bitcompatibilitylibs)
-   endif(LINUX64)
+   endif(LINUX AND ${ARCH} STREQUAL "x86_64")
   use_prebuilt_binary(fontconfig)
 endif(NOT STANDALONE)
 
diff --git a/linden/indra/llmedia/llmediaimplgstreamer.cpp b/linden/indra/llmedia/llmediaimplgstreamer.cpp
index 2bfe4ea..7af9c9a 100644
--- a/linden/indra/llmedia/llmediaimplgstreamer.cpp
+++ b/linden/indra/llmedia/llmediaimplgstreamer.cpp
@@ -188,9 +188,6 @@ bool LLMediaImplGStreamer::startup (LLMediaManagerData* init_data)
                 // Protect against GStreamer resetting the locale, yuck.
                 static std::string saved_locale;
                 saved_locale = setlocale(LC_ALL, NULL);
-#if LL_DARWIN
-                setenv("GST_PLUGIN_SYSTEM_PATH", "lib/gstreamer-plugins", TRUE);
-#endif
                 if (0 == gst_init_check(NULL, NULL, NULL))
                 {
                     LL_WARNS("MediaImpl") << "GStreamer library failed to initialize and load standard plugins." << LL_ENDL;
@@ -294,7 +291,6 @@ void LLMediaImplGStreamer::set_gst_plugin_path()
         // Search both Imprudence and Imprudence\lib\gstreamer-plugins.
         // But we also want to search the path the user has set, if any.
         std::string plugin_path =       
-                "GST_PLUGIN_PATH=" +
 #if LL_WINDOWS
                 imp_dir + "\\lib\\gstreamer-plugins" +
 #elif LL_DARWIN
@@ -307,9 +303,9 @@ void LLMediaImplGStreamer::set_gst_plugin_path()
 
         // Place GST_PLUGIN_PATH in the environment settings
 #if LL_WINDOWS
-        put_result = _putenv( (char*)plugin_path.c_str() );
+        put_result = _putenv_s( "GST_PLUGIN_PATH", (char*)plugin_path.c_str() );
 #elif LL_DARWIN
-        put_result = putenv( (char*)plugin_path.c_str() );
+        put_result = setenv( "GST_PLUGIN_PATH", (char*)plugin_path.c_str(), 1 );
 #endif
 
         if( put_result == -1 )
@@ -324,9 +320,9 @@ void LLMediaImplGStreamer::set_gst_plugin_path()
                 
         // Don't load system plugins. We only want to use ours, to avoid conflicts.
 #if LL_WINDOWS
-        put_result = _putenv( "GST_PLUGIN_SYSTEM_PATH=\"\"" );
+        put_result = _putenv_s( "GST_PLUGIN_SYSTEM_PATH", "" );
 #elif LL_DARWIN
-        put_result = putenv( "GST_PLUGIN_SYSTEM_PATH=\"\"" );
+        put_result = setenv( "GST_PLUGIN_SYSTEM_PATH", "", 1 );
 #endif
 
         if( put_result == -1 )
diff --git a/linden/indra/llrender/llfontregistry.cpp b/linden/indra/llrender/llfontregistry.cpp
index 619228e..b1d8c5c 100644
--- a/linden/indra/llrender/llfontregistry.cpp
+++ b/linden/indra/llrender/llfontregistry.cpp
@@ -48,7 +48,8 @@ using std::map;
 bool fontDescInitFromXML(LLXMLNodePtr node, LLFontDescriptor& desc);
 
 LLFontDescriptor::LLFontDescriptor():
-        mStyle(0)
+        mStyle(0),
+        mSizeMult(1.0)
 {
 }
 
@@ -59,7 +60,8 @@ LLFontDescriptor::LLFontDescriptor(const std::string& name,
         mName(name),
         mSize(size),
         mStyle(style),
-        mFileNames(file_names)
+        mFileNames(file_names),
+        mSizeMult(1.0)
 {
 }
 
@@ -68,7 +70,8 @@ LLFontDescriptor::LLFontDescriptor(const std::string& name,
                                                                    const U8 style):
         mName(name),
         mSize(size),
-        mStyle(style)
+        mStyle(style),
+        mSizeMult(1.0)
 {
 }
 
@@ -165,7 +168,9 @@ LLFontDescriptor LLFontDescriptor::normalize() const
         if (removeSubString(new_name,"Italic"))
                 new_style |= LLFontGL::ITALIC;
 
-        return LLFontDescriptor(new_name,new_size,new_style,getFileNames());
+        LLFontDescriptor norm(new_name,new_size,new_style,getFileNames());
+        norm.setSizeMult(mSizeMult);
+        return norm;
 }
 
 LLFontRegistry::LLFontRegistry(const string_vec_t& xui_paths)
@@ -177,6 +182,9 @@ LLFontRegistry::LLFontRegistry(const string_vec_t& xui_paths)
         // This is potentially a slow directory traversal, so we want to
         // cache the result.
         mUltimateFallbackList = LLWindow::getDynamicFallbackFontList();
+
+        std::string font_choice = gSavedSettings.getString("FontChoice");
+        setAlias("SansSerif", font_choice);
 }
 
 LLFontRegistry::~LLFontRegistry()
@@ -252,6 +260,12 @@ bool fontDescInitFromXML(LLXMLNodePtr node, LLFontDescriptor& desc)
                 }
 
                 desc.setSize(s_template_string);
+
+                F32 attr_size_mult;
+                if (node->getAttributeF32("size_mult",attr_size_mult))
+                {
+                        desc.setSizeMult(attr_size_mult);
+                }
         }
 
         LLXMLNodePtr child;     
@@ -360,7 +374,6 @@ LLFontGL *LLFontRegistry::createFont(const LLFontDescriptor& desc)
                 return NULL;
         }
         llinfos << "createFont " << norm_desc.getName() << " size " << norm_desc.getSize() << " style " << ((S32) norm_desc.getStyle()) << llendl;
-        F32 fallback_scale = 1.0;
 
         // Find corresponding font template (based on same descriptor with no size specified)
         LLFontDescriptor template_desc(norm_desc);
@@ -428,13 +441,13 @@ LLFontGL *LLFontRegistry::createFont(const LLFontDescriptor& desc)
                 LLFontGL *fontp = new LLFontGL;
                 std::string font_path = local_path + *file_name_it;
                 BOOL is_fallback = !is_first_found;
-                F32 extra_scale = (is_fallback)?fallback_scale:1.0;
-                if (!fontp->loadFace(font_path, extra_scale * point_size,
+                F32 size_mult = (is_fallback ? 1 : match_desc->getSizeMult());
+                if (!fontp->loadFace(font_path, point_size * size_mult,
                                                          LLFontGL::sVertDPI, LLFontGL::sHorizDPI, 2, is_fallback))
                 {
                         font_path = sys_path + *file_name_it;
 
-                        if (!fontp->loadFace(font_path, extra_scale * point_size,
+                        if (!fontp->loadFace(font_path, point_size * size_mult,
                                                                  LLFontGL::sVertDPI, LLFontGL::sHorizDPI, 2, is_fallback))
                         {
                                 LL_INFOS_ONCE("LLFontRegistry") << "Couldn't load font " << *file_name_it << LL_ENDL;
@@ -511,17 +524,24 @@ LLFontGL *LLFontRegistry::getFont(const LLFontDescriptor& orig_desc)
 {
         LLFontDescriptor norm_desc = orig_desc.normalize();
 
+        if (hasAlias(norm_desc.getName()))
+        {
+                // llinfos << "Font " << norm_desc.getName() << " is alias for "
+                //         << expandAlias(norm_desc.getName()) << llendl;
+                norm_desc.setName(expandAlias(norm_desc.getName()));
+        }
+
         font_reg_map_t::iterator it = mFontMap.find(norm_desc);
         if (it != mFontMap.end())
                 return it->second;
         else
         {
-                LLFontGL *fontp = createFont(orig_desc);
+                LLFontGL *fontp = createFont(norm_desc);
                 if (!fontp)
                 {
-                        llwarns << "getFont failed, name " << orig_desc.getName()
-                                        <<" style=[" << ((S32) orig_desc.getStyle()) << "]"
-                                        << " size=[" << orig_desc.getSize() << "]" << llendl;
+                        llwarns << "getFont failed, name " << norm_desc.getName()
+                                        <<" style=[" << ((S32) norm_desc.getStyle()) << "]"
+                                        << " size=[" << norm_desc.getSize() << "]" << llendl;
                 }
                 return fontp;
         }
@@ -639,6 +659,7 @@ void LLFontRegistry::dump()
                 llinfos << "Font: name=" << desc.getName()
                                 << " style=[" << ((S32)desc.getStyle()) << "]"
                                 << " size=[" << desc.getSize() << "]"
+                                << " size_mult=[" << desc.getSizeMult() << "]"
                                 << " fileNames="
                                 << llendl;
                 for (string_vec_t::const_iterator file_it=desc.getFileNames().begin();
@@ -649,3 +670,31 @@ void LLFontRegistry::dump()
                 }
         }
 }
+
+
+
+std::string LLFontRegistry::expandAlias(std::string alias_name)
+{
+        font_alias_map_t::iterator it = mFontAliases.find(alias_name);
+        if (it != mFontAliases.end())
+        {
+                return it->second;
+        }
+        return alias_name;
+}
+
+void LLFontRegistry::setAlias(std::string alias_name, std::string orig_name)
+{
+        mFontAliases[alias_name] = orig_name;
+}
+
+void LLFontRegistry::clearAlias(std::string alias_name)
+{
+        mFontAliases.erase(alias_name);
+}
+
+bool LLFontRegistry::hasAlias(std::string alias_name)
+{
+        font_alias_map_t::iterator it = mFontAliases.find(alias_name);
+        return (it != mFontAliases.end());
+}
diff --git a/linden/indra/llrender/llfontregistry.h b/linden/indra/llrender/llfontregistry.h
index 523e184..67a529f 100644
--- a/linden/indra/llrender/llfontregistry.h
+++ b/linden/indra/llrender/llfontregistry.h
@@ -56,6 +56,9 @@ public:
         void setName(const std::string& name) { mName = name; }
         const std::string& getSize() const { return mSize; }
         void setSize(const std::string& size) { mSize = size; }
+        F32 getSizeMult() const { return mSizeMult; }
+        void setSizeMult(F32 size_mult) { mSizeMult = size_mult; }
+
         const std::vector<std::string>& getFileNames() const { return mFileNames; }
         std::vector<std::string>& getFileNames() { return mFileNames; }
         const U8 getStyle() const { return mStyle; }
@@ -64,6 +67,7 @@ public:
 private:
         std::string mName;
         std::string mSize;
+        F32 mSizeMult;
         string_vec_t mFileNames;
         U8 mStyle;
 };
@@ -97,15 +101,29 @@ public:
         
         const string_vec_t& getUltimateFallbackList() const { return mUltimateFallbackList; }
 
+        // If alias_name is a defined alias, returns the original name.
+        // Otherwise returns alias_name itself.
+        std::string expandAlias(std::string alias_name);
+        // Define alias_name as an alias of orig_name.
+        void setAlias(std::string alias_name, std::string orig_name);
+        // Undefines the alias alias_name. Does nothing if it's not an alias.
+        void clearAlias(std::string alias_name);
+        // True if the alias is defined.
+        bool hasAlias(std::string alias_name);
+
+
 private:
         LLFontGL *createFont(const LLFontDescriptor& desc);
         typedef std::map<LLFontDescriptor,LLFontGL*> font_reg_map_t;
         typedef std::map<std::string,F32> font_size_map_t;
+        typedef std::map<std::string,std::string> font_alias_map_t;
 
         // Given a descriptor, look up specific font instantiation.
         font_reg_map_t mFontMap;
         // Given a size name, look up the point size.
         font_size_map_t mFontSizes;
+        // Given an alias name, look up the original name.
+        font_alias_map_t mFontAliases;
 
         string_vec_t mUltimateFallbackList;
         string_vec_t mXUIPaths;
diff --git a/linden/indra/llui/llmenugl.cpp b/linden/indra/llui/llmenugl.cpp
index e00700a..91bb581 100644
--- a/linden/indra/llui/llmenugl.cpp
+++ b/linden/indra/llui/llmenugl.cpp
@@ -101,8 +101,8 @@ const U32 SEPARATOR_HEIGHT_PIXELS = 8;
 const S32 TEAROFF_SEPARATOR_HEIGHT_PIXELS = 10;
 const S32 MENU_ITEM_PADDING = 4;
 
-const std::string BOOLEAN_TRUE_PREFIX( "X" );
-const std::string BRANCH_SUFFIX( ">" );
+const std::string BOOLEAN_TRUE_PREFIX( "\xe2\x9c\x93" ); // U+2714 -- MC
+const std::string BRANCH_SUFFIX( "\xE2\x96\xB6" ); // U+25B6 BLACK RIGHT-POINTING TRIANGLE
 const std::string ARROW_UP  ("^^^^^^^");
 const std::string ARROW_DOWN("vvvvvvv");
 
diff --git a/linden/indra/mac_crash_logger/Info.plist b/linden/indra/mac_crash_logger/Info.plist
index f48293e..a528b64 100644
--- a/linden/indra/mac_crash_logger/Info.plist
+++ b/linden/indra/mac_crash_logger/Info.plist
@@ -11,7 +11,7 @@
         <key>CFBundleIconFile</key>
         <string></string>
         <key>CFBundleIdentifier</key>
-        <string>com.secondlife.indra.crashreporter</string>
+        <string>org.imprudenceviewer.crashreporter</string>
         <key>CFBundleInfoDictionaryVersion</key>
         <string>6.0</string>
         <key>CFBundlePackageType</key>
diff --git a/linden/indra/mac_updater/Info.plist b/linden/indra/mac_updater/Info.plist
index bb27fdd..1e0f8cb 100644
--- a/linden/indra/mac_updater/Info.plist
+++ b/linden/indra/mac_updater/Info.plist
@@ -11,7 +11,7 @@
         <key>CFBundleIconFile</key>
         <string></string>
         <key>CFBundleIdentifier</key>
-        <string>com.secondlife.indra.autoupdater</string>
+        <string>org.imprudenceviewer.autoupdater</string>
         <key>CFBundleInfoDictionaryVersion</key>
         <string>6.0</string>
         <key>CFBundlePackageType</key>
diff --git a/linden/indra/mac_updater/mac_updater.cpp b/linden/indra/mac_updater/mac_updater.cpp
index 18cc0be..cf9de4b 100644
--- a/linden/indra/mac_updater/mac_updater.cpp
+++ b/linden/indra/mac_updater/mac_updater.cpp
@@ -649,7 +649,7 @@ static bool isFSRefViewerBundle(FSRef *targetRef)
         }
         else
         {
-                if(CFStringCompare(targetBundleID, CFSTR("com.secondlife.indra.viewer"), 0) == kCFCompareEqualTo)
+                if(CFStringCompare(targetBundleID, CFSTR("org.imprudenceviewer.viewer"), 0) == kCFCompareEqualTo)
                 {
                         // This is the bundle we're looking for.
                         result = true;
diff --git a/linden/indra/newview/CMakeLists.txt b/linden/indra/newview/CMakeLists.txt
index 995ef7e..1691095 100644
--- a/linden/indra/newview/CMakeLists.txt
+++ b/linden/indra/newview/CMakeLists.txt
@@ -87,6 +87,7 @@ set(viewer_SOURCE_FILES
     hippoGridManager.cpp
     hippoLimits.cpp
     hippoRestRequest.cpp
+    impprefsfonts.cpp
     jcfloater_animation_list.cpp
     jcfloaterareasearch.cpp
     lightshare.cpp
@@ -525,6 +526,7 @@ set(viewer_HEADER_FILES
     hippoGridManager.h
     hippoLimits.h
     hippoRestRequest.h
+    impprefsfonts.h
     jcfloater_animation_list.h
     jcfloaterareasearch.h
     lightshare.h
@@ -955,11 +957,13 @@ if (DARWIN)
   find_library(APPKIT_LIBRARY AppKit)
   find_library(COCOA_LIBRARY Cocoa)
   find_library(IOKIT_LIBRARY IOKit)
+  find_library(SECURITY_LIBRARY SECURITY)
 
   set(viewer_LIBRARIES
     ${COCOA_LIBRARY}
     ${AGL_LIBRARY}
     ${IOKIT_LIBRARY}
+    ${SECURITY_LIBRARY}
     )
 
   # Add resource files to the project.
diff --git a/linden/indra/newview/Info-Imprudence.plist b/linden/indra/newview/Info-Imprudence.plist
index e9728f8..419cacd 100644
--- a/linden/indra/newview/Info-Imprudence.plist
+++ b/linden/indra/newview/Info-Imprudence.plist
@@ -9,7 +9,7 @@
         <key>CFBundleIconFile</key>
         <string>viewer.icns</string>
         <key>CFBundleIdentifier</key>
-        <string>com.secondlife.indra.viewer</string>
+        <string>org.imprudenceviewer.viewer</string>
         <key>CFBundleInfoDictionaryVersion</key>
         <string>6.0</string>
         <key>CFBundleName</key>
diff --git a/linden/indra/newview/app_settings/settings.xml b/linden/indra/newview/app_settings/settings.xml
index 6b1c707..11220ed 100644
--- a/linden/indra/newview/app_settings/settings.xml
+++ b/linden/indra/newview/app_settings/settings.xml
@@ -13,7 +13,7 @@
     <key>Type</key>
     <string>Boolean</string>
     <key>Value</key>
-    <integer>1</integer>
+    <integer>0</integer>
   </map>
   <key>HighlightFriendsChat</key>
   <map>
@@ -36,9 +36,9 @@
     <string>Color4</string>
     <key>Value</key>
     <array>
-      <real>0.699999988079</real>
-      <real>0.899999976158</real>
-      <real>0.699999988079</real>
+      <real>1.0</real>
+      <real>1.0</real>
+      <real>0.0</real>
       <real>1</real>
     </array>
   </map>
@@ -51,7 +51,7 @@
     <key>Type</key>
     <string>Boolean</string>
     <key>Value</key>
-    <integer>1</integer>
+    <integer>0</integer>
   </map>
   <key>OwnNameChatColor</key>
   <map>
@@ -336,6 +336,17 @@
       <integer>0</integer>
     </array>
   </map>
+  <key>FontChoice</key>
+  <map>
+    <key>Comment</key>
+    <string>User's font choice (DejaVu, Delicious, DroidSans, or Liberation)</string>
+    <key>Persist</key>
+    <integer>1</integer>
+    <key>Type</key>
+    <string>String</string>
+    <key>Value</key>
+    <string>DroidSans</string>
+  </map>
   <key>GoAction</key>
   <map>
     <key>Comment</key>
@@ -682,6 +693,17 @@
     <key>Value</key>
     <integer>0</integer>
   </map>
+  <key>ResetFocusOnSelfClick</key>
+                <map>
+                <key>Comment</key>
+                <string>Setting this to TRUE resets your camera when you left-click your avatar</string>
+                <key>Persist</key>
+                <integer>1</integer>
+                <key>Type</key>
+                <string>Boolean</string>
+                <key>Value</key>
+                <integer>0</integer>
+                </map>
   <key>RezWithLandGroup</key>
   <map>
     <key>Comment</key>
@@ -826,6 +848,17 @@
     <key>Value</key>
     <integer>0</integer>
   </map>
+  <key>ShowGroupNameInChatIM</key>
+  <map>
+    <key>Comment</key>
+    <string>Show the group name when receiving group IMs</string>
+    <key>Persist</key>
+    <integer>1</integer>
+    <key>Type</key>
+    <string>Boolean</string>
+    <key>Value</key>
+    <integer>1</integer>
+  </map>
   <key>ShowMiniMapRadar</key>
   <map>
     <key>Comment</key>
@@ -6212,7 +6245,7 @@
     <key>Type</key>
     <string>String</string>
     <key>Value</key>
-    <string>DejaVuSansCondensed.ttf</string>
+    <string>DroidSans.ttf</string>
   </map>
   <key>FontSansSerifBundledFallback</key>
   <map>
@@ -6223,7 +6256,7 @@
     <key>Type</key>
     <string>String</string>
     <key>Value</key>
-    <string>DejaVuSansCondensed.ttf</string>
+    <string>DroidSans.ttf</string>
   </map>
   <key>FontSansSerifBold</key>
   <map>
@@ -6234,7 +6267,7 @@
     <key>Type</key>
     <string>String</string>
     <key>Value</key>
-    <string>DejaVuSansCondensed-Bold.ttf</string>
+    <string>DroidSans-Bold.ttf</string>
   </map>
   <key>FontSansSerifFallback</key>
   <map>
diff --git a/linden/indra/newview/app_settings/viewerversion.xml b/linden/indra/newview/app_settings/viewerversion.xml
index 3b1a7df..f5fb533 100644
--- a/linden/indra/newview/app_settings/viewerversion.xml
+++ b/linden/indra/newview/app_settings/viewerversion.xml
@@ -20,6 +20,6 @@ need to be changed manually - MC
   <viewer version_patch="0" />
 
   <!--string-->
-  <viewer version_test="Experimental 2010.09.04" />
+  <viewer version_test="Experimental 2010.09.11" />
   
 </viewer_version>
diff --git a/linden/indra/newview/floaterlocalassetbrowse.cpp b/linden/indra/newview/floaterlocalassetbrowse.cpp
index c63fd2d..6564528 100644
--- a/linden/indra/newview/floaterlocalassetbrowse.cpp
+++ b/linden/indra/newview/floaterlocalassetbrowse.cpp
@@ -120,8 +120,14 @@ LocalBitmap::LocalBitmap(std::string fullpath)
 
                 /* getting file's last modified */
 
-                llstat temp_stat;
-                LLFile::stat(this->filename, &temp_stat);
+#ifdef LL_WINDOWS
+                struct _stat temp_stat;
+                _stat(this->filename.c_str(), &temp_stat);
+#else
+                struct stat temp_stat;
+                stat(this->filename.c_str(), &temp_stat);
+#endif
+
                 std::time_t time = temp_stat.st_mtime;
 
                 this->last_modified = asctime( localtime(&time) );
@@ -160,8 +166,14 @@ void LocalBitmap::updateSelf()
                 if ( !gDirUtilp->fileExists(this->filename) ) { this->linkstatus = LINK_BROKEN; return; }
 
                 /* exists, let's check if it's lastmod has changed */
-                llstat temp_stat;
-                LLFile::stat(this->filename, &temp_stat);
+
+#ifdef LL_WINDOWS
+                struct _stat temp_stat;
+                _stat(this->filename.c_str(), &temp_stat);
+#else
+                struct stat temp_stat;
+                stat(this->filename.c_str(), &temp_stat);
+#endif
                 std::time_t temp_time = temp_stat.st_mtime;
 
                 LLSD new_last_modified = asctime( localtime(&temp_time) );
diff --git a/linden/indra/newview/impprefsfonts.cpp b/linden/indra/newview/impprefsfonts.cpp
new file mode 100644
index 0000000..3ce71eb
--- /dev/null
+++ b/linden/indra/newview/impprefsfonts.cpp
@@ -0,0 +1,86 @@
+/**
+ * @file impprefsfonts.cpp
+ * @brief Font preferences panel
+ *
+ * Copyright (c) 2010, Jacek Antonelli
+ *
+ * The source code in this file ("Source Code") is provided to you
+ * under the terms of the GNU General Public License, version 2.0
+ * ("GPL"). Terms of the GPL can be found in doc/GPL-license.txt in
+ * this distribution, or online at
+ * http://secondlifegrid.net/programs/open_source/licensing/gplv2
+ *
+ * There are special exceptions to the terms and conditions of the GPL as
+ * it is applied to this Source Code. View the full text of the exception
+ * in the file doc/FLOSS-exception.txt in this software distribution, or
+ * online at
+ * http://secondlifegrid.net/programs/open_source/licensing/flossexception
+ *
+ * By copying, modifying or distributing this software, you acknowledge
+ * that you have read and understood your obligations described above,
+ * and agree to abide by those obligations.
+ *
+ * ALL SOURCE CODE IS PROVIDED "AS IS." THE AUTHOR MAKES NO
+ * WARRANTIES, EXPRESS, IMPLIED OR OTHERWISE, REGARDING ITS ACCURACY,
+ * COMPLETENESS OR PERFORMANCE.
+ */
+
+
+#include "llviewerprecompiledheaders.h"
+#include "impprefsfonts.h"
+
+#include "llradiogroup.h"
+#include "lluictrlfactory.h"
+
+#include "llviewercontrol.h"
+#include "llviewerwindow.h"
+
+
+ImpPrefsFonts::ImpPrefsFonts()
+{
+        LLUICtrlFactory::getInstance()->
+                buildPanel(this, "panel_preferences_fonts.xml");
+}
+
+ImpPrefsFonts::~ImpPrefsFonts()
+{
+}
+
+
+BOOL ImpPrefsFonts::postBuild()
+{
+        refresh();
+        return true;
+}
+
+
+void ImpPrefsFonts::refresh()
+{
+        LLRadioGroup* fonts = getChild<LLRadioGroup>("fonts");
+        if (fonts)
+        {
+                fonts->setValue( gSavedSettings.getString("FontChoice") );
+        }
+}
+
+void ImpPrefsFonts::apply()
+{
+        LLRadioGroup* fonts = getChild<LLRadioGroup>("fonts");
+
+        if (fonts)
+        {
+                std::string font_choice = fonts->getValue().asString();
+
+                if (font_choice != gSavedSettings.getString("FontChoice") &&
+                    !font_choice.empty())
+                {
+                        gSavedSettings.setString("FontChoice", font_choice);
+                        LLNotifications::instance().add("ChangeFont");
+                        refresh();
+                }
+        }
+}
+
+void ImpPrefsFonts::cancel()
+{
+}
diff --git a/linden/indra/newview/impprefsfonts.h b/linden/indra/newview/impprefsfonts.h
new file mode 100644
index 0000000..12aa0bb
--- /dev/null
+++ b/linden/indra/newview/impprefsfonts.h
@@ -0,0 +1,45 @@
+/**
+ * @file impprefsfonts.h
+ * @brief Font preferences panel
+ *
+ * Copyright (c) 2010, Jacek Antonelli
+ *
+ * The source code in this file ("Source Code") is provided to you
+ * under the terms of the GNU General Public License, version 2.0
+ * ("GPL"). Terms of the GPL can be found in doc/GPL-license.txt in
+ * this distribution, or online at
+ * http://secondlifegrid.net/programs/open_source/licensing/gplv2
+ *
+ * There are special exceptions to the terms and conditions of the GPL as
+ * it is applied to this Source Code. View the full text of the exception
+ * in the file doc/FLOSS-exception.txt in this software distribution, or
+ * online at
+ * http://secondlifegrid.net/programs/open_source/licensing/flossexception
+ *
+ * By copying, modifying or distributing this software, you acknowledge
+ * that you have read and understood your obligations described above,
+ * and agree to abide by those obligations.
+ *
+ * ALL SOURCE CODE IS PROVIDED "AS IS." THE AUTHOR MAKES NO
+ * WARRANTIES, EXPRESS, IMPLIED OR OTHERWISE, REGARDING ITS ACCURACY,
+ * COMPLETENESS OR PERFORMANCE.
+ */
+
+#ifndef IMP_PREFSFONTS_H
+#define IMP_PREFSFONTS_H
+
+#include "llpanel.h"
+
+class ImpPrefsFonts : public LLPanel
+{
+public:
+        ImpPrefsFonts();
+        virtual ~ImpPrefsFonts();
+
+        virtual BOOL postBuild();
+        void refresh();
+        void apply();
+        void cancel();
+};
+
+#endif // IMP_PREFSFONTS_H
diff --git a/linden/indra/newview/llagent.cpp b/linden/indra/newview/llagent.cpp
index 03d5c65..51b6c53 100644
--- a/linden/indra/newview/llagent.cpp
+++ b/linden/indra/newview/llagent.cpp
@@ -7209,6 +7209,8 @@ void LLAgent::makeNewOutfit(
                                 }
 
                                 LLViewerInventoryItem* item = gInventory.getItem(mWearableEntry[index].mItemID);
+                                if (!item) continue; //e.g. Ruth hair on OpenSim TODO: disable checkbox
+
                                 S32 todo = addWearableToAgentInventoryCallback::CALL_NONE;
                                 if (!found_first_item)
                                 {
diff --git a/linden/indra/newview/llappviewerlinux.cpp b/linden/indra/newview/llappviewerlinux.cpp
index bb6cf9f..bfad899 100644
--- a/linden/indra/newview/llappviewerlinux.cpp
+++ b/linden/indra/newview/llappviewerlinux.cpp
@@ -270,7 +270,7 @@ static inline BOOL do_elfio_glibc_backtrace()
                                     uintptr_t(stackarray[btpos]) < value+ssize)
                                 {
                                         // symbol is inside viewer
-                                        fprintf(StraceFile, "%-32s\t", "com.secondlife.indra.viewer");
+                                        fprintf(StraceFile, "%-32s\t", "org.imprudenceviewer.viewer");
                                         fprintf(StraceFile, "%p ", stackarray[btpos]);
 
                                         char *demangled_str = NULL;
diff --git a/linden/indra/newview/llfloaterpreference.cpp b/linden/indra/newview/llfloaterpreference.cpp
index 744c179..09336cb 100644
--- a/linden/indra/newview/llfloaterpreference.cpp
+++ b/linden/indra/newview/llfloaterpreference.cpp
@@ -48,6 +48,7 @@
 #include "llspinctrl.h"
 #include "message.h"
 
+#include "impprefsfonts.h"
 #include "llcommandhandler.h"
 #include "llfloaterpreference.h"
 #include "llpanelnetwork.h"
@@ -133,7 +134,8 @@ LLPreferenceCore::LLPreferenceCore(LLTabContainer* tab_container, LLButton * def
         mMsgPanel(NULL),
         mSkinsPanel(NULL),
         mLCDPanel(NULL),
-        mPrefsAdvanced(NULL)
+        mPrefsAdvanced(NULL),
+        mPrefsFonts(NULL)
 {
         mGeneralPanel = new LLPanelGeneral();
         mTabContainer->addTabPanel(mGeneralPanel, mGeneralPanel->getLabel(), FALSE, onTabChanged, mTabContainer);
@@ -197,6 +199,10 @@ LLPreferenceCore::LLPreferenceCore(LLTabContainer* tab_container, LLButton * def
         mTabContainer->addTabPanel(mPrefsAdvanced, mPrefsAdvanced->getLabel(), FALSE, onTabChanged, mTabContainer);
         mPrefsAdvanced->setDefaultBtn(default_btn);
 
+        mPrefsFonts = new ImpPrefsFonts();
+        mTabContainer->addTabPanel(mPrefsFonts, mPrefsFonts->getLabel(), FALSE, onTabChanged, mTabContainer);
+        mPrefsFonts->setDefaultBtn(default_btn);
+
         if (!mTabContainer->selectTab(gSavedSettings.getS32("LastPrefTab")))
         {
                 mTabContainer->selectFirstTab();
@@ -261,6 +267,11 @@ LLPreferenceCore::~LLPreferenceCore()
                 delete mPrefsAdvanced;
                 mPrefsAdvanced = NULL;
         }
+        if (mPrefsFonts)
+        {
+                delete mPrefsFonts;
+                mPrefsFonts = NULL;
+        }
 
 }
 
@@ -278,6 +289,7 @@ void LLPreferenceCore::apply()
         mMsgPanel->apply();
         mSkinsPanel->apply();
         mPrefsAdvanced->apply();
+        mPrefsFonts->apply();
 
         // hardware menu apply
         LLFloaterHardwareSettings::instance()->apply();
@@ -307,6 +319,7 @@ void LLPreferenceCore::cancel()
         mMsgPanel->cancel();
         mSkinsPanel->cancel();
         mPrefsAdvanced->cancel();
+        mPrefsFonts->cancel();
 
         // cancel hardware menu
         LLFloaterHardwareSettings::instance()->cancel();
diff --git a/linden/indra/newview/llfloaterpreference.h b/linden/indra/newview/llfloaterpreference.h
index 1878280..e98c45c 100644
--- a/linden/indra/newview/llfloaterpreference.h
+++ b/linden/indra/newview/llfloaterpreference.h
@@ -56,6 +56,7 @@ class LLPrefsIM;
 class LLPanelMsgs;
 class LLPanelSkins;
 class LLPrefsAdvanced;
+class ImpPrefsFonts;
 class LLScrollListCtrl;
 
 class LLPreferenceCore
@@ -93,6 +94,7 @@ private:
         LLPanelMsgs                             *mMsgPanel;
         LLPanelLCD                              *mLCDPanel;
         LLPrefsAdvanced                 *mPrefsAdvanced;
+  ImpPrefsFonts* mPrefsFonts;
 };
 
 // Floater to control preferences (display, audio, bandwidth, general.
diff --git a/linden/indra/newview/llpanelplace.cpp b/linden/indra/newview/llpanelplace.cpp
index d7939b9..eb3d17d 100644
--- a/linden/indra/newview/llpanelplace.cpp
+++ b/linden/indra/newview/llpanelplace.cpp
@@ -383,14 +383,14 @@ void LLPanelPlace::displayParcelInfo(const LLVector3& pos_region,
         std::string url = gAgent.getRegion()->getCapability("RemoteParcelRequest");
         if (!url.empty())
         {
-                body["location"] = ll_sd_from_vector3(pos_region);
+                body["location"] = ll_sd_from_vector3(mPosRegion);
                 if (!region_id.isNull())
                 {
                         body["region_id"] = region_id;
                 }
-                if (!pos_global.isExactlyZero())
+                if (!mPosGlobal.isExactlyZero())
                 {
-                        U64 region_handle = to_region_handle(pos_global);
+                        U64 region_handle = to_region_handle(mPosGlobal);
                         body["region_handle"] = ll_sd_from_U64(region_handle);
                 }
                 LLHTTPClient::post(url, body, new LLRemoteParcelRequestResponder(this->getHandle()));
diff --git a/linden/indra/newview/llpanelskins.cpp b/linden/indra/newview/llpanelskins.cpp
index 26de356..831adc8 100644
--- a/linden/indra/newview/llpanelskins.cpp
+++ b/linden/indra/newview/llpanelskins.cpp
@@ -60,6 +60,8 @@ BOOL LLPanelSkins::postBuild()
 
         getChild<LLButton>("classic_preview")->setClickedCallback(onClickClassic, this);
         getChild<LLButton>("silver_preview")->setClickedCallback(onClickSilver, this);
+        getChild<LLButton>("dark_preview")->setClickedCallback(onClickDark, this);
+        getChild<LLButton>("gemini_preview")->setClickedCallback(onClickGemini, this);
 
         refresh();
         return TRUE;
@@ -108,3 +110,19 @@ void LLPanelSkins::onClickSilver(void* data)
         gSavedSettings.setString("SkinCurrent", "silver");
         self->getChild<LLRadioGroup>("skin_selection")->setValue("silver");
 }
+
+//static 
+void LLPanelSkins::onClickDark(void* data)
+{
+        LLPanelSkins* self = (LLPanelSkins*)data;
+        gSavedSettings.setString("SkinCurrent", "dark");
+        self->getChild<LLRadioGroup>("skin_selection")->setValue("dark");
+}
+
+//static 
+void LLPanelSkins::onClickGemini(void* data)
+{
+        LLPanelSkins* self = (LLPanelSkins*)data;
+        gSavedSettings.setString("SkinCurrent", "gemini");
+        self->getChild<LLRadioGroup>("skin_selection")->setValue("gemini");
+}
diff --git a/linden/indra/newview/llpanelskins.h b/linden/indra/newview/llpanelskins.h
index 8fd282f..8dbd556 100644
--- a/linden/indra/newview/llpanelskins.h
+++ b/linden/indra/newview/llpanelskins.h
@@ -51,6 +51,8 @@ private:
         static void onSelectSkin(LLUICtrl* ctrl, void* data);
         static void onClickClassic(void* data);
         static void onClickSilver(void* data);
+        static void onClickDark(void* data);
+        static void onClickGemini(void* data);
 
 private:
         std::string mSkin;
diff --git a/linden/indra/newview/llpreviewgesture.cpp b/linden/indra/newview/llpreviewgesture.cpp
index ff3b943..ee1b634 100644
--- a/linden/indra/newview/llpreviewgesture.cpp
+++ b/linden/indra/newview/llpreviewgesture.cpp
@@ -564,14 +564,34 @@ void LLPreviewGesture::addModifiers()
         combo->setCurrentByIndex(0);
 }
 
+std::string magic_key(KEY key)
+{
+        char buffer[2];         /* Flawfinder: ignore */
+        buffer[0] = key;
+        buffer[1] = '\0';
+        std::string res = std::string(buffer);
+        std::string lolk = LLKeyboard::stringFromKey(key);
+        if(res == lolk)
+        {
+                if( key >= ' ' && key <= '~' )
+                {
+                        return lolk;
+                }else
+                {
+                        return "";
+                }
+        }
+        return lolk;
+}
 void LLPreviewGesture::addKeys()
 {
         LLComboBox* combo = mKeyCombo;
 
         combo->add( NONE_LABEL );
-        for (KEY key = KEY_F2; key <= KEY_F12; key++)
+        for (KEY key = ' '; key < KEY_NONE; key++)
         {
-                combo->add( LLKeyboard::stringFromKey(key), ADD_BOTTOM );
+                std::string keystr = magic_key(key);
+                if(keystr != "")combo->add( keystr, ADD_BOTTOM );
         }
         combo->setCurrentByIndex(0);
 }
@@ -1238,7 +1258,7 @@ void LLPreviewGesture::onSaveComplete(const LLUUID& asset_uuid, void* user_data,
                         else
                         {
                                 llwarns << "Inventory item for gesture " << info->mItemUUID
-                                                << " is no longer in agent inventory." << llendl
+                                                << " is no longer in agent inventory." << llendl;
                         }
                 }
                 else
diff --git a/linden/indra/newview/llstartup.cpp b/linden/indra/newview/llstartup.cpp
index 6622740..606262f 100644
--- a/linden/indra/newview/llstartup.cpp
+++ b/linden/indra/newview/llstartup.cpp
@@ -2935,17 +2935,29 @@ std::string LLStartUp::loadPasswordFromDisk()
                 return hashed_password;
         }
 
+        // UUID is 16 bytes, written into ASCII is 32 characters
+        // without trailing \0
+        const S32 HASHED_LENGTH = 32;
+
         std::string filepath = gDirUtilp->getExpandedFilename(LL_PATH_USER_SETTINGS,
                                                                                                            "password.dat");
         LLFILE* fp = LLFile::fopen(filepath, "rb");             /* Flawfinder: ignore */
         if (!fp)
         {
+#if LL_DARWIN
+                UInt32 passwordLength;
+                char *passwordData;
+                OSStatus stat = SecKeychainFindGenericPassword(NULL, 10, "Imprudence", 0, NULL, &passwordLength, (void**)&passwordData, NULL);
+                if (stat == noErr)
+                {
+                        if (passwordLength == HASHED_LENGTH)
+                                hashed_password.assign(passwordData, HASHED_LENGTH);
+                        SecKeychainItemFreeContent(NULL, passwordData);
+                }
+#endif
                 return hashed_password;
         }
 
-        // UUID is 16 bytes, written into ASCII is 32 characters
-        // without trailing \0
-        const S32 HASHED_LENGTH = 32;
         U8 buffer[HASHED_LENGTH+1];
 
         if (1 != fread(buffer, HASHED_LENGTH, 1, fp))
@@ -2969,6 +2981,10 @@ std::string LLStartUp::loadPasswordFromDisk()
         {
                 hashed_password.assign((char*)buffer);
         }
+#if LL_DARWIN
+        // we're migrating to the keychain
+        LLFile::remove(filepath);
+#endif
 
         return hashed_password;
 }
@@ -2977,6 +2993,19 @@ std::string LLStartUp::loadPasswordFromDisk()
 // static
 void LLStartUp::savePasswordToDisk(const std::string& hashed_password)
 {
+#if LL_DARWIN
+        SecKeychainItemRef keychainItem;
+        OSStatus status = SecKeychainFindGenericPassword(NULL, 10, "Imprudence", 0, NULL, NULL, NULL, &keychainItem);
+        if (status == noErr)
+        {
+                SecKeychainItemModifyAttributesAndData(keychainItem, NULL, hashed_password.length(), hashed_password.c_str());
+                CFRelease(keychainItem);
+        }
+        else
+        {
+                SecKeychainAddGenericPassword(NULL, 10, "Imprudence", 0, NULL, hashed_password.length(), hashed_password.c_str(), NULL);
+        }
+#else
         std::string filepath = gDirUtilp->getExpandedFilename(LL_PATH_USER_SETTINGS,
                                                                                                            "password.dat");
         LLFILE* fp = LLFile::fopen(filepath, "wb");             /* Flawfinder: ignore */
@@ -3000,12 +3029,22 @@ void LLStartUp::savePasswordToDisk(const std::string& hashed_password)
         }
 
         fclose(fp);
+#endif
 }
 
 
 // static
 void LLStartUp::deletePasswordFromDisk()
 {
+#if LL_DARWIN
+        SecKeychainItemRef keychainItem;
+        OSStatus status = SecKeychainFindGenericPassword(NULL, 10, "Imprudence", 0, NULL, NULL, NULL, &keychainItem);
+        if (status == noErr)
+        {
+                SecKeychainItemDelete(keychainItem);
+                CFRelease(keychainItem);
+        }
+#endif
         std::string filepath = gDirUtilp->getExpandedFilename(LL_PATH_USER_SETTINGS,
                                                                                                                   "password.dat");
         LLFile::remove(filepath);
diff --git a/linden/indra/newview/lltoolpie.cpp b/linden/indra/newview/lltoolpie.cpp
index 262c349..2887515 100644
--- a/linden/indra/newview/lltoolpie.cpp
+++ b/linden/indra/newview/lltoolpie.cpp
@@ -292,7 +292,10 @@ BOOL LLToolPie::pickAndShowMenu(BOOL always_show)
                         gViewerWindow->hideCursor();
                         LLToolCamera::getInstance()->setMouseCapture(TRUE);
                         LLToolCamera::getInstance()->pickCallback(mPick);
-                        gAgent.setFocusOnAvatar(TRUE, TRUE);
+                        if (gSavedSettings.getBOOL("ResetFocusOnSelfClick"))
+                        {
+                                gAgent.setFocusOnAvatar(TRUE, TRUE);
+                        }
 
                         return TRUE;
                 }
diff --git a/linden/indra/newview/llviewermessage.cpp b/linden/indra/newview/llviewermessage.cpp
index 56aed12..bfd1045 100755
--- a/linden/indra/newview/llviewermessage.cpp
+++ b/linden/indra/newview/llviewermessage.cpp
@@ -2313,7 +2313,20 @@ void process_improved_im(LLMessageSystem *msg, void **user_data)
                         position,
                         true);
 
-                chat.mText = std::string("IM: ") + name + separator_string +  saved + message.substr(message_offset);
+                std::string group_name;
+                if (gAgent.isInGroup(session_id) && gSavedSettings.getBOOL("ShowGroupNameInChatIM"))
+                {
+                        if (!(gCacheName->getGroupName(from_id, group_name)))
+                        {
+                                group_name = std::string((char*)binary_bucket);
+                        }
+                        chat.mText = std::string("IM [") + group_name + std::string("] ") + name 
+                                                + separator_string + saved + message.substr(message_offset);
+                }
+                else
+                {
+                        chat.mText = std::string("IM: ") + name + separator_string +  saved + message.substr(message_offset);
+                }
                 LLFloaterChat::addChat(chat, TRUE, is_this_agent);
         }
         break;
diff --git a/linden/indra/newview/llvoavatar.cpp b/linden/indra/newview/llvoavatar.cpp
index 513d43c..c8b26be 100644
--- a/linden/indra/newview/llvoavatar.cpp
+++ b/linden/indra/newview/llvoavatar.cpp
@@ -8401,7 +8401,7 @@ LLBBox LLVOAvatar::getHUDBBox() const
         {
                 attachment_map_t::const_iterator curiter = iter++;
                 LLViewerJointAttachment* attachment = curiter->second;
-                if (attachment->getIsHUDAttachment() && attachment->getObject())
+                if (attachment && attachment->getIsHUDAttachment() && attachment->getObject())
                 {
                         LLViewerObject* hud_object = attachment->getObject();
 
diff --git a/linden/indra/newview/skins/default/xui/en-us/fonts.xml b/linden/indra/newview/skins/default/xui/en-us/fonts.xml
index 95070ed..15a8254 100644
--- a/linden/indra/newview/skins/default/xui/en-us/fonts.xml
+++ b/linden/indra/newview/skins/default/xui/en-us/fonts.xml
@@ -18,44 +18,95 @@
     </os>
   </font>
 
-  <font name="SansSerif" comment="Name of san-serif font (Truetype file name)">
-    <file>DejaVuSansCondensed.ttf</file>
-  </font>
-
-  <font name="SansSerifBold" 
-        comment="Name of bold sans-serif font" 
-        font_style="Bold">
-    <file>DejaVuSansCondensed-Bold.ttf</file>
-  </font>
 
   <font name="Monospace"
         comment="Name of monospace font">
     <file>VeraMono.ttf</file>
   </font>
 
+
   <font name="DejaVu"
-        comment="Name of DejaVu font">
+        comment="Name of DejaVu font"
+        size_mult="1.00">
     <file>DejaVuSansCondensed.ttf</file>
   </font>
 
   <font name="DejaVu"
-        comment="Name of DejaVu font (bold)"
-        font_style="BOLD">
+        comment="Name of DejaVu font (bold)"
+        size_mult="1.00"
+        font_style="BOLD">
     <file>DejaVuSansCondensed-Bold.ttf</file>
   </font>
 
   <font name="DejaVu"
-        comment="Name of DejaVu font (italic)"
-        font_style="ITALIC">
+        comment="Name of DejaVu font (italic)"
+        size_mult="1.00"
+        font_style="ITALIC">
     <file>DejaVuSansCondensed-Oblique.ttf</file>
   </font>
 
   <font name="DejaVu"
-        comment="Name of DejaVu font (bold italic)"
-        font_style="BOLD|ITALIC">
+        comment="Name of DejaVu font (bold italic)"
+        size_mult="1.00"
+        font_style="BOLD|ITALIC">
     <file>DejaVuSansCondensed-BoldOblique.ttf</file>
   </font>
 
+
+  <font name="Delicious"
+        comment="Name of Delicious font"
+        size_mult="1.1">
+    <file>Delicious-Roman.otf</file>
+  </font>
+
+  <font name="Delicious"
+        comment="Name of Delicious font (bold)"
+        size_mult="1.1"
+        font_style="BOLD">
+    <file>Delicious-Bold.otf</file>
+  </font>
+
+  <font name="Delicious"
+        comment="Name of Delicious font (italic)"
+        size_mult="1.1"
+        font_style="ITALIC">
+    <file>Delicious-Italic.otf</file>
+  </font>
+
+  <font name="Delicious"
+        comment="Name of Delicious font (bold italic)"
+        size_mult="1.1"
+        font_style="BOLD|ITALIC">
+    <file>Delicious-BoldItalic.otf</file>
+  </font>
+
+
+  <font name="Liberation"
+        comment="Name of Liberation font">
+    <file>LiberationSans-Regular.ttf</file>
+  </font>
+
+  <font name="Liberation"
+        comment="Name of Liberation font (bold)"
+        font_style="BOLD">
+    <file>LiberationSans-Bold.ttf</file>
+  </font>
+
+
+  <font name="DroidSans"
+        comment="Name of DroidSans font"
+        size_mult="1.0">
+    <file>DroidSans.ttf</file>
+  </font>
+
+  <font name="DroidSans"
+        comment="Name of DroidSans font (bold)"
+        size_mult="1.0"
+        font_style="BOLD">
+    <file>DroidSans-Bold.ttf</file>
+  </font>
+
+
   <font name="Helvetica"
         comment="Name of Helvetica font">
     <file>arial.ttf</file>
diff --git a/linden/indra/newview/skins/default/xui/en-us/menu_viewer.xml b/linden/indra/newview/skins/default/xui/en-us/menu_viewer.xml
index 0522981..1de4c94 100644
--- a/linden/indra/newview/skins/default/xui/en-us/menu_viewer.xml
+++ b/linden/indra/newview/skins/default/xui/en-us/menu_viewer.xml
@@ -1344,8 +1344,7 @@
         <on_check function="Advanced.CheckWireframe" userdata="" />
       </menu_item_check>
       <menu_item_check name="Object-Object Occlusion"
-                       label="Object-Object Occlusion"
-                       shortcut="control|shift|O">
+                       label="Object-Object Occlusion">
         <on_click function="ToggleControl"
                   userdata="UseOcclusion" />
         <on_check control="UseOcclusion" />
diff --git a/linden/indra/newview/skins/default/xui/en-us/notifications.xml b/linden/indra/newview/skins/default/xui/en-us/notifications.xml
index 0de1df5..eced647 100644
--- a/linden/indra/newview/skins/default/xui/en-us/notifications.xml
+++ b/linden/indra/newview/skins/default/xui/en-us/notifications.xml
@@ -7084,6 +7084,13 @@ Apply this region's settings? (&quot;Ignore&quot; will ignore all region setting
   </form>
 </notification>
 
+<notification
+ name="ChangeFont"
+ icon="alertmodal.tga"
+ type="alertmodal">
+The new font will appear after you restart [VIEWER_NAME].
+</notification>
+
 
 <!--End Imprudence notifications-->
  <!-- [KITTY VIEWER] -->
diff --git a/linden/indra/newview/skins/default/xui/en-us/panel_preferences_advanced.xml b/linden/indra/newview/skins/default/xui/en-us/panel_preferences_advanced.xml
index b344d14..38033a3 100644
--- a/linden/indra/newview/skins/default/xui/en-us/panel_preferences_advanced.xml
+++ b/linden/indra/newview/skins/default/xui/en-us/panel_preferences_advanced.xml
@@ -180,10 +180,10 @@
             initial_value="true" label="Show chat messages from friends in a different color" left="12"
             mouse_opaque="true" name="HighlightFriendsChat" radio_style="false" width="270"/>
 
-        <color_swatch border_color="0.45098 0.517647 0.607843 1" bottom="-90"
+        <color_swatch border_color="0.45098 0.517647 0.607843 1" bottom="-100"
             can_apply_immediately="true" color="1 1 1 1" control_name="FriendsChatColor"
-            enabled="true" follows="left|top" height="56" label="Friends" left_delta="68"
-            mouse_opaque="true" name="FriendsChatColor" width="54" />
+            enabled="true" follows="left|top" height="67" label="Friends" left_delta="68"
+            mouse_opaque="true" name="FriendsChatColor" width="65" />
 
         <check_box bottom_delta="-30" enabled="true" follows="left|top"
                  font="SansSerifSmall" height="16" initial_value="true"
@@ -194,10 +194,10 @@
             initial_value="true" label="Show GroupIM messages containing your name in a different color" left="12"
             mouse_opaque="true" name="HighlightOwnNameInIM" radio_style="false" width="270"/>
 
-        <color_swatch border_color="0.45098 0.517647 0.607843 1" bottom="-210"
+        <color_swatch border_color="0.45098 0.517647 0.607843 1" bottom="-230"
             can_apply_immediately="true" color="1 1 1 1" control_name="OwnNameChatColor"
-            enabled="true" follows="left|top" height="56" label="Own Name" left_delta="68"
-            mouse_opaque="true" name="OwnNameChatColor" width="54" />
+            enabled="true" follows="left|top" height="67" label="Own Name" left_delta="68"
+            mouse_opaque="true" name="OwnNameChatColor" width="65" />
 
     </panel>
   </tab_container>
diff --git a/linden/indra/newview/skins/default/xui/en-us/panel_preferences_fonts.xml b/linden/indra/newview/skins/default/xui/en-us/panel_preferences_fonts.xml
new file mode 100644
index 0000000..3a27bd1
--- /dev/null
+++ b/linden/indra/newview/skins/default/xui/en-us/panel_preferences_fonts.xml
@@ -0,0 +1,49 @@
+<?xml version="1.0" encoding="utf-8" standalone="yes" ?>
+
+<panel name="font_panel" label="Fonts"
+       bottom="-409" left="102" height="408" width="517"
+       border="true" follows="left|top|right|bottom">
+
+  <text bottom="-25" left="10" height="15" width="300">
+    User interface font (requires restart):
+  </text>
+
+  <radio_group name="fonts" draw_border="false"
+               top="-30" left="20" bottom="0" right="-20"
+               follows="top|left|bottom|right">
+
+    <radio_item name="DroidSans" bottom="-20" left="0" height="20">
+      Droid Sans
+    </radio_item>
+    
+    <radio_item name="DejaVu" bottom="-70" left="0" height="20">
+      DejaVu Sans Condensed
+    </radio_item>
+
+    <radio_item name="Delicious" bottom="-120" left="0" height="20">
+      Delicious
+    </radio_item>
+    
+    <radio_item name="Liberation" bottom="-170" left="0" height="20">
+      Liberation Sans (classic Imprudence font)
+    </radio_item>
+    
+  </radio_group>
+
+  <text name="droid_preview" font="DroidSansMedium" top="-55" left="60">
+    Preview: The quick brown fox jumped over the lazy dog. :)
+  </text>
+
+  <text name="dejavu_preview" font="DejaVuMedium" top="-105" left="60">
+    Preview: The quick brown fox jumped over the lazy dog. :)
+  </text>
+
+  <text name="del_preview" font="DeliciousMedium" top="-155" left="60">
+    Preview: The quick brown fox jumped over the lazy dog. :)
+  </text>
+
+  <text name="lib_preview" font="LiberationMedium" top="-205" left="60">
+    Preview: The quick brown fox jumped over the lazy dog. :)
+  </text>
+
+</panel>
diff --git a/linden/indra/newview/skins/default/xui/en-us/panel_preferences_graphics1.xml b/linden/indra/newview/skins/default/xui/en-us/panel_preferences_graphics1.xml
index 153a111..72a6438 100644
--- a/linden/indra/newview/skins/default/xui/en-us/panel_preferences_graphics1.xml
+++ b/linden/indra/newview/skins/default/xui/en-us/panel_preferences_graphics1.xml
@@ -286,7 +286,7 @@
         <slider bottom_delta="-22" can_edit_text="false" control_name="RenderVolumeLODFactor"
              decimal_digits="3" enabled="true" follows="left|top" height="16"
              increment="0.125" initial_val="160" label="  Objects:"
-             label_width="140" left_delta="0" max_val="2" min_val="0"
+             label_width="140" left_delta="0" max_val="4" min_val="0"
              mouse_opaque="true" name="ObjectMeshDetail" show_text="false" width="223" />
         <slider bottom_delta="-20" can_edit_text="false" control_name="RenderFlexTimeFactor"
              decimal_digits="3" enabled="true" follows="left|top" height="16"
diff --git a/linden/indra/newview/skins/default/xui/en-us/panel_preferences_skins.xml b/linden/indra/newview/skins/default/xui/en-us/panel_preferences_skins.xml
index f0b789e..0611ce3 100644
--- a/linden/indra/newview/skins/default/xui/en-us/panel_preferences_skins.xml
+++ b/linden/indra/newview/skins/default/xui/en-us/panel_preferences_skins.xml
@@ -2,21 +2,50 @@
 <panel border="true" bottom="-409" enabled="true" follows="left|top|right|bottom"
      height="408" label="Skins" left="102" mouse_opaque="true"
      name="Skins panel" width="517">
-        <text type="string" length="1" bg_visible="false" border_drop_shadow_visible="false" border_visible="false"
+  <text type="string" length="1" bg_visible="false" border_drop_shadow_visible="false" border_visible="false"
              bottom="-22" drop_shadow_visible="true" enabled="true" follows="left|top"
              font="SansSerifSmall" h_pad="0" halign="left" height="12" left="10"
              mouse_opaque="true" name="muting_text" v_pad="0" width="400">
-                Select a Skin (Requires Restart):
-        </text>
+    Select a skin (requires restart).
+  </text>
   <radio_group bottom="0" draw_border="false" follows="top|left" height="380" left="12"
              name="skin_selection" width="480">
     <radio_item bottom="-20" height="20" left="0" name="default" width="480">
       Default
     </radio_item>
-    <radio_item bottom="-180" height="20" left="0" name="silver" width="480">
+    <radio_item bottom_delta="-50" height="20" left="0" name="silver" width="480">
       Silver
     </radio_item>
+    <radio_item bottom_delta="-50" height="20" left="0" name="dark" width="480">
+      Dark
+    </radio_item>
+    <radio_item bottom_delta="-50" height="20" left="0" name="gemini" width="480">
+      Gemini
+    </radio_item>
   </radio_group>
-  <button left="130" bottom="-160" width="298" height="130" name="classic_preview" label="" scale_image="true" image_selected="skin_thumbnail_default.png" image_unselected="skin_thumbnail_default.png" image_hover_selected="skin_thumbnail_default.png" image_hover_unselected="skin_thumbnail_default.png"/>
-  <button left="130" bottom="-320" width="298" height="130" name="silver_preview" label="" scale_image="true" image_selected="skin_thumbnail_silver.png" image_hover_selected="skin_thumbnail_silver.png" image_unselected="skin_thumbnail_silver.png" image_hover_unselected="skin_thumbnail_silver.png"/>
+  
+  <button left="130" bottom="-125" width="216" height="95" name="classic_preview" 
+          scale_image="true" label="" image_selected="skin_thumbnail_default.png" 
+          image_unselected="skin_thumbnail_default.png" image_hover_selected="skin_thumbnail_default.png"
+          image_hover_unselected="skin_thumbnail_default.png" follows="left|top" />
+  <button left="130" bottom_delta="-100" width="216" height="95" name="silver_preview" 
+          scale_image="true" label="" image_selected="skin_thumbnail_silver.png" 
+          image_hover_selected="skin_thumbnail_silver.png" image_unselected="skin_thumbnail_silver.png" 
+          image_hover_unselected="skin_thumbnail_silver.png" follows="left|top" />
+  <button left="130" bottom_delta="-100" width="216" height="95" name="dark_preview"
+          scale_image="true" label="" image_selected="skin_thumbnail_dark.png"
+          image_hover_selected="skin_thumbnail_dark.png" image_unselected="skin_thumbnail_dark.png"
+          image_hover_unselected="skin_thumbnail_dark.png" follows="left|top" />
+  <button left="130" bottom_delta="-100" width="216" height="95" name="gemini_preview" 
+          scale_image="true" label="" image_selected="skin_thumbnail_gemini.png" 
+          image_hover_selected="skin_thumbnail_gemini.png" image_unselected="skin_thumbnail_gemini.png" 
+          image_hover_unselected="skin_thumbnail_gemini.png" follows="left|top" />
+
+  <text type="string" length="1" bg_visible="false" border_drop_shadow_visible="false" border_visible="false"
+             bottom="10" drop_shadow_visible="true" enabled="true" follows="left|bottom"
+             font="SansSerifSmall" h_pad="0" halign="left" height="12" left="90"
+             mouse_opaque="true" name="muting_text" v_pad="0" width="400">
+    (Please see the skin folders for information and credits)
+  </text>
 </panel>
+
diff --git a/linden/indra/newview/viewer_manifest.py b/linden/indra/newview/viewer_manifest.py
index 15172f2..f66fa5b 100755
--- a/linden/indra/newview/viewer_manifest.py
+++ b/linden/indra/newview/viewer_manifest.py
@@ -75,16 +75,29 @@ class ViewerManifest(LLManifest):
 
         # Include our fonts
         if self.prefix(src="fonts"):
+            self.path("GPL.txt")
+            self.path("Liberation-License.txt")
             self.path("LiberationSans-Bold.ttf")
             self.path("LiberationSans-Regular.ttf")
-            self.path("VeraMono.ttf")
+
+            self.path("Delicious-License.txt")
+            self.path("Delicious-BoldItalic.otf")
+            self.path("Delicious-Bold.otf")
+            self.path("Delicious-Italic.otf")
+            self.path("Delicious-Roman.otf")
+
+            self.path("Droid-License.txt")
+            self.path("DroidSans-Bold.ttf")
+            self.path("DroidSans.ttf")
+
+            self.path("DejaVu-License.txt")
             self.path("DejaVuSansCondensed-BoldOblique.ttf")
             self.path("DejaVuSansCondensed-Bold.ttf")
             self.path("DejaVuSansCondensed-Oblique.ttf")
             self.path("DejaVuSansCondensed.ttf")
-            self.path("GPL.txt")
-            self.path("Liberation-License.txt")
+
             self.path("Vera-License.txt")
+            self.path("VeraMono.ttf")
             self.end_prefix("fonts")
 
         # skins
@@ -531,6 +544,7 @@ class DarwinManifest(ViewerManifest):
             if self.prefix(src="../../libraries/universal-darwin/lib_release", dst="MacOS/"):
 
                 self.path("libndofdev.dylib")
+                self.path("libhunspell-1.2.dylib")
                 
                 self.path("libopenal.1.dylib")
                 self.path("libalut.0.dylib")