summaryrefslogtreecommitdiff
path: root/indra/newview/llviewerobject.cpp
AgeCommit message (Collapse)Author
2011-02-10Automated merge up from viewer-development into mesh-developmentLoren Shih
2011-02-09pull from viewer-developmentMerov Linden
2011-02-09trivial: remove some redundant code.Xiaohong Bao
2011-02-09debug code for SH-924: [PUBLIC-JIRA-USERS] Viewer crash in ↵Xiaohong Bao
LLSurface::getWaterHeight
2011-01-24Automated merge up from viewer-development into mesh-developmentLoren Shih
2011-01-20SH-635 Fix for changing one physics parameter changing all physics parameters.Dave Parks
2011-01-19ER-428 / CTS-422 : [PUBLIC] movement updates are lost when walking. Changed ↵Dave SIMmONs
code to detect if the circuit has stopped getting packets. Reviewed by Andrew
2011-01-14Mesh-development work in progressLoren Shih
2011-01-14Automated merge up from viewer-developmentLoren Shih
2011-01-13Automated merge up from viewer-developmentLoren Shih
2011-01-12Merge with viewer-developmentDon Kjer
2010-12-30STORM-955: VWR-24312: Massively duplicated objectsAleric Inglewood
Turns out that most of my SNOW-800 patch was included in Viewer 2 (albeit without crediting me). However, not everything was used and some more cleaning up was possible. After this patch, and when compiling with optimization, there are no duplicates left anymore that shouldn't be there in the first place. Apart from the debug stream iostream guard variable, there are several static variables with the same name (r, r1, r2, etc) but that indeed actually different symbol objects. Then there are a few constant POD arrays that are duplicated a hand full of times because they are accessed with a variable index (so optimizing them away is not possible). I left them like that (although defining those as extern as well would have been more consistent and not slower; in fact it would be faster theoretically because those arrays could share the same cache page then).
2010-12-22Cleanup from review with Andrew and MerovDon Kjer
2010-12-17For object-vs-parcel overlap we now use list of axis aligned boxesAndrew Meadows
one box for each prim, for less slop on queries
2010-12-16ER-414: Add object update type debug rendering viewDon Kjer
2010-12-15ER-407 child bounding boxes not rotated properly for encroachment returnabilityAndrew Meadows
Using the correct method for joining BBoxes in the agent frame ::addBBoxAgent()
2010-12-14ER-398 viewer's encroachment logic only uses bounding box of root primAndrew Meadows
Adding LLBBox::join() to allow us to compute the bounding box of a linked object
2010-12-01Automated merge up from viewer-developmentLoren Shih
2010-11-19Fixing a typo that broke the build.Andrew Meadows
2010-11-18Added viewer-side "object overlaps parcel" check encroachment returnabilty UIAndrew Meadows
Reviewed with Falcon
2010-11-08ER-290 : New motion prediction in the viewer has avatars settle a bit too ↵Dave SIMmONs
deeply underground when the simulator is paused, also no angular velocity damping. Put Z limit on AVs, but not regular objects nor stopping rotation. Reviewed by Kelly.
2010-11-05Merge latest from lindenlab/viewer-developmentDave SIMmONs
2010-10-27Automated merge up from viewer-developmentLoren Shih
2010-10-26STORM-416 : merge with viewer-developmentMerov Linden
2010-10-20mergeDave Parks
2010-10-20Automated merge up from viewer-developmentLoren Shih
2010-10-19First stab at using GetObjectPhysicsDataDave Parks
2010-10-13correct licenses (fix problem with license change merge)Oz Linden
2010-10-12Adjust viewer object interpolation code so that tapering off only occurs if ↵Dave SIMmONs
the simulator stops sending data. Reviewed by Ambroff
2010-10-12Initial work on viewer motion interpolation. Changes include:Dave SIMmONs
* InterpolationTime and InterpolationPhaseOut values in settings.xml to control new object interpolation code. Use zero to revert to old logic * Viewer motion interpolation lasts InterpolationTime and will start to phase out after InterpolationPhaseOut seconds * Changed LLWorld::getMinAllowedZ() to take a world-position as a parameter * Added LLVOAvatarSelf::resetRegionCrossingTimer() * Actually reset LLVOAvatarSelf::mRegionCrossingTimer so we get sensible timing data for region crossings * LLVOAvatarSelf::updateRegion() will update position value due to region changes Code reviewed by Ambroff *
2010-10-07Add pure physics cost to UIDave Parks
2010-09-30Port of SNOW-643 : Water flicker at high altitude. This doesn't fix the low ↵Merov Linden
altitude flicker though (STORM-306)
2010-09-29SH-224 Add new streaming cost algorithm debug displays to viewer.Dave Parks
Add the ability to clear LOD slots. Make triangle count UI more responsive to Generate LOD button. Add triangle count debug display for current selection. Reviewed by Nyx
2010-09-27MergeLeyla Farazha
2010-09-27mergeDave Parks
2010-09-21Fix for build failures - disabling tcmalloc for nowBrad Payne (Vir Linden)
2010-09-19Raycasting for rigged attachments now works for your own attachments while ↵Dave Parks
in edit mode.
2010-09-16[STORM-175] Fix Ping Interpolate Object PositionOz Linden
2010-09-03Post-convert merge by convert_monolith.py from ↵Aimee Linden
/Users/Aimee/Documents/Work/Linden-Lab/Development/viewer/convert/viewer-identity-evolution
2010-09-03Merge between james/viewer-identity-evolution and dessie/viewer-publicAimee Linden
2010-09-21STORM-163 FIXED Intermittent FPS drop related to "audio" (main thread hangs ↵Vadim Savchuk
often on openal lock) Submitting a patch made by Aleric Inglewood (See VWR-14914). This bug happens for a lot of people, although it might be needed to have a fast multi core machine. I have seen it on 1.22.10 once, never used 1.23 sorry, and saw it often on snowglobe. I am sure it also affects 1.23 but I'd have to test that. The symptons are that on a viewer with normally a good, high FPS, sometimes it happens that the FPS dramatically drops (as low as 0.3, but it can also be anything higher, as high as 10, say). This particular jira is about a problem where the main thread is slowed down by a mutex lock in libopenal (most calls starting with 'al' in indra/llaudio/audioengine_openal.cpp and one in indra/llaudio/listener_openal.cpp). You can see that this is the case by opening the Frame Console (control-shift-2) and checking that the "audio" (and possibly misc) timings are very large compared to the Render time.
2010-08-25mergeDave Parks
2010-08-24Backed out changeset c3d41f18ce2bTofu Linden
back-out the back-out for this branch. yay.
2010-08-24Backed out changeset a62bf7c0af21Tofu Linden
Backing out this merge that I pushed (prematurely) to the wrong place.
2010-08-24merge heads. whew.Tofu Linden
2010-08-19Integrate SIMD API from oreh/server-trunk-orehDave Parks
2010-08-13Change license from GPL to LGPL (version 2.1)Oz Linden
2010-08-12merge from viewer-releaseTofu Linden
2010-08-11EXT-8650 Can wear mutliple copies of a no-copy item via object linksLoren Shih
- EXT-8660 Cleanup ambiguous llviewerobject::set/getItemID code Lots of files changed, but this is mostly just a trivial function call rename. This change is very low risk.
2010-08-04Merge with dessie/viewer-releaseLeyla Farazha