ogb912/opensim
1
0
Fork 0
mirror of https://github.com/opensim/opensim.git synced 2026-06-29 02:25:39 +08:00
Code Issues Packages Projects Releases Wiki Activity
20,901 Commits 5 Branches 83 Tags
a44939e951cfb5dc04f331eaeab7ec196715d08a
Commit Graph

504 Commits

Author SHA1 Message Date
Melanie
7d1bec00d5 Add a skeleton for a name value storage associated with regions 2012-08-15 01:08:30 +02:00
Melanie
6930d696e9 Merge branch 'master' into careminster 
Conflicts:
	OpenSim/Region/CoreModules/Avatar/Attachments/Tests/AttachmentsModuleTests.cs
 2012-07-25 18:19:12 +01:00
Justin Clark-Casey (justincc)
2858b1b1f4 extend regression TestDetachScriptedAttachementToInventory() to check correct running status on a re-rezzed attachment 2012-07-24 22:33:54 +01:00
Melanie
df866fd300 Merge branch 'avination' into careminster 2012-07-20 09:35:22 +01:00
Melanie
ce8b9e6c57 Fix slow loading of task inventory 2012-07-19 12:27:36 +02:00
Melanie
36d744e2a5 Merge branch 'master' into careminster 
Conflicts:
	OpenSim/Region/CoreModules/Avatar/Inventory/Transfer/InventoryTransferModule.cs
	OpenSim/Region/Framework/Scenes/Scene.cs
	OpenSim/Region/ScriptEngine/Shared/Api/Implementation/LSL_Api.cs
	OpenSim/Region/ScriptEngine/XEngine/XEngine.cs
 2012-07-19 09:47:51 +01:00
Justin Clark-Casey (justincc)
6dda7c65ae Add EventManager.OnRegionLoginsStatusChange fired whenever logins are enabled or disabled at any point, not just during initial startup. 
This replaces EventManager.OnLoginsEnabled which only fired when logins were first enabled
and was affected by a bug where it would never fire if the region started with logins disabled.
 2012-07-19 00:09:22 +01:00
Melanie
64393a7ca8 Merge branch 'master' into careminster 
Conflicts:
	OpenSim/Region/Framework/Scenes/Scene.cs
 2012-07-13 02:27:16 +01:00
Justin Clark-Casey (justincc)
3b3d9967b1 Remove IClientAPI.GetClientEP() in favour of existing identical IClientAPI.RemoteEndpoint. 2012-07-12 23:29:57 +01:00
Melanie
d632fd7124 Merge branch 'master' into careminster 
Conflicts:
	OpenSim/Region/CoreModules/Avatar/Attachments/AttachmentsModule.cs
	OpenSim/Region/Framework/Scenes/SceneObjectGroup.cs
	OpenSim/Region/Framework/Scenes/SceneObjectPart.cs
	OpenSim/Region/ScriptEngine/Shared/Instance/ScriptInstance.cs
 2012-07-12 08:55:16 +01:00
Justin Clark-Casey (justincc)
fc24563206 Add regression TestDetachScriptedAttachmentToInventory() 
This currently only does a relatively crude check for a ScriptState node in the serialized xml
 2012-07-11 21:43:35 +01:00
Justin Clark-Casey (justincc)
14d05dc2a9 Add regression TestRezScriptedAttachmentsFromInventory() though this currently only checks for the presence of script items, not for started scripts 2012-07-11 19:54:40 +01:00
Melanie
0bc8238a6c Merge branch 'master' into careminster 
Conflicts:
	OpenSim/Framework/Watchdog.cs
	OpenSim/Region/CoreModules/Avatar/Attachments/AttachmentsModule.cs
	OpenSim/Region/Framework/Scenes/Scene.cs
	OpenSim/Region/Framework/Scenes/SceneObjectPart.cs
	OpenSim/Region/Framework/Scenes/ScenePresence.cs
 2012-07-11 03:56:50 +01:00
Justin Clark-Casey (justincc)
2eaa6d5ace Do not allow a script to attach a prim if its being sat upon. 
This prevents a stack overflow where a get position on the avatar will refer to the attachment which will in turn refer back to the avatar.
This required recording of all sitting avatars on a prim which is done separately from recording the sit target avatar.
Recording HashSet is null if there are no sitting avatars in order to save memory.
 2012-07-09 21:24:32 +01:00
Justin Clark-Casey (justincc)
7ff4eec79c Remove redundant SetScene() function in Scene.AddSceneObject() 
This is always done later on in SceneGraph.AddSceneObject() if the call hasn't failed due to sanity checks.
There's no other purpose for this method to exist and it's dangerous/pointless to call in other conditions.
 2012-07-07 00:02:45 +01:00
Melanie
5776351f6a Merge branch 'master' into careminster 
Conflicts:
	OpenSim/Region/Framework/Scenes/Scene.cs
	OpenSim/Region/ScriptEngine/Shared/Api/Implementation/LSL_Api.cs
 2012-07-05 22:17:39 +01:00
Justin Clark-Casey (justincc)
951b45b80f Add OSSL function osForceAttachToAvatarFromInventory() 
This works like osForceAttachToAvatar() but allows an object to be directly specified from the script object's inventory rather than forcing it to be rezzed in the scene first.
Still only attaches objects to the owner of the script.
This allows one to bypass the complicated co-ordination of first rezzing objects in the scene before attaching them.
Threat level high.
 2012-07-05 00:05:06 +01:00
Melanie
41a1903c60 Merge branch 'master' into careminster 
Conflicts:
	OpenSim/Region/CoreModules/Avatar/Attachments/Tests/AttachmentsModuleTests.cs
 2012-06-28 03:21:08 +01:00
Justin Clark-Casey (justincc)
5bec5bcf71 Automatically disable log4net before each regression test so that logging is confined to a single test if it's turned on. 
This involves making test classes inherit from a common OpenSimTestCase.
This will be applied to more classes as required.
 2012-06-27 00:01:51 +01:00
Justin Clark-Casey (justincc)
99954c1498 refactor: Remove unnecessary AttachmentModuleTests.m_userId in favour of local variables 2012-06-26 22:53:08 +01:00
Melanie
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
Justin Clark-Casey (justincc)
cf080a68d6 Remove long obsolete and unused IClientAPI.KillEndDone() 2012-06-13 23:42:22 +01:00
Melanie
84377a23db Merge branch 'avination' into careminster 
Conflicts:
	OpenSim/Region/Framework/Interfaces/ISimulationDataService.cs
	OpenSim/Services/Connectors/Simulation/SimulationDataService.cs
	OpenSim/Tests/Common/Mock/MockRegionDataPlugin.cs
 2012-06-11 16:56:40 +01:00
Melanie
26c5b32988 Add the ability to query the MYSQL databse for a list of the stored prim UUIDs 2012-06-07 22:39:03 +02:00
Melanie
884c0e7bb1 Merge branch 'master' into careminster 
Conflicts:
	OpenSim/Data/MySQL/MySQLSimulationData.cs
	OpenSim/Data/MySQL/Resources/RegionStore.migrations
	OpenSim/Region/CoreModules/Avatar/Attachments/AttachmentsModule.cs
	OpenSim/Region/CoreModules/Framework/EntityTransfer/EntityTransferModule.cs
	OpenSim/Region/CoreModules/Framework/InventoryAccess/InventoryAccessModule.cs
	OpenSim/Region/CoreModules/ServiceConnectorsOut/Simulation/LocalSimulationConnector.cs
	OpenSim/Region/Framework/Scenes/Scene.cs
	OpenSim/Region/Framework/Scenes/SceneObjectPartInventory.cs
	OpenSim/Region/ScriptEngine/Shared/Api/Implementation/LSL_Api.cs
	OpenSim/Region/ScriptEngine/Shared/Api/Implementation/OSSL_Api.cs
 2012-05-27 19:24:30 +01:00
PixelTomsen
bc543c1797 Environment Module - allows Environment settings for Viewer3 warning: includes database region store migrations for mssql, mysql, sqlite 
enable/disable this module:
Cap_EnvironmentSettings = "localhost" (for enable)
Cap_EnvironmentSettings = "" (for disable) at ClientStack.LindenCaps section (OpenSimDefaults.ini file)
 or owerwrite in OpenSim.ini

mantis: http://opensimulator.org/mantis/view.php?id=5860

Signed-off-by: BlueWall <jamesh@bluewallgroup.com>
 2012-05-23 17:04:19 -04:00
Justin Clark-Casey (justincc)
ff429a259b Fix bug where an avatar that had an object they owned attached through llAttachToAvatar() or osForceAttachToAvatar() would wrongly have next permissions come into play when they detached that object and rezzed it in scene. 
This is because the attachments module code was setting the 'object slam' bit by using PermissionMask.All
Solution here is to route the attachment item creation call through the existing inventory code in BasicInventoryAccessModule rather than copy/pasted code in AttachmentsModule itself.
 2012-05-23 01:58:10 +01:00
Melanie
34f20b7fe3 Merge branch 'master' into careminster 2012-05-17 13:28:25 +01:00
Justin Clark-Casey (justincc)
f0c9cb8dc0 Comment out TestSameSimulatorSeparatedRegionsQueryAccessFails() regression test logging accidentally left in 2012-05-17 01:34:04 +01:00
Justin Clark-Casey (justincc)
bdcf2d1348 Add regression TestSameSimulatorSeparatedRegionsQueryAccessFails() 2012-05-17 01:27:59 +01:00
Melanie
597f99bca7 Merge branch 'master' into careminster 2012-05-16 12:40:45 +01:00
Justin Clark-Casey (justincc)
1b5ce8c10e Fix issue where loading OARs could sometimes result in link numbers being reordered. 
This was because the parts in scene objects were sometimes not serialized in link order.
This is perfectly fine since the parts still have the right link numbers, but an extra fix to adjust for this
had not been done in the SerialiserModule methods that OAR loading used.
Add regression test for same.
Addresses http://opensimulator.org/mantis/view.php?id=5948, http://opensimulator.org/mantis/view.php?id=5749
 2012-05-15 23:43:59 +01:00
Melanie
fe029cf4e8 Merge branch 'avination' into careminster 2012-05-13 01:25:03 +01:00
Melanie
e2dc04586a Merge branch 'master' into careminster 2012-05-13 01:24:01 +01:00
UbitUmarov
7461fe4554 TEST MESS* reduce animation packets send. Added onchangeanim event with parameters to define if to add or remove, and if to send anims pack on that evocation, etc 2012-05-12 15:27:37 +01:00
Justin Clark-Casey (justincc)
9d66792c2a Fix mono compiler warning. 
Last jenkins failure looked like a glitch.
 2012-05-12 03:04:47 +01:00
Melanie
bf630fb808 Merge branch 'master' into careminster 
Conflicts:
	OpenSim/Region/CoreModules/Framework/EntityTransfer/EntityTransferModule.cs
	OpenSim/Region/CoreModules/Framework/EntityTransfer/HGEntityTransferModule.cs
	OpenSim/Region/Framework/Interfaces/IEntityTransferModule.cs
 2012-05-02 01:37:51 +01:00
Justin Clark-Casey (justincc)
9d2e1c67a8 Add regression test for teleporting between neighbouring regions on the same simulator 
This adds a non-advertised wait_for_callback option in [EntityTransfer].  Default is always true.
Teleport tests disable the wait for callback from the destination region in order to run within a single thread.
 2012-05-01 23:14:12 +01:00
Melanie
4b982db252 Merge branch 'master' into careminster 
Conflicts:
	OpenSim/Data/MySQL/MySQLAssetData.cs
	OpenSim/Data/MySQL/MySQLSimulationData.cs
	OpenSim/Data/MySQL/MySQLUserAccountData.cs
 2012-04-30 19:04:38 +01:00
Justin Clark-Casey (justincc)
b678ea18b2 Create TestHelpers.EnableLogging() and DisableLogging() to turn logging on and off within tests. 
This makes *.Tests.dll.config files no longer needed, hence deleted.
 2012-04-30 18:44:22 +01:00
Melanie
90305001de Merge branch 'master' into careminster 
Conflicts:
	OpenSim/Region/CoreModules/Framework/EntityTransfer/EntityTransferModule.cs
	OpenSim/Region/Framework/Scenes/Scene.Inventory.cs
	OpenSim/Region/Framework/Scenes/Scene.cs
 2012-04-27 17:09:49 +01:00
Justin Clark-Casey (justincc)
07e62df558 Add regression test for teleporting an agent between separated regions on the same simulator. 
This involves a large amount of change in test scene setup code to allow test scenes to share shared modules
SetupScene is now an instance method that requires an instantiation of SceneHelpers, though other SceneHelpers methods are still static
May split these out into separate classes in the future.
 2012-04-27 00:58:54 +01:00
Melanie
8df4bd14f5 Merge branch 'master' into careminster 2012-04-22 15:06:06 +01:00
Justin Clark-Casey (justincc)
06552f217e Add TestSetPhysics() to SOP status tests 2012-04-21 00:54:48 +01:00
Melanie
f3132c45d9 Merge branch 'master' into careminster 
Conflicts:
	OpenSim/Region/CoreModules/Framework/InventoryAccess/InventoryAccessModule.cs
	OpenSim/Region/Framework/Scenes/SceneObjectGroup.cs
	OpenSim/Region/ScriptEngine/Shared/Api/Implementation/LSL_Api.cs
	OpenSim/Tests/Common/Mock/TestClient.cs
 2012-03-31 02:18:02 +01:00
Justin Clark-Casey (justincc)
59157d9d63 Add simple login test with online friends. Add IFriendsModule.GrantRights() for granting rights via a module call. 
Rename IFriendsModule.GetFriendPerms() -> GetRightsGrantedByFriend() to be more self-documenting and consistent with friends module terminology.
Add some method doc.
 2012-03-30 00:42:55 +01:00
Justin Clark-Casey (justincc)
22a85b947a Add back parts of reverted changes that were not concerned with child agent caching. 
This adds ScenePresence to IClientAPI.SceneAgent earlier on in the add client process so that its information is available to EventManager.OnNewClient() and OnClientLogin()
Also add a code comment as to why we're caching friend information for child agents.
 2012-03-29 01:26:30 +01:00
Justin Clark-Casey (justincc)
93ac47f0d3 Revert "Simplify friends caching by only doing this for root agents - no functions require caching for child agents." 
We need to cache child agents so that friends object edit/delete permissions will work across boarders on regions hosted by different simulators.

This reverts commit d9f7b8549b.
 2012-03-29 01:08:47 +01:00
Justin Clark-Casey (justincc)
d9f7b8549b Simplify friends caching by only doing this for root agents - no functions require caching for child agents. 
This allows us to avoid unnecessary multiple calls to the friends service.
All friends functions originate from the root agent and only go to other root agents in existing code.
This also allows us to eliminate complex ref counting.
 2012-03-28 23:40:25 +01:00
Melanie
7dad1ded2e Merge branch 'master' into careminster 
Conflicts:
	OpenSim/Region/CoreModules/Avatar/Friends/FriendsModule.cs
 2012-03-29 00:27:35 +01:00