Merge branch 'master' of git://github.com/Lirusaito/SingularityViewer into VoiceUpdate

2013-06-23 02:25:15 -04:00
parent c8427e1c63 62f5e73767
commit d4bed6382c
68 changed files with 661 additions and 1039 deletions
--- a/indra/newview/llfloaternotificationsconsole.h
+++ b/indra/newview/llfloaternotificationsconsole.h
@@ -73,7 +73,6 @@ public:
 	void onClose(bool app_quitting) { setVisible(FALSE); }

 private:
-	static void onCommitResponse(LLUICtrl* ctrl, void* data) { ((LLFloaterNotification*)data)->respond(); }
 	LLNotification* mNote;
 };
 #endif