From d60f16540dba5616cd8260046b44ebc2a1047065 Mon Sep 17 00:00:00 2001
From: Josh Bell <josh@lindenlab.com>
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.cpp | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

(limited to 'indra/llwindow/llwindow.cpp')

diff --git a/indra/llwindow/llwindow.cpp b/indra/llwindow/llwindow.cpp
index 21774fe233..d5e1e77053 100644
--- a/indra/llwindow/llwindow.cpp
+++ b/indra/llwindow/llwindow.cpp
@@ -23,6 +23,7 @@
 
 #include "llerror.h"
 #include "llkeyboard.h"
+#include "linked_lists.h"
 
 //static instance for default callbacks
 LLWindowCallbacks	LLWindow::sDefaultCallbacks;
@@ -305,7 +306,8 @@ void LLSplashScreen::hide()
 // LLWindowManager
 //
 
-LLLinkedList<LLWindow> LLWindowManager::sWindowList;
+// TODO: replace with std::set
+static LLLinkedList<LLWindow> sWindowList;
 
 LLWindow* LLWindowManager::createWindow(
 	char *title,
-- 
cgit v1.2.3