aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim/Server/Handlers (follow)
Commit message (Collapse)AuthorAgeFilesLines
* If GridUserService is asked for a nonexistent user, bail gracefullyMelanie Thielker2014-08-231-0/+3
|
* Change the map tile system to be multi-grid hosting compatibleMelanie Thielker2014-08-233-2/+267
| | | | | | Conflicts: OpenSim/Server/Handlers/Map/MapRemoveServerConnector.cs
* Merge branch 'master' into careminsterMelanie2013-02-281-1/+2
|\ | | | | | | | | Conflicts: OpenSim/Region/Framework/Scenes/SceneManager.cs
| * Switched to using the other Util function with a default value.Diva Canto2013-02-271-1/+2
| |
| * Moved the HG default variables out of [Startup] and into their own section ↵Diva Canto2013-02-271-1/+1
| | | | | | | | [Hypergrid] in *Common.ini.example. Backwards compatible for now.
* | Merge branch 'master' into careminsterMelanie2013-02-231-1/+1
|\ \ | |/ | | | | | | 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-221-1/+1
| | | | | | | | one I added yesterday -- this is for helping move config vars out of [Startup]
* | Merge branch 'master' into careminsterMelanie2013-02-222-10/+12
|\ \ | |/
| * Simplification of HG configs: HomeURI and GatekeeperURI now are defined as ↵Diva Canto2013-02-211-9/+11
| | | | | | | | 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-191-1/+1
| |
* | Merge branch 'master' into careminsterMelanie2013-02-051-1/+1
|\ \ | |/ | | | | | | | | | | | | 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-051-1/+1
| | | | | | | | | | | | | | | | 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 careminsterMelanie2012-12-091-0/+67
|\ \ | |/
| * Merge branch 'master' into connector_pluginBlueWall2012-11-255-11/+214
| |\ | | | | | | | | | | | | Conflicts: OpenSim/Server/Base/ServicesServerBase.cs
| * | Move PluginManagerBlueWall2012-10-191-3/+5
| | | | | | | | | | | | Move PluginManager out to OpenSimFramework for general use
| * | Added parts to manage repositories and plugin managementBlueWall2012-10-061-0/+4
| | | | | | | | | | | | This is working - more testing to follow, then soem documentation
| * | Add modular configuration for Robust connectorsBlueWall2012-10-031-0/+61
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | We can provide modular ini for connectors... look for our configuration in the following places... 1) in the default ini/-inifile 2) in the named file (ConfigName) located in the configured directory (see Robust[.HG].ini [Start] section for ConfigDirectory) 3) in the repository named in the connector (ConfigURL) In this case, the file will be written into the configured directory with the specified See example connector/service @ https://github.com/BlueWall/SlipStream for testing.
* | | Merge branch 'master' into careminsterMelanie2012-11-222-3/+122
|\ \ \ | | |/ | |/|
| * | If an asset POST does not contain well-formed XML, return a 400 (Bad ↵Justin Clark-Casey (justincc)2012-11-222-3/+38
| | | | | | | | | | | | Request) HTTP status rather than simply dropping the request.
| * | Add regression test for a good request made to the asset service post handler.Justin Clark-Casey (justincc)2012-11-211-0/+84
| | | | | | | | | | | | Adds new OpenSim.Server.Handlers.Tests.dll to test suite
* | | Merge branch 'master' into careminsterMelanie2012-11-151-0/+33
|\ \ \ | |/ /
| * | Added AssemblyInfos in the OpenSim.Server namespace dlls.Diva Canto2012-11-141-0/+33
| | |
* | | Merge branch 'master' into careminsterMelanie2012-11-032-8/+56
|\ \ \ | |/ /
| * | Add [AssetService] AllowRemoteDeleteAllTypes (default false).Justin Clark-Casey (justincc)2012-11-022-15/+52
| | | | | | | | | | | | | | | | | | This allows a closed grid to delete asset types other than maptile remotely. Only operational if AllowRemoteDelete = true also. Defaults to false - do not enable if anybody other than you can make asset service requests.
| * | Move check to allow only deletion of maptiles up to AssetServerDeleteHandler ↵Justin Clark-Casey (justincc)2012-11-021-3/+14
| | | | | | | | | | | | | | | | | | | | | | | | from AssetService. This allows us to use a common check for both AssetService and XAssetService. It also allows future console commands to delete an asset. As before, deletion of maptile assets is not allowed remotely unless this is explicitly configured.
* | | Merge branch 'master' into careminsterMelanie2012-10-261-0/+3
|\ \ \ | |/ / | | | | | | | | | | | | | | | | | | | | | Conflicts: OpenSim/Region/CoreModules/Avatar/Chat/ChatModule.cs OpenSim/Region/CoreModules/Framework/EntityTransfer/EntityTransferModule.cs OpenSim/Region/Framework/Scenes/Scene.PacketHandlers.cs OpenSim/Region/ScriptEngine/Shared/Api/Implementation/OSSL_Api.cs OpenSim/Region/ScriptEngine/Shared/Api/Runtime/LSL_Constants.cs
| * | Get "save oar" and "save iar" to tell you in a more friendly manner if the ↵Justin Clark-Casey (justincc)2012-10-241-0/+3
| |/ | | | | | | | | | | filename to save already exists, rather than exception throwing. Also changes ConsoleUtil.CheckFileExists to CheckFileDoesNotExist() since this is more meaningful in the context, even though it does result in double negatives.
* | Merge branch 'avination' into careminsterMelanie2012-09-271-1/+9
|\ \ | | | | | | | | | | | | | | | Conflicts: OpenSim/Region/CoreModules/Agent/AssetTransaction/AgentAssetsTransactions.cs OpenSim/Region/Framework/Scenes/Scene.cs
| * | Make agent creation at destination asynchronous. Failures here are prettyMelanie2012-09-161-1/+9
| | | | | | | | | | | | | | | | | | | | | | | | much guaranteed to be fatal and the few times this would dosconnect an agent are more than made up for by the increased throughput of replying and closing the connection vs. keeping it open during the heavy work. Also causes better feedback to the viewer as the time is now split between Requesting Teleport and Connectiong to Destination.
* | | Merge branch 'master' into careminsterMelanie2012-09-161-0/+18
|\ \ \ | |/ / |/| / | |/ | | | | Conflicts: OpenSim/Region/CoreModules/Framework/EntityTransfer/HGEntityTransferModule.cs OpenSim/Region/Framework/Scenes/EventManager.cs
| * Don't store the unnecessary VERSIONMIN. VERSIONMAX, METHOD or UserID ↵Justin Clark-Casey (justincc)2012-09-141-0/+18
| | | | | | | | | | | | (present as column PrincipalID) parameters in the Avatars table. These are used to invoke avatar service calls but are not in themselves persistable avatar data.
* | Merge branch 'master' into careminsterMelanie2012-07-139-74/+61
|\ \ | |/ | | | | | | Conflicts: OpenSim/Region/Framework/Scenes/Scene.cs
| * Rather than instantiating a UTF8 encoding everywhere when we want to supress ↵Justin Clark-Casey (justincc)2012-07-139-74/+61
| | | | | | | | | | | | the BOM, use a single Util.UTF8NoBomEncoding. This class is thread-safe (as evidenced by the provision of the system-wide Encoding.UTF8 which does not suppress BOM on output).
* | Merge branch 'avination' into careminsterMelanie2012-07-111-1/+14
|\ \ | | | | | | | | | | | | Conflicts: OpenSim/Data/MySQL/MySQLSimulationData.cs
| * | Address map lag issue seen with non-avination viewersMelanie2012-07-081-1/+14
| | |
* | | Merge branch 'master' into careminsterMelanie2012-07-011-48/+0
|\ \ \ | | |/ | |/|
| * | Removing unused handling of incoming create object by userID and itemID only.Justin Clark-Casey (justincc)2012-06-301-48/+0
| | | | | | | | | | | | | | | It appears this was never actually used since attachments were rezzed in other code. This was never available on remote simulator comms, only local.
* | | Merge branch 'master' into careminsterMelanie2012-05-272-5/+8
|\ \ \ | |/ / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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
| * | In remote QueryAccess, also receive the actual status (true|false) instead ↵Justin Clark-Casey (justincc)2012-05-251-2/+5
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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-3/+3
| | | | | | | | | | | | lookup rather than the region handle.
* | | Merge branch 'master' into careminsterMelanie2012-05-054-4/+7
|\ \ \ | |/ / | | | | | | | | | | | | | | | | | | | | | 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
| * | Remove the somewhat misleading logging of the string length of some unknown ↵Justin Clark-Casey (justincc)2012-05-033-4/+5
| | | | | | | | | | | | | | | | | | requests, as this appeared to be some kind of numbered error code. This brings these messages into line with similar messages that did not do this.
| * | Implement optional name and description on http stream handlers so that we ↵Justin Clark-Casey (justincc)2012-05-031-0/+2
| | | | | | | | | | | | | | | | | | can relate a slow request to what the handler actually does and the agent it serves, if applicable. This is most useful for capabilities where the url is not self-describing.
* | | Merge branch 'master' into careminsterMelanie2012-04-271-5/+74
|\ \ \ | |/ / | | / | |/ |/| Conflicts: OpenSim/Region/ScriptEngine/Shared/Api/Implementation/Plugins/SensorRepeat.cs
| * MapImageService: changed the event at which the map tiles are uploaded, ↵Diva Canto2012-04-271-2/+2
| | | | | | | | because they were being uploaded before the region was registered with the grid
| * MapImage security issue. Compare strings instead of IPAddresses.Diva Canto2012-04-271-1/+1
| |
| * MapImage security issue: better error messagesDiva Canto2012-04-271-3/+5
| |
| * Amend to last commit: account for the existence of proxies.Diva Canto2012-04-271-3/+32
| |
| * MapImageService: added an additional security check for OSGrid and other ↵Diva Canto2012-04-271-5/+43
| | | | | | | | grids like it.
* | Merge branch 'master' into careminsterMelanie2012-04-071-13/+59
|\ \ | |/ | | | | | | | | | | | | | | 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