svn merge -r88066:88786 svn+ssh://svn.lindenlab.com/svn/linden/branches/cmake-9-merge

dataserver-is-deprecated
for-fucks-sake-whats-with-these-commit-markers

14 files changed, 133 insertions, 30 deletions

diff --git a/indra/llui/CMakeLists.txt b/indra/llui/CMakeLists.txt
new file mode 100644
index 0000000000..77efec5696
--- /dev/null
+++ b/indra/llui/CMakeLists.txt
@@ -0,0 +1,133 @@
+# -*- cmake -*-
+
+project(llui)
+
+include(00-Common)
+include(LLAudio)
+include(LLCommon)
+include(LLImage)
+include(LLMath)
+include(LLMessage)
+include(LLRender)
+include(LLWindow)
+include(LLVFS)
+include(LLXML)
+
+include_directories(
+    ${LLAUDIO_INCLUDE_DIRS}
+    ${LLCOMMON_INCLUDE_DIRS}
+    ${LLIMAGE_INCLUDE_DIRS}
+    ${LLMATH_INCLUDE_DIRS}
+    ${LLMESSAGE_INCLUDE_DIRS}
+    ${LLRENDER_INCLUDE_DIRS}
+    ${LLWINDOW_INCLUDE_DIRS}
+    ${LLVFS_INCLUDE_DIRS}
+    ${LLXML_INCLUDE_DIRS}
+    )
+
+set(llui_SOURCE_FILES
+    llalertdialog.cpp
+    llbutton.cpp
+    llcheckboxctrl.cpp
+    llclipboard.cpp
+    llcombobox.cpp
+    llctrlselectioninterface.cpp
+    lldraghandle.cpp
+    lleditmenuhandler.cpp
+    llfloater.cpp
+    llfocusmgr.cpp
+    lliconctrl.cpp
+    llkeywords.cpp
+    lllineeditor.cpp
+    llmenugl.cpp
+    llmodaldialog.cpp
+    llmultislider.cpp
+    llmultisliderctrl.cpp
+    llpanel.cpp
+    llradiogroup.cpp
+    llresizebar.cpp
+    llresizehandle.cpp
+    llresmgr.cpp
+    llrootview.cpp
+    llscrollbar.cpp
+    llscrollcontainer.cpp
+    llscrollingpanellist.cpp
+    llscrolllistctrl.cpp
+    llslider.cpp
+    llsliderctrl.cpp
+    llspinctrl.cpp
+    llstyle.cpp
+    lltabcontainer.cpp
+    lltabcontainervertical.cpp
+    lltextbox.cpp
+    lltexteditor.cpp
+    llui.cpp
+    lluictrl.cpp
+    lluictrlfactory.cpp
+    lluistring.cpp
+    llundo.cpp
+    llviewborder.cpp
+    llview.cpp
+    llviewquery.cpp
+    )
+    
+set(llui_HEADER_FILES
+    CMakeLists.txt
+
+    llalertdialog.h
+    llbutton.h
+    llcallbackmap.h
+    llcheckboxctrl.h
+    llclipboard.h
+    llcombobox.h
+    llctrlselectioninterface.h
+    lldraghandle.h
+    lleditmenuhandler.h
+    llfloater.h
+    llfocusmgr.h
+    llhtmlhelp.h
+    lliconctrl.h
+    llkeywords.h
+    lllineeditor.h
+    llmemberlistener.h
+    llmenugl.h
+    llmodaldialog.h
+    llmultisliderctrl.h
+    llmultislider.h
+    llpanel.h
+    llradiogroup.h
+    llresizebar.h
+    llresizehandle.h
+    llresmgr.h
+    llrootview.h
+    llscrollbar.h
+    llscrollcontainer.h
+    llscrollingpanellist.h
+    llscrolllistctrl.h
+    llsliderctrl.h
+    llslider.h
+    llspinctrl.h
+    llstyle.h
+    lltabcontainer.h
+    lltabcontainervertical.h
+    lltextbox.h
+    lltexteditor.h
+    lluiconstants.h
+    lluictrlfactory.h
+    lluictrl.h
+    lluifwd.h
+    llui.h
+    lluistring.h
+    lluixmltags.h
+    llundo.h
+    llviewborder.h
+    llview.h
+    llviewquery.h
+    )
+
+set_source_files_properties(${llui_HEADER_FILES}
+                            PROPERTIES HEADER_FILE_ONLY TRUE)
+
+list(APPEND llui_SOURCE_FILES ${llui_HEADER_FILES})
+
+add_library (llui ${llui_SOURCE_FILES})
diff --git a/indra/llui/llbutton.cpp b/indra/llui/llbutton.cpp
index e0ac3cebd7..4fa2a3de92 100644
--- a/indra/llui/llbutton.cpp
+++ b/indra/llui/llbutton.cpp
@@ -39,13 +39,10 @@
 
 // Project includes
 #include "llkeyboard.h"
-#include "llgl.h"
 #include "llui.h"
 #include "lluiconstants.h"
-//#include "llcallbacklist.h"
 #include "llresmgr.h"
 #include "llcriticaldamp.h"
-#include "llglheaders.h"
 #include "llfocusmgr.h"
 #include "llwindow.h"
 #include "llglimmediate.h"
diff --git a/indra/llui/lllineeditor.cpp b/indra/llui/lllineeditor.cpp
index 90e0552861..96039ce943 100644
--- a/indra/llui/lllineeditor.cpp
+++ b/indra/llui/lllineeditor.cpp
@@ -39,7 +39,6 @@
 #include "llmath.h"
 #include "llfontgl.h"
 #include "llgl.h"
-#include "sound_ids.h"
 #include "lltimer.h"
 
 //#include "llclipboard.h"
diff --git a/indra/llui/llmenugl.cpp b/indra/llui/llmenugl.cpp
index bc4445ea6c..c2b2e08755 100644
--- a/indra/llui/llmenugl.cpp
+++ b/indra/llui/llmenugl.cpp
@@ -46,7 +46,6 @@
 #include "llmenugl.h"
 
 #include "llmath.h"
-#include "llgl.h"
 #include "llglimmediate.h"
 #include "llfocusmgr.h"
 #include "llfont.h"
@@ -59,7 +58,6 @@
 #include "llresmgr.h"
 #include "llui.h"
 
-#include "llglheaders.h"
 #include "llstl.h"
 
 #include "v2math.h"
diff --git a/indra/llui/llpanel.cpp b/indra/llui/llpanel.cpp
index 875f114ce3..fb14470612 100644
--- a/indra/llui/llpanel.cpp
+++ b/indra/llui/llpanel.cpp
@@ -55,8 +55,6 @@
 #include "llbutton.h"
 
 // LLLayoutStack
-#include "llgl.h"
-#include "llglheaders.h"
 #include "llresizebar.h"
 #include "llcriticaldamp.h"
 
diff --git a/indra/llui/llscrollbar.cpp b/indra/llui/llscrollbar.cpp
index 2c4a5cbc58..3536e6bb03 100644
--- a/indra/llui/llscrollbar.cpp
+++ b/indra/llui/llscrollbar.cpp
@@ -41,10 +41,8 @@
 #include "llcriticaldamp.h"
 #include "llkeyboard.h"
 #include "llui.h"
-//#include "llviewerimagelist.h"
 #include "llfocusmgr.h"
 #include "llwindow.h"
-#include "llglheaders.h"
 #include "llcontrol.h"
 #include "llglimmediate.h"
 
diff --git a/indra/llui/llscrollcontainer.cpp b/indra/llui/llscrollcontainer.cpp
index edad4c4d6b..72fe2040af 100644
--- a/indra/llui/llscrollcontainer.cpp
+++ b/indra/llui/llscrollcontainer.cpp
@@ -32,9 +32,7 @@
 
 #include "linden_common.h"
 
-#include "llgl.h"
 #include "llglimmediate.h"
-
 #include "llscrollcontainer.h"
 #include "llscrollbar.h"
 #include "llui.h"
@@ -45,8 +43,6 @@
 #include "lluictrlfactory.h"
 #include "llfontgl.h"
 
-#include "llglheaders.h"
-
 ///----------------------------------------------------------------------------
 /// Local function declarations, constants, enums, and typedefs
 ///----------------------------------------------------------------------------
diff --git a/indra/llui/llscrolllistctrl.cpp b/indra/llui/llscrolllistctrl.cpp
index 05888fe382..c923f6b116 100644
--- a/indra/llui/llscrolllistctrl.cpp
+++ b/indra/llui/llscrolllistctrl.cpp
@@ -42,9 +42,7 @@
 #include "llcheckboxctrl.h"
 #include "llclipboard.h"
 #include "llfocusmgr.h"
-#include "llgl.h"
 #include "llglimmediate.h"
-#include "llglheaders.h"
 #include "llresmgr.h"
 #include "llscrollbar.h"
 #include "llstring.h"
diff --git a/indra/llui/llsliderctrl.cpp b/indra/llui/llsliderctrl.cpp
index 9cf1ca5929..a2b0718c50 100644
--- a/indra/llui/llsliderctrl.cpp
+++ b/indra/llui/llsliderctrl.cpp
@@ -34,7 +34,6 @@
 #include "llsliderctrl.h"
 
 #include "audioengine.h"
-#include "sound_ids.h"
 
 #include "llmath.h"
 #include "llfontgl.h"
diff --git a/indra/llui/llspinctrl.cpp b/indra/llui/llspinctrl.cpp
index 36b84c741f..c577b35e19 100644
--- a/indra/llui/llspinctrl.cpp
+++ b/indra/llui/llspinctrl.cpp
@@ -44,7 +44,6 @@
 #include "lltextbox.h"
 #include "llkeyboard.h"
 #include "llmath.h"
-#include "sound_ids.h"
 #include "audioengine.h"
 #include "llcontrol.h"
 #include "llfocusmgr.h"
diff --git a/indra/llui/lltabcontainer.cpp b/indra/llui/lltabcontainer.cpp
index 2d1228b084..fabdbd6860 100644
--- a/indra/llui/lltabcontainer.cpp
+++ b/indra/llui/lltabcontainer.cpp
@@ -42,7 +42,6 @@
 #include "lltabcontainervertical.h"
 #include "llglimmediate.h"
 
-
 const F32 SCROLL_STEP_TIME = 0.4f;
 const F32 SCROLL_DELAY_TIME = 0.5f;
 const S32 TAB_PADDING = 15;
diff --git a/indra/llui/lltexteditor.cpp b/indra/llui/lltexteditor.cpp
index f0f3ac3bdc..8264f0cf87 100644
--- a/indra/llui/lltexteditor.cpp
+++ b/indra/llui/lltexteditor.cpp
@@ -36,13 +36,11 @@
 #include "lltexteditor.h"
 
 #include "llfontgl.h"
-#include "llgl.h"
 #include "llglimmediate.h"
 #include "llui.h"
 #include "lluictrlfactory.h"
 #include "llrect.h"
 #include "llfocusmgr.h"
-#include "sound_ids.h"
 #include "lltimer.h"
 #include "llmath.h"
 
@@ -58,7 +56,6 @@
 #include "llcontrol.h"
 #include "llimagegl.h"
 #include "llwindow.h"
-#include "llglheaders.h"
 #include <queue>
 
 // 
diff --git a/indra/llui/llui.cpp b/indra/llui/llui.cpp
index f7489a7512..1a238ce7fa 100644
--- a/indra/llui/llui.cpp
+++ b/indra/llui/llui.cpp
@@ -41,25 +41,19 @@
 #include "audioengine.h"
 #include "v2math.h"
 #include "v4color.h"
-#include "llgl.h"
 #include "llglimmediate.h"
 #include "llrect.h"
 #include "llimagegl.h"
-//#include "llviewerimage.h"
 #include "lldir.h"
 #include "llfontgl.h"
 
 // Project includes
-//#include "audioengine.h"
 #include "llcontrol.h"
-//#include "llstartup.h"
 #include "llui.h"
 #include "llview.h"
 #include "lllineeditor.h"
 #include "llwindow.h"
 
-#include "llglheaders.h"
-
 //
 // Globals
 //
diff --git a/indra/llui/llview.cpp b/indra/llui/llview.cpp
index 0fafc1fecd..fa78534a83 100644
--- a/indra/llui/llview.cpp
+++ b/indra/llui/llview.cpp
@@ -41,8 +41,6 @@
 #include "llevent.h"
 #include "llfontgl.h"
 #include "llfocusmgr.h"
-#include "llgl.h"
-#include "llglheaders.h"
 #include "llrect.h"
 #include "llstl.h"
 #include "llui.h"	// colors saved settings