aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim/Tests (follow)
Commit message (Collapse)AuthorAgeFilesLines
...
* | Merge branch 'master' into careminsterMelanie2012-06-141-4/+0
|\ \ | |/ | | | | | | | | Conflicts: OpenSim/Region/ClientStack/Linden/UDP/LLClientView.cs OpenSim/Region/ScriptEngine/Shared/Api/Implementation/LSL_Api.cs
| * Remove long obsolete and unused IClientAPI.KillEndDone()Justin Clark-Casey (justincc)2012-06-131-4/+0
| |
* | Merge branch 'avination' into careminsterMelanie2012-06-111-0/+10
|\ \ | | | | | | | | | | | | | | | | | | Conflicts: OpenSim/Region/Framework/Interfaces/ISimulationDataService.cs OpenSim/Services/Connectors/Simulation/SimulationDataService.cs OpenSim/Tests/Common/Mock/MockRegionDataPlugin.cs
| * | Add the ability to query the MYSQL databse for a list of the stored prim UUIDsMelanie2012-06-071-0/+10
| | |
* | | Merge branch 'master' into careminsterMelanie2012-05-272-4/+38
|\ \ \ | | |/ | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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
| * | Environment Module - allows Environment settings for Viewer3 warning: ↵PixelTomsen2012-05-231-1/+34
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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>
| * | Fix bug where an avatar that had an object they owned attached through ↵Justin Clark-Casey (justincc)2012-05-231-3/+4
| | | | | | | | | | | | | | | | | | | | | 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.
* | | Merge branch 'master' into careminsterMelanie2012-05-171-1/+7
|\ \ \ | |/ /
| * | Comment out TestSameSimulatorSeparatedRegionsQueryAccessFails() regression ↵Justin Clark-Casey (justincc)2012-05-171-0/+6
| | | | | | | | | | | | test logging accidentally left in
| * | Add regression TestSameSimulatorSeparatedRegionsQueryAccessFails()Justin Clark-Casey (justincc)2012-05-171-1/+1
| | |
* | | Merge branch 'master' into careminsterMelanie2012-05-161-4/+4
|\ \ \ | |/ /
| * | Fix issue where loading OARs could sometimes result in link numbers being ↵Justin Clark-Casey (justincc)2012-05-151-4/+4
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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
* | | Merge branch 'avination' into careminsterMelanie2012-05-131-0/+1
|\ \ \ | | |/ | |/|
| * | ªTEST MESS* reduce animation packets send. Added onchangeanim event with ↵UbitUmarov2012-05-121-0/+1
| | | | | | | | | | | | parameters to define if to add or remove, and if to send anims pack on that evocation, etc
* | | Merge branch 'master' into careminsterMelanie2012-05-131-1/+1
|\ \ \ | | |/ | |/|
| * | Fix mono compiler warning.Justin Clark-Casey (justincc)2012-05-121-1/+1
| | | | | | | | | | | | Last jenkins failure looked like a glitch.
* | | Merge branch 'master' into careminsterMelanie2012-05-023-14/+106
|\ \ \ | |/ / | | | | | | | | | | | | | | | Conflicts: OpenSim/Region/CoreModules/Framework/EntityTransfer/EntityTransferModule.cs OpenSim/Region/CoreModules/Framework/EntityTransfer/HGEntityTransferModule.cs OpenSim/Region/Framework/Interfaces/IEntityTransferModule.cs
| * | Add regression test for teleporting between neighbouring regions on the same ↵Justin Clark-Casey (justincc)2012-05-013-14/+106
| | | | | | | | | | | | | | | | | | | | | 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.
* | | Merge branch 'master' into careminsterMelanie2012-04-301-0/+46
|\ \ \ | |/ / | | | | | | | | | | | | | | | Conflicts: OpenSim/Data/MySQL/MySQLAssetData.cs OpenSim/Data/MySQL/MySQLSimulationData.cs OpenSim/Data/MySQL/MySQLUserAccountData.cs
| * | Create TestHelpers.EnableLogging() and DisableLogging() to turn logging on ↵Justin Clark-Casey (justincc)2012-04-301-0/+46
| | | | | | | | | | | | | | | | | | and off within tests. This makes *.Tests.dll.config files no longer needed, hence deleted.
* | | Merge branch 'master' into careminsterMelanie2012-04-275-100/+141
|\ \ \ | |/ / | | | | | | | | | | | | | | | Conflicts: OpenSim/Region/CoreModules/Framework/EntityTransfer/EntityTransferModule.cs OpenSim/Region/Framework/Scenes/Scene.Inventory.cs OpenSim/Region/Framework/Scenes/Scene.cs
| * | Add regression test for teleporting an agent between separated regions on ↵Justin Clark-Casey (justincc)2012-04-275-100/+141
| | | | | | | | | | | | | | | | | | | | | | | | 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.
* | | Merge branch 'master' into careminsterMelanie2012-04-221-1/+1
|\ \ \ | |/ / | | / | |/ |/|
| * Add TestSetPhysics() to SOP status testsJustin Clark-Casey (justincc)2012-04-211-1/+1
| |
* | Merge branch 'master' into careminsterMelanie2012-03-312-19/+36
|\ \ | |/ | | | | | | | | | | | | 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
| * Add simple login test with online friends. Add IFriendsModule.GrantRights() ↵Justin Clark-Casey (justincc)2012-03-302-16/+32
| | | | | | | | | | | | | | 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.
| * Add back parts of reverted changes that were not concerned with child agent ↵Justin Clark-Casey (justincc)2012-03-291-1/+1
| | | | | | | | | | | | | | 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.
| * Revert "Simplify friends caching by only doing this for root agents - no ↵Justin Clark-Casey (justincc)2012-03-291-1/+1
| | | | | | | | | | | | | | | | 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 d9f7b8549b3cb9699eb8bd54242d31aac0f8241a.
* | Merge branch 'master' into careminsterMelanie2012-03-291-1/+1
|\ \ | |/ | | | | | | Conflicts: OpenSim/Region/CoreModules/Avatar/Friends/FriendsModule.cs
| * Simplify friends caching by only doing this for root agents - no functions ↵Justin Clark-Casey (justincc)2012-03-281-1/+1
| | | | | | | | | | | | | | | | 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.
* | Merge branch 'master' into careminsterMelanie2012-03-222-26/+45
|\ \ | |/ | | | | | | | | Conflicts: OpenSim/Region/CoreModules/World/Land/LandObject.cs OpenSim/Region/ScriptEngine/Shared/Api/Implementation/LSL_Api.cs
| * Merge branch 'master' of ssh://opensimulator.org/var/git/opensimJustin Clark-Casey (justincc)2012-03-221-21/+45
| |\
| | * Updated the UserAccountsClient a little bit, plus some more sanity checks on ↵Diva Canto2012-03-211-21/+45
| | | | | | | | | | | | the service connector.
| * | Instead of loading default avatar animations in both SLUtil and ↵Justin Clark-Casey (justincc)2012-03-211-5/+0
| |/ | | | | | | | | | | | | | | AvatarAnimations, load just in AvatarAnimations instead. This lets us remove the dependency of OpenSim.Framework.dll on data/avataranimations.xml, which is not necessary for ROBUST. This commit also takes care of the odd situation where animations are stored and used internally with uppercase names (e.g. "STAND") but scripts refer to them with lowercase names (e.g. "sit").
* | Merge branch 'master' into careminsterMelanie2012-03-202-2/+2
|\ \ | |/ | | | | | | Conflicts: OpenSim/Region/Framework/Scenes/Scene.cs
| * minor: remove some mono compiler warningsJustin Clark-Casey (justincc)2012-03-201-1/+1
| |
| * Move frame loop entirely within Scene.Update() for better future performance ↵Justin Clark-Casey (justincc)2012-03-201-1/+1
| | | | | | | | | | | | | | | | analysis and stat accuracy. Update() now accepts a frames parameter which can control the number of frames updated. -1 will update until shutdown. The watchdog updating moves above the maintc recalculation for any required sleep since it should be accounted for within the frame.
* | added ObjectPhysicsProperties http event message to send viewer that data. ↵UbitUmarov2012-03-151-0/+4
| | | | | | | | For now on caps/EventQueue, and still only used on a material change...
* | BIG MESS. changed Iclient interface so only one event is used to inform ↵UbitUmarov2012-03-101-0/+1
| | | | | | | | scene about position scale or rotation change by client (others can be added). Its served at SceneGraph that does permition checks, undostore and sends down to SOG. changed values are stored in a class (ObjectChangeData) and what is changed as a enum (ObjectChangeWhat) with bit fields and 'macros' of this for better readability (at top of scenegraph.cs lasy to find better place for now) this can be extended for other things clients changes and need undo/redo. SOG process acording to what is changed. Changed UNDO/redo to use this also (warning is only storing what is changed, previus stored all, this must be checked for side efects. to save all PRS change commented line in scenegraph). Still have excessive calls to ScheduleGroupForTerseUpdate. **** UNTESTED ****
* | Merge branch 'master' into careminsterMelanie2012-03-074-20/+25
|\ \ | |/ | | | | | | Conflicts: OpenSim/Region/Framework/Scenes/SceneObjectPart.cs
| * minor: make NPC tests run in a given order, comment out log lines in mock ↵Justin Clark-Casey (justincc)2012-03-074-20/+25
| | | | | | | | region data plugins, null out scene in script and npc torture tests, add other doc comments to torture tests
* | Merge branch 'master' into careminsterMelanie2012-03-074-7/+15
|\ \ | |/ | | | | | | Conflicts: OpenSim/Region/Framework/Scenes/Scene.cs
| * Stop individually deleting objects at the end of each ObjectTortureTest.Justin Clark-Casey (justincc)2012-03-074-7/+15
| | | | | | | | | | | | We can now do this since the entire scene and all objects within it are now successfully gc'd at the end of these tests. This greatly improves the time taken to run each test (by reducing teardown time, not the time to actually do the test work that we're interested in). Slightly simplifies config read in Scene constructor to help facilitate this.
* | Merge branch 'master' into careminsterMelanie2012-03-031-1/+1
|\ \ | |/ | | | | | | | | | | Conflicts: OpenSim/Framework/Servers/VersionInfo.cs OpenSim/Region/CoreModules/World/WorldMap/WorldMapModule.cs OpenSim/Region/Framework/Scenes/ScenePresence.cs
| * Use a fully stubbed out MockConsole for unit tests rather than inheriting ↵Justin Clark-Casey (justincc)2012-03-011-1/+1
| | | | | | | | | | | | | | | | from CommandConsole. This is so that the static MainConsole.Instance doesn't retain references to methods registered by scene and other modules to service commands. This prevents the scene from being garbage collected at the end of a test. This is not the final thing preventing GC - next up is the timer started by SimStatsReporter that holds a reference to Scene that prevents end of test gc.
* | Merge branch 'master' into careminsterMelanie2012-02-162-3/+21
|\ \ | |/ | | | | | | Conflicts: OpenSim/Region/ScriptEngine/Shared/Api/Implementation/OSSL_Api.cs
| * In ObjectTortureTests, run garbage collector on Teardown and run scene loop ↵Justin Clark-Casey (justincc)2012-02-152-3/+21
| | | | | | | | | | | | | | | | | | | | | | update when scene objects have been deleted. At least on mono 2.6.4, running GC.Collect() is not guaranteed to force gc of all objects when run in the same method where those objects had references. Therefore, GC.Collect() is now being done in the per-script teardown of ObjectTortureTests. In addition, scene loop update is being run after garbage collection in order to clean out the viewer update list of scene objects in the SceneGraph. These measures mean that scene objects/parts are now garbage collected after a test run if deleted from the scene, resulting in a much better memory usage report (though probably still not very accurate). However, deletion takes a very long time - what's really needed is to find out now why the entire scene isn't being GC'd by this measure. This change hasn't yet been applied to the other stress tests.
* | Merge branch 'master' into careminsterMelanie2012-02-101-0/+185
|\ \ | |/ | | | | | | | | Conflicts: OpenSim/Region/CoreModules/Framework/InventoryAccess/InventoryAccessModule.cs OpenSim/Region/OptionalModules/World/NPC/NPCModule.cs
| * Add NPC torture tests for 100, 1000 and 2000 create and delete NPC calls.Justin Clark-Casey (justincc)2012-02-091-0/+185
| |
* | Merge branch 'master' into careminsterMelanie2012-02-073-3/+20
|\ \ | |/