Second Life viewer sources 1.20.2

1 files changed, 5 insertions, 5 deletions

diff --git a/linden/indra/newview/llviewerpartsim.cpp b/linden/indra/newview/llviewerpartsim.cpp
index 267f0c8..1788a7c 100644
--- a/linden/indra/newview/llviewerpartsim.cpp
+++ b/linden/indra/newview/llviewerpartsim.cpp
@@ -70,7 +70,7 @@ U32 LLViewerPart::sNextPartID = 1;
 
 F32 calc_desired_size(LLVector3 pos, LLVector2 scale)
 {
-        F32 desired_size = (pos-gCamera->getOrigin()).magVec();
+        F32 desired_size = (pos-LLViewerCamera::getInstance()->getOrigin()).magVec();
         desired_size /= 4;
         return llclamp(desired_size, scale.magVec()*0.5f, PART_SIM_BOX_SIDE*2);
 }
@@ -121,7 +121,7 @@ LLViewerPartGroup::LLViewerPartGroup(const LLVector3 &center_agent, const F32 bo
         mVOPartGroupp = NULL;
         mUniformParticles = TRUE;
 
-        mRegionp = gWorldPointer->getRegionFromPosAgent(center_agent);
+        mRegionp = LLWorld::getInstance()->getRegionFromPosAgent(center_agent);
         llassert_always(center_agent.isFinite());
         
         if (!mRegionp)
@@ -243,7 +243,7 @@ void LLViewerPartGroup::updateParticles(const F32 lastdt)
         S32 i;
         F32 dt;
         
-        LLVector3 gravity(0.f, 0.f, -9.8f);
+        LLVector3 gravity(0.f, 0.f, GRAVITY);
 
         LLViewerRegion *regionp = getRegion();
         S32 end = (S32) mParticles.size();
@@ -371,7 +371,7 @@ void LLViewerPartGroup::updateParticles(const F32 lastdt)
                         if (!posInGroup(part.mPosAgent, desired_size))
                         {
                                 // Transfer particles between groups
-                                gWorldPointer->mPartSim.put(&part);
+                                LLViewerPartSim::getInstance()->put(&part);
                                 end--;
                                 LLPointer<LLViewerPart>::swap(mParticles[i], mParticles[end]);
                                 // be sure to process the particle we just swapped-in
@@ -445,7 +445,7 @@ LLViewerPartSim::LLViewerPartSim()
 }
 
 
-LLViewerPartSim::~LLViewerPartSim()
+void LLViewerPartSim::destroyClass()
 {
         LLMemType mt(LLMemType::MTYPE_PARTICLES);
         S32 i;