diff options
| author | Brad Linden <46733234+brad-linden@users.noreply.github.com> | 2023-04-28 09:48:02 -0700 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2023-04-28 09:48:02 -0700 |
| commit | b21e16f27d215cd2e564af7c48cba86459d07645 (patch) | |
| tree | ebccf636e37fd64fd08435f20c220f037ceec97d /indra/newview/llworld.h | |
| parent | f5cf0cf876c3e69aa9b378b3f363f39679f4b7a4 (diff) | |
| parent | 97c6bf8f743ef4956d7d706e26f25ce6f32182b4 (diff) | |
Merge pull request #198 from secondlife/DRTVWR-559-merge-539
DRTVWR-559 merge 539
Diffstat (limited to 'indra/newview/llworld.h')
| -rw-r--r-- | indra/newview/llworld.h | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/indra/newview/llworld.h b/indra/newview/llworld.h index 5dee8eea0f..b2be36d72c 100644 --- a/indra/newview/llworld.h +++ b/indra/newview/llworld.h @@ -51,6 +51,7 @@ class LLHost; class LLViewerObject; class LLSurfacePatch; +class LLCharacter; class LLCloudPuff; class LLCloudGroup; class LLVOAvatar; @@ -171,6 +172,8 @@ public: // or if the circuit to this simulator had been lost. bool isRegionListed(const LLViewerRegion* region) const; + S32 getNearbyAvatarsAndCompl(std::vector<LLCharacter*> &valid_nearby_avs); + private: void clearHoleWaterObjects(); void clearEdgeWaterObjects(); |