Fixed line endings (no change to content itself)

indra/newview/fslslbridge.cpp

@@ -65,7 +65,7 @@
 #define FS_BRIDGE_MINOR_VERSION 7
 
 const std::string UPLOAD_SCRIPT_1_7 = "EBEDD1D2-A320-43f5-88CF-DD47BBCA5DFB.lsltxt";
-const boost::regex FSBridgePattern("^#Firestorm LSL Bridge v*.*");
+const boost::regex FSBridgePattern("^#Firestorm LSL Bridge v*.*");
 
 
 //
@@ -562,12 +562,12 @@ void FSLSLBridge :: checkBridgeScriptName(std::string fileName)
 			cleanUpBridge();
 			return;
 		}
-		//registerVOInventoryListener(obj, NULL);
-		obj->saveScript(gInventory.getItem(mScriptItemID), TRUE, false);
-		FSLSLBridgeCleanupTimer *objTimer = new FSLSLBridgeCleanupTimer((F32)1.0);
-		objTimer->startTimer();
-		//obj->doInventoryCallback();
-		//requestVOInventory();
+		//registerVOInventoryListener(obj, NULL);
+		obj->saveScript(gInventory.getItem(mScriptItemID), TRUE, false);
+		FSLSLBridgeCleanupTimer *objTimer = new FSLSLBridgeCleanupTimer((F32)1.0);
+		objTimer->startTimer();
+		//obj->doInventoryCallback();
+		//requestVOInventory();
 	}
 }
 
@@ -588,13 +588,13 @@ void FSLSLBridge :: cleanUpBridge()
 	mBridgeCreating = false;
 }
 
-void FSLSLBridge :: finishBridge()
-{
+void FSLSLBridge :: finishBridge()
+{
 	//announce yourself
 	reportToNearbyChat("Bridge created.");
 
 	mBridgeCreating = false;
-	//removeVOInventoryListener();
+	//removeVOInventoryListener();
 	cleanUpBridgeFolder();
 }
 //

indra/newview/fslslbridge.h

@@ -94,8 +94,8 @@ protected:
 	void initCreationStep();
 	void cleanUpBridge();
 	void startCreation();
-	void finishBridge();
-
+	void finishBridge();
+
 	/*virtual*/ void inventoryChanged(LLViewerObject* obj,
 									 LLInventoryObject::object_list_t* inv,
 									 S32 serial_num,
@@ -140,8 +140,8 @@ class FSLSLBridgeCleanupTimer : public LLEventTimer
 public:
 	FSLSLBridgeCleanupTimer(F32 period) : LLEventTimer(period) {}
 	BOOL tick();
-	void startTimer() { mEventTimer.start(); }
-	void stopTimer() { mEventTimer.stop(); }
+	void startTimer() { mEventTimer.start(); }
+	void stopTimer() { mEventTimer.stop(); }
 
 };
 

indra/newview/fslslbridgerequest.cpp

@@ -23,41 +23,41 @@
  * The Phoenix Viewer Project, Inc., 1831 Oakwood Drive, Fairmont, Minnesota 56031-3225 USA
  * $/LicenseInfo$
  */
-
-#include "llviewerprecompiledheaders.h"
-#include "fslslbridgerequest.h"
-#include "fslslbridge.h"
+
+#include "llviewerprecompiledheaders.h"
+#include "fslslbridgerequest.h"
+#include "fslslbridge.h"
 #include "llagent.h"  // for gAgent
 #include "llhttpclient.h"
-
+
 #ifdef LL_STANDALONE
 #include <expat.h>
 #else
 #include "expat/expat.h"
 #endif
-
-//
+
+//
 //-TT Client LSL Bridge File
 //
-
-FSLSLBridgeRequestManager::FSLSLBridgeRequestManager()
-{
-}
-
-FSLSLBridgeRequestManager::~FSLSLBridgeRequestManager()
-{
-}
-
+
+FSLSLBridgeRequestManager::FSLSLBridgeRequestManager()
+{
+}
+
+FSLSLBridgeRequestManager::~FSLSLBridgeRequestManager()
+{
+}
+
 void FSLSLBridgeRequestManager::initSingleton()
 {
 }
-void FSLSLBridgeRequestManager::processBridgeCall(const LLSD& content)
-{
-	std::string strContent = content.asString();
-	llinfos << "Got info: " << strContent << llendl;
-	
-}
-
+void FSLSLBridgeRequestManager::processBridgeCall(const LLSD& content)
+{
+	std::string strContent = content.asString();
+	llinfos << "Got info: " << strContent << llendl;
+	
+}
+
 FSLSLBridgeRequestResponder::FSLSLBridgeRequestResponder() 
 { 
 	//FSLSLBridgeRequestManager::instance().initSingleton(); 
@@ -66,10 +66,10 @@ FSLSLBridgeRequestResponder::FSLSLBridgeRequestResponder()
 void FSLSLBridgeRequestResponder::result(const LLSD& content)
 {
 	//FSLSLBridgeRequestManager::instance().processBridgeCall(content);
-	std::string strContent = content.asString();
-	llinfos << "Got info: " << strContent << llendl;
-
-	//do not use - infinite loop, only here for testing.
+	std::string strContent = content.asString();
+	llinfos << "Got info: " << strContent << llendl;
+
+	//do not use - infinite loop, only here for testing.
 	//FSLSLBridge::instance().viewerToLSL("Response_to_response|" + strContent);
 }
 
@@ -79,6 +79,6 @@ void FSLSLBridgeRequestResponder::error(U32 status, const std::string& reason)
 	llwarns << "FSLSLBridgeRequest::error("
 	<< status << ": " << reason << ")" << llendl;
 }
-
-
-
+
+
+

indra/newview/fslslbridgerequest.h

@@ -30,26 +30,26 @@
 #include "llviewerprecompiledheaders.h"
 #include "llhttpclient.h"
 
-//
+//
 //-TT Client LSL Bridge File
 //
-
-class FSLSLBridgeRequestManager //: public LLSingleton<FSLSLBridgeRequestManager>
-{
-public:
-	FSLSLBridgeRequestManager();
-	~FSLSLBridgeRequestManager();
-
-	void processBridgeCall(const LLSD& content);
+
+class FSLSLBridgeRequestManager //: public LLSingleton<FSLSLBridgeRequestManager>
+{
+public:
+	FSLSLBridgeRequestManager();
+	~FSLSLBridgeRequestManager();
+
+	void processBridgeCall(const LLSD& content);
 	/* virtual */ void initSingleton();
-private:
-	LLSD mBridgeCalls;
+private:
+	LLSD mBridgeCalls;
 
 	//friend class LLSingleton<FSLSLBridgeRequestManager>;	
 
-};
-
-
+};
+
+
 class FSLSLBridgeRequestResponder : public LLHTTPClient::Responder
 {
 public:

indra/newview/llinventorybridge.h

@@ -294,9 +294,9 @@ protected:
 	BOOL checkFolderForContentsOfType(LLInventoryModel* model, LLInventoryCollectFunctor& typeToCheck);
 
 	void modifyOutfit(BOOL append);
-//-TT Patch: ReplaceWornItemsOnly
+//-TT Patch: ReplaceWornItemsOnly
 	void modifyOutfit(BOOL append, BOOL replace);
-//-TT 
+//-TT 
 	void determineFolderType();
 
 	menuentry_vec_t getMenuItems() { return mItems; } // returns a copy of current menu items