Merge remote-tracking branch 'origin/DRTVWR-600-maint-A' into brad/merge-maint-a-to-dev

1 files changed, 44 insertions, 44 deletions

diff --git a/indra/newview/llsidepanelinventorysubpanel.cpp b/indra/newview/llsidepanelinventorysubpanel.cpp
index 58982a38f5..820ceed296 100644
--- a/indra/newview/llsidepanelinventorysubpanel.cpp
+++ b/indra/newview/llsidepanelinventorysubpanel.cpp
@@ -1,25 +1,25 @@
-/** 
+/**
  * @file llsidepanelinventorysubpanel.cpp
  * @brief A floater which shows an inventory item's properties.
  *
  * $LicenseInfo:firstyear=2002&license=viewerlgpl$
  * Second Life Viewer Source Code
  * Copyright (C) 2010, Linden Research, Inc.
- * 
+ *
  * This library is free software; you can redistribute it and/or
  * modify it under the terms of the GNU Lesser General Public
  * License as published by the Free Software Foundation;
  * version 2.1 of the License only.
- * 
+ *
  * This library is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
  * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
  * Lesser General Public License for more details.
- * 
+ *
  * You should have received a copy of the GNU Lesser General Public
  * License along with this library; if not, write to the Free Software
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301  USA
- * 
+ *
  * Linden Research, Inc., 945 Battery Street, San Francisco, CA  94111  USA
  * $/LicenseInfo$
  */
@@ -48,9 +48,9 @@
 // Default constructor
 LLSidepanelInventorySubpanel::LLSidepanelInventorySubpanel(const LLPanel::Params& p)
   : LLPanel(p),
-	mIsDirty(true),
-	mIsEditing(false),
-	mCancelBtn(NULL)
+    mIsDirty(true),
+    mIsEditing(false),
+    mCancelBtn(NULL)
 {
 }
 
@@ -63,77 +63,77 @@ LLSidepanelInventorySubpanel::~LLSidepanelInventorySubpanel()
 bool LLSidepanelInventorySubpanel::postBuild()
 {
 
-	mCancelBtn = findChild<LLButton>("cancel_btn");
-	if (mCancelBtn)
-	{
-		mCancelBtn->setClickedCallback(boost::bind(&LLSidepanelInventorySubpanel::onCancelButtonClicked, this));
-	}
-	return true;
+    mCancelBtn = findChild<LLButton>("cancel_btn");
+    if (mCancelBtn)
+    {
+        mCancelBtn->setClickedCallback(boost::bind(&LLSidepanelInventorySubpanel::onCancelButtonClicked, this));
+    }
+    return true;
 }
 
 void LLSidepanelInventorySubpanel::setVisible(bool visible)
 {
-	if (visible)
-	{
-		dirty();
-	}
-	LLPanel::setVisible(visible);
+    if (visible)
+    {
+        dirty();
+    }
+    LLPanel::setVisible(visible);
 }
 
 void LLSidepanelInventorySubpanel::setIsEditing(bool edit)
 {
-	mIsEditing = edit;
-	mIsDirty = true;
+    mIsEditing = edit;
+    mIsDirty = true;
 }
 
 bool LLSidepanelInventorySubpanel::getIsEditing() const
 {
 
-	return true; // Default everything to edit mode since we're not using an edit button anymore.
-	// return mIsEditing;
+    return true; // Default everything to edit mode since we're not using an edit button anymore.
+    // return mIsEditing;
 }
 
 void LLSidepanelInventorySubpanel::reset()
 {
-	mIsDirty = true;
+    mIsDirty = true;
 }
 
 void LLSidepanelInventorySubpanel::draw()
 {
-	if (mIsDirty)
-	{
-		refresh();
-		updateVerbs();
-		mIsDirty = false;
-	}
-
-	LLPanel::draw();
+    if (mIsDirty)
+    {
+        refresh();
+        updateVerbs();
+        mIsDirty = false;
+    }
+
+    LLPanel::draw();
 }
 
 void LLSidepanelInventorySubpanel::dirty()
 {
-	mIsDirty = true;
-	setIsEditing(false);
+    mIsDirty = true;
+    setIsEditing(false);
 }
 
 void LLSidepanelInventorySubpanel::updateVerbs()
 {
-	if (mCancelBtn)
-	{
-		mCancelBtn->setVisible(mIsEditing);
-	}
+    if (mCancelBtn)
+    {
+        mCancelBtn->setVisible(mIsEditing);
+    }
 }
 
 void LLSidepanelInventorySubpanel::onEditButtonClicked()
 {
-	setIsEditing(true);
-	refresh();
-	updateVerbs();
+    setIsEditing(true);
+    refresh();
+    updateVerbs();
 }
 
 void LLSidepanelInventorySubpanel::onCancelButtonClicked()
 {
-	setIsEditing(false);
-	refresh();
-	updateVerbs();
+    setIsEditing(false);
+    refresh();
+    updateVerbs();
 }