Merge pull request #1476 from secondlife/marchcat/x-b-merge

Maint X -> Maint B merge

1 files changed, 18 insertions, 18 deletions

diff --git a/indra/newview/lluploadfloaterobservers.h b/indra/newview/lluploadfloaterobservers.h
index 77e950a1c9..fa63e3ad19 100644
--- a/indra/newview/lluploadfloaterobservers.h
+++ b/indra/newview/lluploadfloaterobservers.h
@@ -34,48 +34,48 @@ class LLUploadPermissionsObserver
 {
 public:
 
-	LLUploadPermissionsObserver(){mUploadPermObserverHandle.bind(this);}
-	virtual ~LLUploadPermissionsObserver() {}
+    LLUploadPermissionsObserver(){mUploadPermObserverHandle.bind(this);}
+    virtual ~LLUploadPermissionsObserver() {}
 
-	virtual void onPermissionsReceived(const LLSD& result) = 0;
-	virtual void setPermissonsErrorStatus(S32 status, const std::string& reason) = 0;
+    virtual void onPermissionsReceived(const LLSD& result) = 0;
+    virtual void setPermissonsErrorStatus(S32 status, const std::string& reason) = 0;
 
-	LLHandle<LLUploadPermissionsObserver> getPermObserverHandle() const {return mUploadPermObserverHandle;}
+    LLHandle<LLUploadPermissionsObserver> getPermObserverHandle() const {return mUploadPermObserverHandle;}
 
 protected:
-	LLRootHandle<LLUploadPermissionsObserver> mUploadPermObserverHandle;
+    LLRootHandle<LLUploadPermissionsObserver> mUploadPermObserverHandle;
 };
 
 class LLWholeModelFeeObserver
 {
 public:
-	LLWholeModelFeeObserver() { mWholeModelFeeObserverHandle.bind(this); }
-	virtual ~LLWholeModelFeeObserver() {}
+    LLWholeModelFeeObserver() { mWholeModelFeeObserverHandle.bind(this); }
+    virtual ~LLWholeModelFeeObserver() {}
 
-	virtual void onModelPhysicsFeeReceived(const LLSD& result, std::string upload_url) = 0;
-	virtual void setModelPhysicsFeeErrorStatus(S32 status, const std::string& reason, const LLSD& result) = 0;
+    virtual void onModelPhysicsFeeReceived(const LLSD& result, std::string upload_url) = 0;
+    virtual void setModelPhysicsFeeErrorStatus(S32 status, const std::string& reason, const LLSD& result) = 0;
 
-	LLHandle<LLWholeModelFeeObserver> getWholeModelFeeObserverHandle() const { return mWholeModelFeeObserverHandle; }
+    LLHandle<LLWholeModelFeeObserver> getWholeModelFeeObserverHandle() const { return mWholeModelFeeObserverHandle; }
 
 protected:
-	LLRootHandle<LLWholeModelFeeObserver> mWholeModelFeeObserverHandle;
+    LLRootHandle<LLWholeModelFeeObserver> mWholeModelFeeObserverHandle;
 };
 
 
 class LLWholeModelUploadObserver
 {
 public:
-	LLWholeModelUploadObserver() { mWholeModelUploadObserverHandle.bind(this); }
-	virtual ~LLWholeModelUploadObserver() {}
+    LLWholeModelUploadObserver() { mWholeModelUploadObserverHandle.bind(this); }
+    virtual ~LLWholeModelUploadObserver() {}
 
-	virtual void onModelUploadSuccess() = 0;
+    virtual void onModelUploadSuccess() = 0;
 
-	virtual void onModelUploadFailure() = 0;
+    virtual void onModelUploadFailure() = 0;
 
-	LLHandle<LLWholeModelUploadObserver> getWholeModelUploadObserverHandle() const { return mWholeModelUploadObserverHandle; }
+    LLHandle<LLWholeModelUploadObserver> getWholeModelUploadObserverHandle() const { return mWholeModelUploadObserverHandle; }
 
 protected:
-	LLRootHandle<LLWholeModelUploadObserver> mWholeModelUploadObserverHandle;
+    LLRootHandle<LLWholeModelUploadObserver> mWholeModelUploadObserverHandle;
 };
 
 #endif /* LL_LLUPLOADFLOATEROBSERVERS_H */