94e7ccea99
Merge branch 'ubitwork' of ssh://3dhosting.de/var/git/careminster into ubitwork
2013-01-02 21:07:47 +01:00
be6b6bf191
add a lock to CollisionEventsThisFrame
2013-01-02 20:06:57 +00:00
f4e189e828
Merge branch 'ubitwork' of ssh://3dhosting.de/var/git/careminster into ubitwork
2013-01-02 20:41:13 +01:00
7980a1d849
*TEST* avatar unscripted sit. Some guessing/automation
2013-01-02 19:39:46 +00:00
41a44d7165
Merge branch 'ubitwork' of ssh://3dhosting.de/var/git/careminster into ubitwork
2013-01-02 09:28:55 +01:00
2313a86e32
Merge branch 'ubitwork' into avination
2012-12-22 01:04:49 +01:00
77cc7ce399
* Partial Commit for Avatar Appearance to include the functionality of Cached Bakes.
2012-12-21 19:12:30 -05:00
f9051c22d8
* Send an Unsolicited AgentDataUpdate packet upon Root Agent Status to synchronize with Agni.
2012-12-19 22:14:20 -05:00
c648325d7c
Merge branch 'avination' of careminster:/var/git/careminster into teravuswork
2012-12-19 11:53:26 -05:00
d1dd5a8ba9
Add the interfaces for the new Avination baked texture cache service
2012-12-19 13:04:41 +01:00
021485b581
Merge branch 'ubitwork' of ssh://3dhosting.de/var/git/careminster into ubitwork
2012-12-18 11:09:53 +01:00
f185239fc3
Merge branch 'avination' into ubitwork
2012-12-18 10:05:43 +00:00
861477d85e
Fix locking for good
2012-12-18 09:32:05 +01:00
72c7f4b2eb
Merge branch 'avination' into ubitwork
2012-12-18 02:15:35 +00:00
ed9cb18cf0
missing file
2012-12-18 00:54:40 +00:00
4b911348b4
Merge branch 'ubitwork' of ssh://3dhosting.de/var/git/careminster into ubitwork
2012-12-18 01:54:36 +01:00
42d57fbce0
Merge branch 'ubitwork' of ssh://3dhosting.de/var/git/careminster into ubitwork
2012-12-18 01:50:47 +01:00
f87af983f3
fix
2012-12-18 00:50:36 +00:00
e33b350ffe
Merge branch 'ubitwork' of ssh://3dhosting.de/var/git/careminster into ubitwork
2012-12-17 23:11:53 +01:00
9089bc7e37
some clean up/fix
2012-12-17 22:11:29 +00:00
e4fd63e402
Merge branch 'ubitwork' of ssh://3dhosting.de/var/git/careminster into ubitwork
2012-12-17 02:43:59 +01:00
9d1a6558d9
*TESTP unscripted sit: missing files
2012-12-17 01:43:16 +00:00
46ca9e8a1a
Merge branch 'ubitwork' of ssh://3dhosting.de/var/git/careminster into ubitwork
2012-12-17 02:41:53 +01:00
d003aa2e7b
* TEST * unscripted sit
2012-12-17 01:40:48 +00:00
51354bad48
Merge branch 'ubitwork' into avination
2012-12-17 02:01:47 +01:00
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
7d8c2b342c
Fix locking objects
2012-12-16 02:05:01 +01:00
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
1d713bcdb8
Merge branch 'ubitwork' into avination
2012-12-14 03:57:31 +01:00
7a093df24b
Prevent a failed user relogi from throwing exceptions in poll services
2012-12-14 03:35:55 +01:00
ea82efdee2
Merge branch 'ubitwork' of ssh://3dhosting.de/var/git/careminster into ubitwork
2012-12-13 08:49:04 +01:00
5ad424a792
right fix this time ??
2012-12-13 07:48:29 +00:00
21f3d193d9
Merge branch 'ubitwork' of ssh://3dhosting.de/var/git/careminster into ubitwork
2012-12-13 08:47:01 +01:00
94a659a9e0
fix the 'fix'
2012-12-13 07:46:33 +00:00
48b0a3de79
Merge branch 'ubitwork' of ssh://3dhosting.de/var/git/careminster into ubitwork
2012-12-13 08:39:55 +01:00
c0368f4143
fix coment out code not in use
2012-12-13 07:39:10 +00:00
3cf0d8b165
Merge branch 'ubitwork' of ssh://3dhosting.de/var/git/careminster into ubitwork
2012-12-13 08:36:18 +01:00
b3a77c16bd
FIX small avatars movement on terrain. (avatar appearance getting even
...
more messy)
2012-12-13 07:34:27 +00:00
020bc9c358
Merge branch 'ubitwork' of ssh://3dhosting.de/var/git/careminster into ubitwork
2012-12-13 04:36:47 +01:00
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
7d2dad0ffa
Merge branch 'ubitwork' of ssh://3dhosting.de/var/git/careminster into ubitwork
2012-12-11 23:55:34 +01:00
71fc9f29f9
make ubitODE ignore X and Y rotation components on avatar rotations
2012-12-11 22:53:24 +00:00
f35e3c6fe0
changes on the fast speed avatars collider, collisions from above, etc
2012-12-11 19:38:44 +00:00
04baea2d71
Merge branch 'avination' into ubitwork
2012-12-11 18:02:01 +00:00
28ea08c3e2
fix let other phys plugins work.. broken when added feetOffset
2012-12-11 17:14:32 +00:00
377e6f44e7
Merge branch 'ubitwork' of ssh://3dhosting.de/var/git/careminster into ubitwork
2012-12-11 05:49:52 +01:00
9a253c7c04
missing files remove some warnings...
2012-12-11 04:49:14 +00:00
420015b7d0
missing file
2012-12-11 04:47:40 +00:00
a1f0e3d95a
Merge branch 'ubitwork' of ssh://3dhosting.de/var/git/careminster into ubitwork
2012-12-11 05:37:33 +01:00
80639ace95
a few more changes on avatar collider
2012-12-11 04:36:27 +00:00
ubit