diff options
| author | Josh Bell <josh@lindenlab.com> | 2007-01-04 02:04:29 +0000 |
|---|---|---|
| committer | Josh Bell <josh@lindenlab.com> | 2007-01-04 02:04:29 +0000 |
| commit | d60f16540dba5616cd8260046b44ebc2a1047065 (patch) | |
| tree | ab241efaf58ba4eeb1916763cef337a04bc15d64 /indra/llwindow/llwindow.h | |
| parent | 0434d35c160bcd0d78b8f4e795a62155f50a6fb8 (diff) | |
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
Diffstat (limited to 'indra/llwindow/llwindow.h')
| -rw-r--r-- | indra/llwindow/llwindow.h | 13 |
1 files changed, 0 insertions, 13 deletions
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 <sys/stat.h> #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<LLWindow> 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_ |