diff options
author | Loren Shih <seraph@lindenlab.com> | 2010-10-27 15:08:21 -0400 |
---|---|---|
committer | Loren Shih <seraph@lindenlab.com> | 2010-10-27 15:08:21 -0400 |
commit | 225ffbba205e832b75bed3492428ae3a0c8c7404 (patch) | |
tree | 510681690c0c3c5e2504739453873c7ed701c658 /indra/newview/llviewerregion.cpp | |
parent | 1aee2f0d4d16548660df4995aaf3c349304962af (diff) | |
parent | a7143a9998f2a69d323d384558e078b05e9a73a2 (diff) |
Automated merge up from viewer-development
Diffstat (limited to 'indra/newview/llviewerregion.cpp')
-rw-r--r-- | indra/newview/llviewerregion.cpp | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/indra/newview/llviewerregion.cpp b/indra/newview/llviewerregion.cpp index 6deaca3819..3f6082885c 100644 --- a/indra/newview/llviewerregion.cpp +++ b/indra/newview/llviewerregion.cpp @@ -266,6 +266,7 @@ LLViewerRegion::LLViewerRegion(const U64 &handle, //MUST MATCH declaration of eObjectPartitions mObjectPartition.push_back(new LLHUDPartition()); //PARTITION_HUD mObjectPartition.push_back(new LLTerrainPartition()); //PARTITION_TERRAIN + mObjectPartition.push_back(new LLVoidWaterPartition()); //PARTITION_VOIDWATER mObjectPartition.push_back(new LLWaterPartition()); //PARTITION_WATER mObjectPartition.push_back(new LLTreePartition()); //PARTITION_TREE mObjectPartition.push_back(new LLParticlePartition()); //PARTITION_PARTICLE |