From 939a506569433db7bff96c12200f03b3f85f40de Mon Sep 17 00:00:00 2001
From: Eric Tulla <tulla@lindenlab.com>
Date: Mon, 30 Jun 2008 17:57:00 +0000
Subject: Merging in file-move-merge ( QAR-649 ) Result of "svn merge -r
 90669:90786 $tulla/file-move-merge ."

Be careful of future merges involving changes to any of these moved files as SVN usually does the wrong thing:
newview/llglslshader.* -> llrender/llglslshader.*, llrender/llshadermgr.*, newview/llviewershadermgr.* (gets split into 3 separate files)
newview/llpostprocess.* -> llrender/llpostprocess.*
newview/llrendersphere.* -> llrender/llrendersphere.*
newview/llcubemap.* -> llrender/llcubemap.*
llwindow/llgl.* -> llrender/llgl.*
llwindow/llglstates.h -> llrender/llglstates.h
llwindow/llgltypes.h -> llrender/llgltypes.h
llwindow/llglheaders.h -> llrender/llglheaders.h
---
 indra/newview/CMakeLists.txt | 10 ++--------
 1 file changed, 2 insertions(+), 8 deletions(-)

(limited to 'indra/newview/CMakeLists.txt')

diff --git a/indra/newview/CMakeLists.txt b/indra/newview/CMakeLists.txt
index a1515abf9d..46fb6a6246 100644
--- a/indra/newview/CMakeLists.txt
+++ b/indra/newview/CMakeLists.txt
@@ -85,7 +85,6 @@ set(viewer_SOURCE_FILES
     llconfirmationmanager.cpp
     llconsole.cpp
     llcontainerview.cpp
-    llcubemap.cpp
     llcurrencyuimanager.cpp
     llcylinder.cpp
     lldebugmessagebox.cpp
@@ -196,7 +195,6 @@ set(viewer_SOURCE_FILES
     llgesturemgr.cpp
     llgivemoney.cpp
     llglsandbox.cpp
-    llglslshader.cpp
     llgroupmgr.cpp
     llgroupnotify.cpp
     llhoverview.cpp
@@ -285,7 +283,6 @@ set(viewer_SOURCE_FILES
     llpatchvertexarray.cpp
     llpolymesh.cpp
     llpolymorph.cpp
-    llpostprocess.cpp
     llprefschat.cpp
     llprefsim.cpp
     llprefsvoice.cpp
@@ -299,7 +296,6 @@ set(viewer_SOURCE_FILES
     llpreviewtexture.cpp
     llprogressview.cpp
     llregionposition.cpp
-    llrendersphere.cpp
     llremoteparcelrequest.cpp
     llsavedsettingsglue.cpp
     llselectmgr.cpp
@@ -385,6 +381,7 @@ set(viewer_SOURCE_FILES
     llviewerpartsim.cpp
     llviewerpartsource.cpp
     llviewerregion.cpp
+    llviewershadermgr.cpp
     llviewerstats.cpp
     llviewertexteditor.cpp
     llviewertextureanim.cpp
@@ -475,7 +472,6 @@ set(viewer_HEADER_FILES
     llconfirmationmanager.h
     llconsole.h
     llcontainerview.h
-    llcubemap.h
     llcurrencyuimanager.h
     llcylinder.h
     lldebugmessagebox.h
@@ -586,7 +582,6 @@ set(viewer_HEADER_FILES
     llgenepool.h
     llgesturemgr.h
     llgivemoney.h
-    llglslshader.h
     llgroupmgr.h
     llgroupnotify.h
     llhoverview.h
@@ -674,7 +669,6 @@ set(viewer_HEADER_FILES
     llpanelweb.h
     llparcelselection.h
     llpatchvertexarray.h
-    llpostprocess.h
     llpolymesh.h
     llpolymorph.h
     llprefschat.h
@@ -691,7 +685,6 @@ set(viewer_HEADER_FILES
     llprogressview.h
     llregionposition.h
     llremoteparcelrequest.h
-    llrendersphere.h
     llresourcedata.h
     llsavedsettingsglue.h
     llselectmgr.h
@@ -778,6 +771,7 @@ set(viewer_HEADER_FILES
     llviewerpartsource.h
     llviewerprecompiledheaders.h
     llviewerregion.h
+    llviewershadermgr.h
     llviewerstats.h
     llviewertexteditor.h
     llviewertextureanim.h
-- 
cgit v1.2.3