diff options
author | McCabe Maxsted | 2009-06-07 23:14:43 -0700 |
---|---|---|
committer | McCabe Maxsted | 2009-06-07 23:14:43 -0700 |
commit | e0a70bea805cf07b92efabca15ffe56a777f90ac (patch) | |
tree | 2c93d38e210832e737d09cff7561373d8d5453b2 /linden/indra/newview/llviewerregion.cpp | |
parent | 1.1 version final (diff) | |
parent | Merge branch 'sl-base-1.22' into next (diff) | |
download | meta-impy-e0a70bea805cf07b92efabca15ffe56a777f90ac.zip meta-impy-e0a70bea805cf07b92efabca15ffe56a777f90ac.tar.gz meta-impy-e0a70bea805cf07b92efabca15ffe56a777f90ac.tar.bz2 meta-impy-e0a70bea805cf07b92efabca15ffe56a777f90ac.tar.xz |
Moved base up to 1.22
Diffstat (limited to 'linden/indra/newview/llviewerregion.cpp')
-rw-r--r-- | linden/indra/newview/llviewerregion.cpp | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/linden/indra/newview/llviewerregion.cpp b/linden/indra/newview/llviewerregion.cpp index 19e5117..0018323 100644 --- a/linden/indra/newview/llviewerregion.cpp +++ b/linden/indra/newview/llviewerregion.cpp | |||
@@ -4,7 +4,7 @@ | |||
4 | * | 4 | * |
5 | * $LicenseInfo:firstyear=2000&license=viewergpl$ | 5 | * $LicenseInfo:firstyear=2000&license=viewergpl$ |
6 | * | 6 | * |
7 | * Copyright (c) 2000-2008, Linden Research, Inc. | 7 | * Copyright (c) 2000-2009, Linden Research, Inc. |
8 | * | 8 | * |
9 | * Second Life Viewer Source Code | 9 | * Second Life Viewer Source Code |
10 | * The source code in this file ("Source Code") is provided by Linden Lab | 10 | * The source code in this file ("Source Code") is provided by Linden Lab |
@@ -215,6 +215,7 @@ LLViewerRegion::LLViewerRegion(const U64 &handle, | |||
215 | mObjectPartition.push_back(new LLGrassPartition()); //PARTITION_GRASS | 215 | mObjectPartition.push_back(new LLGrassPartition()); //PARTITION_GRASS |
216 | mObjectPartition.push_back(new LLVolumePartition()); //PARTITION_VOLUME | 216 | mObjectPartition.push_back(new LLVolumePartition()); //PARTITION_VOLUME |
217 | mObjectPartition.push_back(new LLBridgePartition()); //PARTITION_BRIDGE | 217 | mObjectPartition.push_back(new LLBridgePartition()); //PARTITION_BRIDGE |
218 | mObjectPartition.push_back(new LLHUDParticlePartition());//PARTITION_HUD_PARTICLE | ||
218 | mObjectPartition.push_back(NULL); //PARTITION_NONE | 219 | mObjectPartition.push_back(NULL); //PARTITION_NONE |
219 | 220 | ||
220 | } | 221 | } |