livie
/
phoenix-firestorm
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Changed method names for consistency

master
Ansariel 2016-06-02 09:33:19 +02:00
parent 6948e6a18d
commit d22d0da0e8
4 changed files with 7 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
indra/newview/fslslbridge.cpp
View File

@ -434,7 +434,7 @@ bool FSLSLBridge::viewerToLSL(const std::string& message, tCallback aCallback )
if( !pCallback )
pCallback = FSLSLBridgeRequest_Success;
LLCoreHttpUtil::HttpCoroutineAdapter::callbackHttpPost(mCurrentURL, LLSD(message), pCallback, FSLSLBridgeRequestResponder_Failure );
LLCoreHttpUtil::HttpCoroutineAdapter::callbackHttpPost(mCurrentURL, LLSD(message), pCallback, FSLSLBridgeRequest_Failure );
return true;
}

4
indra/newview/fslslbridgerequest.cpp
View File

@ -44,12 +44,12 @@ void FSLSLBridgeRequest_Success( LLSD const &aData )
}
//If we get back an error (not found, etc...), handle it here
void FSLSLBridgeRequestResponder_Failure( LLSD const &aData )
void FSLSLBridgeRequest_Failure( LLSD const &aData )
{
LL_WARNS() << "FSLSLBridgeRequest::error(" << ll_pretty_print_sd( aData ) << ")" << LL_ENDL;
}
void FSLSLBridgeRequestRadarPosResponder_Success( LLSD const &aData )
void FSLSLBridgeRequestRadarPos_Success( LLSD const &aData )
{
FSRadar* radar = FSRadar::getInstance();
LL_DEBUGS() << ll_pretty_print_sd( aData ) << LL_ENDL;

9
indra/newview/fslslbridgerequest.h
View File

@ -28,13 +28,8 @@
#ifndef FS_LSLBRIDGEREQUEST_H
#define FS_LSLBRIDGEREQUEST_H
//
//-TT Client LSL Bridge File
//
void FSLSLBridgeRequest_Success( LLSD const &aData );
void FSLSLBridgeRequestResponder_Failure( LLSD const &aData );
void FSLSLBridgeRequestRadarPosResponder_Success( LLSD const &aData );
void FSLSLBridgeRequest_Failure( LLSD const &aData );
void FSLSLBridgeRequestRadarPos_Success( LLSD const &aData );
#endif // FS_LSLBRIDGEREQUEST_H

4
indra/newview/fsradar.cpp
View File

@ -658,7 +658,7 @@ void FSRadar::updateRadarList()
if (++updatesPerRequest > FSRADAR_MAX_OFFSET_REQUESTS)
{
msg = msg.substr(0, msg.size() - 1);
FSLSLBridge::instance().viewerToLSL(prefix + msg, FSLSLBridgeRequestRadarPosResponder_Success);
FSLSLBridge::instance().viewerToLSL(prefix + msg, FSLSLBridgeRequestRadarPos_Success);
//LL_INFOS() << " OFFSET REQUEST SEGMENT"<< prefix << msg << LL_ENDL;
msg = "";
updatesPerRequest = 0;
@ -667,7 +667,7 @@ void FSRadar::updateRadarList()
if (updatesPerRequest > 0)
{
msg = msg.substr(0, msg.size() - 1);
FSLSLBridge::instance().viewerToLSL(prefix + msg, FSLSLBridgeRequestRadarPosResponder_Success);
FSLSLBridge::instance().viewerToLSL(prefix + msg, FSLSLBridgeRequestRadarPos_Success);
//LL_INFOS() << " OFFSET REQUEST FINAL " << prefix << msg << LL_ENDL;
}