ogb912/opensim
1
0
Fork 0
mirror of https://github.com/opensim/opensim.git synced 2026-06-23 14:25:42 +08:00
Code Issues Packages Projects Releases Wiki Activity
27,653 Commits 5 Branches 106 Tags
b453ef0fbd3cc54752e97df9738bbc4a8a7c19d4
Commit Graph

702 Commits

Author SHA1 Message Date
UbitUmarov
72684592ba Merge branch 'master' into avinationmerge 
Conflicts:
	OpenSim/Framework/AvatarAppearance.cs
	OpenSim/Framework/Servers/ServerBase.cs
	OpenSim/Framework/VersionInfo.cs
	OpenSim/Region/CoreModules/Agent/AssetTransaction/AssetXferUploader.cs
	OpenSim/Region/CoreModules/Framework/EntityTransfer/EntityTransferModule.cs
	OpenSim/Region/CoreModules/ServiceConnectorsOut/Simulation/LocalSimulationConnector.cs
	OpenSim/Region/CoreModules/ServiceConnectorsOut/Simulation/RemoteSimulationConnector.cs
	OpenSim/Region/Framework/Interfaces/IEntityTransferModule.cs
	OpenSim/Region/Framework/Scenes/SceneObjectGroup.cs
	OpenSim/Region/Framework/Scenes/SceneObjectPart.cs
	OpenSim/Region/PhysicsModules/ConvexDecompositionDotNet/Properties/AssemblyInfo.cs
	OpenSim/Region/PhysicsModules/Ode/ODEPrim.cs
	OpenSim/Region/PhysicsModules/Ode/OdeScene.cs
	OpenSim/Services/Connectors/Simulation/SimulationServiceConnector.cs
	OpenSim/Services/HypergridService/GatekeeperService.cs
	OpenSim/Services/Interfaces/IAvatarService.cs
	OpenSim/Services/LLLoginService/LLLoginService.cs
 2015-11-01 03:01:59 +00:00
Melanie Thielker
ea56f4f27c Introduce an EntityTransferContext carrying the version numbers to pass 
to all interested functions. Should fix the varregion conditional.
Still a testing version, do NOT use in production!
 2015-10-31 18:13:02 +01:00
Melanie Thielker
f0fd028ed9 Merge branch 'master' of opensimulator.org:/var/git/opensim 2015-10-31 00:06:34 +01:00
Melanie Thielker
dc6d9eadf3 Testing stage of the new versioning system. Use at own risk. May not 
work. Will eat your babies. Yada. Yada.
 2015-10-31 00:01:35 +01:00
UbitUmarov
dd9b06e3b6 fix mantis 7733, reverting setting of IsAttachment on first call to full check. Replace instead same simple IsAttachment tests by full checks 2015-10-29 22:14:11 +00:00
UbitUmarov
c3532ba876 set SOG.IsAttachment when doing a full check, so future gets see the right value 2015-10-25 19:59:05 +00:00
UbitUmarov
28d4afbe3a replace objects scale clamp by a more readable clamp. Simplify GroupResize and let rescale factors < 1 also be checked for size limits, Set new scales directly not checking them again. 2015-10-23 01:39:53 +01:00
UbitUmarov
52860a7d15 stop using a Vector3 to store 3bits 2015-10-20 16:55:18 +01:00
UbitUmarov
dfd60d6f71 STATUS_ROTATE are linkset flags and not prim 2015-10-20 15:37:43 +01:00
UbitUmarov
4a2e6db344 add high level code suport for SetHoverHeight() called from a attachment, so in future physics engines can also suport it 2015-09-30 17:34:25 +01:00
UbitUmarov
0fb033e567 fix object crossings to other scene on same instance 2015-09-26 01:31:57 +01:00
UbitUmarov
032958709b last merging of sog m_linkedAvatars into m_sittingAvatars - untested. 2015-09-21 21:49:51 +01:00
Kevin Cozens
b412db72be Fix a regression to GetSittingAvatars(). Return List<ScenePresence> once more. 2015-09-21 11:00:34 -04:00
UbitUmarov
5becc16acf try to improve vehicles crossing with Xengine. Lag seems main issue now, but needs testing, specially the fail cases, that most likelly need more work 2015-09-14 16:40:01 +01:00
Robert Adams
e5367d822b Merge of ubitworkvarnew with opensim/master as of 20150905. 
This integrates the OpenSim refactoring to make physics, etc into modules.
AVN physics hasn't been moved to new location.
Does not compile yet.

Merge branch 'osmaster' into mbworknew1
 2015-09-08 04:54:16 -07:00
UbitUmarov
a11edceb00 seems to compile ( tests comented out) 2015-09-02 19:54:53 +01:00
UbitUmarov
371c9dd2af bad merge? 2015-09-01 14:54:35 +01:00
Diva Canto
ce2c67876e More namespace and dll name changes. Still no functional changes. 2015-08-30 21:05:36 -07:00
Diva Canto
2c0cad6dd3 Renamed the namespaces too 2015-08-30 20:29:31 -07:00
UbitUmarov
d2776ec645 funny bug 2015-08-19 17:14:29 +01:00
AliciaRaven
cb586d1158 Enable grab feature (Ctrl+Drag) for non-physical link-sets and add code to handle spin (Ctrl+Shift+Drag) 
This patch fixes permission issues with dragging scripted objects. As on LL grid, scripted prims can not be dragged. Also after dragging, the group was not marked as updated. This meant that after the region was restarted the group would revert to its original position. This version fixes issues where scripts in child prims were not detected and also blocks grab for attachments.

Signed-off-by: BlueWall <jamesh@bluewallgroup.com>
 2015-05-13 12:16:14 -05:00
BlueWall
e171ae899d Revert "Enable grab feature (Ctrl+Drag) for non-physical link-sets and add code to handle spin (Ctrl+Shift+Drag)" 
We found that linksets can move if the root prim is unscripted. Will revert this until a fix can be implemented.
 2015-04-28 17:24:54 -05:00
AliciaRaven
f11720d71f Enable grab feature (Ctrl+Drag) for non-physical link-sets and add code to handle spin (Ctrl+Shift+Drag) 
This patch fixes permission issues with dragging scripted objects. As on LL grid, scripted prims can not be dragged now. Also after dragging, the group was not marked as updated. This meant that after the region was restarted the group would revert to its original position.

Signed-off-by: Michael Cerquoni <nebadon2025@gmail.com>
 2015-04-20 16:38:37 -04:00
Robert Adams
7d699514a5 Revert "Enable grab feature (Ctrl+Drag) for non-physical link-sets and add code to handle spin (Ctrl+Shift+Drag)" 
This change sees to enable general moving of objects with touch scripts.
Reverting until the move permissions are understood.

This reverts commit 28ce323802.
 2015-04-19 20:22:55 -07:00
AliciaRaven
28ce323802 Enable grab feature (Ctrl+Drag) for non-physical link-sets and add code to handle spin (Ctrl+Shift+Drag) 
Signed-off-by: BlueWall <jamesh@bluewallgroup.com>
 2015-04-17 19:37:18 -05:00
Robert Adams
07dead7dcb varregion: any conversions of use of Constants.RegionSize converted into 
Util.cs routines to convert region coords to and from world coords or handles.
 2015-03-29 14:25:12 -07:00
Robert Adams
9f18e3ba80 Varregion: first cut at removing Border class checks for region crossings. 
Added Scene.PositionIsInCurrentRegion(pos) to sense when new position needs some crossing work.
Many changes made to EntityTransferModule to accomodate new crossing sense logic.
 2015-03-22 21:53:02 -07:00
Justin Clark-Casey (justincc)
dd6f560c05 If serialized scene object XML has a SavedScriptState with no UUID, then read past the innerXML instead of wrongly continously looping on the same element. 
Addresses http://opensimulator.org/mantis/view.php?id=7437
 2015-02-11 00:53:56 +00:00
Justin Clark-Casey (justincc)
1d2616e7a2 If the owner of an object is taking a copy from the scene (e.g. via the "take copy" option on a viewer) then only require owner copy perms, not copy and transfer. 
This matches Linden Lab behaviour and what was already possible via shift-copy.
Transfer would not apply here as the owner and copier are the same.
This is the only functional change, all other current take copy logic remains the same.
Adds regression tests around relevant take copy cases.
 2015-02-03 23:43:30 +00:00
Justin Clark-Casey (justincc)
d0a2ea0857 Fix regression where the stored state of every second script in an object rezzed from inventory (e.g. attachments) was no longer loaded. 
Likely a regression since f132f642 (2014-08-28)
Relates to http://opensimulator.org/mantis/view.php?id=7278
 2015-01-23 00:27:57 +00:00
Justin Clark-Casey
3247a7cb3e refactor: capitalize SOP.moveToTarget() and stopMoveToTarget() in accordance with code guidelines and the rest of the methods. 2014-11-19 20:12:28 +00:00
UbitUmarov
6bebb9206c fix stopMoveToTarget in attachments case ( similar to core fix) 2014-11-19 20:11:16 +00:00
Justin Clark-Casey
7a2c77e7ea If calling llStopMoveToTarget() on an in-world prim, don't send an unnecessary object update if the prim was not moving to target. 
This involves making PhysicsActor.PIDActive get as well as set.
On physics components that don't implement this (all characters and some phys engines) we return false.
 2014-11-19 20:06:56 +00:00
Justin Clark-Casey
67e56872f3 If llStopMoveToTarget() is called on an attachment, then stop the avatar if it was moving to target. 
Same behaviour as on Linden Lab grid.
Will probably also address http://opensimulator.org/mantis/view.php?id=7369 by not generating spurious object updates when llStopMoveToTarget() is called in attachments where the avatar is not moving.
 2014-11-19 19:08:33 +00:00
UbitUmarov
37a5eab0f5 BUG FIX prevent references to null scene (as happens on mesh uploads) 2014-11-03 00:03:53 +00:00
UbitUmarov
bc4d0179b3 remove debug message 2014-10-26 12:38:22 +00:00
UbitUmarov
b07ea475bf delete keyframes on temporary backup group 2014-10-26 12:30:11 +00:00
UbitUmarov
b43ce909aa Debug... ( restored TriggerOnSceneObjectPreSave) 2014-10-26 11:28:24 +00:00
UbitUmarov
cfc8de096b remove lock that did nothing, DEBUG disable TriggerOnSceneObjectPreSave 2014-10-26 10:48:53 +00:00
UbitUmarov
6600282fe9 another try to prevent double crossing 2014-10-26 10:08:13 +00:00
UbitUmarov
139044fc79 keep intransit flag even if deleted, dont set sog position if in transit 2014-10-26 01:25:28 +00:00
UbitUmarov
639f128d2c some cleanup, localID coerence fix.. 2014-10-26 01:27:43 +01:00
UbitUmarov
16608ffb01 don't backup in transit SOGs 2014-10-24 21:51:38 +01:00
UbitUmarov
4571e5bc3e try to make SOG crossings full async. Simplify some borders checking.... 2014-10-24 18:10:28 +01:00
Justin Clark-Casey (justincc)
cbd428cff3 Add LSL transaction_result event. 
This is cinderblocks' transaction_result.diff from http://opensimulator.org/mantis/view.php?id=7329 but I have used lsl.parser.cs and lsl.lexer.cs files generated directly from opensim-libs rather than those supplied in the patch.
I also added scriptEvents.transaction_reuslt.
The required parser/lexer generation file changes were made in commit d564f28 in the opensim-libs repo.
Thanks!
 2014-10-04 00:16:47 +01:00
Justin Clark-Casey (justincc)
57e75d7c03 Do not add attachments to the region scene object backup list. 
Attachment persistence is not handled in this way and this just results in a load of busy work until a check in each SOG terminates a backup check for attachments anyway.
 2014-10-02 22:30:44 +01:00
UbitUmarov
79e47eb60e some changes in link/unlink code, bypassing complex variables set methods 2014-09-22 23:32:55 +01:00
UbitUmarov
ea4a526095 a few more changes on link/unlink 2014-09-22 16:09:39 +01:00
UbitUmarov
bcaf202e34 update scenegraph group find by part information in sog link, so script link functions do update that also. 2014-09-22 13:59:23 +01:00
UbitUmarov
51697944b6 dont send fullObjectUpdate on deselect 2014-09-09 00:09:39 +01:00