Merge DRTVWR-591-maint-X to main on promotion of secondlife/viewer #705: Maintenance X

1 files changed, 37 insertions, 37 deletions

diff --git a/indra/newview/llplacesinventorybridge.h b/indra/newview/llplacesinventorybridge.h
index 108991210f..270e0690f5 100644
--- a/indra/newview/llplacesinventorybridge.h
+++ b/indra/newview/llplacesinventorybridge.h
@@ -1,25 +1,25 @@
-/** 
+/**
  * @file llplacesinventorybridge.h
  * @brief Declaration of the Inventory-Folder-View-Bridge classes for Places Panel.
  *
  * $LicenseInfo:firstyear=2009&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$
  */
@@ -36,21 +36,21 @@ class LLFolderViewFolder;
  */
 class LLPlacesLandmarkBridge : public LLLandmarkBridge
 {
-	friend class LLPlacesInventoryBridgeBuilder;
+    friend class LLPlacesInventoryBridgeBuilder;
 
 public:
-	/*virtual*/ void buildContextMenu(LLMenuGL& menu, U32 flags);
+    /*virtual*/ void buildContextMenu(LLMenuGL& menu, U32 flags);
 
 protected:
-	LLPlacesLandmarkBridge(LLInventoryType::EType type, 
-						   LLInventoryPanel* inventory,
-						   LLFolderView* root,
-						   const LLUUID& uuid, 
-						   U32 flags = 0x00) :
-		LLLandmarkBridge(inventory, root, uuid, flags)
-	{
-		mInvType = type;
-	}
+    LLPlacesLandmarkBridge(LLInventoryType::EType type,
+                           LLInventoryPanel* inventory,
+                           LLFolderView* root,
+                           const LLUUID& uuid,
+                           U32 flags = 0x00) :
+        LLLandmarkBridge(inventory, root, uuid, flags)
+    {
+        mInvType = type;
+    }
 };
 
 /**
@@ -58,22 +58,22 @@ protected:
  */
 class LLPlacesFolderBridge : public LLFolderBridge
 {
-	friend class LLPlacesInventoryBridgeBuilder;
+    friend class LLPlacesInventoryBridgeBuilder;
 
 public:
-	/*virtual*/ void buildContextMenu(LLMenuGL& menu, U32 flags);
-	/*virtual*/ void performAction(LLInventoryModel* model, std::string action);
+    /*virtual*/ void buildContextMenu(LLMenuGL& menu, U32 flags);
+    /*virtual*/ void performAction(LLInventoryModel* model, std::string action);
 
 protected:
-	LLPlacesFolderBridge(LLInventoryType::EType type, 
-						 LLInventoryPanel* inventory,
-						 LLFolderView* root,						 
-						 const LLUUID& uuid) :
-		LLFolderBridge(inventory, root, uuid)
-	{
-		mInvType = type;
-	}
-	LLFolderViewFolder* getFolder();
+    LLPlacesFolderBridge(LLInventoryType::EType type,
+                         LLInventoryPanel* inventory,
+                         LLFolderView* root,
+                         const LLUUID& uuid) :
+        LLFolderBridge(inventory, root, uuid)
+    {
+        mInvType = type;
+    }
+    LLFolderViewFolder* getFolder();
 };
 
 
@@ -85,16 +85,16 @@ protected:
 class LLPlacesInventoryBridgeBuilder : public LLInventoryFolderViewModelBuilder
 {
 public:
-	LLPlacesInventoryBridgeBuilder() {}
+    LLPlacesInventoryBridgeBuilder() {}
 
-	/*virtual*/ LLInvFVBridge* createBridge(LLAssetType::EType asset_type,
-											LLAssetType::EType actual_asset_type,
-											LLInventoryType::EType inv_type,
-											LLInventoryPanel* inventory,
-											LLFolderViewModelInventory* view_model,
-											LLFolderView* root,
-											const LLUUID& uuid,
-											U32 flags = 0x00) const;
+    /*virtual*/ LLInvFVBridge* createBridge(LLAssetType::EType asset_type,
+                                            LLAssetType::EType actual_asset_type,
+                                            LLInventoryType::EType inv_type,
+                                            LLInventoryPanel* inventory,
+                                            LLFolderViewModelInventory* view_model,
+                                            LLFolderView* root,
+                                            const LLUUID& uuid,
+                                            U32 flags = 0x00) const;
 };
 
 #endif // LL_LLPLACESINVENTORYBRIDGE_H