From 050dad0ce35207a4ac1562175e853590ad9b7681 Mon Sep 17 00:00:00 2001
From: Steven Bennetts <steve@lindenlab.com>
Date: Wed, 7 Nov 2007 22:55:27 +0000
Subject: merge svn+ssh://steve@svn/svn/linden/branches/viewer-cleanup-3 -r
 73026:73079

---
 indra/newview/llvosky.cpp | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

(limited to 'indra/newview/llvosky.cpp')

diff --git a/indra/newview/llvosky.cpp b/indra/newview/llvosky.cpp
index d3c24a6e72..b8d994d095 100644
--- a/indra/newview/llvosky.cpp
+++ b/indra/newview/llvosky.cpp
@@ -53,7 +53,6 @@
 #include "llviewerregion.h"
 #include "llworld.h"
 #include "pipeline.h"
-#include "viewer.h"		// for gSunTextureID
 
 const S32 NUM_TILES_X = 8;
 const S32 NUM_TILES_Y = 4;
@@ -72,6 +71,10 @@ const LLVector2 TEX01 = LLVector2(0.f, 1.f);
 const LLVector2 TEX10 = LLVector2(1.f, 0.f);
 const LLVector2 TEX11 = LLVector2(1.f, 1.f);
 
+// Exported globals
+LLUUID gSunTextureID = IMG_SUN;
+LLUUID gMoonTextureID = IMG_MOON;
+
 //static 
 LLColor3 LLHaze::sAirScaSeaLevel;
 
-- 
cgit v1.2.3