diff options
author | Nat Goodspeed <nat@lindenlab.com> | 2022-05-18 14:08:24 -0400 |
---|---|---|
committer | Nat Goodspeed <nat@lindenlab.com> | 2022-05-18 14:08:24 -0400 |
commit | c0aa1a1202678fdde0206c9372fb071c028cfe5b (patch) | |
tree | 614a5e0b9e24343c59709a9378050b601dd0f828 /indra/newview/llworld.h | |
parent | 06aa68c2fbcd83cb00465c9f14933bda276b11e8 (diff) | |
parent | a9363222618a879dd7d0d78471f8773af6b61618 (diff) |
SL-17219: Merge 'DRTVWR-546' of lindenlab/viewer into SL-17219
Update task branch from main project branch.
Diffstat (limited to 'indra/newview/llworld.h')
-rw-r--r-- | indra/newview/llworld.h | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/indra/newview/llworld.h b/indra/newview/llworld.h index 69f2df4203..5c43cdf4e2 100644 --- a/indra/newview/llworld.h +++ b/indra/newview/llworld.h @@ -64,7 +64,9 @@ class LLWorld : public LLSimpleton<LLWorld> public: LLWorld(); - void destroyClass(); + // Clear any objects, regions + // Prepares class to be reused or destroyed + void resetClass(); LLViewerRegion* addRegion(const U64 ®ion_handle, const LLHost &host); // safe to call if already present, does the "right thing" if |