diff options
| author | Mark Palange (Mani) <palange@lindenlab.com> | 2010-06-01 18:42:27 -0700 |
|---|---|---|
| committer | Mark Palange (Mani) <palange@lindenlab.com> | 2010-06-01 18:42:27 -0700 |
| commit | ebee0b30eb8bd2cce773ed5e2f70aa21afeb2924 (patch) | |
| tree | 2ca64c56c047ebf621e20b61108e78cac73b4756 /indra/newview/llcloud.cpp | |
| parent | 7bf5e5c6189a7316b7d1dbcb749c0feb8564c3e5 (diff) | |
| parent | 6886bd65ddaa07f6fb22e243995964084acce998 (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) { |