a4b223248e
Merge
2010-09-27 17:54:52 -07:00
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
0a74d15935
Merge between james/viewer-identity-evolution and dessie/viewer-public
2010-09-03 15:30:16 +01:00
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
5215bf9925
[STORM-175] Fix Ping Interpolate Object Position
2010-09-16 20:01:35 -04:00
e416840f85
Backed out changeset c3d41f18ce2b
...
back-out the back-out for this branch. yay.
2010-08-24 19:22:00 +01:00
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
6ba23344c9
merge heads. whew.
2010-08-24 18:37:53 +01:00
06b0d72efa
Change license from GPL to LGPL (version 2.1)
2010-08-13 07:24:57 -04:00
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
6f256e2d57
Merge with dessie/viewer-release
2010-08-04 15:44:45 -07:00
15247f0869
Backed out changeset: 58571b4e704b
2010-07-27 14:22:14 -07:00
0e06dc8964
Merge from dessie/viewer-release
2010-07-27 14:13:07 -07:00
d603085c03
Merge with dessie/viewer-release
2010-07-19 17:22:12 -07:00
5d85dad85f
Reverted changeset 2bb10eae42bf
2010-07-15 12:31:08 -07:00
a884f5c0c7
Added AgentPositionSnaps data to ViewerStats to measure frequency and scale of interpolation failures.
2010-07-13 17:16:05 -07:00
c0761b99b7
EXT-8002: FIXED: Crossing a sim boundary in a vehicle results in unexpected catapulting
2010-07-07 12:19:24 -06:00
33d1aa30ab
Merge from dessie/viewer-release
2010-07-06 17:51:07 -07:00
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
abb607a65e
EXT-7446 Spatial Partition Crash. reviewed by Richard.
2010-06-25 09:59:20 -05:00
8b52454990
merge pull from dessie/viewer-public, picking up SLE code
2010-05-13 15:47:32 -07:00
2b7153c26a
merge from dessie/viewer-public right before SLE code landed
2010-05-11 16:11:09 -07:00
8ba5517a08
Automated merge
2010-04-07 13:20:33 -07:00
658ccc3e85
Re-insert backed out SLE checkin so we can fix it
2010-04-07 11:08:04 -07:00
8da371b0f0
merge
2010-04-07 12:16:36 +01:00
0bb3f144c0
Backed out changeset 63b699f90efd
2010-04-07 10:37:07 +01:00
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
aa0a129b67
Automated Merge
2010-04-01 21:47:22 -07:00
ecc2c72650
Merge latest viewer-hotfix, approximately equal to Viewer 2.0 final
2010-03-29 16:55:22 -07:00
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
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
0a56031bd3
automated merge
2010-03-25 20:15:51 -04:00
885fc3f9b5
EXT-6536 : Make LLVOAvatarSelf a singleton
...
Minor superficial cleanup to have all references to getAvatarObject use LLVOAvatarSelf *avatarp = gAgent.getAvatarObject()
2010-03-25 19:56:52 -04:00
fc49539b36
EXT-2959 : Full out camera functions from llagent to llagentcamera
...
First check-in; only compiles, nothing more.
2010-03-23 15:59:52 -04:00
18b7ab0018
Weekly automated merge from viewer 2.0
2010-03-22 16:12:41 -07:00
f50be64167
EXT-6421 [crashhunters] Crash in LLViewerObject::getBoundingBoxAgent()
...
added null guard to fix crash when the xform has no parent. reviewed by davep.
2010-03-19 12:09:06 -05:00
18ebacefcf
Merge with viewer 2 beta 4
2010-03-08 10:54:23 -08:00
541291b366
Removed unnecessary include llhudtext.h from llviewerobject.h
2010-02-26 17:31:55 -08:00
36c35bca26
Support multiple fonts, colors and styles in name tags
...
Simplified LLHUDText string API to be UTF8 only
Added per-text segment font support
Changed LLVOAvatar invalidateNameTag to clearNameTag
2010-02-25 17:06:17 -08:00
0980df1e0c
merge
2010-02-23 17:07:18 -08:00
da79eb5545
Turning on Davep optimizations again. Backed out changeset d89b00b44ab6
2010-02-23 16:48:49 -08:00
3b8463f0fd
merge
2010-02-12 21:06:25 -08:00
1f672990e7
Backed out davep's optimization pass. changeset 3c3685de430a
2010-02-12 21:06:02 -08:00
418504207b
merge
2010-02-12 15:16:19 -08:00
443993bc19
EXT-4739 - Crash on teleport after viewer minimize. Making sure we don't accidentally set av self to null & added a few more null checks.
...
-Reviewed by nyx
2010-02-05 16:15:43 -05:00
8e67ecf3dc
Optimization pass.
...
-- Further instrumentation of idle update
-- Removed mActiveQ from LLPipeline, instead making calm objects static during LLVOVolume::idleUpdate
-- Further instrumentation of flexible object update
-- Converted LLDynamicArray and LLMap members of LLViewerObjectList to stl counterparts
-- Increased number of update bins in LLViewerObjectList from 16 to 128 (objects will be processed every 128 frames instead of every 16, or ~ 90% fewer objects processed per frame)
-- Removed unused "renderObjectsForSelect" code.
-- Reenabled LOD updates for objects further than 24m from camera
2010-02-03 12:33:32 -06:00
c84aa46ac8
CID-111
...
Checker: MISSING_BREAK
Function: LLViewerObject::processUpdateMessage(LLMessageSystem *, void **, unsigned int, e_object_update_type, LLDataPacker *)
File: /indra/newview/llviewerobject.cpp
not a bug. commented.
2010-01-27 13:36:27 -08:00
5aedcb3936
CID-112
...
Checker: MISSING_BREAK
Function: LLViewerObject::processUpdateMessage(LLMessageSystem *, void **, unsigned int, e_object_update_type, LLDataPacker *)
File: /indra/newview/llviewerobject.cpp
not a bug. commented.
2010-01-27 13:34:49 -08:00
b11a625e6f
Automated merge with a few fixups for code review comments
2010-03-01 15:31:04 -08:00
a2efe4bb41
automated merge
2010-02-26 19:18:15 -08:00
Leyla Farazha