aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim/Services (follow)
Commit message (Collapse)AuthorAgeFilesLines
* 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
| | |
| * | Fix configuration problems where XAssetDatabasePlugin was picked up ↵Justin Clark-Casey (justincc)2012-03-192-1/+95
| |/ | | | | | | | | | | | | | | | | accidentally. The asset data plugin now implements IXAssetData rather than IAssetData so the ordinary AssetService should no longer pick it up. This replaces the changes in 92b1ade. There is no longer any need to adjust your StandaloneCommon.ini/Robust.ini/Robust.HG.ini files. This may explain very recent issues in the last few weeks where textures have been disappearing or turning white (as they were going to different places). Unfortunately, you will need to rollback to an earlier database backup or reupload the textures.
* | Merge branch 'master' into careminsterMelanie2012-03-141-1/+1
|\ \ | |/ | | | | | | | | Conflicts: OpenSim/Region/ScriptEngine/Shared/Instance/ScriptInstance.cs OpenSim/Region/ScriptEngine/XEngine/XEngine.cs
| * Rename the stream extension method WebUtil.CopyTo() to WebUtil.CopyStream().Robert Adams2012-03-121-1/+1
| | | | | | | | | | | | | | | | | | | | .NET 4.0 added the method Stream.CopyTo(stream, bufferSize). For .NET 3.5 and before, WebUtil defined an extension method for Stream with the signature Stream.CopyTo(stream, maxBytesToCopy). The meaning of the second parameter is different in the two forms and depending on which compiler and/or runtime you use, you could get one form or the other. Crashes ensue. This change renames the WebUtil stream copy method to something that cannot be confused with the new CopyTo method defined in .NET 4.0.
* | Merge branch 'master' into careminsterMelanie2012-03-091-3/+7
|\ \ | |/
| * More on inventory transfer hold ups:Diva Canto2012-03-091-3/+7
| | | | | | | | | | | | - Added an inventory cache for caching root and system folders - Synchronized the remote inventory connector, so that all the remote inventory calls are serialized This will not make much difference in the hold ups. We'd have to move the FireAndForget high up to AddInventoryItem, but that opens up a can of worms regarding the notification of the recipient... the recipient would be notified of the offer before the items are effectively in his inventory, which could lead to surprises.
generated by cgit v1.1 at 2024-12-23 19:25:13 +0000