From 156e72fc19c7be33a7d8d04e5a630ecac6c8d5a6 Mon Sep 17 00:00:00 2001
From: Oz Linden <oz@lindenlab.com>
Date: Thu, 26 May 2011 21:40:16 -0400
Subject: correct merge errors

---
 indra/newview/llworld.cpp | 3 ---
 1 file changed, 3 deletions(-)

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

diff --git a/indra/newview/llworld.cpp b/indra/newview/llworld.cpp
index 00a1f90b1c..4a6ec7fdbb 100644
--- a/indra/newview/llworld.cpp
+++ b/indra/newview/llworld.cpp
@@ -61,7 +61,6 @@
 #include <map>
 #include <cstring>
 
-#define TMP_WL_REMOVE_CLOUDS /* disables code for classic clouds */
 
 //
 // Globals
@@ -658,8 +657,6 @@ void LLWorld::updateParticles()
 	LLViewerPartSim::getInstance()->updateSimulation();
 }
 
-#ifndef TMP_WL_REMOVE_CLOUDS
-
 void LLWorld::renderPropertyLines()
 {
 	S32 region_count = 0;
-- 
cgit v1.2.3