ogb912/opensim
1
0
Fork 0
mirror of https://github.com/opensim/opensim.git synced 2026-07-14 03:15:36 +08:00
Code Issues Packages Projects Releases Wiki Activity
28,771 Commits 5 Branches 86 Tags
b52f7b920342b7ea3e0294eae054e7520801e339
Commit Graph

667 Commits

Author SHA1 Message Date
Justin Clark-Casey (justincc)
45d1e6ab09 Make "show info" command available across all servers 
This helpfully lists version information, startup location and console log level
 2012-11-22 04:45:53 +00:00
Justin Clark-Casey (justincc)
cf03d6ea92 Factor out common registration of "show uptime" command 2012-11-22 04:11:03 +00:00
Justin Clark-Casey (justincc)
5c48d7a378 factor out common HandleShow code for "show uptime" 2012-11-22 04:05:09 +00:00
Justin Clark-Casey (justincc)
74a20a62ee refactor: Factor out copy/pasted server uptime report code 2012-11-22 03:43:21 +00:00
Melanie
5f4ac1c5a3 Merge branch 'master' into careminster 2012-11-22 03:40:30 +00:00
Melanie
c4c6121752 Merge branch 'master' into careminster 2012-11-22 03:17:33 +00:00
Justin Clark-Casey (justincc)
448811ccdd If an asset POST does not contain well-formed XML, return a 400 (Bad Request) HTTP status rather than simply dropping the request. 2012-11-22 03:03:37 +00:00
Justin Clark-Casey (justincc)
bac8ac32da Add regression test for a good request made to the asset service post handler. 
Adds new OpenSim.Server.Handlers.Tests.dll to test suite
 2012-11-21 23:42:34 +00:00
Melanie
e4659a83f1 Merge branch 'master' into careminster 2012-11-17 02:03:24 +00:00
Diva Canto
df62d113ab The last few AssemblyInfos. Finished! 2012-11-14 21:18:18 -08:00
Melanie
06fa1681ae Merge branch 'master' into careminster 2012-11-15 00:43:26 +00:00
Diva Canto
35fd4474b2 Added AssemblyInfos in the OpenSim.Server namespace dlls. 2012-11-14 11:20:55 -08:00
Melanie
d0473b73da Merge branch 'master' into careminster 2012-11-03 15:38:47 +00:00
Justin Clark-Casey (justincc)
ce7beb6f20 Add [AssetService] AllowRemoteDeleteAllTypes (default false). 
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.
 2012-11-02 01:41:38 +00:00
Justin Clark-Casey (justincc)
462ad336dc Move check to allow only deletion of maptiles up to AssetServerDeleteHandler 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.
 2012-11-02 00:02:10 +00:00
Melanie
26cc57b6ca Merge branch 'master' into careminster 
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
 2012-10-26 21:13:01 +01:00
Justin Clark-Casey (justincc)
f76dceb90b Get "save oar" and "save iar" to tell you in a more friendly manner if the 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.
 2012-10-24 03:08:58 +01:00
BlueWall
99bb6c9304 Move PluginManager 
Move PluginManager out to OpenSimFramework for general use
 2012-10-19 07:38:36 -04:00
Melanie
6ce93b22d1 Merge branch 'master' into careminster 
Conflicts:
	OpenSim/Region/ClientStack/Linden/UDP/LLClientView.cs
	OpenSim/Region/ClientStack/Linden/UDP/LLUDPServer.cs
	OpenSim/Region/Framework/Scenes/Scene.cs
 2012-10-12 19:05:06 +01:00
BlueWall
c8393dd0be Add logging to help track sequence of events 2012-10-11 07:38:15 -04:00
BlueWall
83073ebd03 Implement plugin unloading 
Plugin may be enabled and disabled on the fly.
 2012-10-10 09:35:08 -04:00
BlueWall
a960efeaba Fix registry issue 
Rebuild registry if loading from a local dll to give access to the addin data for it on the first pass.
 2012-10-09 08:00:02 -04:00
BlueWall
92849c5cc3 missed some conflict markup 2012-10-09 07:59:44 -04:00
BlueWall
252af020b0 Merge branch 'master' into connector_plugin 
Conflicts:
	OpenSim/Server/ServerMain.cs
 2012-10-09 06:44:14 -04:00
Melanie
f65218f826 Fix build break 2012-10-08 19:02:21 +01:00
Melanie
ff92330523 Add a ServiceList section to Robust .ini to get rid of the long string 2012-10-08 17:57:22 +01:00
Melanie
90a39379f0 Allow other whitespace characters than spaces in Robust connection string 2012-10-08 17:36:40 +01:00
BlueWall
440726250c Added parts to manage repositories and plugin management 
This is working - more testing to follow, then soem documentation
 2012-10-06 11:48:21 -04:00
BlueWall
3e71c71cbf Add modular configuration for Robust connectors 
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.
 2012-10-03 16:07:11 -04:00
Melanie
001ec0e2e6 Merge branch 'avination' into careminster 
Conflicts:
	OpenSim/Region/CoreModules/Agent/AssetTransaction/AgentAssetsTransactions.cs
	OpenSim/Region/Framework/Scenes/Scene.cs
 2012-09-27 17:29:44 +01:00
Melanie
8dae7928d3 Make agent creation at destination asynchronous. Failures here are pretty 
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.
 2012-09-16 23:41:34 +02:00
Melanie
db774d4292 Merge branch 'master' into careminster 
Conflicts:
	OpenSim/Region/CoreModules/Framework/EntityTransfer/HGEntityTransferModule.cs
	OpenSim/Region/Framework/Scenes/EventManager.cs
 2012-09-16 04:11:20 +01:00
Justin Clark-Casey (justincc)
6f7825e310 Don't store the unnecessary VERSIONMIN. VERSIONMAX, METHOD or UserID (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.
 2012-09-14 00:07:39 +01:00
Melanie
924df14c5e Merge branch 'master' into careminster 
Conflicts:
	OpenSim/Capabilities/Handlers/GetTexture/GetTextureHandler.cs
	OpenSim/Framework/Servers/VersionInfo.cs
 2012-09-07 19:49:46 +01:00
SignpostMarv
3f6c6eed33 pasting in show uptime code 
Signed-off-by: BlueWall <jamesh@bluewallgroup.com>
 2012-09-06 06:13:07 -04:00
Melanie
64393a7ca8 Merge branch 'master' into careminster 
Conflicts:
	OpenSim/Region/Framework/Scenes/Scene.cs
 2012-07-13 02:27:16 +01:00
Justin Clark-Casey (justincc)
884d603cac Rather than instantiating a UTF8 encoding everywhere when we want to supress 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).
 2012-07-13 01:03:28 +01:00
Melanie
d632fd7124 Merge branch 'master' into careminster 
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
 2012-07-12 08:55:16 +01:00
Justin Clark-Casey (justincc)
916e3bf886 Where possible, use the system Encoding.ASCII and Encoding.UTF8 rather than 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.
 2012-07-11 22:54:22 +01:00
Melanie
89c9528e38 Merge branch 'avination' into careminster 
Conflicts:
	OpenSim/Data/MySQL/MySQLSimulationData.cs
 2012-07-11 14:27:33 +01:00
Melanie
d3b778ebbe Address map lag issue seen with non-avination viewers 2012-07-08 06:06:33 +02:00
Melanie
e5eef139ed Merge branch 'master' into careminster 2012-07-01 03:04:23 +01:00
Justin Clark-Casey (justincc)
1926de5a05 Remove some mono compiler warnings 2012-06-30 01:25:39 +01:00
Justin Clark-Casey (justincc)
a4551b027b Removing unused handling of incoming create object by userID and itemID only. 
It appears this was never actually used since attachments were rezzed in other code.
This was never available on remote simulator comms, only local.
 2012-06-30 01:14:49 +01:00
Melanie
30d872caad Merge branch 'master' into careminster 2012-06-15 02:53:34 +01:00
Justin Clark-Casey (justincc)
94517c8d5c Make the "debug http" command available for robust as well as the simulator. 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.
 2012-06-15 02:51:52 +01:00
Justin Clark-Casey (justincc)
257b1b517d Add main instance to internal MainServer.m_Servers list to simplify internal logic. 
This does require the server to be added before it is set as the main Instance
 2012-06-15 02:03:50 +01:00
Melanie
884c0e7bb1 Merge branch 'master' into careminster 
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
 2012-05-27 19:24:30 +01:00
Justin Clark-Casey (justincc)
7cceab1295 In remote QueryAccess, also receive the actual status (true|false) instead 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.
 2012-05-25 01:41:00 +01:00
Justin Clark-Casey (justincc)
38ce9d45a5 Make ISimulationScene.GetScene() used the more efficient region id for lookup rather than the region handle. 2012-05-24 01:00:18 +01:00