Merge branch 'release/luau-scripting' into lua-resultset

1 files changed, 11 insertions, 11 deletions

diff --git a/indra/newview/llworld.cpp b/indra/newview/llworld.cpp
index 249dd10f46..2eadea20ef 100644
--- a/indra/newview/llworld.cpp
+++ b/indra/newview/llworld.cpp
@@ -107,7 +107,7 @@ LLWorld::LLWorld() :
     *(default_texture++) = MAX_WATER_COLOR.mV[2];
     *(default_texture++) = MAX_WATER_COLOR.mV[3];
 
-    mDefaultWaterTexturep = LLViewerTextureManager::getLocalTexture(raw.get(), FALSE);
+    mDefaultWaterTexturep = LLViewerTextureManager::getLocalTexture(raw.get(), false);
     gGL.getTexUnit(0)->bind(mDefaultWaterTexturep);
     mDefaultWaterTexturep->setAddressMode(LLTexUnit::TAM_CLAMP);
 
@@ -450,7 +450,7 @@ void LLWorld::updateAgentOffset(const LLVector3d &offset_global)
 }
 
 
-BOOL LLWorld::positionRegionValidGlobal(const LLVector3d &pos_global)
+bool LLWorld::positionRegionValidGlobal(const LLVector3d &pos_global)
 {
     for (region_list_t::iterator iter = mRegionList.begin();
          iter != mRegionList.end(); ++iter)
@@ -458,10 +458,10 @@ BOOL LLWorld::positionRegionValidGlobal(const LLVector3d &pos_global)
         LLViewerRegion* regionp = *iter;
         if (regionp->pointInRegionGlobal(pos_global))
         {
-            return TRUE;
+            return true;
         }
     }
-    return FALSE;
+    return false;
 }
 
 
@@ -961,7 +961,7 @@ void LLWorld::updateWaterObjects()
             if (!getRegionFromHandle(region_handle))
             {   // No region at that area, so make water
                 LLVOWater* waterp = (LLVOWater *)gObjectList.createObjectViewer(LLViewerObject::LL_VO_WATER, gAgent.getRegion());
-                waterp->setUseTexture(FALSE);
+                waterp->setUseTexture(false);
                 waterp->setPositionGlobal(LLVector3d(x + rwidth/2,
                                                      y + rwidth/2,
                                                      256.f + water_height));
@@ -1015,8 +1015,8 @@ void LLWorld::updateWaterObjects()
             mEdgeWaterObjects[dir] = (LLVOWater *)gObjectList.createObjectViewer(LLViewerObject::LL_VO_VOID_WATER,
                                                                                  gAgent.getRegion());
             waterp = mEdgeWaterObjects[dir];
-            waterp->setUseTexture(FALSE);
-            waterp->setIsEdgePatch(TRUE);
+            waterp->setUseTexture(false);
+            waterp->setIsEdgePatch(true);
             gPipeline.createObject(waterp);
         }
 
@@ -1129,7 +1129,7 @@ void process_enable_simulator(LLMessageSystem *msg, void **user_data)
     LLHost sim(ip_u32, port);
 
     // Viewer trusts the simulator.
-    msg->enableCircuit(sim, TRUE);
+    msg->enableCircuit(sim, true);
     LLWorld::getInstance()->addRegion(handle, sim);
 
     // give the simulator a message it can use to get ip and port
@@ -1259,7 +1259,7 @@ void send_agent_pause()
         gMessageSystem->sendReliable(regionp->getHost());
     }
 
-    gObjectList.mWasPaused = TRUE;
+    gObjectList.mWasPaused = true;
     LLViewerStats::instance().getRecording().stop();
 }
 
@@ -1352,8 +1352,8 @@ void LLWorld::getAvatars(uuid_vec_t* avatar_ids, std::vector<LLVector3d>* positi
     {
         LLViewerRegion* regionp = *iter;
         const LLVector3d& origin_global = regionp->getOriginGlobal();
-        S32 count = regionp->mMapAvatars.size();
-        for (S32 i = 0; i < count; i++)
+        auto count = regionp->mMapAvatars.size();
+        for (size_t i = 0; i < count; i++)
         {
             LLVector3d pos_global = unpackLocalToGlobalPosition(regionp->mMapAvatars.at(i), origin_global);
             if(dist_vec_squared(pos_global, relative_to) <= radius_squared)