Merge branch 'next' of git://github.com/jacek/imprudence into next

Conflicts (manually merged):
	linden/indra/llcommon/llversionviewer.h
	linden/indra/llvfs/lldir.cpp
	linden/indra/llvfs/lldir_mac.cpp
	linden/indra/newview/CMakeLists.txt
	linden/indra/newview/English.lproj/InfoPlist.strings
	linden/indra/newview/Info-Imprudence.plist
	linden/indra/newview/Info-meta-impy.plist
	linden/indra/newview/llappviewer.cpp
	linden/indra/newview/llpanellogin.cpp
	linden/indra/newview/packaging/mac/Info.plist.in
	linden/indra/newview/res/viewerRes.rc
	linden/indra/newview/skins/default/xui/en-us/floater_about.xml
	linden/indra/newview/skins/default/xui/en-us/panel_preferences_advanced.xml
	linden/indra/newview/skins/default/xui/en-us/panel_preferences_graphics1.xml
	linden/indra/newview/skins/default/xui/en-us/panel_preferences_im.xml
	linden/indra/newview/skins/default/xui/en-us/panel_preferences_skins.xml
	linden/indra/newview/skins/default/xui/en-us/panel_preferences_web.xml
	linden/indra/newview/skins/default/xui/zh/menu_viewer.xml
	linden/indra/newview/skins/default/xui/zh/panel_group_general.xml
	linden/indra/newview/viewer_manifest.py
	linden/indra/newview/viewerversion.cpp
	linden/indra/newview/viewerversion.h
	linden/install.xml

Also some post merge tweaks.

4 files changed, 23 insertions, 45 deletions

diff --git a/linden/indra/llui/lllineeditor.cpp b/linden/indra/llui/lllineeditor.cpp
index 453bb50..5f16853 100644
--- a/linden/indra/llui/lllineeditor.cpp
+++ b/linden/indra/llui/lllineeditor.cpp
@@ -223,18 +223,15 @@ LLLineEditor::LLLineEditor(const std::string& name, const LLRect& rect,
         }
         mImage = sImage;
 
-
         LLMenuGL* menu = LLUICtrlFactory::getInstance()->buildMenu("menu_rightclick_text.xml",this);
         if (!menu)
         {
-                  menu = new LLMenuGL(LLStringUtil::null);
+                menu = new LLMenuGL(LLStringUtil::null);
         }
 
         defineMenuCallbacks(menu);
         mPopupMenuHandle = menu->getHandle();
-        menu->setBorderColor(gColors.getColor("MenuItemDisabledColor"));
         menu->setBackgroundColor(gColors.getColor("MenuPopupBgColor"));
-
 }
 
 
@@ -1344,7 +1341,7 @@ void LLLineEditor::defineMenuCallbacks(LLMenuGL* menu) {
                               "Select All Text",
                               this,
                               (void*)context_enable_selectall);
-        menu->setCtrlResponse(1+LLCallbackInformation::LL_MENU_ITEM_CALL_GL_ON_CLICK,
+        menu->setCtrlResponse(LLCallbackInformation::LL_MENU_ITEM_CALL_GL_ON_CLICK,
                               "Select All Text",
                               this,
                               (void*)context_selectall);
diff --git a/linden/indra/llui/llmenugl.cpp b/linden/indra/llui/llmenugl.cpp
index d5e1186..2d4a2f1 100644
--- a/linden/indra/llui/llmenugl.cpp
+++ b/linden/indra/llui/llmenugl.cpp
@@ -3099,8 +3099,7 @@ void LLMenuGL::draw( void )
 
         if( mBgVisible )
         {
-                gl_rect_2d( -1, getRect().getHeight()+2, getRect().getWidth()+2, -2, mBorderColor,FALSE);
-                gl_rect_2d(  0, getRect().getHeight(),   getRect().getWidth(),   0, mBackgroundColor );
+                gl_rect_2d(  0, getRect().getHeight(),   getRect().getWidth(),    0, mBackgroundColor );
         }
         LLView::draw();
 }
@@ -3157,37 +3156,18 @@ LLMenuGL* LLMenuGL::getChildMenuByName(const std::string& name, BOOL recurse) co
 }
 
 
-void LLMenuGL::setBackgroundColor( const LLColor4& color ) {
-
-  mBackgroundColor = color;
-  item_list_t::iterator item_iter;
-  for (item_iter = mItems.begin(); item_iter != mItems.end(); ++item_iter)
-    {
-              if((*item_iter)->getType()=="menu")
-                 {
-                   LLMenuItemBranchGL *menuBranchItem = (LLMenuItemBranchGL*)(*item_iter);
-                   menuBranchItem->getBranch()->setBackgroundColor(color);
-                 }
-    }
-
-
-}
-
-
-void LLMenuGL::setBorderColor( const LLColor4& color ) {
-
-  mBorderColor = color;
-  item_list_t::iterator item_iter;
-  for (item_iter = mItems.begin(); item_iter != mItems.end(); ++item_iter)
+void LLMenuGL::setBackgroundColor( const LLColor4& color )
+{
+        mBackgroundColor = color;
+        item_list_t::iterator item_iter;
+        for (item_iter = mItems.begin(); item_iter != mItems.end(); ++item_iter)
     {
-              if((*item_iter)->getType()=="menu")
-                 {
-                   LLMenuItemBranchGL *menuBranchItem = (LLMenuItemBranchGL*)(*item_iter);
-                   menuBranchItem->getBranch()->setBorderColor(color);
-                 }
-    }
-
-
+        if((*item_iter)->getType()=="menu")
+                {
+                        LLMenuItemBranchGL *menuBranchItem = (LLMenuItemBranchGL*)(*item_iter);
+                        menuBranchItem->getBranch()->setBackgroundColor(color);
+                }
+        }
 }
 
 
diff --git a/linden/indra/llui/llmenugl.h b/linden/indra/llui/llmenugl.h
index 9a9d1b0..3b57a32 100644
--- a/linden/indra/llui/llmenugl.h
+++ b/linden/indra/llui/llmenugl.h
@@ -514,10 +514,8 @@ public:
 
         // background colors
         static void setDefaultBackgroundColor( const LLColor4& color ) { sDefaultBackgroundColor = color; }
-        void setBackgroundColor( const LLColor4& color );
-        void setBorderColor( const LLColor4& color );
+    void setBackgroundColor( const LLColor4& color );
         const LLColor4& getBackgroundColor() const { return mBackgroundColor; }
-        const LLColor4& getBorderColor() const { return mBorderColor; }
         void setBackgroundVisible( BOOL b )     { mBgVisible = b; }
         void setCanTearOff(BOOL tear_off, LLHandle<LLFloater> parent_floater_handle = LLHandle<LLFloater>());
 
@@ -631,7 +629,6 @@ private:
         static BOOL             sKeyboardMode;
 
         LLColor4                mBackgroundColor;
-        LLColor4                mBorderColor;
         BOOL                    mBgVisible;
         LLMenuItemGL*   mParentMenuItem;
         LLUIString              mLabel;
diff --git a/linden/indra/llui/lltexteditor.cpp b/linden/indra/llui/lltexteditor.cpp
index 28859b1..8612427 100644
--- a/linden/indra/llui/lltexteditor.cpp
+++ b/linden/indra/llui/lltexteditor.cpp
@@ -389,14 +389,12 @@ LLTextEditor::LLTextEditor(
         LLMenuGL* menu = LLUICtrlFactory::getInstance()->buildMenu("menu_rightclick_text.xml",this);
         if (!menu)
         {
-                  menu = new LLMenuGL(LLStringUtil::null);
+                menu = new LLMenuGL(LLStringUtil::null);
         }
 
         defineMenuCallbacks(menu);
         mPopupMenuHandle = menu->getHandle();
-        menu->setBorderColor(gColors.getColor("MenuItemDisabledColor"));
         menu->setBackgroundColor(gColors.getColor("MenuPopupBgColor"));
-
 }
 
 LLTextEditor::~LLTextEditor()
@@ -636,7 +634,7 @@ void LLTextEditor::defineMenuCallbacks(LLMenuGL* menu) {
                               "Select All Text",
                               this,
                               (void*)context_enable_selectall);
-        menu->setCtrlResponse(1+LLCallbackInformation::LL_MENU_ITEM_CALL_GL_ON_CLICK,
+        menu->setCtrlResponse(LLCallbackInformation::LL_MENU_ITEM_CALL_GL_ON_CLICK,
                               "Select All Text",
                               this,
                               (void*)context_selectall);
@@ -3869,6 +3867,12 @@ void LLTextEditor::onTabInto()
 // virtual
 void LLTextEditor::clear()
 {
+        // Also clear any styling we might have added -- MC
+        mParseHTML = FALSE;
+        mParseHighlights = FALSE;
+
+        mSegments.clear();
+
         setText(LLStringUtil::null);
         std::for_each(mSegments.begin(), mSegments.end(), DeletePointer());
         mSegments.clear();