From 377ae59c21215473cf05e3cb8a86eb14c9e7715c Mon Sep 17 00:00:00 2001 From: Steven Bennetts Date: Tue, 11 Mar 2008 01:47:36 +0000 Subject: merge Branch_1-19-1-Viewer -r 80930 : 81609 -> release DEV-11202: Unhandled Excpetion in pipeline.cpp. Merged over updated windlight ui help text from windlight14. Reverting a const change in a virtual that was not propagated to all overrides. DEV-10957 stop and pause Media and music buttons do not work DEV-10762 Displayed page in the client browser disappears when crossing property boundaries. DEV-11220 replace misspellings in alerts.xml parameters of 'messsage' DEV-11221 fix a misspelling of 'participants' in floater_chat_history.xml tooltip DEV-11193 clean up some viewer strings related to Windlight help text svn merge -r81144:81147 svn+ssh://svn/svn/linden/branches/1-19-1-viewer-threads DEV-11110 Media browser history dropdown does not save items across sessions Ran the xuiparse -process tool on all en-us xml files. This does NOT change any data, merely reorders attributes and cleans up tab/spacing. DEV-11349 XML CLEANUP: fix duplicate sibling names in en-us xui files DEV-11348 Change to llmimetypes.cpp broke Media Type dropdown dev-10623 "parcels that played movies no longer work in combo-merge-ui" DEV-11379 - crash in LLTabContainer::draw() DEV-11377 Elminiate dangerous LLLinkedList and LLDoubleLinkedList from newview DEV-11158 sculpties on the top10 crash list DEV-11404 "Send Current URL to Parcel" does not set the MIME type merge 80958:80959 maint-ui-9-qa, DEV-11105 -- Searching for people with 3 characters like "j l" hurts the database. DEV-10489: no draw distance cheating DEV-879: water noise frequency DEV-10764: macbook air support DEV-10878: Linux Intel945 support DEV-7551: featuretable adjustments for framerate. DEV-11426 Enormous mini-map. DEV-11505 - Crash in gunzip_file. Removed final LinkedList, SkipMap, and AssocList templates from the Viewer! DEV-11115 truncated word in the Advanced Water Editor's modal help dialog --- indra/newview/lltoolbrush.cpp | 60 +++++++++++++++++++++---------------------- 1 file changed, 30 insertions(+), 30 deletions(-) (limited to 'indra/newview/lltoolbrush.cpp') diff --git a/indra/newview/lltoolbrush.cpp b/indra/newview/lltoolbrush.cpp index 5a637a6346..d39ce57e56 100644 --- a/indra/newview/lltoolbrush.cpp +++ b/indra/newview/lltoolbrush.cpp @@ -108,10 +108,10 @@ void LLToolBrushLand::modifyLandAtPointGlobal(const LLVector3d &pos_global, S32 radioAction = gSavedSettings.getS32("RadioLandBrushAction"); determineAffectedRegions(mLastAffectedRegions, pos_global); - for(LLViewerRegion* regionp = mLastAffectedRegions.getFirstData(); - regionp != NULL; - regionp = mLastAffectedRegions.getNextData()) + for(region_list_t::iterator iter = mLastAffectedRegions.begin(); + iter != mLastAffectedRegions.end(); ++iter) { + LLViewerRegion* regionp = *iter; //BOOL is_changed = FALSE; LLVector3 pos_region = regionp->getPosRegionFromGlobal(pos_global); LLSurface &land = regionp->getLand(); @@ -200,7 +200,7 @@ void LLToolBrushLand::modifyLandInSelectionGlobal() S32 radioAction = gSavedSettings.getS32("RadioLandBrushAction"); - mLastAffectedRegions.removeAllNodes(); + mLastAffectedRegions.clear(); determineAffectedRegions(mLastAffectedRegions, LLVector3d(min.mdV[VX], min.mdV[VY], 0)); determineAffectedRegions(mLastAffectedRegions, LLVector3d(min.mdV[VX], max.mdV[VY], 0)); @@ -223,10 +223,10 @@ void LLToolBrushLand::modifyLandInSelectionGlobal() } // Stop if our selection include a no-terraform region - for(LLViewerRegion* regionp = mLastAffectedRegions.getFirstData(); - regionp != NULL; - regionp = mLastAffectedRegions.getNextData()) + for(region_list_t::iterator iter = mLastAffectedRegions.begin(); + iter != mLastAffectedRegions.end(); ++iter) { + LLViewerRegion* regionp = *iter; if (!canTerraform(regionp)) { alertNoTerraform(regionp); @@ -234,10 +234,10 @@ void LLToolBrushLand::modifyLandInSelectionGlobal() } } - for(LLViewerRegion* regionp = mLastAffectedRegions.getFirstData(); - regionp != NULL; - regionp = mLastAffectedRegions.getNextData()) + for(region_list_t::iterator iter = mLastAffectedRegions.begin(); + iter != mLastAffectedRegions.end(); ++iter) { + LLViewerRegion* regionp = *iter; //BOOL is_changed = FALSE; LLVector3 min_region = regionp->getPosRegionFromGlobal(min); LLVector3 max_region = regionp->getPosRegionFromGlobal(max); @@ -398,7 +398,7 @@ BOOL LLToolBrushLand::handleHover( S32 x, S32 y, MASK mask ) BOOL LLToolBrushLand::handleMouseUp(S32 x, S32 y, MASK mask) { BOOL handled = FALSE; - mLastAffectedRegions.removeAllNodes(); + mLastAffectedRegions.clear(); if( hasMouseCapture() ) { // Release the mouse @@ -452,15 +452,15 @@ void LLToolBrushLand::render() spot.mdV[VY] = floor( spot.mdV[VY] + 0.5 ); mBrushIndex = gSavedSettings.getS32("RadioLandBrushSize"); - LLLinkedList regions; + region_list_t regions; determineAffectedRegions(regions, spot); // Now, for each region, render the overlay LLVector3 pos_world = gAgent.getRegion()->getPosRegionFromGlobal(spot); - for(LLViewerRegion* region = regions.getFirstData(); - region != NULL; - region = regions.getNextData()) + for(region_list_t::iterator iter = regions.begin(); + iter != regions.end(); ++iter) { + LLViewerRegion* region = *iter; renderOverlay(region->getLand(), region->getPosRegionFromGlobal(spot), pos_world); @@ -499,7 +499,7 @@ void LLToolBrushLand::renderOverlay(LLSurface& land, const LLVector3& pos_region glPopMatrix(); } -void LLToolBrushLand::determineAffectedRegions(LLLinkedList& regions, +void LLToolBrushLand::determineAffectedRegions(region_list_t& regions, const LLVector3d& spot ) const { LLVector3d corner(spot); @@ -507,27 +507,27 @@ void LLToolBrushLand::determineAffectedRegions(LLLinkedList& reg corner.mdV[VY] -= (LAND_BRUSH_SIZE[mBrushIndex] / 2); LLViewerRegion* region = NULL; region = gWorldPointer->getRegionFromPosGlobal(corner); - if(region && !regions.checkData(region)) + if(region && regions.find(region) == regions.end()) { - regions.addData(region); + regions.insert(region); } corner.mdV[VY] += LAND_BRUSH_SIZE[mBrushIndex]; region = gWorldPointer->getRegionFromPosGlobal(corner); - if(region && !regions.checkData(region)) + if(region && regions.find(region) == regions.end()) { - regions.addData(region); + regions.insert(region); } corner.mdV[VX] += LAND_BRUSH_SIZE[mBrushIndex]; region = gWorldPointer->getRegionFromPosGlobal(corner); - if(region && !regions.checkData(region)) + if(region && regions.find(region) == regions.end()) { - regions.addData(region); + regions.insert(region); } corner.mdV[VY] -= LAND_BRUSH_SIZE[mBrushIndex]; region = gWorldPointer->getRegionFromPosGlobal(corner); - if(region && !regions.checkData(region)) + if(region && regions.find(region) == regions.end()) { - regions.addData(region); + regions.insert(region); } } @@ -554,10 +554,10 @@ void LLToolBrushLand::onMouseCaptureLost() // static void LLToolBrushLand::undo() { - for(LLViewerRegion* regionp = mLastAffectedRegions.getFirstData(); - regionp != NULL; - regionp = mLastAffectedRegions.getNextData()) + for(region_list_t::iterator iter = mLastAffectedRegions.begin(); + iter != mLastAffectedRegions.end(); ++iter) { + LLViewerRegion* regionp = *iter; gMessageSystem->newMessageFast(_PREHASH_UndoLand); gMessageSystem->nextBlockFast(_PREHASH_AgentData); gMessageSystem->addUUIDFast(_PREHASH_AgentID, gAgent.getID() ); @@ -570,10 +570,10 @@ void LLToolBrushLand::undo() /* void LLToolBrushLand::redo() { - for(LLViewerRegion* regionp = mLastAffectedRegions.getFirstData(); - regionp != NULL; - regionp = mLastAffectedRegions.getNextData()) + for(region_list_t::iterator iter = mLastAffectedRegions.begin(); + iter != mLastAffectedRegions.end(); ++iter) { + LLViewerRegion* regionp = *iter; gMessageSystem->newMessageFast(_PREHASH_RedoLand); gMessageSystem->nextBlockFast(_PREHASH_AgentData); gMessageSystem->addUUIDFast(_PREHASH_AgentID, gAgent.getID() ); -- cgit v1.3