livie
/
phoenix-firestorm
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

correct merge errors

master
Oz Linden 2011-05-26 21:40:16 -04:00
parent 42b967e8a1
commit 156e72fc19
1 changed files with 0 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
indra/newview/llworld.cpp
View File

@ -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;