From d60f16540dba5616cd8260046b44ebc2a1047065 Mon Sep 17 00:00:00 2001 From: Josh Bell Date: Thu, 4 Jan 2007 02:04:29 +0000 Subject: svn merge svn+ssh://svn.lindenlab.com/svn/linden/release@56429 svn+ssh://svn.lindenlab.com/svn/linden/branches/maintenance@56431 This turned up the following "lost" changes: llapp.cpp (from maintenance r55371) - SIGPIPE fix, possibly llfontgl.cpp (from maintenance r50207) - whitespace only inventorybridge.cpp (property - non-executable) skins/xui/*/* (from maintenance r55380) - XML processing instruction went AWOL --- indra/llwindow/llwindow.h | 13 ------------- 1 file changed, 13 deletions(-) (limited to 'indra/llwindow/llwindow.h') diff --git a/indra/llwindow/llwindow.h b/indra/llwindow/llwindow.h index 703eee32d0..442f4c9667 100644 --- a/indra/llwindow/llwindow.h +++ b/indra/llwindow/llwindow.h @@ -12,7 +12,6 @@ #include #include "llrect.h" -#include "linked_lists.h" #include "llcoord.h" #include "llstring.h" @@ -272,9 +271,6 @@ const S32 OSBTN_CANCEL = 3; class LLWindowManager { -private: - static LLLinkedList sWindowList; - public: static LLWindow* createWindow( char *title, @@ -316,13 +312,4 @@ void shell_open(const char* file_path); void simpleEscapeString ( std::string& stringIn ); - -#if LL_WINDOWS - // return Win32 specific window handle - HWND llwindow_get_hwnd(LLWindow *window); - - // backdoor for special case handling of Win32 messages - void llwindow_install_wndproc(LLWindow *window, WNDPROC wnd_proc); -#endif - #endif // _LL_window_h_ -- cgit v1.2.3