diff options
| author | Oz Linden <oz@lindenlab.com> | 2011-05-26 21:40:16 -0400 |
|---|---|---|
| committer | Oz Linden <oz@lindenlab.com> | 2011-05-26 21:40:16 -0400 |
| commit | 156e72fc19c7be33a7d8d04e5a630ecac6c8d5a6 (patch) | |
| tree | ade05c2798239797c3c570fa3e4cfeb7d5eb20f2 | |
| parent | 42b967e8a1ad55dd3a07616f8c1a8d92e535848f (diff) | |
correct merge errors
| -rw-r--r-- | indra/newview/llworld.cpp | 3 |
1 files changed, 0 insertions, 3 deletions
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; |