Commit Graph

134 Commits (17854c4e8702febaa8fe4adfbc678f9abaaa52c7)

Author SHA1 Message Date
Merov Linden b82f2c4e4d pull from viewer-development 2011-02-09 15:10:26 -08:00
Xiaohong Bao 8d43cb2701 trivial: remove some redundant code. 2011-02-09 12:15:21 -07:00
Xiaohong Bao 54cced2356 debug code for SH-924: [PUBLIC-JIRA-USERS] Viewer crash in LLSurface::getWaterHeight 2011-02-09 10:33:07 -07:00
Dave SIMmONs f91a9c87e5 ER-428 / CTS-422 : [PUBLIC] movement updates are lost when walking. Changed code to detect if the circuit has stopped getting packets. Reviewed by Andrew 2011-01-19 12:54:05 -08:00
Don Kjer 756a4e26da Merge with viewer-development 2011-01-12 19:00:36 -08:00
Aleric Inglewood 9531046609 STORM-955: VWR-24312: Massively duplicated objects
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-30 14:53:30 +01:00
Don Kjer 649dd6eb74 Cleanup from review with Andrew and Merov 2010-12-22 14:23:35 -08:00
Andrew Meadows 7fc9d70119 For object-vs-parcel overlap we now use list of axis aligned boxes
one box for each prim, for less slop on queries
2010-12-17 19:52:45 -08:00
Don Kjer 14e402cf5e ER-414: Add object update type debug rendering view 2010-12-16 22:09:49 -08:00
Andrew Meadows 3be87bb046 ER-407 child bounding boxes not rotated properly for encroachment returnability
Using the correct method for joining BBoxes in the agent frame ::addBBoxAgent()
2010-12-15 11:23:00 -08:00
Andrew Meadows 64512b681e ER-398 viewer's encroachment logic only uses bounding box of root prim
Adding LLBBox::join() to allow us to compute the bounding box of a linked object
2010-12-14 08:52:33 -08:00
Andrew Meadows c320b2cef9 Fixing a typo that broke the build. 2010-11-19 08:36:53 -08:00
Andrew Meadows 424786d8d0 Added viewer-side "object overlaps parcel" check encroachment returnabilty UI
Reviewed with Falcon
2010-11-18 15:55:53 -08:00
Dave SIMmONs b90614a6e7 ER-290 : New motion prediction in the viewer has avatars settle a bit too 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-08 16:34:14 -08:00
Dave SIMmONs 447dc782fd Merge latest from lindenlab/viewer-development 2010-11-05 13:30:20 -07:00
Merov Linden ebce1a4ea8 STORM-416 : merge with viewer-development 2010-10-26 10:59:37 -07:00
Dave SIMmONs d5d4a06527 Adjust viewer object interpolation code so that tapering off only occurs if the simulator stops sending data. Reviewed by Ambroff 2010-10-12 17:15:29 -07:00
Dave SIMmONs 58f0e78cb4 Initial work on viewer motion interpolation. Changes include:
* 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-12 13:50:17 -07:00
Merov Linden c7b6ebaf76 Port of SNOW-643 : Water flicker at high altitude. This doesn't fix the low altitude flicker though (STORM-306) 2010-09-30 22:57:05 -07:00
Leyla Farazha a4b223248e Merge 2010-09-27 17:54:52 -07:00
Oz Linden 5215bf9925 [STORM-175] Fix Ping Interpolate Object Position 2010-09-16 20:01:35 -04:00
Aimee Linden ffae589843 Post-convert merge by convert_monolith.py from /Users/Aimee/Documents/Work/Linden-Lab/Development/viewer/convert/viewer-identity-evolution 2010-09-03 17:41:39 +01:00
Aimee Linden 0a74d15935 Merge between james/viewer-identity-evolution and dessie/viewer-public 2010-09-03 15:30:16 +01:00
Vadim Savchuk 5b2d4a1698 STORM-163 FIXED Intermittent FPS drop related to "audio" (main thread hangs 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-21 19:11:40 +03:00
Tofu Linden e416840f85 Backed out changeset c3d41f18ce2b
back-out the back-out for this branch.  yay.
2010-08-24 19:22:00 +01:00
Tofu Linden 98cc236503 Backed out changeset a62bf7c0af21
Backing out this merge that I pushed (prematurely) to the wrong place.
2010-08-24 18:44:39 +01:00
Tofu Linden 6ba23344c9 merge heads. whew. 2010-08-24 18:37:53 +01:00
Oz Linden 06b0d72efa Change license from GPL to LGPL (version 2.1) 2010-08-13 07:24:57 -04:00
Loren Shih 7836f0fff3 EXT-8650 Can wear mutliple copies of a no-copy item via object links
- 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-11 12:34:27 -04:00
Leyla Farazha 6f256e2d57 Merge with dessie/viewer-release 2010-08-04 15:44:45 -07:00
Richard Linden 15247f0869 Backed out changeset: 58571b4e704b 2010-07-27 14:22:14 -07:00
Leyla Farazha 0e06dc8964 Merge from dessie/viewer-release 2010-07-27 14:13:07 -07:00
Leyla Farazha d603085c03 Merge with dessie/viewer-release 2010-07-19 17:22:12 -07:00
Dessie Linden 5d85dad85f Reverted changeset 2bb10eae42bf 2010-07-15 12:31:08 -07:00
Matthew Breindel (Falcon) a884f5c0c7 Added AgentPositionSnaps data to ViewerStats to measure frequency and scale of interpolation failures. 2010-07-13 17:16:05 -07:00
Xiaohong Bao c0761b99b7 EXT-8002: FIXED: Crossing a sim boundary in a vehicle results in unexpected catapulting 2010-07-07 12:19:24 -06:00
Leyla Farazha 33d1aa30ab Merge from dessie/viewer-release 2010-07-06 17:51:07 -07:00
Xiaohong Bao b50ab89052 EXT-7983: FIXED: viewer gets confused about position of objects that cross a region boundary.
worked together with davep.
2010-07-06 16:29:07 -06:00
Karl Stiefvater (qarl) abb607a65e EXT-7446 Spatial Partition Crash. reviewed by Richard. 2010-06-25 09:59:20 -05:00
James Cook 8b52454990 merge pull from dessie/viewer-public, picking up SLE code 2010-05-13 15:47:32 -07:00
James Cook 2b7153c26a merge from dessie/viewer-public right before SLE code landed 2010-05-11 16:11:09 -07:00
Roxie Linden 8ba5517a08 Automated merge 2010-04-07 13:20:33 -07:00
Roxie Linden 658ccc3e85 Re-insert backed out SLE checkin so we can fix it 2010-04-07 11:08:04 -07:00
Tofu Linden 8da371b0f0 merge 2010-04-07 12:16:36 +01:00
Tofu Linden 0bb3f144c0 Backed out changeset 63b699f90efd 2010-04-07 10:37:07 +01:00
Loren Shih 2eba9819df EXT-6703 : LLInventory.h cleanup and create new LLInventoryDefines
Took out enums and flags from LLInventory into LLInventoryDefines
Did a bunch of header file reformatting for LLInventory.h

Change made to simulator files as well.
2010-04-05 15:02:36 -04:00
Roxie Linden aa0a129b67 Automated Merge 2010-04-01 21:47:22 -07:00
James Cook ecc2c72650 Merge latest viewer-hotfix, approximately equal to Viewer 2.0 final 2010-03-29 16:55:22 -07:00
Loren Shih 58d76a9ecf EXT-6536 : Make LLVOAvatarSelf a singleton
Superficial cleanup to replace all instances of "gAgentAvatar" with "gAgentAvatarp".
2010-03-29 12:11:51 -04:00
Loren Shih 94e6e10739 EXT-6536 : Make LLVOAvatarSelf a singleton
Superficial cleanup to replace all instances of "LLVOAvatarSelf *avatarp = gAgent.getAvatarObject" with "gAgentAvatar".
2010-03-29 12:00:26 -04:00