aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim/Services (follow)
Commit message (Collapse)AuthorAgeFilesLines
* 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
| |\
| | * User level based restrictions for HyperGrid teleports, asset uploads, group ↵Snoopy Pfeffer2012-03-272-2/+25
| | | | | | | | | | | | creations and getting contacted from other grids. Incoming HyperGrid teleports can also be restricted to local users.
| * | Amend to previous commit regarding the config name. Bugs bite.Diva Canto2012-03-271-2/+0
| |/
* | Merge branch 'master' into careminsterMelanie2012-03-275-44/+38
|\ \ | |/
| * Send the config section name up to the service classes themselves ↵Diva Canto2012-03-275-44/+38
| | | | | | | | (XInventory and Assets).
* | Replace HG linker with core versionMelanie2012-03-271-13/+49
| |
* | Merge branch 'master' into careminsterMelanie2012-03-226-2/+173
|\ \ | |/ | | | | | | | | Conflicts: OpenSim/Region/CoreModules/World/Land/LandObject.cs OpenSim/Region/ScriptEngine/Shared/Api/Implementation/LSL_Api.cs
| * Updated the UserAccountsClient a little bit, plus some more sanity checks on ↵Diva Canto2012-03-211-1/+8
| | | | | | | | the service connector.
| * HG Friends: reroute the status notifications to the HGFriends service, so ↵Diva Canto2012-03-215-1/+165
| | | | | | | | that they can scale better. They were previously being handled by the UAS; that is still there, but it's now obsolete and will be removed in a future release.
* | Merge branch 'master' into careminsterMelanie2012-03-216-12/+460
|\ \ | |/ | | | | | | Conflicts: OpenSim/Region/CoreModules/Avatar/Friends/FriendsModule.cs
| * Merge branch 'master' of ssh://opensimulator.org/var/git/opensimDiva Canto2012-03-203-2/+96
| |\ | | | | | | | | | | | | Conflicts: OpenSim/Framework/Util.cs
| * | HG Friends: allow the establishment of HG friendships without requiring ↵Diva Canto2012-03-204-11/+388
| | | | | | | | | | | | co-presence in the same sim. Using avatar picker, users can now search for names such as "first.last@grid.com:9000", find them, and request friendship. Friendship requests are stored if target user is offline. TESTED ON STANDALONE ONLY.
| * | Added GetUUID(first, last) on UserAgentsService so that we can finally make ↵Diva Canto2012-03-173-1/+72
| | | | | | | | | | | | direct user connections.
* | | Merge branch 'master' into careminsterMelanie2012-03-203-2/+96
|\ \ \ | | |/ | |/| | | | | | | Conflicts: OpenSim/Data/MySQL/MySQLXAssetData.cs
| * | Fix small typoJustin Clark-Casey (justincc)2012-03-201-1/+1
| | |
generated by cgit v1.1 at 2024-12-16 07:04:54 +0000