Melanie
e1cfa846ea
Merge branch 'ubitwork' of ssh://3dhosting.de/var/git/careminster into ubitwork
2013-01-08 13:58:42 +01:00
UbitUmarov
fb088a48ac
also update m_lastSize in SendAvatarDataToAllAgents so more paths update
...
it
2013-01-08 14:09:01 +00:00
Melanie
ef8f03b711
Prevent avatar data from being sent during login when it's not valid and
...
crashes login on some viewers.
2013-01-08 13:57:45 +01:00
Melanie
09d41f4f78
Revert "Remove sending AvatarData because this also happens on login, where it chokes"
...
This reverts commit d1fa650c3f
.
2013-01-08 13:11:04 +01:00
Melanie
f86278e389
Merge branch 'teravuswork' into avination
2013-01-08 12:14:08 +01:00
Melanie
4cd1fd7485
Merge branch 'ubitwork' into avination
2013-01-08 12:14:01 +01:00
Melanie
d1fa650c3f
Remove sending AvatarData because this also happens on login, where it chokes
...
Firestorm, Singularity and other viewers with the new appearance pipeline.
2013-01-08 12:08:34 +01:00
UbitUmarov
126e73c5ed
put back position and rot change check before sending releasing plane constrain
2013-01-08 02:29:21 +00:00
UbitUmarov
1bf553fd65
reduce sampling of camera raycasts to previus value
2013-01-08 01:12:00 +00:00
UbitUmarov
d5066ae678
* DAnger, TEST * change camera plane collision detection. Still bounces on
...
* prim edges due to camera lag
2013-01-08 00:21:09 +00:00
Melanie
910a94d143
Merge branch 'ubitwork' into avination
2013-01-07 15:06:17 +01:00
UbitUmarov
d2cb2da790
also exclude land
2013-01-07 11:03:36 +00:00
UbitUmarov
982328b4ed
exclude avatars from unfiltered RaycastWorld
2013-01-07 10:56:30 +00:00
UbitUmarov
ca40e656ab
in raycast for camera exclude self detection
2013-01-07 10:35:55 +00:00
UbitUmarov
dc6b7bb5c9
don't try to read geom positions outside main ode thread :(
2013-01-06 12:07:16 +00:00
UbitUmarov
c961cfe19e
bug fix, cleanup...
2013-01-03 21:53:21 +00:00
UbitUmarov
a285ff7e69
check land permitions on sit target for unscripted sits
2013-01-03 14:27:21 +00:00
UbitUmarov
1665a0d636
make ResetMoveToTarget cancel any 'force' waiting to be applied to avatar
...
( by the odd use of Velocity)
2013-01-03 03:29:40 +00:00
UbitUmarov
d40cdd2649
cancel MoveToTarget (viewer 'go here") on sits
2013-01-03 02:25:27 +00:00
UbitUmarov
a504704071
i try to fix avatar orientation in some cases..
2013-01-02 21:59:19 +00:00
UbitUmarov
be6b6bf191
add a lock to CollisionEventsThisFrame
2013-01-02 20:06:57 +00:00
UbitUmarov
7980a1d849
*TEST* avatar unscripted sit. Some guessing/automation
2013-01-02 19:39:46 +00:00
teravus
2805ec6466
* Fixed a bug that replayed old cached appearance when changing outfits
...
* Added suser(bad client) DOS protection by limiting the max cacheitems to the maximum sane amount.
* Prevents potential numerous loops from running amok and index errors if the client purposely provides bad cache info.
* If the XBakes service wasn't running, the SetAvatarAppearance routine would crash when contacting the XBakes service even though it was in a Try/Catch for the appropriate error type. It only properly error handles with the type Exception :(. (commented on that because it's unusual)
2012-12-31 23:04:28 -05:00
teravus
6797ac1474
* This finishes the implementation of AgentCachedTexture. Requires the XBakes Module and service for full functionality. Previous no-cache functionality works without the service and module. In some ways, I would have been happier not putting an AssetBase in WearableCacheItem.. but turns out it was probably unavoidable. No additional locks, yay.
2012-12-29 08:53:58 -05:00
Melanie
2313a86e32
Merge branch 'ubitwork' into avination
2012-12-22 01:04:49 +01:00
teravus
77cc7ce399
* Partial Commit for Avatar Appearance to include the functionality of Cached Bakes.
2012-12-21 19:12:30 -05:00
teravus
f9051c22d8
* Send an Unsolicited AgentDataUpdate packet upon Root Agent Status to synchronize with Agni.
2012-12-19 22:14:20 -05:00
teravus
c648325d7c
Merge branch 'avination' of careminster:/var/git/careminster into teravuswork
2012-12-19 11:53:26 -05:00
Melanie
d1dd5a8ba9
Add the interfaces for the new Avination baked texture cache service
2012-12-19 13:04:41 +01:00
UbitUmarov
f185239fc3
Merge branch 'avination' into ubitwork
2012-12-18 10:05:43 +00:00
Melanie
861477d85e
Fix locking for good
2012-12-18 09:32:05 +01:00
UbitUmarov
72c7f4b2eb
Merge branch 'avination' into ubitwork
2012-12-18 02:15:35 +00:00
UbitUmarov
ed9cb18cf0
missing file
2012-12-18 00:54:40 +00:00
UbitUmarov
f87af983f3
fix
2012-12-18 00:50:36 +00:00
UbitUmarov
9089bc7e37
some clean up/fix
2012-12-17 22:11:29 +00:00
UbitUmarov
9d1a6558d9
*TESTP unscripted sit: missing files
2012-12-17 01:43:16 +00:00
UbitUmarov
d003aa2e7b
* TEST * unscripted sit
2012-12-17 01:40:48 +00:00
Melanie
51354bad48
Merge branch 'ubitwork' into avination
2012-12-17 02:01:47 +01:00
Melanie
a5781ea9fc
Merge branch 'avination' of ssh://3dhosting.de/var/git/careminster into avination
...
Conflicts:
OpenSim/Region/Framework/Scenes/SceneObjectGroup.cs
2012-12-17 01:59:50 +01:00
Melanie
7d8c2b342c
Fix locking objects
2012-12-16 02:05:01 +01:00
teravus
d2695cb3f7
* Fix for Prim Locking. Prior to the merge, it was just a clone of the root part to each of the child parts.
2012-12-15 16:26:03 -05:00
Melanie
1d713bcdb8
Merge branch 'ubitwork' into avination
2012-12-14 03:57:31 +01:00
Melanie
7a093df24b
Prevent a failed user relogi from throwing exceptions in poll services
2012-12-14 03:35:55 +01:00
UbitUmarov
5ad424a792
right fix this time ??
2012-12-13 07:48:29 +00:00
UbitUmarov
94a659a9e0
fix the 'fix'
2012-12-13 07:46:33 +00:00
UbitUmarov
c0368f4143
fix coment out code not in use
2012-12-13 07:39:10 +00:00
UbitUmarov
b3a77c16bd
FIX small avatars movement on terrain. (avatar appearance getting even
...
more messy)
2012-12-13 07:34:27 +00:00
UbitUmarov
20773dcfcc
add a Check method to flotsamAssetCache, so to check if a asset is in
...
cache without actually loading it. Make use limited use of it in
avatarfactory textures check. Also on llclientview
HandleAgentTextureCached that now should work. Other asset cache modules
for now will return false, so are broken. baked textures logic
still unchanged. *UNTESTED*
2012-12-13 02:55:36 +00:00
UbitUmarov
71fc9f29f9
make ubitODE ignore X and Y rotation components on avatar rotations
2012-12-11 22:53:24 +00:00
UbitUmarov
f35e3c6fe0
changes on the fast speed avatars collider, collisions from above, etc
2012-12-11 19:38:44 +00:00