diff options
author | Don Kjer <don@lindenlab.com> | 2007-05-01 21:39:25 +0000 |
---|---|---|
committer | Don Kjer <don@lindenlab.com> | 2007-05-01 21:39:25 +0000 |
commit | 4ecb9cb63e4993b3b4bc65d73ed255139b5c3f75 (patch) | |
tree | 48d9bb9a1ae468ecdbd53cf21a598d66ee8eced3 /indra/newview/llviewergesture.h | |
parent | f5e9ce7e47694e349a4eb28b052016b11e1bdf81 (diff) |
svn merge -r 59163:61099 svn+ssh://svn/svn/linden/branches/release-candidate into release
Diffstat (limited to 'indra/newview/llviewergesture.h')
-rw-r--r-- | indra/newview/llviewergesture.h | 2 |
1 files changed, 0 insertions, 2 deletions
diff --git a/indra/newview/llviewergesture.h b/indra/newview/llviewergesture.h index ced12a7c34..6eca0d1eca 100644 --- a/indra/newview/llviewergesture.h +++ b/indra/newview/llviewergesture.h @@ -45,7 +45,6 @@ class LLViewerGestureList : public LLGestureList public: LLViewerGestureList(); - void saveToServer(); //void requestFromServer(); BOOL getIsLoaded() { return mIsLoaded; } @@ -57,7 +56,6 @@ public: BOOL matchPrefix(const std::string& in_str, std::string* out_str); static void xferCallback(void *data, S32 size, void** /*user_data*/, S32 status); - static void processGestureUpdate(LLMessageSystem *msg, void** /*user_data*/); protected: LLGesture *create_gesture(U8 **buffer, S32 max_size); |