aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim/Services (follow)
Commit message (Collapse)AuthorAgeFilesLines
* Merge branch 'master' into careminsterMelanie2013-05-112-2/+25
|\ | | | | | | | | | | | | | | Conflicts: OpenSim/Region/Framework/Scenes/Scene.cs OpenSim/Services/LLLoginService/LLLoginResponse.cs OpenSim/Services/LLLoginService/LLLoginService.cs OpenSim/Tests/Common/Mock/TestClient.cs
| * Application support:BlueWall2013-05-092-2/+25
| | | | | | | | Adding some viwer supported url settings for destination guide and avatar picker apps. URL for the destinations should be: "secondlife:///app/teleport/slurl"
* | Merge branch 'master' into careminsterMelanie2013-04-293-5/+70
|\ \ | |/
| * Added an interface to an external ban service. With this commit, the ↵Diva Canto2013-04-272-4/+69
| | | | | | | | interface is used only in Hypergrided worlds (Gatekeeper), although in those, it applies to both local and foreign users. The Ban service itself is not in core; it is to be provided externally.
| * Make method virtualDiva Canto2013-04-271-1/+1
| |
* | Merge branch 'master' into careminsterMelanie2013-04-101-110/+83
|\ \ | |/ | | | | | | | | | | Conflicts: OpenSim/Data/MySQL/MySQLAssetData.cs OpenSim/Region/CoreModules/Framework/InventoryAccess/InventoryAccessModule.cs OpenSim/Region/Physics/BulletSPlugin/BSShapeCollection.cs
| * Optimize the number of Simian calls to get the initial presenceMic Bowman2013-04-071-110/+83
| | | | | | | | | | | | information for the friends list. This is a pretty big performance improvement on login. Note that you must upgrade simian to incorporate the corresponding GetSessions call.
| * Phase 1 of implementing a transfer permission. Overwrite libOMV's PermissionMaskMelanie2013-03-263-1/+6
| | | | | | | | with our own and add export permissions as well as a new definition for "All" as meaning "all conventional permissions" rather than "all possible permissions"
| * Merge branch 'master' into newmultiattachMelanie2013-03-183-56/+86
| |\ | | | | | | | | | | | | Conflicts: OpenSim/Region/CoreModules/Avatar/Attachments/AttachmentsModule.cs
| * | Multiattach, part 2Melanie2013-03-181-3/+9
| | |
| * | Multiattach, part 1Melanie2013-03-181-1/+8
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: OpenSim/Framework/AvatarAppearance.cs OpenSim/Region/CoreModules/Avatar/Attachments/AttachmentsModule.cs OpenSim/Region/CoreModules/Avatar/Attachments/Tests/AttachmentsModuleTests.cs OpenSim/Region/Framework/Interfaces/IAttachmentsModule.cs OpenSim/Region/Framework/Scenes/Scene.cs OpenSim/Region/OptionalModules/Avatar/Attachments/TempAttachmentsModule.cs OpenSim/Region/ScriptEngine/Shared/Api/Implementation/LSL_Api.cs
* | | Phase 1 of implementing a transfer permission. Overwrite libOMV's PermissionMaskMelanie2013-03-243-1/+6
| | | | | | | | | | | | with our own and add export permissions as well as a new definition for "All" as meaning "all conventional permissions" rather than "all possible permissions"
* | | Merge branch 'master' into careminsterMelanie2013-03-153-56/+86
|\ \ \ | | |/ | |/| | | | | | | | | | Conflicts: OpenSim/Framework/Servers/BaseOpenSimServer.cs OpenSim/Region/ScriptEngine/Shared/Api/Implementation/LSL_Api.cs
| * | refactor: Reuse Get() method in AssetService to eliminate some copy/paste in ↵Justin Clark-Casey (justincc)2013-03-151-23/+5
| | | | | | | | | | | | other Get methods
| * | Migrate assets from chained asset service to xassetservice as they are ↵Justin Clark-Casey (justincc)2013-03-151-28/+20
| | | | | | | | | | | | | | | | | | requested. This shrinks the asset database over time as duplicate assets are fetched.
| * | Fix bug in AssetService where requesting data only for an asset would throw ↵Justin Clark-Casey (justincc)2013-03-151-1/+5
| | | | | | | | | | | | an exception if the asset did not exist.
| * | Make it possible to chain another asset service underneath the ↵Justin Clark-Casey (justincc)2013-03-152-23/+75
| |/ | | | | | | | | | | | | | | de-duplicating XAssetService. This makes it possible to use the dedupliicating service without needing to migrate all the existing asset data beforehand. Currently controlled by a ChainedServiceModule setting in [AssetService] (e.g. ChainedServiceModule = "OpenSim.Services.AssetService.dll:AssetService") Not yet ready for use.
* | Merge branch 'avination' into careminsterMelanie2013-03-061-4/+17
|\ \ | | | | | | | | | | | | Conflicts: OpenSim/Region/CoreModules/Avatar/Attachments/AttachmentsModule.cs
| * | Multiattach, part 2Melanie2013-03-051-3/+9
| | |
| * | Multiattach, part 1Melanie2013-03-051-1/+8
| | |
* | | Merge branch 'master' into careminsterMelanie2013-02-286-6/+12
|\ \ \ | | |/ | |/| | | | | | | Conflicts: OpenSim/Region/Framework/Scenes/SceneManager.cs
| * | Switched to using the other Util function with a default value.Diva Canto2013-02-276-6/+12
| | |
| * | Merge branch 'master' of ssh://opensimulator.org/var/git/opensimDiva Canto2013-02-274-81/+83
| |\ \
| * | | Moved the HG default variables out of [Startup] and into their own section ↵Diva Canto2013-02-276-6/+6
| | | | | | | | | | | | | | | | [Hypergrid] in *Common.ini.example. Backwards compatible for now.
* | | | Merge branch 'master' into careminsterMelanie2013-02-274-81/+83
|\ \ \ \ | | |/ / | |/| | | | | | | | | | | | | | | | | | Conflicts: OpenSim/Framework/RegionLoader/Web/RegionLoaderWebServer.cs OpenSim/Region/CoreModules/Scripting/LSLHttp/UrlModule.cs OpenSim/Region/CoreModules/World/WorldMap/WorldMapModule.cs
| * | | Make sure we dispose of WebResponse, StreamReader and Stream in various ↵Justin Clark-Casey (justincc)2013-02-274-81/+83
| |/ / | | | | | | | | | places where we were not already.
* | | Merge branch 'master' into careminsterMelanie2013-02-236-6/+6
|\ \ \ | |/ / | | | | | | | | | Conflicts: OpenSim/Region/CoreModules/Framework/EntityTransfer/EntityTransferModule.cs
| * | Added new Util function for reading config vars that's more generic than the ↵Diva Canto2013-02-226-6/+6
| | | | | | | | | | | | one I added yesterday -- this is for helping move config vars out of [Startup]
* | | Merge branch 'master' into careminsterMelanie2013-02-2222-30/+45
|\ \ \ | |/ /
| * | Simplification of HG configs: HomeURI and GatekeeperURI now are defined as ↵Diva Canto2013-02-216-12/+16
| | | | | | | | | | | | default under [Startup]. They can then be overwritten in the other sections (but probably shouldn't). I kept the existing code for backwards compatibility, so this should not cause any breaks from people's current configurations. But people should move to have these 2 vars under [Startup] -- see OpenSim.ini.example and Robust.HG.ini.example. And yes, both names now end with "URI" for consistency.
| * | Deleted all AssemblyFileVersion directivesDiva Canto2013-02-1916-16/+16
| | |
| * | Give the user some feedback about the success or failure of console login ↵Justin Clark-Casey (justincc)2013-02-201-2/+13
| | | | | | | | | | | | property commands
* | | Merge branch 'master' into careminsterMelanie2013-02-101-1/+1
|\ \ \ | |/ / | | | | | | | | | | | | Conflicts: OpenSim/Data/MySQL/MySQLSimulationData.cs OpenSim/Data/MySQL/Resources/RegionStore.migrations
| * | Fixed check for 0 results in GetUserAccounts()Oren Hurvitz2013-02-091-1/+1
| | |
* | | Merge branch 'master' into careminsterMelanie2013-02-061-1/+1
|\ \ \ | |/ / | | | | | | | | | Conflicts: OpenSim/Region/Physics/BulletSPlugin/BSShapeCollection.cs
| * | Changed protection of CreateDefaultAppearanceEntries to protected, so ↵Diva Canto2013-02-051-1/+1
| | | | | | | | | | | | extensions of the UserAccountService can reuse this.
* | | Merge branch 'master' into careminsterMelanie2013-02-0516-16/+16
|\ \ \ | |/ / | | | | | | | | | | | | | | | | | | Conflicts: OpenSim/Data/MySQL/MySQLSimulationData.cs OpenSim/Framework/Servers/VersionInfo.cs OpenSim/Region/ClientStack/Linden/Caps/BunchOfCaps/BunchOfCaps.cs OpenSim/Region/Framework/Scenes/SceneObjectPart.cs
| * | Bump version and assembly version numbers from 0.7.5 to 0.7.6Justin Clark-Casey (justincc)2013-02-0516-16/+16
| | | | | | | | | | | | | | | | | | | | | | | | This is mostly Bluewall's work but I am also bumping the general version number OpenSimulator 0.7.5 remains in the release candidate stage. I'm doing this because master is significantly adding things that will not be in 0.7.5 This update should not cause issues with existing external binary DLLs because our DLLs do not have strong names and so the exact version match requirement is not in force.
* | | Merge branch 'master' into careminsterMelanie2013-01-042-8/+8
|\ \ \ | |/ / | | | | | | | | | | | | Conflicts: OpenSim/Region/CoreModules/World/Land/LandManagementModule.cs OpenSim/Region/ScriptEngine/Shared/Api/Implementation/LSL_Api.cs
| * | Allow registering regions whose names are equivalent under LIKE but not ↵Oren Hurvitz2013-01-022-8/+8
| | | | | | | | | | | | truly equal
* | | Merge branch 'master' into careminsterMelanie2013-01-021-1/+10
|\ \ \ | |/ / | | | | | | | | | Conflicts: OpenSim/Region/ScriptEngine/Shared/Api/Implementation/LSL_Api.cs
| * | Fixed bugs when getting the root folder.Oren Hurvitz2013-01-021-1/+10
| | | | | | | | | | | | | | | | | | | | | | | | 1. The error checking for the case where there's no "My Inventory" folder was incorrect: it checked the wrong variable. 2. If GetSystemFolderForType() is called to get AssetType.RootFolder then it should return the root folder immediately; not look for another root folder below it.
* | | Merge branch 'avination' into careminsterMelanie2012-12-211-0/+17
|\ \ \ | | |/ | |/|
| * | Add the interfaces for the new Avination baked texture cache serviceMelanie2012-12-191-0/+17
| | |
* | | Merge branch 'avination' into careminsterMelanie2012-12-181-1/+8
|\ \ \ | |/ /
| * | add some default size setting and checksUbitUmarov2012-12-071-1/+6
| | |
| * | revert the use of avatar skeleton and use avatar size provided by viewers,UbitUmarov2012-12-071-1/+3
| | | | | | | | | | | | since at least for now seems good enought
* | | Merge branch 'master' into careminsterMelanie2012-12-091-1/+1
|\ \ \ | | |/ | |/|
| * | Trying to prevent old route of sending attachments, simulator version ↵Diva Canto2012-12-061-1/+1
| | | | | | | | | | | | unknown maybe due to timeout. mantis #6450
* | | Merge branch 'master' into careminsterMelanie2012-12-042-10/+140
|\ \ \ | |/ / | | / | |/ |/| Conflicts: OpenSim/Region/CoreModules/Avatar/InstantMessage/OfflineMessageModule.cs
generated by cgit v1.1 at 2024-12-30 16:09:02 +0000