From 3c6db2c17e30a2e7ef2944ff961e86f1f02b3b20 Mon Sep 17 00:00:00 2001 From: Ansariel Date: Sun, 3 Jul 2011 16:47:42 +0200 Subject: [PATCH] Fixed line endings (no change to content itself) --- indra/newview/fslslbridge.cpp | 20 +++++----- indra/newview/fslslbridge.h | 8 ++-- indra/newview/fslslbridgerequest.cpp | 60 ++++++++++++++-------------- indra/newview/fslslbridgerequest.h | 28 ++++++------- indra/newview/llinventorybridge.h | 4 +- 5 files changed, 60 insertions(+), 60 deletions(-) diff --git a/indra/newview/fslslbridge.cpp b/indra/newview/fslslbridge.cpp index 79556cefc0..7a2cac1e79 100644 --- a/indra/newview/fslslbridge.cpp +++ b/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(); } // diff --git a/indra/newview/fslslbridge.h b/indra/newview/fslslbridge.h index b704d86968..a7215bdec4 100644 --- a/indra/newview/fslslbridge.h +++ b/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(); } }; diff --git a/indra/newview/fslslbridgerequest.cpp b/indra/newview/fslslbridgerequest.cpp index d779710db3..81ed68a303 100644 --- a/indra/newview/fslslbridgerequest.cpp +++ b/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 #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; } - - - + + + diff --git a/indra/newview/fslslbridgerequest.h b/indra/newview/fslslbridgerequest.h index c9cf24120b..8778e298cb 100644 --- a/indra/newview/fslslbridgerequest.h +++ b/indra/newview/fslslbridgerequest.h @@ -30,26 +30,26 @@ #include "llviewerprecompiledheaders.h" #include "llhttpclient.h" -// +// //-TT Client LSL Bridge File // - -class FSLSLBridgeRequestManager //: public LLSingleton -{ -public: - FSLSLBridgeRequestManager(); - ~FSLSLBridgeRequestManager(); - - void processBridgeCall(const LLSD& content); + +class FSLSLBridgeRequestManager //: public LLSingleton +{ +public: + FSLSLBridgeRequestManager(); + ~FSLSLBridgeRequestManager(); + + void processBridgeCall(const LLSD& content); /* virtual */ void initSingleton(); -private: - LLSD mBridgeCalls; +private: + LLSD mBridgeCalls; //friend class LLSingleton; -}; - - +}; + + class FSLSLBridgeRequestResponder : public LLHTTPClient::Responder { public: diff --git a/indra/newview/llinventorybridge.h b/indra/newview/llinventorybridge.h index eb03d0556a..0a80cb2dc8 100644 --- a/indra/newview/llinventorybridge.h +++ b/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