ogb912/opensim
1
0
Fork 0
mirror of https://github.com/opensim/opensim.git synced 2026-06-28 01:35:38 +08:00
Code Issues Packages Projects Releases Wiki Activity
19,838 Commits 5 Branches 82 Tags
3a26e366d2829c2f66a8aa22158bd0905f0894de
Commit Graph

13118 Commits

Author SHA1 Message Date
Justin Clark-Casey (justincc)
e23a0dcc5d minor: On teleport, signal a child agent before we send the viewer TeleportFinish in order to avoid a theoretical race condition when teleporting to a neighbour. 
If we do this after TeleportFinish, then it's possible for a neighbour destination to request the source to create a child agent whilst its still treated as root.
This closes the original presence which we don't really want to do.
This is probably okay (albeit with warnings on the console) but afaics there's no reason not to move the child agent signal.
 2013-03-21 23:37:23 +00:00
Justin Clark-Casey (justincc)
46c833810c On a teleport, lock m_agentsInTransit whilst we grab the value to check for completion just to be sure we're not using a thread cached version. 2013-03-21 00:46:08 +00:00
Justin Clark-Casey (justincc)
4de530af45 minor: disable logging on regression TestCrossOnSameSimulator() that I accidentally left on a few commits ago. 2013-03-20 23:13:12 +00:00
Justin Clark-Casey (justincc)
b1cd1d917e minor: don't bother with the pause before rezzing attachments if we are running regression tests (fire and forget calls launched on the same thread). 
Also adds code comments as to why this pause exists.
 2013-03-20 23:12:13 +00:00
Justin Clark-Casey (justincc)
36651bed71 On the later forms of teleport failure, tell the user if this was because viewer couldn't/didn't connect with destination or if destination didn't signal teleport completion. 
Also adds regression test for the case where the viewer couldn't connect with the destination region.
Also refactoring of regression test support code associated with entity transfer in order to make this test possible and the code less obscure.
 2013-03-20 23:01:16 +00:00
Justin Clark-Casey (justincc)
8de933ab07 Insert a short delay on the simulator side rezzing of attachments in order to fix viewer 3 issues if its own rezzing actions on login collide with the simulator side actions. 
This resolves issues (at least in my tests with LL 3.3.4) where this can make attachments invisible until one zooms in on the avatar.
This doesn't affect version 1 viewers since this delay is shorter than the login delay.
This doesn't increase the login time since this part of the process was already being performed asynchronously.
This may be a temporary solution.
 2013-03-20 02:09:25 +00:00
Justin Clark-Casey (justincc)
c0ff5635ba Fix "show attachments" command probably broken in commit addab12 (Wed Jan 2 21:38:00 2013) 
This break was not connected with the recent attachment code changes.
 2013-03-20 02:00:56 +00:00
Justin Clark-Casey (justincc)
3cb1c23554 Force a viewer object update for attachments at the end of the final Scene.CompleteMovement() in order to make all multi-attachments appear on the destination region. 
For some reason, sending updates before this will not have this effect.
This may be something related to some viewers (e.g. LL 3.3.4) or something OpenSimulator isn't getting quite right.
 2013-03-20 01:46:50 +00:00
Justin Clark-Casey (justincc)
9151b9d233 Merge branch 'master' of ssh://opensimulator.org/var/git/opensim 2013-03-20 01:36:28 +00:00
Robert Adams
90b9121e66 BulletSim: change 'degenerate mesh' message from Error to Debug because there 
seem to be lots of sculpties with this problem while the condition really doesn't
change region operation.
 2013-03-19 17:15:24 -07:00
Justin Clark-Casey (justincc)
3648164219 Prevent multiple instances of the same item ID being appended to an AvatarAppearance 
It looks like this was happening when AttachmentsModule.RezAttachments was doing a secondary set of each attachment to update with the asset ID (initially they only have the inventory ID).
However, with multi-attach this was appending a second copy of the same attachment rather than updating the data that was already there.
This commit requires both simulator and service to be updated.
 2013-03-19 21:49:29 +00:00
Robert Adams
1dd2d432f1 For those people collecting and comparing logfiles from servers scattered 
around the world, change LogWriter to use DateTime.UtcNow rather than
DateTime.Now.
 2013-03-19 11:40:10 -07:00
Robert Adams
8360223fed BulletSim: code to generate a higher resolution terrain mesh. Parameter 
TerrainMeshMagnification controls number of vertices generated per
heightmap point. Default is 3.
 2013-03-19 00:00:03 -07:00
Robert Adams
8510f57ad4 BulletSim: add terrain contact processing threshold parameter. Initialize contact processing threshold for static object as well as mesh terrain. 2013-03-19 00:00:02 -07:00
Justin Clark-Casey (justincc)
397379cd3f Process default attachment point in AttachObjectInternal before we check whether a worn object needs to displace an existing attachment on the same point if we are not using multi-attach. 2013-03-19 00:39:58 +00:00
Melanie
55ab6f015a Fix tests for multiattach 2013-03-18 23:48:03 +00:00
Melanie
5e1f651e21 Merge branch 'master' into newmultiattach 
Conflicts:
	OpenSim/Region/CoreModules/Avatar/Attachments/AttachmentsModule.cs
 2013-03-18 23:31:27 +00:00
Melanie
0635d9d174 Merge commit 'ccd6f443e1092cb410f565e921f7cf4dd8cd2dac' into newmultiattach 
Conflicts:
	OpenSim/Region/CoreModules/Avatar/Attachments/AttachmentsModule.cs
 2013-03-18 23:21:01 +00:00
Melanie
e4a70b9f9a Limit each attachment point to 5 items as per spec 2013-03-18 22:56:26 +00:00
Melanie
fcecfc81bb Multiattach, part 1 
Conflicts:

	OpenSim/Framework/AvatarAppearance.cs
	OpenSim/Region/CoreModules/Avatar/Attachments/AttachmentsModule.cs
	OpenSim/Region/CoreModules/Avatar/Attachments/Tests/AttachmentsModuleTests.cs
	OpenSim/Region/Framework/Interfaces/IAttachmentsModule.cs
	OpenSim/Region/Framework/Scenes/Scene.cs
	OpenSim/Region/OptionalModules/Avatar/Attachments/TempAttachmentsModule.cs
	OpenSim/Region/ScriptEngine/Shared/Api/Implementation/LSL_Api.cs
 2013-03-18 22:56:03 +00:00
Justin Clark-Casey (justincc)
3611d33b00 Improve rejection of any attempt to reattach an object that is already attached. 
This also adds/extends regression tests for wearing attachments directly for the scene and attempting to reattach/rewear already attached objects.
 2013-03-18 22:04:27 +00:00
Justin Clark-Casey (justincc)
a7a9a8a614 Fix recent regression where an item worn to an attachment point that was already occupied did not remove the previous attachment (current behaviour) 
Regression was commit ccd6f4 (Tue Mar 5 23:47:36 2013)
Added regression test for this case.
 2013-03-18 20:48:50 +00:00
Melanie
46a81b3527 Merge branch 'master' of melanie@opensimulator.org:/var/git/opensim 2013-03-17 23:07:12 +00:00
Robert Adams
464201b41d BulletSim: add INI parameter for angular banking timescale fudge parameter. 2013-03-16 15:34:07 -07:00
Vegaslon
fc84ebb819 BulletSim: Working Implementation of Angular Banking for Vehicles (Not SL Grade, Other features when implemented should slow it down for now be Strong with Vertical Angular attraction setting and conservative with Angular Velocity on X axis) 
Signed-off-by: Robert Adams <Robert.Adams@intel.com>
 2013-03-16 15:13:40 -07:00
Melanie
7e5d553781 Make the LSL memory functions virtual so script engines can override them if they have different memory management. 2013-03-15 23:46:49 +00:00
Vegaslon
78b25094dc BulletSim: Tweak vertical angular attraction to remove double VehicleOrientation application fixing the problem with the vertical attractor pushing vehicles nose first into ground when tilted on side. 
Signed-off-by: Robert Adams <Robert.Adams@intel.com>
 2013-03-15 14:05:38 -07:00
Robert Adams
c10c43d6f6 Fix server statistics always reporting zero for total network bytes in/out. 
Clean up some parameter code in Statistics.Binary.
 2013-03-15 13:59:34 -07:00
Justin Clark-Casey (justincc)
d3e76730bd Add example code to DOExampleModule to pull data from that previously saved by DAExampleModule when instantiating a dynamc object. 2013-03-15 00:49:35 +00:00
Justin Clark-Casey (justincc)
cb74186888 Add ParentGroup.HasGroupChanged = true setting to DAExampleModule as this is necessary to get attributes to save (though this probably happens anyway due to the prim move) 2013-03-15 00:27:06 +00:00
Justin Clark-Casey (justincc)
e25ba116a3 refactor: make llGetLinkName() and llGetLinkKey() use a common GetLinkEntity() method 2013-03-15 00:06:42 +00:00
Justin Clark-Casey (justincc)
081271e1d7 minor: remove mono compiler warnings in LSL_Api.cs 2013-03-14 23:44:16 +00:00
Justin Clark-Casey (justincc)
12900ea84e Log same environment information to Robust log as is already done for simulator logs, for debug purposes 2013-03-14 23:39:15 +00:00
Justin Clark-Casey (justincc)
2fbc08d7dd refactor: minor cleanup in osGetAvatarList() 2013-03-14 23:19:18 +00:00
Justin Clark-Casey (justincc)
0ea0f8aa83 Fix bug in osCauseHealing() if called with an avatar ID for an avatar that is not in the scene. 2013-03-14 23:16:39 +00:00
Justin Clark-Casey (justincc)
56b333f301 minor: Use more compact libomv primitive constructors in osNpcGetPos() and osNpcGetRot() 2013-03-14 23:12:58 +00:00
Justin Clark-Casey (justincc)
55204ccde6 Fix minor race conditions in OSSL_Api functions where a parcel could be misidentified for moving prims. 2013-03-14 23:09:59 +00:00
Justin Clark-Casey (justincc)
f8dab4f93f refactor: Use LSL_Vector(Vector3) constructor in llCastRay() 2013-03-14 23:06:54 +00:00
Justin Clark-Casey (justincc)
ca99f418d8 refactor: Use ILandChannel.GetLandObject(Vector3) in LSL_Api rather than having to continually take intermediate Vector3s to avoid race conditions 2013-03-14 23:05:21 +00:00
Justin Clark-Casey (justincc)
c1115e4c2e Add ILandChannel.GetLandObject(Vector3 position) as this is a very common input to GetLandObject() 
This conforms to the existing ILandChannel.ParcelsNearPoint() method
 2013-03-14 22:56:26 +00:00
Justin Clark-Casey (justincc)
c09f4ff483 Fix minor race condition in llGetCameraRot() where inconsistent information could be returned for a rotating camera 2013-03-14 22:49:08 +00:00
Justin Clark-Casey (justincc)
114fd042de Fix minor race condition in llGetCameraPos() where an inconsistent post could be returned for a moving camera 2013-03-14 22:46:27 +00:00
Justin Clark-Casey (justincc)
d4b109b4c4 Fix minor race condition in llParcelMediaCommandList() where a parcel could be misidentified for a moving prim 2013-03-14 22:45:00 +00:00
Justin Clark-Casey (justincc)
2a81eb8d45 Fix minor race conditions in LSL_Api.GetPrimParams() for PRIM_POSITION, PRIM_SIZE and PRIM_ROT_LOCAL 
This function is used by all the various ll*Params() and os*Params() functions
 2013-03-14 22:42:11 +00:00
Justin Clark-Casey (justincc)
b23009e480 Fix minor race condition in llGetGeometricCenter() if this was changing whilst the function was called. 2013-03-14 22:35:41 +00:00
Justin Clark-Casey (justincc)
a6f8638174 refactor: use LSL_Rotation(Quaternion) constructor in lLGetRootRotation() 2013-03-14 22:34:48 +00:00
Justin Clark-Casey (justincc)
dd6f1fc637 Fix minor race condition in llGetRootPosition() where inconsistent results could be returned for moving prims 2013-03-14 22:33:44 +00:00
Justin Clark-Casey (justincc)
e7603f98b7 Fix minor race conditions in detecting current parcel for llAddToLandPassList(), llSetParcelMusicURL() and llGetParcelMusicURL() for moving prims 2013-03-14 22:31:07 +00:00
Justin Clark-Casey (justincc)
e6eb914675 refactor: use LSL_Vector(Vector3) constructor in llGroundNormal() 2013-03-14 22:29:09 +00:00
Justin Clark-Casey (justincc)
f8c24b2a61 minor: Reuse ground LSL_Vector in llGroundSlope() rather than creating a new one. 2013-03-14 22:26:37 +00:00