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

1 files changed, 9 insertions, 9 deletions

diff --git a/indra/newview/llmarketplacenotifications.h b/indra/newview/llmarketplacenotifications.h
index 83a4e163c7..a602b930de 100644
--- a/indra/newview/llmarketplacenotifications.h
+++ b/indra/newview/llmarketplacenotifications.h
@@ -1,4 +1,4 @@
-/** 
+/**
  * @file llmarketplacenotifications.h
  * @brief Handler for notifications related to marketplace file I/O
  * class definition
@@ -6,21 +6,21 @@
  * $LicenseInfo:firstyear=2001&license=viewerlgpl$
  * Second Life Viewer Source Code
  * Copyright (C) 2011, 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$
  */
@@ -46,11 +46,11 @@
 
 namespace LLMarketplaceInventoryNotifications
 {
-	void update();
+    void update();
+
+    typedef boost::function<void (const LLSD&)> NoCopyCallbackFunction;
 
-	typedef boost::function<void (const LLSD&)> NoCopyCallbackFunction;
-	
-	void addNoCopyNotification(const LLSD& payload, const NoCopyCallbackFunction& cb);
+    void addNoCopyNotification(const LLSD& payload, const NoCopyCallbackFunction& cb);
 };