39f5fd0f58
Merge branch 'avination' into ubitwork
2012-08-31 22:30:33 +01:00
e402a24972
Merge branch 'ubitwork' of ssh://3dhosting.de/var/git/careminster into ubitwork
2012-08-30 02:35:31 +02:00
a7281003d8
move keyframemotion.copy from sop.copy to sog.copy, where there is
...
newgroup information avaiable.
2012-08-30 01:30:56 +01:00
f15b690687
Merge branch 'ubitwork' of ssh://3dhosting.de/var/git/careminster into ubitwork
2012-08-30 01:33:05 +02:00
1eb7d963cf
Merge branch 'ubitwork' of ssh://3dhosting.de/var/git/careminster into ubitwork
2012-08-30 00:31:03 +01:00
194eb78b90
Merge branch 'ubitwork' of ssh://3dhosting.de/var/git/careminster into ubitwork
2012-08-30 01:29:43 +02:00
c821153a4f
[possible still bad] make use of keyframemotion.copy on sop.copy, replacing
...
fromdata(seralize). for now its called with null group since sop.copy()
hasn't usable new group information, so for copied keyframes be fully operational UpdateSceneObject(newgroup) needs to be called on them.
2012-08-30 00:15:46 +01:00
927cbc6762
Merge branch 'ubitwork' into avination
2012-08-30 00:36:37 +02:00
211f4fb411
Sequence inventory descendents requests to reduce inventory server load and
...
movement lag.
2012-08-30 00:34:12 +02:00
67f18655d5
Allow llList2Key to also act on System.String
2012-08-29 22:06:43 +02:00
f7a60261e9
Merge branch 'ubitwork' into avination
2012-08-29 11:46:57 +02:00
74465df43f
Fix issue with the quit packet being stuck int he queue and a one packet delay.
...
Also fix semaphore excetion caused by enqueueing while dequque is taking place.
2012-08-29 11:45:28 +02:00
34f0694938
Remove Justin's addition to avoid sending incoming packets to inactive clients
...
This also causes the initial AgentUpdate to be rejected because our processing
is asynchronous.
2012-08-29 11:35:21 +02:00
f671e446bf
Merge branch 'ubitwork' of ssh://3dhosting.de/var/git/careminster into ubitwork
2012-08-29 11:18:32 +02:00
c34b8ed0f0
Merge branch 'ubitwork' of ssh://3dhosting.de/var/git/careminster into ubitwork
2012-08-29 04:20:50 +02:00
2e54c3cc8f
A few more changes to keyframes
2012-08-29 03:19:47 +01:00
73b88140ee
Merge branch 'ubitwork' of ssh://3dhosting.de/var/git/careminster into ubitwork
2012-08-29 01:37:44 +02:00
72ac0665b2
[Potentially broken] keyframes changes.. since it's there, use timer for
...
crossing retries and not still another thread, etc...
2012-08-29 00:35:06 +01:00
378a79e7cc
Add a queue with two priority levels. This is a drop in replacement for
...
the BlockingQueue from OMV, but allows two priorities.
2012-08-28 22:17:17 +02:00
5284e514d5
Fix a nullref while object is being created
2012-08-28 22:16:01 +02:00
2546e4c2de
Merge branch 'ubitwork' of ssh://3dhosting.de/var/git/careminster into ubitwork
2012-08-28 04:27:59 +02:00
ef6e007a4c
[possible still very broken] mess around keyframes. timer events
...
threads overlaps, some null objects exceptions, region crossing...
2012-08-28 03:21:03 +01:00
b1d0fab954
fix incoerence btw KFM_TRANSLATION and ROTATION LSL constants and internal
...
DataFormat enum, using values from the KFM constants
2012-08-26 20:33:45 +01:00
bfa22e2f52
Make llCollisionSprite not throw anymore
2012-08-25 23:49:37 +02:00
7a4dba2fdc
Merge branch 'ubitwork' of ssh://3dhosting.de/var/git/careminster into ubitwork
2012-08-25 16:33:29 +02:00
9a80330875
Merge branch 'avination' into ubitwork
2012-08-25 15:21:51 +01:00
f1a71f544b
Merge branch 'ubitwork' into avination
2012-08-24 23:53:14 +02:00
6d48dbf8ca
Remove debug spam
2012-08-24 23:49:31 +02:00
7e17f4296e
Fix background inventory loading (Viewer 3) so it won't lag out the sim
2012-08-24 23:48:01 +02:00
c1a0c7fad1
Fix bad child prim permissions that can make objects change perms after rezzing
2012-08-23 23:09:32 +02:00
450207d4d8
Make terrain save every 1000 frames instead of every 50. Database load is a sim killer.
2012-08-22 00:27:54 +02:00
526445c394
Fix group return stuff
2012-08-21 23:28:00 +02:00
5273b6880a
Allow updates sent for right pec to go to the client
2012-08-21 21:20:20 +02:00
8d2a37c5a4
Implement seeing busy status in LSL
2012-08-21 20:13:55 +02:00
26224704de
Cause a persistence save if prim flags change
2012-08-21 19:24:41 +02:00
f2ac1b9e8a
Add Camera Offsets to serialization
2012-08-21 16:41:08 +02:00
f71ed7eb79
Fix scripted detach of temp attachments
2012-08-20 15:35:06 +02:00
a329c77063
Merge branch 'avination' into ubitwork
2012-08-19 06:14:49 +01:00
0a959343a5
Make the console output from the reigon console hookable
2012-08-18 22:36:48 +02:00
2efd13ae18
Fix a typo
2012-08-18 22:36:42 +02:00
f9a318380b
let setLinkPrimParams terminate even if there are no more parts.
2012-08-16 22:14:56 +01:00
d1b3f68df4
try fixing building..
2012-08-16 16:53:43 +02:00
998bd48d98
Merge branch 'ubitwork' of ssh://3dhosting.de/var/git/careminster into ubitwork
2012-08-16 16:27:01 +02:00
db3f0a3748
fix vs2010 build
2012-08-16 15:26:16 +01:00
d09fa0d76e
Merge branch 'ubitwork' of ssh://3dhosting.de/var/git/careminster into ubitwork
2012-08-16 16:13:38 +02:00
90ad98370a
Merge branch 'master' into careminster
...
Conflicts:
OpenSim/Region/ScriptEngine/Shared/Api/Implementation/LSL_Api.cs
2012-08-16 02:46:48 +01:00
9995421df1
Do a proper null check to avoid the overloaded operator == trap
2012-08-16 02:35:03 +01:00
bbac8f76fa
Remove AreUpdatesSuspended flag because it does nothing
2012-08-16 01:18:32 +02:00
b97053269b
Change case of areUpdatesSuspended to upper case as is proper for a property
2012-08-16 01:02:20 +02:00
4e5c19595c
Fix casts and calls for link primitive param setting for avatars
2012-08-16 01:01:03 +02:00
UbitUmarov