aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim/Server (follow)
Commit message (Collapse)AuthorAgeFilesLines
* Merge branch 'master' into careminsterMelanie2012-11-222-139/+13
|\
| * Factor out command script code.Justin Clark-Casey (justincc)2012-11-221-39/+0
| | | | | | | | This also allows comments in command scripts (lines starting with ;, # or //) to be used across all servers
| * Make "config show/set/get/save" console commands available on all serversJustin Clark-Casey (justincc)2012-11-222-15/+6
| |
| * Factor out common pid file creation and removal code.Justin Clark-Casey (justincc)2012-11-221-22/+3
| | | | | | | | Log path at which pid file is created or reason for failure to create.
| * Make "set log level" command available across all serversJustin Clark-Casey (justincc)2012-11-221-1/+0
| |
| * Make "show info" command available across all serversJustin Clark-Casey (justincc)2012-11-221-42/+1
| | | | | | | | This helpfully lists version information, startup location and console log level
| * Factor out common registration of "show uptime" commandJustin Clark-Casey (justincc)2012-11-221-5/+2
| |
| * factor out common HandleShow code for "show uptime"Justin Clark-Casey (justincc)2012-11-221-16/+2
| |
* | Merge branch 'master' into careminsterMelanie2012-11-221-23/+4
|\ \ | |/
| * refactor: Factor out copy/pasted server uptime report codeJustin Clark-Casey (justincc)2012-11-221-23/+4
| |
* | 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-171-0/+33
|\ \ | |/
| * The last few AssemblyInfos. Finished!Diva Canto2012-11-141-0/+33
| |
* | Merge branch 'master' into careminsterMelanie2012-11-152-0/+66
|\ \ | |/
| * Added AssemblyInfos in the OpenSim.Server namespace dlls.Diva Canto2012-11-142-0/+66
| |
* | 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 'master' into careminsterMelanie2012-10-121-2/+20
|\ \ | |/ | | | | | | | | | | Conflicts: OpenSim/Region/ClientStack/Linden/UDP/LLClientView.cs OpenSim/Region/ClientStack/Linden/UDP/LLUDPServer.cs OpenSim/Region/Framework/Scenes/Scene.cs
| * Fix build breakMelanie2012-10-081-1/+1
| |
| * Add a ServiceList section to Robust .ini to get rid of the long stringMelanie2012-10-081-0/+18
| |
| * Allow other whitespace characters than spaces in Robust connection stringMelanie2012-10-081-2/+2
| |
* | 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-09-071-0/+41
|\ \ \ | |/ / | | / | |/ |/| | | Conflicts: OpenSim/Capabilities/Handlers/GetTexture/GetTextureHandler.cs OpenSim/Framework/Servers/VersionInfo.cs
| * pasting in show uptime codeSignpostMarv2012-09-061-0/+41
| | | | | | | | Signed-off-by: BlueWall <jamesh@bluewallgroup.com>
* | 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 'master' into careminsterMelanie2012-07-121-4/+4
|\ \ | |/ | | | | | | | | | | | | Conflicts: OpenSim/Region/CoreModules/Avatar/Attachments/AttachmentsModule.cs OpenSim/Region/Framework/Scenes/SceneObjectGroup.cs OpenSim/Region/Framework/Scenes/SceneObjectPart.cs OpenSim/Region/ScriptEngine/Shared/Instance/ScriptInstance.cs
| * Where possible, use the system Encoding.ASCII and Encoding.UTF8 rather than ↵Justin Clark-Casey (justincc)2012-07-111-4/+4
| | | | | | | | | | | | | | constructing fresh copies. The encodings are thread-safe and already used in such a manner in other places. This isn't done where Byte Order Mark output is suppressed, since Encoding.UTF8 is constructed to output the BOM.
* | 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-012-51/+1
|\ \ \ | | |/ | |/|
| * | Remove some mono compiler warningsJustin Clark-Casey (justincc)2012-06-301-3/+1
| | |
| * | 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-06-152-82/+31
|\ \ \ | |/ /
| * | Make the "debug http" command available for robust as well as the simulator. ↵Justin Clark-Casey (justincc)2012-06-152-74/+30
| | | | | | | | | | | | | | | | | | This allows one to see incoming requests as they happen. This required making everything use the common MainServer class for registering and retrieving http servers, rather than duplicate structures.
| * | Add main instance to internal MainServer.m_Servers list to simplify internal ↵Justin Clark-Casey (justincc)2012-06-151-10/+3
| | | | | | | | | | | | | | | | | | logic. This does require the server to be added before it is set as the main Instance
* | | 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-101-3/+3
|\ \ \ | |/ /
| * | Escape and unescape xml element names if necessary in ↵Justin Clark-Casey (justincc)2012-05-091-3/+3
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | ServerUtils.BuildXmlData() and ParseElement() If AvatarService appearance data is retrieved over the network, then ServerUtils was attempting to transfer names such as "Wearable 0:0" directly to xml element names, resulting in an exception. Space is not valid in xml element names. Neither is : in this case since the intention is not to namespace. Using names directly as keys is not a good idea. To get around this problem this patch escapes and unescapes the element names as appropriate. This has no impact on existing xml (since it had to be valid in the first place) but allows AvatarService data to be used over the network. Setting appearance (from simulator to AvatarService) did not suffer this problem since the values are passed in the query string which is already properly escaped.
* | | 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
generated by cgit v1.1 at 2024-10-22 11:39:45 +0000