aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim/Services (follow)
Commit message (Collapse)AuthorAgeFilesLines
* Merge branch 'master' into careminsterMelanie2012-05-275-30/+78
|\ | | | | | | | | | | | | | | | | | | | | | | | | | | 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
| * Fix bug where a failed QueryAccess to a remove region would always have the ↵Justin Clark-Casey (justincc)2012-05-251-13/+20
| | | | | | | | reason "Communications failure" no matter what the destination region actually returned
| * In remote QueryAccess, also receive the actual status (true|false) instead ↵Justin Clark-Casey (justincc)2012-05-251-0/+4
| | | | | | | | | | | | | | | | | | | | of always true no matter what the callee actually returned. This was due to two things 1) SimulationServiceConnector.QueryAccess was always looking to the outer result["success"]. But if a "_Result" map is returned (which is certainly the case right now), then the true success is _Result["success"], result["success"] is always true no matter what 2) If QueryAccess was false at the destination, then AgentHandlers.DoQueryAccess() was never putting this in the result. The default action of SerializeJsonString() is not to put false booleans in the JSON!!!, so this has to be explicitly set.
| * Make ISimulationScene.GetScene() used the more efficient region id for ↵Justin Clark-Casey (justincc)2012-05-242-2/+12
| | | | | | | | lookup rather than the region handle.
| * Environment Module - allows Environment settings for Viewer3 warning: ↵PixelTomsen2012-05-231-0/+16
| | | | | | | | | | | | | | | | | | | | | | | | | | 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>
| * Add ConsoleDisplayList for more consistent formatting of console output in ↵Justin Clark-Casey (justincc)2012-05-231-9/+9
| | | | | | | | | | | | list form. Convert "show region" to use this structure rather than hand-constructing
| * Add missing Y co-ord in "show region" console command informationJustin Clark-Casey (justincc)2012-05-231-1/+1
| |
| * Lay out "show region" information in an easier to read line by line formatJustin Clark-Casey (justincc)2012-05-231-9/+11
| |
| * minor: extend commented out LinkInventoryItem log message for future useJustin Clark-Casey (justincc)2012-05-211-3/+3
| |
| * Fix bug where outfit folders could not be renamed.Justin Clark-Casey (justincc)2012-05-211-4/+13
| | | | | | | | Outfit folders are a type of system folder whose details are allowed to change.
* | Merge branch 'master' into careminsterMelanie2012-05-191-3/+9
|\ \ | |/ | | | | | | | | Conflicts: OpenSim/Region/Framework/Scenes/Scene.cs OpenSim/Region/RegionCombinerModule/RegionCombinerModule.cs
| * Fix issue where a new outfit folder is not created when a new outfit is ↵Justin Clark-Casey (justincc)2012-05-181-3/+9
| | | | | | | | | | | | saved if there are no previous outfits This was because AddFolder() was disallowing these though they are legal.
* | Merge branch 'master' into careminsterMelanie2012-05-1015-0/+0
|\ \ | |/
| * Where necessary, rename OpenSim/Services/Connectors/*.cs files to reflect ↵Justin Clark-Casey (justincc)2012-05-0915-0/+0
| | | | | | | | | | | | | | | | the actual class names. This is usually because the file name was singular (*Service*) but the class name was plural (*Services*). This is to make configuration easier rather than having to look in the c# code itself to find the slightly different name of the connector. This does not affect existing configuration since the files are being renamed rather than the classes.
* | Merge branch 'master' into careminsterMelanie2012-05-053-9/+71
|\ \ | |/ | | | | | | | | | | | | | | Conflicts: OpenSim/Framework/WebUtil.cs OpenSim/Region/ClientStack/Linden/Caps/BunchOfCaps/BunchOfCaps.cs OpenSim/Region/CoreModules/Asset/FlotsamAssetCache.cs OpenSim/Region/CoreModules/Scripting/LSLHttp/UrlModule.cs OpenSim/Region/Framework/Scenes/ScenePresence.cs
| * minor: remove mono compiler warningJustin Clark-Casey (justincc)2012-05-041-1/+1
| |
| * refactor: Rename new DeleteFoldersEx/PurgeFoldersEx methods to ↵Justin Clark-Casey (justincc)2012-05-041-6/+7
| | | | | | | | | | | | DeleteFolders/PurgeFolders overloads as previously discussed with Oren - I think this makes more sense on balance These overloads are not publicly available on core connectors or IInventoryService.
| * Allow deleting folders even if they're not in the TrashOren Hurvitz2012-05-041-4/+15
| | | | | | | | The functions DeleteFolders() and PurgeFolder() still work as before, i.e. they only allow deleting folders that are in the Trash. However, the functions DeleteFoldersEx() and PurgeFolderEx() can now be used to delete any folder.
| * Calculate the Daylight Savings Time information sent to the viewer based on ↵Justin Clark-Casey (justincc)2012-05-042-5/+55
| | | | | | | | | | | | | | | | | | | | | | | | US Pacific Standard Time rather than whatever timezone the login server is set to. This is because the viewer doesn't receive a timezone from the server but bases its displays on Pacific Standard Time. However, it still expects to receive notification from the server as to whether or not Daylight Savings Time for PST is in operation. This commit introduces a new DSTZone setting in the [LoginService] config setting that accepts a list of timezone names valid across different platforms to calculate Pacific DST. If you need the old behaviour of calculating DST based on the local timezone of the server running the login service, then please override DSTZone with "local". A mailing list announcement will be made later. Thanks to Olivier Van Helden and Gudule Lapointe for determining this behaviour and providing this patch. From http://opensimulator.org/mantis/view.php?id=5972
* | Merge branch 'master' of ssh://melanie@3dhosting.de/var/git/careminster into ↵Melanie2012-04-271-5/+15
|\ \ | | | | | | | | | careminster
| * | Help big boobies to dance (avatar visualParams). May not persist and need ↵UbitUmarov2012-04-261-5/+15
| | | | | | | | | | | | more lobe ?
* | | Merge branch 'master' into careminsterMelanie2012-04-251-1/+1
|\ \ \ | | |/ | |/| | | | | | | Conflicts: OpenSim/Region/Framework/Scenes/ScenePresence.cs
| * | Comment out AvatarService.SetAvatar debug log line for nowJustin Clark-Casey (justincc)2012-04-251-1/+1
| | |
* | | Merge branch 'master' into careminsterMelanie2012-04-251-13/+18
|\ \ \ | |/ / | | | | | | | | | Conflicts: OpenSim/Region/OptionalModules/World/NPC/NPCModule.cs
| * | Go back to always using the local timezone for now - not all machines have ↵Justin Clark-Casey (justincc)2012-04-241-13/+18
| | | | | | | | | | | | | | | | | | US/Pacific or Olsen Amercia/Los_Angeles and this introduces variability that the server operator cannot control Please see http://opensimulator.org/mantis/view.php?id=5972 soon for more comments.
* | | Merge branch 'master' into careminsterMelanie2012-04-241-1/+20
|\ \ \ | |/ / | | | | | | | | | | | | Conflicts: OpenSim/Region/CoreModules/World/Warp3DMap/MapImageModule.cs OpenSim/Region/ScriptEngine/Shared/Api/Implementation/LSL_Api.cs
| * | minor: formatting changes to top of LLLoginResponse.SetDefaultValues(), ↵Justin Clark-Casey (justincc)2012-04-241-1/+6
| | | | | | | | | | | | chiefly some break up of the long line.
| * | DST settings to match client default Pacific Time (mantis #5972)Olivier van Helden and Gudule Lapointe (Speculoos.net)2012-04-241-1/+15
| | |
* | | Merge branch 'master' into careminsterMelanie2012-04-201-5/+20
|\ \ \ | |/ / | | | | | | | | | | | | | | | Conflicts: OpenSim/Region/CoreModules/Avatar/Lure/LureModule.cs OpenSim/Region/ScriptEngine/XEngine/XEngine.cs OpenSim/Services/Connectors/Hypergrid/GatekeeperServiceConnector.cs
| * | Remember to dispose of the bitmap opened from a file in ↵Justin Clark-Casey (justincc)2012-04-201-4/+11
| | | | | | | | | | | | GatekeeperServiceConnector.GetMapImage()
* | | Merge branch 'master' into careminsterMelanie2012-04-111-8/+15
|\ \ \ | |/ / | | | | | | | | | Conflicts: OpenSim/Region/Framework/Interfaces/IEstateModule.cs
| * | Add uri to various log messages when region registration fails. Upgrade ↵Justin Clark-Casey (justincc)2012-04-101-8/+15
| | | | | | | | | | | | some debug log messages to error.
* | | Merge branch 'master' into careminsterMelanie2012-04-081-50/+56
|\ \ \ | |/ / | | / | |/ |/|
| * A few more minor improvements on Suitcase inventory service.Diva Canto2012-04-071-7/+6
| |
| * Better Suitcase Inventory Service.Diva Canto2012-04-061-48/+55
| |
* | Merge branch 'master' into careminsterMelanie2012-04-074-127/+280
|\ \ | |/ | | | | | | | | | | | | | | Conflicts: OpenSim/Region/CoreModules/Framework/InventoryAccess/InventoryAccessModule.cs OpenSim/Region/CoreModules/World/Land/LandObject.cs OpenSim/Region/Framework/Scenes/Scene.Inventory.cs OpenSim/Region/Framework/Scenes/SceneObjectPart.cs OpenSim/Region/ScriptEngine/Shared/Api/Implementation/LSL_Api.cs
| * Deleted the unused and commented code from 2 commits ago.Diva Canto2012-04-061-594/+0
| |
| * WARNING: LOTS OF COMMENTED AND UNUSED CODE IN THIS COMMIT. This is on ↵Diva Canto2012-04-061-36/+712
| | | | | | | | purpose; it's an historical record of what works and what doesn't wrt manipulating inventory at the viewer. I'll remove the unused code in a subsequent commit, but wanted to place it in history. The uncommented code works.
| * A few minor tweaks here and there in XInventoryService.Diva Canto2012-04-061-14/+48
| |
| * Finish the implementation of GetUserInventory, even though it's still not used.Diva Canto2012-04-062-8/+45
| |
* | Merge branch 'master' into careminsterMelanie2012-03-313-124/+231
|\ \ | |/ | | | | | | | | | | | | 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-3/+12
| | | | | | | | | | | | | | 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.
| * Merge branch 'master' of ssh://opensimulator.org/var/git/opensimJustin Clark-Casey (justincc)2012-03-301-120/+218
| |\
| | * Finish up the SuitcaseInventory service.Diva Canto2012-03-291-120/+218
| | |
| * | refactor: Stop passing both IClientAPI and agentID to friend event ↵Justin Clark-Casey (justincc)2012-03-291-1/+1
| |/ | | | | | | listeners, these are redundant. Replace a few magic numbers with FriendRights enum already used elsewhere.
* | Merge branch 'master' into careminsterMelanie2012-03-291-0/+368
|\ \ | |/ | | | | | | Conflicts: OpenSim/Region/CoreModules/Avatar/Friends/FriendsModule.cs
| * HG 2.0: added the beginning of HGSuitcaseInventoryService. Plus moved the ↵Diva Canto2012-03-281-0/+368
| | | | | | | | hack away from ScenePresence. This is better but it still doesn't restore the inventory upon arrival.
* | Merge branch 'master' into careminsterMelanie2012-03-274-5/+26
|\ \ | |/ | | | | | | Conflicts: OpenSim/Region/ScriptEngine/Shared/Api/Implementation/LSL_Api.cs
| * Reverse a conditional in XInventory that made updating system folder evrsion ↵Melanie2012-03-271-1/+1
| | | | | | | | numbers impossible
| * Merge branch 'master' of ssh://opensimulator.org/var/git/opensimDiva Canto2012-03-272-2/+25
| |\
generated by cgit v1.1 at 2024-11-19 18:25:26 +0000