Merge commit 'e7eced3' into lua-timers for whitespace fixes.

1 files changed, 23 insertions, 23 deletions

diff --git a/indra/newview/llvoinventorylistener.h b/indra/newview/llvoinventorylistener.h
index c50c475478..3686aa25cf 100644
--- a/indra/newview/llvoinventorylistener.h
+++ b/indra/newview/llvoinventorylistener.h
@@ -1,25 +1,25 @@
-/** 
+/**
  * @file llvoinventorylistener.h
  * @brief Interface for classes that wish to receive updates about viewer object inventory
  *
  * $LicenseInfo:firstyear=2001&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$
  */
@@ -37,31 +37,31 @@ class LLViewerObject;
 class LLVOInventoryListener
 {
 public:
-	virtual void inventoryChanged(LLViewerObject* object,
-								 LLInventoryObject::object_list_t* inventory,
-								 S32 serial_num,
-								 void* user_data) = 0;
+    virtual void inventoryChanged(LLViewerObject* object,
+                                 LLInventoryObject::object_list_t* inventory,
+                                 S32 serial_num,
+                                 void* user_data) = 0;
 
-	// Remove the listener from the object and clear this listener
-	void removeVOInventoryListener();
+    // Remove the listener from the object and clear this listener
+    void removeVOInventoryListener();
 
-	// Just clear this listener, don't worry about the object.
-	void clearVOInventoryListener();
+    // Just clear this listener, don't worry about the object.
+    void clearVOInventoryListener();
 
 protected:
-	LLVOInventoryListener() : mListenerVObject(NULL) { }
-	virtual ~LLVOInventoryListener() { removeVOInventoryListener(); }
+    LLVOInventoryListener() : mListenerVObject(NULL) { }
+    virtual ~LLVOInventoryListener() { removeVOInventoryListener(); }
 
-	void registerVOInventoryListener(LLViewerObject* object, void* user_data);
-	void requestVOInventory();
+    void registerVOInventoryListener(LLViewerObject* object, void* user_data);
+    void requestVOInventory();
 
 private:
-	// LLViewerObject is normally wrapped by an LLPointer, but not in
-	// this case, because it's already sure to be kept alive by
-	// LLPointers held by other objects that have longer lifetimes
-	// than this one.  Plumbing correct LLPointer usage all the way
-	// down here has been deemed too much work for now.
-	LLViewerObject *mListenerVObject;
+    // LLViewerObject is normally wrapped by an LLPointer, but not in
+    // this case, because it's already sure to be kept alive by
+    // LLPointers held by other objects that have longer lifetimes
+    // than this one.  Plumbing correct LLPointer usage all the way
+    // down here has been deemed too much work for now.
+    LLViewerObject *mListenerVObject;
 };
 
 #endif