Singularity-Viewer/SingularityViewer
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'aleric/master' into 1.7.3-dev

Browse Source
This commit is contained in:
Latif Khalifa
2013-01-13 12:45:25 +01:00
parent 94edef2c3f 3a414b21fa
commit 31d2a15957
73 changed files with 1210 additions and 808 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
indra/newview/llimview.cpp
View File

@@ -94,8 +94,7 @@ LLIMMgr* gIMMgr = NULL;
//{
// return (LLStringUtil::compareDict( a->mName, b->mName ) < 0);
//}
class LLViewerChatterBoxInvitationAcceptResponder :
public LLHTTPClient::ResponderWithResult
class LLViewerChatterBoxInvitationAcceptResponder : public LLHTTPClient::ResponderWithResult
{
public:
LLViewerChatterBoxInvitationAcceptResponder(
@@ -106,7 +105,7 @@ public:
mInvitiationType = invitation_type;
}
void result(const LLSD& content)
/*virtual*/ void result(const LLSD& content)
{
if ( gIMMgr)
{
@@ -154,8 +153,8 @@ public:
}
}
void error(U32 statusNum, const std::string& reason)
{
/*virtual*/ void error(U32 statusNum, const std::string& reason)
{
//throw something back to the viewer here?
if ( gIMMgr )
{
@@ -177,7 +176,8 @@ public:
}
}
virtual AIHTTPTimeoutPolicy const& getHTTPTimeoutPolicy(void) const { return viewerChatterBoxInvitationAcceptResponder_timeout; }
/*virtual*/ AIHTTPTimeoutPolicy const& getHTTPTimeoutPolicy(void) const { return viewerChatterBoxInvitationAcceptResponder_timeout; }
/*virtual*/ char const* getName(void) const { return "LLViewerChatterBoxInvitationAcceptResponder"; }
private:
LLUUID mSessionID;