summaryrefslogtreecommitdiff
path: root/indra/newview/llviewerobject.cpp
AgeCommit message (Collapse)Author
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-07Add pure physics cost to UIDave Parks
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-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-09-16[STORM-175] Fix Ping Interpolate Object PositionOz Linden
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
2010-07-27Backed out changeset: 58571b4e704bRichard Linden
2010-07-27Merge from dessie/viewer-releaseLeyla Farazha
2010-07-19Merge with dessie/viewer-releaseLeyla Farazha
2010-07-15Make tools floater update automatically when object cost received.Dave Parks
2010-07-15Reverted changeset 2bb10eae42bfDessie Linden
2010-07-14mergeDave Parks
2010-07-13Added AgentPositionSnaps data to ViewerStats to measure frequency and scale ↵Matthew Breindel (Falcon)
of interpolation failures.
2010-07-09Gravity, Friction, Restitution, Density now work with simulator.Matthew Breindel (Falcon)
2010-07-07EXT-8002: FIXED: Crossing a sim boundary in a vehicle results in unexpected ↵Xiaohong Bao
catapulting
2010-07-06Merge from dessie/viewer-releaseLeyla Farazha
2010-07-06EXT-7983: FIXED: viewer gets confused about position of objects that cross a ↵Xiaohong Bao
region boundary. worked together with davep.
2010-07-01added new physics parameters to primsKarl Stiefvater (qarl)
2010-06-25EXT-7446 Spatial Partition Crash. reviewed by Richard.Karl Stiefvater (qarl)
2010-06-10mergeDave Parks
2010-06-07Merge with render-pipelineDave Parks
2010-06-03Vectorized octree and much of llspatialpartition and lldrawable.Dave Parks
Octree driven raycast.
2010-05-15Highlight for object cost and proper retrieval/display of prim object cost ↵Dave Parks
and linkset cost.
2010-05-13merge pull from dessie/viewer-public, picking up SLE codeJames Cook
2010-05-13Vis that works and first pass at fetching prim cost.Dave Parks
2010-05-11merge from dessie/viewer-public right before SLE code landedJames Cook
2010-05-01Rigged attachment integration WIP.Dave Parks
2010-04-07Automated mergeRoxie Linden
2010-04-07Re-insert backed out SLE checkin so we can fix itRoxie Linden
2010-04-07merge from viewer-trunkTofu Linden
2010-04-07mergeTofu Linden
2010-04-07Backed out changeset 63b699f90efdTofu Linden
2010-04-06YET another hairy merge from viewer-trunk. Conflicts resolved... so far.Tofu Linden