1aa7469253
correct wrong incomplete comment from previous commit 3c3ea19 in AttachmentsModule
2012-06-14 02:30:40 +01:00
3c3ea19620
Fix a bug where scene objects attached as HUDs through scripts would not disappear for other avatars.
...
We do this by sending a kill message for that object to all other avatars apart from the one that has the hud.
2012-06-14 02:26:38 +01:00
0d2243a393
Merge branch 'master' of ssh://opensimulator.org/var/git/opensim
2012-06-14 01:38:41 +01:00
917d753f1c
Fix a race condition where an object update for a hud could be sent to non-owner avatars if the hud was attached directly from within the region.
...
If this happens, then the non-owners would see unremovable huds that they did not own until relog, and sometimes even beyond that.
This was due to a race between the entity update and the attachment code when moving an object from within scene to a hud.
2012-06-14 01:36:37 +01:00
a4290048e5
Add SOG.HasPrivateAttachmentPoint to tell if a SOG has a private attachment point. HUDs attachment points are private.
...
Change SOP.SendFullUpdateToClient() and SoundModule.PlayAttachedSound() to use this rather than different magic number formulations.
This also corrects a bug in PlayAttachedSound() where the code assumed that all attachment points over 30 were HUDs.
It appears this is no longer true with Neck and Root (Avatar Center)
2012-06-14 01:20:55 +01:00
91b569087a
Merge branch 'master' into careminster
2012-06-14 00:59:26 +01:00
cba8b4f8b8
Fix not sending TransferInfo when an asset is not found. This clogs
...
up the sound pipeline in the viewer.
2012-06-14 00:58:17 +01:00
36117e079a
Merge branch 'master' into careminster
2012-06-14 00:57:05 +01:00
6a77a65675
minor: remove unnecessary IsAttachment = false setting for new object in UploadObjectAssetModule, property always starts as false
2012-06-14 00:35:26 +01:00
d893e54f4b
Merge branch 'master' into careminster
...
Conflicts:
OpenSim/Region/ClientStack/Linden/UDP/LLClientView.cs
OpenSim/Region/ScriptEngine/Shared/Api/Implementation/LSL_Api.cs
2012-06-14 00:10:52 +01:00
16ffc764bf
minor: refactor part of LLClientView.ProcessEntityUpdates() to remove duplicate code
2012-06-13 23:54:32 +01:00
cf080a68d6
Remove long obsolete and unused IClientAPI.KillEndDone()
2012-06-13 23:42:22 +01:00
f726150afd
Add ObjectUpdate as one of the packets that can be screened out when setting debug packet level
2012-06-13 23:39:23 +01:00
9b9332782d
Merge branch 'ubitwork' of ssh://3dhosting.de/var/git/careminster into ubitwork
2012-06-13 06:19:40 +02:00
aac80550e0
Merge branch 'avination' into ubitwork
2012-06-13 05:16:18 +01:00
88438c097a
Merge branch 'ubitwork' of ssh://3dhosting.de/var/git/careminster into ubitwork
2012-06-13 06:13:22 +02:00
7bd274b3d3
Changed t adding the avatar dependent sit offset and not subtracting, so not to break inworld contents. SL ported scripts will show a sit error around 0.1m. Added respective compensation in LSL api to maintain coerence. Fixed several bugs still on SET/GET[link]PrimitiveParams[fast] and llGetObjectDetails()
2012-06-13 04:59:09 +01:00
1f34c8277d
In the osGetGrid functions, if the [GridInfo] section does not exist then return "Configuration Error", as already happens if there is no GridInfoURI
2012-06-13 04:05:02 +01:00
66cb533f26
Merge branch 'master' of ssh://opensimulator.org/var/git/opensim
2012-06-13 03:51:13 +01:00
5145356467
Add "deregister region" by uuid command to grid service to allow manual deregistration of simulators.
...
Useful if a simulator has crashed without removing its regions and those regions have been reconfigured differently
2012-06-13 03:49:22 +01:00
b30c23eba4
convert a LSL rotation of <0,0,0,0> to <0,0,0,1> and not <0,0,1,0> in SitTarget. Something seems to be doing that before this gets called, but just in case...
2012-06-13 02:50:39 +01:00
77f579dcc8
Merge branch 'master' of melanie@opensimulator.org:/var/git/opensim
2012-06-13 02:34:25 +01:00
7c0843aad1
Add the updated OpenSimDefaults.ini for the prior timer_Interval patch.
2012-06-12 21:55:31 -04:00
4e18e71089
Committing the Avination implementation of llCastRay. This is a complete rewrite
...
wich does it's thing independently of physics. Enjoy!
2012-06-13 02:32:25 +01:00
94bbbf96c7
Merge branch 'master' of ssh://opensimulator.org/var/git/opensim
2012-06-13 02:25:42 +01:00
12621201ba
Merge branch 'master' into careminster
...
Conflicts:
OpenSim/Framework/Servers/HttpServer/BaseHttpServer.cs
2012-06-13 02:15:12 +01:00
cbeb7c8aef
Merge branch 'ubitwork' of ssh://3dhosting.de/var/git/careminster into ubitwork
2012-06-13 03:07:54 +02:00
4027c8e9c9
Fixed llGetObjectDetails(), OBJECT_ROT for sitting avatars case, plus 'cosmetics' and added some parts costs information.
2012-06-13 01:51:22 +01:00
b4ab9a7350
*TEST this will affect inworld sittargets by +-0.1m, so may be very BAD *. Changed the sign of the sitoffset dependent on avatar size in SP.cs. Removed that offset correction from SET/GET..primitiveParams in LSL api. If the sign needs to be the previus one, then all references to avatar positions on LSL api need to be fixed with that correction, not only SET/GETprimitiveParams.
2012-06-13 01:26:15 +01:00
ff450d29da
Add detecting non-physical phantoms back into raycast
2012-06-13 01:59:54 +02:00
c6e375291a
Don't include time to transmit response back to requester when assessing slow handling of requests.
...
This is to avoid logging a 'slow' request when the source of delay is the viewer in processing a response.
This is not something we can do much about on the server end - it's server-side delay that we're interested in.
To ensure consistency, this commit also had to refactor and simplify inbound non-poll network request handling, though there should be no functional change.
IOSHttpResponse no longer exposes the Send() method, only classes in OpenSim.Framework.Servers.HttpServer should be doing this.
Only the GetTextureHandler was sending its own response. Now it leaves this to BaseHttpServer, like all other core handlers.
2012-06-13 00:03:44 +01:00
c53c55fed0
Add variable timer configureation for the timer_Script
...
Added "timer_Interval" to the OpenSimDefaults.ini, leaving the default value set to 1200, as the previous default setting. The value represents seconds. To change the default, copy the entry to OpenSim.ini and multiply the number of minutes for the interval by 60.
2012-06-12 17:15:56 -04:00
bbad68a65a
Merge branch 'ubitwork' of ssh://3dhosting.de/var/git/careminster into ubitwork
2012-06-12 09:09:05 +02:00
f51ef99bd5
try to replicate SL bug of PRIM_ROTATION also for avas, est a fix to other cases
2012-06-12 08:05:40 +01:00
9997466632
Merge branch 'ubitwork' of ssh://3dhosting.de/var/git/careminster into ubitwork
2012-06-12 07:02:14 +02:00
5784b3eb31
fix the try.. finally in SetPrimitiveParams i did mess and add one for the avatars case, so to optimize a bit 'warp' scripts.
2012-06-12 05:57:28 +01:00
8b5342f613
more changes to Get and Get primitiveparams: Let Get remove avatarheight adjust,add Get PRIM_LINK_TARGET handling, changed avatar Set positions code...
2012-06-12 05:21:49 +01:00
dfafb5ca14
Merge branch 'master' into careminster
...
Conflicts:
OpenSim/Region/ClientStack/Linden/UDP/LLClientView.cs
OpenSim/Region/ClientStack/Linden/UDP/LLUDPServer.cs
2012-06-12 03:09:52 +01:00
2ca31a9841
Remove accidental timeout left in during earlier debugging. Has been in since two commits ago ( b099f26)
2012-06-12 02:46:14 +01:00
1b1f0a2d77
OnConnectionClosed listeners, retrieve data from IClientAPI.SceneAgent rather than scanning all scene for the presence with the right id
...
Stop checking IsLoggingOut on these listeners, if called with a root agent then we always want to perform these actions.
This covers cases where the client is closed due to manual kick, simulator shutdown, etc.
2012-06-12 02:43:33 +01:00
aad7b4a192
Merge branch 'ubitwork' of ssh://3dhosting.de/var/git/careminster into ubitwork
2012-06-12 03:22:19 +02:00
5fd6f678a4
Moved auxiliar funtions of last commit from sop to lsl api since they are only used on one place each
2012-06-12 02:20:47 +01:00
b099f26376
Set IClientAPI.IsActive = false early on client removal due to ack timeout rather than using IsLoggingOut flag.
...
IsActive is more appropriate since unack timeout is not due to voluntary logout.
This is in line with operations such as manual kick that do not set the IsLoggingOut flag.
It's also slightly better race-wise since it reduces the chance of this operation clashing with another reason for client deactivation (e.g. manual kick).
2012-06-12 02:16:36 +01:00
c89db34fc4
If the simulator closes a root agent due to ack timeout, then send the client a kick message with that reason, in case it is somehow still listening.
2012-06-12 02:03:31 +01:00
6ccf746226
Merge branch 'ubitwork' of ssh://3dhosting.de/var/git/careminster into ubitwork
2012-06-12 02:29:06 +02:00
24e8e5d818
*UNTESTED* extended llGet*PrimitiveParam() to support avatars. Some auxiliar code in SOP.cs
2012-06-12 01:26:03 +01:00
8c7149063b
In PresenceDetector.OnConnectionClose(), use the IsChildAgent check already available on IClientAPI.SceneAgent rather than retrieving it again by scanning all scenes.
2012-06-12 01:25:09 +01:00
bab7dab4c5
Comment out the scene presence sitting debug log messages for now
2012-06-11 23:37:16 +01:00
51fe97a00c
Set CreateDefaultAvatarEntries = true in Robust.HG.ini.example to match Robust.HG.ini
...
Thanks to Ai Austin for the spot.
2012-06-11 23:33:32 +01:00
daad0a3e11
Revert "Bind ~ and ! operators in LSL tighter in order to resolve issues in LSL where these aren't evaluated propertly."
...
This reverts commit a8a9d13dc0
2012-06-11 23:30:58 +01:00
Justin Clark-Casey (justincc)