aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim/Services (follow)
Commit message (Collapse)AuthorAgeFilesLines
...
| * More debug mantis #6625Diva Canto2013-06-291-0/+1
| |
| * Changed HG status notifications timeout down to 15secs from the default 100.Diva Canto2013-06-291-1/+1
| |
| * In XAssetService, on a delete asset request also delete the asset in any ↵Justin Clark-Casey (justincc)2013-06-281-3/+4
| | | | | | | | | | | | chained service. This eliminates the async migration since it causes a race condition with the "delete asset" console command
* | Merge branch 'master' into careminsterMelanie2013-06-236-185/+71
|\ \ | |/ | | | | | | | | | | | | Conflicts: OpenSim/Framework/Monitoring/BaseStatsCollector.cs OpenSim/Region/ClientStack/Linden/Caps/WebFetchInvDescModule.cs OpenSim/Region/CoreModules/Avatar/InstantMessage/OfflineMessageModule.cs OpenSim/Region/Framework/Scenes/Scene.Inventory.cs
| * Change IsLocalRegion from using region handle to using regionID. This was ↵Diva Canto2013-06-221-1/+1
| | | | | | | | affecting UpdateAgent and CloseAgent in cases where the foreign region is on the same coordinates as *some* local region.
| * Finally moved HG agent transfers to use agent fatpacks.Diva Canto2013-06-216-184/+70
| |
* | Merge branch 'master' into careminsterMelanie2013-06-182-2/+20
|\ \ | |/ | | | | | | | | | | Conflicts: OpenSim/Region/ScriptEngine/Shared/Api/Implementation/LSL_Api.cs OpenSim/Services/LLLoginService/LLLoginResponse.cs OpenSim/Services/LLLoginService/LLLoginService.cs
| * Merge branch 'master' of /home/opensim/src/opensimBlueWall2013-06-132-2/+20
| |\
| | * Add Option: ClassifiedFeeBlueWall2013-06-132-2/+20
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Add option to set minimum fee for publishing classifieds. Many viewers have a hard coded minimum of 50, which makes publishing classifieds fail where grids have no economy. This allows the grid to set the minimum fee to a suitable value for their operation. The option is located in the [LoginService] section and defaults to 0. The value is sent as "classified_fee" in the login response.
* | | Merge branch 'master' into careminsterMelanie2013-06-132-69/+79
|\ \ \ | |/ /
| * | Make XInventoryServicesConnector properly handle a RESULT = false return for ↵Justin Clark-Casey (justincc)2013-06-131-68/+56
| | | | | | | | | | | | | | | | | | methods where this contains failure rather than throwing an exception. Result = False is generated for methods such as GetFolderForType() when the other end wants to signal a failure of the operation in methods such as GetFolderForType()
| * | After calls to GetSuitcaseXFolder() in HGSuitcaseInventoryService, ↵Justin Clark-Casey (justincc)2013-06-121-1/+23
| |/ | | | | | | | | | | | | consistently check for null return and log warning rather than throw exception. This was being done already in some places. If an exception is thrown it is now an error rather than debug
| * Remove Temporary from use to shortcut asset stores. The Local propertyMic Bowman2013-06-101-1/+1
| | | | | | | | | | | | differentiates between local & grid storage. The Temporary property just says that which service handles the it, the asset can be safely removed in the future.
* | Merge branch 'master' into careminsterMelanie2013-06-043-0/+348
|\ \ | |/ | | | | | | | | Conflicts: OpenSim/Region/CoreModules/Avatar/Gods/GodsModule.cs OpenSim/Region/ScriptEngine/Shared/Api/Implementation/AsyncCommandManager.cs
| * Adding standard OpenSim header to source filesBlueWall2013-05-313-0/+81
| |
| * UserProfilesBlueWall2013-05-303-0/+267
| | | | | | | | UserProfiles for Robust and Standalone. Includes service and connectors for Robust and standalone opensim plus matching region module.
* | 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
| | |