diff options
| author | Tofu Linden <tofu.linden@lindenlab.com> | 2010-05-27 12:22:31 +0100 |
|---|---|---|
| committer | Tofu Linden <tofu.linden@lindenlab.com> | 2010-05-27 12:22:31 +0100 |
| commit | 63200e2a5bfc7538fd8114464000f35798670f23 (patch) | |
| tree | 75cb9595ce06d0c460f700c96da053644f9bc733 /indra/newview/llcloud.cpp | |
| parent | 8eb3829ef7e22eb934a36476cba10d651b528bf2 (diff) | |
| parent | f33fdbf0ef25c485bdd09faaf1177d2b2b1a7694 (diff) | |
merge
Diffstat (limited to 'indra/newview/llcloud.cpp')
| -rw-r--r-- | indra/newview/llcloud.cpp | 22 |
1 files changed, 11 insertions, 11 deletions
diff --git a/indra/newview/llcloud.cpp b/indra/newview/llcloud.cpp index af6f4e3286..a4104923e4 100644 --- a/indra/newview/llcloud.cpp +++ b/indra/newview/llcloud.cpp @@ -329,16 +329,7 @@ void LLCloudLayer::setRegion(LLViewerRegion *regionp) void LLCloudLayer::destroy() { - // Kill all of the existing puffs - S32 i, j; - - for (i = 0; i < CLOUD_GROUPS_PER_EDGE; i++) - { - for (j = 0; j < CLOUD_GROUPS_PER_EDGE; j++) - { - mCloudGroups[i][j].cleanup(); - } - } + reset(); delete [] mDensityp; mDensityp = NULL; @@ -348,8 +339,17 @@ void LLCloudLayer::destroy() void LLCloudLayer::reset() { -} + // Kill all of the existing puffs + S32 i, j; + for (i = 0; i < CLOUD_GROUPS_PER_EDGE; i++) + { + for (j = 0; j < CLOUD_GROUPS_PER_EDGE; j++) + { + mCloudGroups[i][j].cleanup(); + } + } +} void LLCloudLayer::setWindPointer(LLWind *windp) { |