Commit Graph

20924 Commits (653d97b739a2c324003c4a7c81c41c5d3cefc518)

Author SHA1 Message Date
UbitUmarov 041fcd6a72 remove extra '/' in assets url 2012-09-06 17:18:34 +01:00
Melanie ac6448810e Prevent double slashes, try #3 2012-09-06 17:39:30 +02:00
Melanie 3257f4d5d2 Revert "Change string concatenation to Path.Combine to eliminate extra slashes."
This reverts commit b9d026666d.
2012-09-06 17:31:41 +02:00
Melanie 012f299052 Merge branch 'ubitwork' into avination 2012-09-06 17:12:42 +02:00
Melanie b9d026666d Change string concatenation to Path.Combine to eliminate extra slashes.
Windoze barfs on them.
2012-09-06 17:11:44 +02:00
Melanie 27d345c9a0 Revert " remove extra '/' in assets url"
This reverts commit 041fcd6a72.
2012-09-06 17:02:55 +02:00
Melanie 9ae293881a Make friend notifies and closing child agents async because both can
block the heartbeat thread if the sim being contacted is unresponsive
2012-09-04 22:53:52 +02:00
Melanie 8a537f8f66 Merge branch 'ubitwork' into avination 2012-09-04 13:02:33 +02:00
ubit ed4ad93fef Merge branch 'ubitwork' of ssh://3dhosting.de/var/git/careminster into ubitwork 2012-09-04 11:53:04 +02:00
UbitUmarov c298ae9e75 bug fix 2012-09-04 10:51:43 +01:00
ubit a6bbaba7ef Merge branch 'ubitwork' of ssh://3dhosting.de/var/git/careminster into ubitwork 2012-09-04 08:42:15 +02:00
UbitUmarov d4fad2ba42 a forgotten file plus minor changes. Imp and SL viewer seem to preserve
flight. FS 4.2.2 does not.
2012-09-04 07:32:03 +01:00
ubit 1bd47566ce Merge branch 'ubitwork' of ssh://3dhosting.de/var/git/careminster into ubitwork 2012-09-04 06:01:13 +02:00
UbitUmarov e1755e2d71 let avatar keep flying in tps to same region. (still bad for other
regions )
2012-09-04 04:56:37 +01:00
Melanie 3fb2523f5b Remove debug spam 2012-09-04 03:20:37 +02:00
Melanie 056e66b3de Refactor avatar transfer so that the heavy (UpdateAgent) part is separated into
it's own sub-method
2012-09-04 03:14:39 +02:00
Melanie 7cfcca87c6 Prevent a nullref if SimStatsReporter tries to report on a sim where psysics are
not yet initialized
2012-09-03 13:25:31 +02:00
ubit c93b2db9f2 Merge branch 'ubitwork' of ssh://3dhosting.de/var/git/careminster into ubitwork 2012-09-01 03:12:10 +02:00
UbitUmarov 63e6666f22 try to reduce potencial recursive locking 2012-09-01 02:05:28 +01:00
UbitUmarov 39f5fd0f58 Merge branch 'avination' into ubitwork 2012-08-31 22:30:33 +01:00
ubit e402a24972 Merge branch 'ubitwork' of ssh://3dhosting.de/var/git/careminster into ubitwork 2012-08-30 02:35:31 +02:00
UbitUmarov a7281003d8 move keyframemotion.copy from sop.copy to sog.copy, where there is
newgroup information avaiable.
2012-08-30 01:30:56 +01:00
ubit f15b690687 Merge branch 'ubitwork' of ssh://3dhosting.de/var/git/careminster into ubitwork 2012-08-30 01:33:05 +02:00
UbitUmarov 1eb7d963cf Merge branch 'ubitwork' of ssh://3dhosting.de/var/git/careminster into ubitwork 2012-08-30 00:31:03 +01:00
ubit 194eb78b90 Merge branch 'ubitwork' of ssh://3dhosting.de/var/git/careminster into ubitwork 2012-08-30 01:29:43 +02:00
UbitUmarov 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
Melanie 927cbc6762 Merge branch 'ubitwork' into avination 2012-08-30 00:36:37 +02:00
Melanie 211f4fb411 Sequence inventory descendents requests to reduce inventory server load and
movement lag.
2012-08-30 00:34:12 +02:00
Melanie 67f18655d5 Allow llList2Key to also act on System.String 2012-08-29 22:06:43 +02:00
Melanie f7a60261e9 Merge branch 'ubitwork' into avination 2012-08-29 11:46:57 +02:00
Melanie 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
Melanie 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
Melanie f671e446bf Merge branch 'ubitwork' of ssh://3dhosting.de/var/git/careminster into ubitwork 2012-08-29 11:18:32 +02:00
ubit c34b8ed0f0 Merge branch 'ubitwork' of ssh://3dhosting.de/var/git/careminster into ubitwork 2012-08-29 04:20:50 +02:00
UbitUmarov 2e54c3cc8f A few more changes to keyframes 2012-08-29 03:19:47 +01:00
ubit 73b88140ee Merge branch 'ubitwork' of ssh://3dhosting.de/var/git/careminster into ubitwork 2012-08-29 01:37:44 +02:00
UbitUmarov 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
Melanie 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
Melanie 5284e514d5 Fix a nullref while object is being created 2012-08-28 22:16:01 +02:00
ubit 2546e4c2de Merge branch 'ubitwork' of ssh://3dhosting.de/var/git/careminster into ubitwork 2012-08-28 04:27:59 +02:00
UbitUmarov 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
UbitUmarov 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
Melanie bfa22e2f52 Make llCollisionSprite not throw anymore 2012-08-25 23:49:37 +02:00
ubit 7a4dba2fdc Merge branch 'ubitwork' of ssh://3dhosting.de/var/git/careminster into ubitwork 2012-08-25 16:33:29 +02:00
UbitUmarov 9a80330875 Merge branch 'avination' into ubitwork 2012-08-25 15:21:51 +01:00
Melanie f1a71f544b Merge branch 'ubitwork' into avination 2012-08-24 23:53:14 +02:00
Melanie 6d48dbf8ca Remove debug spam 2012-08-24 23:49:31 +02:00
Melanie 7e17f4296e Fix background inventory loading (Viewer 3) so it won't lag out the sim 2012-08-24 23:48:01 +02:00
Melanie c1a0c7fad1 Fix bad child prim permissions that can make objects change perms after rezzing 2012-08-23 23:09:32 +02:00
Melanie 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