f53ca6285b
Prevent double slashes, try #4
2012-09-06 18:41:21 +01:00
a18c010729
Merge branch 'ubitwork' of ssh://3dhosting.de/var/git/careminster into ubitwork
2012-09-06 19:24:26 +02:00
402de5fb78
Merge branch 'ubitwork' of ssh://3dhosting.de/var/git/careminster into ubitwork
2012-09-06 18:58:57 +02:00
a03ad8bdb4
Merge branch 'ubitwork' of ssh://3dhosting.de/var/git/careminster into ubitwork
2012-09-06 18:22:09 +02:00
041fcd6a72
remove extra '/' in assets url
2012-09-06 17:18:34 +01:00
ac6448810e
Prevent double slashes, try #3
2012-09-06 17:39:30 +02:00
3257f4d5d2
Revert "Change string concatenation to Path.Combine to eliminate extra slashes."
...
This reverts commit b9d026666d
2012-09-06 17:31:41 +02:00
012f299052
Merge branch 'ubitwork' into avination
2012-09-06 17:12:42 +02:00
b9d026666d
Change string concatenation to Path.Combine to eliminate extra slashes.
...
Windoze barfs on them.
2012-09-06 17:11:44 +02:00
27d345c9a0
Revert " remove extra '/' in assets url"
...
This reverts commit 041fcd6a72
2012-09-06 17:02:55 +02:00
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
8a537f8f66
Merge branch 'ubitwork' into avination
2012-09-04 13:02:33 +02:00
ed4ad93fef
Merge branch 'ubitwork' of ssh://3dhosting.de/var/git/careminster into ubitwork
2012-09-04 11:53:04 +02:00
c298ae9e75
bug fix
2012-09-04 10:51:43 +01:00
a6bbaba7ef
Merge branch 'ubitwork' of ssh://3dhosting.de/var/git/careminster into ubitwork
2012-09-04 08:42:15 +02:00
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
1bd47566ce
Merge branch 'ubitwork' of ssh://3dhosting.de/var/git/careminster into ubitwork
2012-09-04 06:01:13 +02:00
e1755e2d71
let avatar keep flying in tps to same region. (still bad for other
...
regions )
2012-09-04 04:56:37 +01:00
3fb2523f5b
Remove debug spam
2012-09-04 03:20:37 +02:00
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
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
c93b2db9f2
Merge branch 'ubitwork' of ssh://3dhosting.de/var/git/careminster into ubitwork
2012-09-01 03:12:10 +02:00
63e6666f22
try to reduce potencial recursive locking
2012-09-01 02:05:28 +01:00
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
UbitUmarov