aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim/Tests/Common (follow)
Commit message (Collapse)AuthorAgeFilesLines
* Merge branch 'master' into careminsterMelanie2012-11-252-26/+76
|\ | | | | | | | | | | Conflicts: OpenSim/Region/CoreModules/World/Estate/EstateManagementModule.cs OpenSim/Region/CoreModules/World/Land/LandManagementModule.cs
| * Fix bug where loading an OAR with a deeded parcel would always set the ↵Justin Clark-Casey (justincc)2012-11-242-26/+76
| | | | | | | | | | | | | | | | | | parcel owner ID to the estate owner even if the group UUID was present. Aims to address http://opensimulator.org/mantis/view.php?id=6355 As part of this work, an incomplete IXGroupsData was added which currently only allows store/fetch/delete of group records (i.e. no membership data etc) This is subject to change and currently only an in-memory storage implementation exists for regression test purposes.
* | Merge branch 'avination' into careminsterMelanie2012-11-201-0/+6
|\ \
| * | * Plumbing and basic setting of the GetMesh Cap Throttler.teravus2012-11-171-0/+6
| | | | | | | | | | | | * Last step is to flip the throttle distribution.
| * | Revert "Merge master into teravuswork", it should have been avination, not ↵teravus2012-11-155-142/+12
| | | | | | | | | | | | | | | | | | | | | master. This reverts commit dfac269032300872c4d0dc507f4f9062d102b0f4, reversing changes made to 619c39e5144f15aca129d6d999bcc5c34133ee64.
| * | Merge master into teravusworkteravus2012-11-155-12/+142
| |\ \
* | \ \ Merge branch 'avination' into careminsterMelanie2012-11-171-1/+1
|\ \ \ \ | |/ / /
| * | | Pipe Throttle Update Event to EventManager, client --> ScenePresence --> ↵teravus2012-11-041-1/+1
| | | | | | | | | | | | | | | | EventManager, so that modules can know when throttles are updated. The event contains no client specific data to preserve the possibility of 'multiple clients' and you must still call ControllingClient.GetThrottlesPacked(f) to see what the throttles actually are once the event fires. Hook EventManager.OnUpdateThrottle to GetTextureModule.
* | | | Merge branch 'master' into careminsterMelanie2012-11-131-0/+4
|\ \ \ \ | | |_|/ | |/| |
| * | | minor: Add some explanative method doc to SceneHelpers.SetupSceneModules()Justin Clark-Casey (justincc)2012-11-131-0/+4
| | | |
* | | | Merge branch 'master' into careminsterMelanie2012-11-122-27/+9
|\ \ \ \ | |/ / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: OpenSim/Region/Application/OpenSimBase.cs OpenSim/Region/ClientStack/Linden/Caps/NewFileAgentInventoryVariablePriceModule.cs OpenSim/Region/CoreModules/World/Warp3DMap/Warp3DImageModule.cs OpenSim/Region/Framework/ModuleLoader.cs OpenSim/Region/Framework/Scenes/SceneManager.cs
| * | | Remove the old style module loader and all references to itMelanie2012-11-122-4/+4
| | | |
| * | | Remove IRegionModule support from the test setup helperMelanie2012-11-121-23/+5
| | | |
* | | | Merge branch 'master' into careminsterMelanie2012-11-121-5/+5
|\ \ \ \ | |/ / / | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: OpenSim/Region/CoreModules/Framework/InventoryAccess/InventoryAccessModule.cs OpenSim/Region/CoreModules/World/Permissions/PermissionsModule.cs OpenSim/Region/OptionalModules/Scripting/XmlRpcRouterModule/XmlRpcRouterModule.cs OpenSim/Region/OptionalModules/World/NPC/NPCModule.cs
| * | | Fix issues with the DynamicTextureModule and corresponding unit tests.Diva Canto2012-11-111-5/+5
| | | |
* | | | Merge branch 'master' into careminsterMelanie2012-11-111-9/+9
|\ \ \ \ | |/ / / | | | | | | | | | | | | | | | | | | | | Conflicts: OpenSim/Region/CoreModules/Avatar/Gods/GodsModule.cs OpenSim/Region/CoreModules/Scripting/WorldComm/WorldCommModule.cs OpenSim/Region/CoreModules/World/WorldMap/MapSearchModule.cs
| * | | One more module converted: GodsModule.Diva Canto2012-11-101-3/+3
| | | |
| * | | Fix Unit tests -- the module contract was not being honored in the set up of ↵Diva Canto2012-11-101-6/+6
| | | | | | | | | | | | | | | | scenes.
* | | | Merge branch 'master' into careminsterMelanie2012-11-091-0/+1
|\ \ \ \ | |/ / / | | | / | |_|/ |/| |
| * | Update parent inventory folder version numbers when folders are ↵Justin Clark-Casey (justincc)2012-11-091-0/+1
| | | | | | | | | | | | | | | | | | | | | | | | moved/created/deleted to match version numbers cached by viewers. This is done in the way that one would expect (e.g. moving a folder increments version number on both source and destination parent folders). This should hopefully improve viewer reuse of its cached inventory information. Currently MySQL only but will be implement for SQLite/MSSQL if there are no issues.
* | | Merge branch 'master' into careminsterMelanie2012-10-261-7/+3
|\ \ \ | |/ / | | | | | | | | | | | | | | | | | | | | | Conflicts: OpenSim/Region/CoreModules/Avatar/Chat/ChatModule.cs OpenSim/Region/CoreModules/Framework/EntityTransfer/EntityTransferModule.cs OpenSim/Region/Framework/Scenes/Scene.PacketHandlers.cs OpenSim/Region/ScriptEngine/Shared/Api/Implementation/OSSL_Api.cs OpenSim/Region/ScriptEngine/Shared/Api/Runtime/LSL_Constants.cs
| * | Fix script error messages not showing up in viewer 3 and associated viewers.Justin Clark-Casey (justincc)2012-10-251-7/+3
| | | | | | | | | | | | | | | | | | | | | Viewer 3 will discard such a message if the chat message owner does not match the avatar. We were filling the ownerID with the primID, so this never matched, hence viewer 3 did not see any script error messages. This commit fills the ownerID in with the prim ownerID so the script owner will receive script error messages. This does not affect viewer 1 and associated viewers which continue to process script errors as normal.
* | | Merge branch 'avination' into careminsterMelanie2012-09-271-0/+4
|\ \ \ | | |/ | |/| | | | | | | | | | Conflicts: OpenSim/Region/CoreModules/Agent/AssetTransaction/AgentAssetsTransactions.cs OpenSim/Region/Framework/Scenes/Scene.cs
| * | add missing transactionID in SendInventoryItemCreateUpdate. and make useUbitUmarov2012-09-241-0/+4
| | | | | | | | | | | | | | | of it on inventoryAccessModule, etc. Most likelly it's needs where there is a transactionID not zero
* | | Merge branch 'master' into careminsterMelanie2012-08-294-2/+136
|\ \ \ | | |/ | |/| | | | | | | | | | Conflicts: OpenSim/Region/ScriptEngine/Shared/Api/Implementation/LSL_Api.cs OpenSim/Region/ScriptEngine/Shared/Api/Interface/ILSL_Api.cs
| * | Fix regression introduced in a0d178b2 (Sat Aug 25 02:00:17 2012) where ↵Justin Clark-Casey (justincc)2012-08-294-2/+136
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | folders with asset type of 'Folder' and 'Unknown' were accidentally treated as system folders. This prevented more than one additional ordinary folder from being created in the base "My Inventory" user folder. Added regression test for this case. Switched tests to use XInventoryService with mostly implemented TestXInventoryDataPlugin rather than InventoryService Disabled TestLoadIarV0_1SameNameCreator() since this has not been working for a very long time (ever since XInventoryService) started being used since it doesnt' preserve creator data in the same way as InventoryService did and so effectively lost the OSPAs. However, nobody noticed/complained about this issue and OSPAs have been superseded by HG like creator information via the --home save oar/iar switch.
* | | Merge branch 'master' into careminsterMelanie2012-08-231-3/+3
|\ \ \ | |/ / | | / | |/ |/| | | | | | | | | | | | | Conflicts: OpenSim/Framework/IClientAPI.cs OpenSim/Region/ClientStack/Linden/UDP/LLClientView.cs OpenSim/Region/CoreModules/ServiceConnectorsOut/Simulation/LocalSimulationConnector.cs OpenSim/Region/Framework/Scenes/Scene.cs OpenSim/Region/OptionalModules/Agent/InternetRelayClientView/Server/IRCClientView.cs OpenSim/Region/OptionalModules/World/NPC/NPCAvatar.cs OpenSim/Region/ScriptEngine/Shared/Api/Implementation/LSL_Api.cs
| * Add --force flag to "kick user" console command to allow bypassing of recent ↵Justin Clark-Casey (justincc)2012-08-201-0/+5
| | | | | | | | | | | | | | | | | | race condition checks. This is to allow a second attempt to remove an avatar even if "show connections" shows them as already inactive (i.e. close has already been attempted once). You should only attempt --force if a normal kick fails. This is partly for diagnostics as we have seen some connections occasionally remain on lbsa plaza even if they are registered as inactive. This is not a permanent solution and may not work anyway - the ultimate solution is to stop this problem from happening in the first place.
| * Add a skeleton for a name value storage associated with regionsMelanie2012-08-151-0/+26
| |
* | Add a skeleton for a name value storage associated with regionsMelanie2012-08-151-0/+26
| |
* | Merge branch 'master' into careminsterMelanie2012-07-251-2/+20
|\ \ | |/ | | | | | | Conflicts: OpenSim/Region/CoreModules/Avatar/Attachments/Tests/AttachmentsModuleTests.cs
| * extend regression TestDetachScriptedAttachementToInventory() to check ↵Justin Clark-Casey (justincc)2012-07-241-2/+20
| | | | | | | | correct running status on a re-rezzed attachment
* | Merge branch 'avination' into careminsterMelanie2012-07-201-1/+1
|\ \
| * | Fix slow loading of task inventoryMelanie2012-07-191-1/+1
| | |
* | | Merge branch 'master' into careminsterMelanie2012-07-191-1/+1
|\ \ \ | |/ / |/| / | |/ | | | | | | | | 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
| * Add EventManager.OnRegionLoginsStatusChange fired whenever logins are ↵Justin Clark-Casey (justincc)2012-07-191-1/+1
| | | | | | | | | | | | | | 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.
* | Merge branch 'master' into careminsterMelanie2012-07-131-5/+0
|\ \ | |/ | | | | | | Conflicts: OpenSim/Region/Framework/Scenes/Scene.cs
| * Remove IClientAPI.GetClientEP() in favour of existing identical ↵Justin Clark-Casey (justincc)2012-07-121-5/+0
| | | | | | | | IClientAPI.RemoteEndpoint.
* | Merge branch 'master' into careminsterMelanie2012-07-122-22/+59
|\ \ | |/ | | | | | | | | | | | | 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
| * Add regression TestDetachScriptedAttachmentToInventory()Justin Clark-Casey (justincc)2012-07-111-1/+1
| | | | | | | | This currently only does a relatively crude check for a ScriptState node in the serialized xml
| * Add regression TestRezScriptedAttachmentsFromInventory() though this ↵Justin Clark-Casey (justincc)2012-07-112-22/+59
| | | | | | | | currently only checks for the presence of script items, not for started scripts
* | Merge branch 'master' into careminsterMelanie2012-07-112-20/+87
|\ \ | |/ | | | | | | | | | | | | | | 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
| * Do not allow a script to attach a prim if its being sat upon.Justin Clark-Casey (justincc)2012-07-092-17/+67
| | | | | | | | | | | | 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.
| * Remove redundant SetScene() function in Scene.AddSceneObject()Justin Clark-Casey (justincc)2012-07-071-3/+20
| | | | | | | | | | 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.
* | Merge branch 'master' into careminsterMelanie2012-07-052-10/+47
|\ \ | |/ | | | | | | | | Conflicts: OpenSim/Region/Framework/Scenes/Scene.cs OpenSim/Region/ScriptEngine/Shared/Api/Implementation/LSL_Api.cs
| * Add OSSL function osForceAttachToAvatarFromInventory()Justin Clark-Casey (justincc)2012-07-052-10/+47
| | | | | | | | | | | | | | 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.
* | Merge branch 'master' into careminsterMelanie2012-06-283-1/+53
|\ \ | |/ | | | | | | Conflicts: OpenSim/Region/CoreModules/Avatar/Attachments/Tests/AttachmentsModuleTests.cs
| * Automatically disable log4net before each regression test so that logging is ↵Justin Clark-Casey (justincc)2012-06-272-1/+48
| | | | | | | | | | | | | | 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.
| * refactor: Remove unnecessary AttachmentModuleTests.m_userId in favour of ↵Justin Clark-Casey (justincc)2012-06-261-0/+5
| | | | | | | | local variables
* | 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
generated by cgit v1.1 at 2024-12-24 01:27:26 +0000