Merge branch 'meshupload' of git://github.com/AlericInglewood/SingularityViewer into meshup

This commit is contained in:
Siana Gearz
2013-01-13 20:10:25 +01:00
75 changed files with 1218 additions and 815 deletions

View File

@@ -3309,6 +3309,8 @@ protected:
delete m_chat;
}
/*virtual*/ char const* getName(void) const { return "ChatTranslationReceiver"; }
private:
LLChat *m_chat;
const BOOL m_history;
@@ -3373,6 +3375,7 @@ protected:
}
/*virtual*/ AIHTTPTimeoutPolicy const& getHTTPTimeoutPolicy(void) const { return authHandler_timeout; }
/*virtual*/ char const* getName(void) const { return "AuthHandler"; }
};
void process_chat_from_simulator(LLMessageSystem *msg, void **user_data)