Singularity-Viewer/SingularityViewer
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Cleanup stuffs inspired by Drake's work~

Browse Source
This commit is contained in:
Inusaito Sayori
2015-01-13 00:50:49 -05:00
parent eef7596aeb
commit 0b998da183
2 changed files with 39 additions and 40 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
indra/llcommon/llmemory.cpp
View File

@@ -133,8 +133,6 @@ void LLMemory::updateMemoryInfo()
sMaxPhysicalMemInKB = U32_MAX ; sMaxPhysicalMemInKB = U32_MAX ;
sAvailPhysicalMemInKB = U32_MAX ; sAvailPhysicalMemInKB = U32_MAX ;
#endif #endif
return ;
} }
// //

77
indra/newview/llworld.cpp
View File

@@ -137,7 +137,7 @@ void LLWorld::destroyClass()
{ {
mHoleWaterObjects.clear(); mHoleWaterObjects.clear();
gObjectList.destroy(); gObjectList.destroy();
for(region_list_t::iterator region_it = mRegionList.begin(); region_it != mRegionList.end(); ) for(region_list_t::iterator region_it = mRegionList.begin(), region_it_end(mRegionList.end()); region_it != region_it_end; )
{ {
LLViewerRegion* region_to_delete = *region_it++; LLViewerRegion* region_to_delete = *region_it++;
removeRegion(region_to_delete->getHost()); removeRegion(region_to_delete->getHost());
@@ -314,8 +314,8 @@ void LLWorld::removeRegion(const LLHost &host)
if (regionp == gAgent.getRegion()) if (regionp == gAgent.getRegion())
{ {
for (region_list_t::iterator iter = mRegionList.begin(); for (region_list_t::iterator iter = mRegionList.begin(), iter_end(mRegionList.end());
iter != mRegionList.end(); ++iter) iter != iter_end; ++iter)
{ {
LLViewerRegion* reg = *iter; LLViewerRegion* reg = *iter;
llwarns << "RegionDump: " << reg->getName() llwarns << "RegionDump: " << reg->getName()
@@ -361,8 +361,8 @@ void LLWorld::removeRegion(const LLHost &host)
LLViewerRegion* LLWorld::getRegion(const LLHost &host) LLViewerRegion* LLWorld::getRegion(const LLHost &host)
{ {
for (region_list_t::iterator iter = mRegionList.begin(); for (region_list_t::iterator iter = mRegionList.begin(), iter_end(mRegionList.end());
iter != mRegionList.end(); ++iter) iter != iter_end; ++iter)
{ {
LLViewerRegion* regionp = *iter; LLViewerRegion* regionp = *iter;
if (regionp->getHost() == host) if (regionp->getHost() == host)
@@ -380,8 +380,8 @@ LLViewerRegion* LLWorld::getRegionFromPosAgent(const LLVector3 &pos)
LLViewerRegion* LLWorld::getRegionFromPosGlobal(const LLVector3d &pos) LLViewerRegion* LLWorld::getRegionFromPosGlobal(const LLVector3d &pos)
{ {
for (region_list_t::iterator iter = mRegionList.begin(); for (region_list_t::iterator iter = mRegionList.begin(), iter_end = mRegionList.end();
iter != mRegionList.end(); ++iter) iter != iter_end; ++iter)
{ {
LLViewerRegion* regionp = *iter; LLViewerRegion* regionp = *iter;
if (regionp->pointInRegionGlobal(pos)) if (regionp->pointInRegionGlobal(pos))
@@ -469,8 +469,8 @@ LLViewerRegion* LLWorld::getRegionFromHandle(const U64 &handle)
from_region_handle(handle, &x, &y); from_region_handle(handle, &x, &y);
// </FS:CR> Aurora Sim // </FS:CR> Aurora Sim
for (region_list_t::iterator iter = mRegionList.begin(); for (region_list_t::iterator iter = mRegionList.begin(), iter_end(mRegionList.end());
iter != mRegionList.end(); ++iter) iter != iter_end; ++iter)
{ {
LLViewerRegion* regionp = *iter; LLViewerRegion* regionp = *iter;
// <FS:CR> Aurora Sim // <FS:CR> Aurora Sim
@@ -491,8 +491,8 @@ LLViewerRegion* LLWorld::getRegionFromHandle(const U64 &handle)
LLViewerRegion* LLWorld::getRegionFromID(const LLUUID& region_id) LLViewerRegion* LLWorld::getRegionFromID(const LLUUID& region_id)
{ {
for (region_list_t::iterator iter = mRegionList.begin(); for (region_list_t::iterator iter = mRegionList.begin(), iter_end(mRegionList.end());
iter != mRegionList.end(); ++iter) iter != iter_end; ++iter)
{ {
LLViewerRegion* regionp = *iter; LLViewerRegion* regionp = *iter;
if (regionp->getRegionID() == region_id) if (regionp->getRegionID() == region_id)
@@ -518,8 +518,8 @@ 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(); for (region_list_t::iterator iter = mRegionList.begin(), iter_end(mRegionList.end());
iter != mRegionList.end(); ++iter) iter != iter_end; ++iter)
{ {
LLViewerRegion* regionp = *iter; LLViewerRegion* regionp = *iter;
if (regionp->pointInRegionGlobal(pos_global)) if (regionp->pointInRegionGlobal(pos_global))
@@ -688,8 +688,8 @@ void LLWorld::updateVisibilities()
F32 cur_far_clip = LLViewerCamera::getInstance()->getFar(); F32 cur_far_clip = LLViewerCamera::getInstance()->getFar();
// Go through the culled list and check for visible regions (region is visible if land is visible) // Go through the culled list and check for visible regions (region is visible if land is visible)
for (region_list_t::iterator iter = mCulledRegionList.begin(); for (region_list_t::iterator iter = mCulledRegionList.begin(), iter_end(mCulledRegionList.end());
iter != mCulledRegionList.end(); ) iter != iter_end; )
{ {
region_list_t::iterator curiter = iter++; region_list_t::iterator curiter = iter++;
LLViewerRegion* regionp = *curiter; LLViewerRegion* regionp = *curiter;
@@ -707,8 +707,8 @@ void LLWorld::updateVisibilities()
} }
// Update all of the visible regions // Update all of the visible regions
for (region_list_t::iterator iter = mVisibleRegionList.begin(); for (region_list_t::iterator iter = mVisibleRegionList.begin(), iter_end(mVisibleRegionList.end());
iter != mVisibleRegionList.end(); ) iter != iter_end; )
{ {
region_list_t::iterator curiter = iter++; region_list_t::iterator curiter = iter++;
LLViewerRegion* regionp = *curiter; LLViewerRegion* regionp = *curiter;
@@ -749,8 +749,8 @@ void LLWorld::updateRegions(F32 max_update_time)
BOOL did_one = FALSE; BOOL did_one = FALSE;
// Perform idle time updates for the regions (and associated surfaces) // Perform idle time updates for the regions (and associated surfaces)
for (region_list_t::iterator iter = mActiveRegionList.begin()/*mRegionList.begin()*/; for (region_list_t::iterator iter = mActiveRegionList.begin()/*mRegionList.begin()*/, iter_end(mActiveRegionList.end()/*mRegionList.end()*/);
iter != mActiveRegionList.end()/*mRegionList.end()*/; ++iter) iter != iter_end; ++iter)
{ {
LLViewerRegion* regionp = *iter; LLViewerRegion* regionp = *iter;
F32 max_time = max_update_time - update_timer.getElapsedTimeF32(); F32 max_time = max_update_time - update_timer.getElapsedTimeF32();
@@ -790,8 +790,9 @@ void LLWorld::updateClouds(const F32 dt)
{ {
// Update all the cloud puff positions, and timer based stuff // Update all the cloud puff positions, and timer based stuff
// such as death decay // such as death decay
region_list_t::iterator iter_end(mActiveRegionList.end());
for (region_list_t::iterator iter = mActiveRegionList.begin(); for (region_list_t::iterator iter = mActiveRegionList.begin();
iter != mActiveRegionList.end(); ++iter) iter != iter_end; ++iter)
{ {
LLViewerRegion* regionp = *iter; LLViewerRegion* regionp = *iter;
regionp->mCloudLayer.updatePuffs(dt); regionp->mCloudLayer.updatePuffs(dt);
@@ -799,7 +800,7 @@ void LLWorld::updateClouds(const F32 dt)
// Reshuffle who owns which puffs // Reshuffle who owns which puffs
for (region_list_t::iterator iter = mActiveRegionList.begin(); for (region_list_t::iterator iter = mActiveRegionList.begin();
iter != mActiveRegionList.end(); ++iter) iter != iter_end; ++iter)
{ {
LLViewerRegion* regionp = *iter; LLViewerRegion* regionp = *iter;
regionp->mCloudLayer.updatePuffOwnership(); regionp->mCloudLayer.updatePuffOwnership();
@@ -807,7 +808,7 @@ void LLWorld::updateClouds(const F32 dt)
// Add new puffs // Add new puffs
for (region_list_t::iterator iter = mActiveRegionList.begin(); for (region_list_t::iterator iter = mActiveRegionList.begin();
iter != mActiveRegionList.end(); ++iter) iter != iter_end; ++iter)
{ {
LLViewerRegion* regionp = *iter; LLViewerRegion* regionp = *iter;
regionp->mCloudLayer.updatePuffCount(); regionp->mCloudLayer.updatePuffCount();
@@ -821,8 +822,8 @@ LLCloudGroup* LLWorld::findCloudGroup(const LLCloudPuff &puff)
{ {
// Update all the cloud puff positions, and timer based stuff // Update all the cloud puff positions, and timer based stuff
// such as death decay // such as death decay
for (region_list_t::iterator iter = mActiveRegionList.begin(); for (region_list_t::iterator iter = mActiveRegionList.begin(), iter_end(mActiveRegionList.end());
iter != mActiveRegionList.end(); ++iter) iter != iter_end; ++iter)
{ {
LLViewerRegion* regionp = *iter; LLViewerRegion* regionp = *iter;
LLCloudGroup *groupp = regionp->mCloudLayer.findCloudGroup(puff); LLCloudGroup *groupp = regionp->mCloudLayer.findCloudGroup(puff);
@@ -842,8 +843,8 @@ void LLWorld::renderPropertyLines()
S32 region_count = 0; S32 region_count = 0;
S32 vertex_count = 0; S32 vertex_count = 0;
for (region_list_t::iterator iter = mVisibleRegionList.begin(); for (region_list_t::iterator iter = mVisibleRegionList.begin(), iter_end(mVisibleRegionList.end());
iter != mVisibleRegionList.end(); ++iter) iter != iter_end; ++iter)
{ {
LLViewerRegion* regionp = *iter; LLViewerRegion* regionp = *iter;
region_count++; region_count++;
@@ -857,8 +858,8 @@ void LLWorld::updateNetStats()
F32 bits = 0.f; F32 bits = 0.f;
U32 packets = 0; U32 packets = 0;
for (region_list_t::iterator iter = mActiveRegionList.begin(); for (region_list_t::iterator iter = mActiveRegionList.begin(), iter_end(mActiveRegionList.end());
iter != mActiveRegionList.end(); ++iter) iter != iter_end; ++iter)
{ {
LLViewerRegion* regionp = *iter; LLViewerRegion* regionp = *iter;
regionp->updateNetStats(); regionp->updateNetStats();
@@ -899,8 +900,8 @@ void LLWorld::printPacketsLost()
llinfos << "----------" << llendl; llinfos << "----------" << llendl;
LLCircuitData *cdp = NULL; LLCircuitData *cdp = NULL;
for (region_list_t::iterator iter = mActiveRegionList.begin(); for (region_list_t::iterator iter = mActiveRegionList.begin(), iter_end(mActiveRegionList.end());
iter != mActiveRegionList.end(); ++iter) iter != iter_end; ++iter)
{ {
LLViewerRegion* regionp = *iter; LLViewerRegion* regionp = *iter;
cdp = gMessageSystem->mCircuitInfo.findCircuit(regionp->getHost()); cdp = gMessageSystem->mCircuitInfo.findCircuit(regionp->getHost());
@@ -950,7 +951,7 @@ void LLWorld::setLandFarClip(const F32 far_clip)
// a (possibly) new water height. Update it in our local copy. // a (possibly) new water height. Update it in our local copy.
void LLWorld::waterHeightRegionInfo(std::string const& sim_name, F32 water_height) void LLWorld::waterHeightRegionInfo(std::string const& sim_name, F32 water_height)
{ {
for (region_list_t::iterator iter = mRegionList.begin(); iter != mRegionList.end(); ++iter) for (region_list_t::iterator iter = mRegionList.begin(), iter_end(mRegionList.end()); iter != iter_end; ++iter)
{ {
if ((*iter)->getName() == sim_name) if ((*iter)->getName() == sim_name)
{ {
@@ -1189,7 +1190,7 @@ void LLWorld::updateWaterObjects()
llinfos << "Water height used for Hole and Edge water objects: " << water_height << llendl; llinfos << "Water height used for Hole and Edge water objects: " << water_height << llendl;
// Update all Region water objects. // Update all Region water objects.
for (region_list_t::iterator iter = mRegionList.begin(); iter != mRegionList.end(); ++iter) for (region_list_t::iterator iter = mRegionList.begin(), iter_end(mRegionList.end()); iter != iter_end; ++iter)
{ {
LLViewerRegion* regionp = *iter; LLViewerRegion* regionp = *iter;
LLVOWater* waterp = regionp->getLand().getWaterObj(); LLVOWater* waterp = regionp->getLand().getWaterObj();
@@ -1304,8 +1305,8 @@ U64 LLWorld::getSpaceTimeUSec() const
void LLWorld::requestCacheMisses() void LLWorld::requestCacheMisses()
{ {
for (region_list_t::iterator iter = mRegionList.begin(); for (region_list_t::iterator iter = mRegionList.begin(), iter_end(mRegionList.end());
iter != mRegionList.end(); ++iter) iter != iter_end; ++iter)
{ {
LLViewerRegion* regionp = *iter; LLViewerRegion* regionp = *iter;
regionp->requestCacheMisses(); regionp->requestCacheMisses();
@@ -1315,8 +1316,8 @@ void LLWorld::requestCacheMisses()
void LLWorld::getInfo(LLSD& info) void LLWorld::getInfo(LLSD& info)
{ {
LLSD region_info; LLSD region_info;
for (region_list_t::iterator iter = mRegionList.begin(); for (region_list_t::iterator iter = mRegionList.begin(), iter_end(mRegionList.end());
iter != mRegionList.end(); ++iter) iter != iter_end; ++iter)
{ {
LLViewerRegion* regionp = *iter; LLViewerRegion* regionp = *iter;
regionp->getInfo(region_info); regionp->getInfo(region_info);
@@ -1327,8 +1328,8 @@ void LLWorld::getInfo(LLSD& info)
void LLWorld::disconnectRegions() void LLWorld::disconnectRegions()
{ {
LLMessageSystem* msg = gMessageSystem; LLMessageSystem* msg = gMessageSystem;
for (region_list_t::iterator iter = mRegionList.begin(); for (region_list_t::iterator iter = mRegionList.begin(), iter_end(mRegionList.end());
iter != mRegionList.end(); ++iter) iter != iter_end; ++iter)
{ {
LLViewerRegion* regionp = *iter; LLViewerRegion* regionp = *iter;
if (regionp == gAgent.getRegion()) if (regionp == gAgent.getRegion())