Second Life viewer sources 1.19.0.0

1 files changed, 7 insertions, 5 deletions

diff --git a/linden/indra/newview/llpanelobject.cpp b/linden/indra/newview/llpanelobject.cpp
index bd7f700..e4e28b8 100644
--- a/linden/indra/newview/llpanelobject.cpp
+++ b/linden/indra/newview/llpanelobject.cpp
@@ -12,12 +12,12 @@
  * ("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
+ * 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://secondlife.com/developers/opensource/flossexception
+ * 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,
@@ -350,7 +350,7 @@ void LLPanelObject::getState( )
                 //forfeit focus
                 if (gFocusMgr.childHasKeyboardFocus(this))
                 {
-                        gFocusMgr.setKeyboardFocus(NULL, NULL);
+                        gFocusMgr.setKeyboardFocus(NULL);
                 }
 
                 // Disable all text input fields
@@ -1095,10 +1095,12 @@ void LLPanelObject::getState( )
                         {
                                 mLabelSculptType->setEnabled(TRUE);
                         }
-
-                        
                 }
         }
+        else
+        {
+                mSculptTextureRevert = LLUUID::null;
+        }
 
         
         //----------------------------------------------------------------------------