admin/opensim
1
0
Fork 0
mirror of git://opensimulator.org/git/opensim synced 2026-08-17 02:22:40 +00:00
Code Issues Packages Projects Releases Wiki Activity
18,695 Commits 112 Branches 81 Tags
integration
Commit Graph
392 Commits
Author SHA1 Message Date
BlueWall 1140cb613b Merge branch 'master' of /home/opensim/var/repo/opensim 
Conflicts:
	OpenSim/Region/CoreModules/ServiceConnectorsOut/Presence/LocalPresenceServiceConnector.cs
 2012-11-27 07:11:50 -05:00
Justin Clark-Casey (justincc) 3ce00e97cc Factor out command script code. 
This also allows comments in command scripts (lines starting with ;, # or //) to be used across all servers
 2012-11-22 05:57:20 +00:00
Justin Clark-Casey (justincc) 9fcf3f1a3f Make "config show/set/get/save" console commands available on all servers 2012-11-22 05:48:41 +00:00
Justin Clark-Casey (justincc) 8269d2b893 Factor out common pid file creation and removal code. 
Log path at which pid file is created or reason for failure to create.
 2012-11-22 05:14:43 +00:00
Justin Clark-Casey (justincc) 4c4379b50f Make "set log level" command available across all servers 2012-11-22 04:50:09 +00:00
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
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
Diva Canto df62d113ab The last few AssemblyInfos. Finished! 2012-11-14 21:18:18 -08:00
BlueWall 24754b4155 Merge branch 'master' of /home/opensim/var/repo/opensim 2012-11-14 15:17:24 -05:00
Diva Canto 35fd4474b2 Added AssemblyInfos in the OpenSim.Server namespace dlls. 2012-11-14 11:20:55 -08:00
BlueWall c24fe86f0e Merge branch 'master' of /home/opensim/var/repo/opensim 2012-11-09 08:49:38 -05: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
BlueWall fc507ff59b Merge branch 'master' of /home/opensim/var/repo/opensim 2012-10-26 16:43:08 -04: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 9f6e26d31d Merge branch 'master' of /home/opensim/var/repo/opensim 
Conflicts:
	bin/Robust.HG.ini.example
	bin/Robust.ini.example
 2012-10-20 04:08:27 -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 286a9adcb2 Merge branch 'master' of /home/opensim/var/repo/opensim 2012-09-14 20:26:45 -04: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
SignpostMarv 3f6c6eed33 pasting in show uptime code 
Signed-off-by: BlueWall <jamesh@bluewallgroup.com>
 2012-09-06 06:13:07 -04:00
SignpostMarv ef574d3a29 pasting in show uptime code 
Signed-off-by: BlueWall <jamesh@bluewallgroup.com>
 2012-09-06 06:07:45 -04:00
BlueWall afa2d7eea3 Some formatting changes 2012-07-13 23:15:11 -04:00
BlueWall 6e4e26d213 Merge branch 'master' of /home/opensim/var/repo/opensim 
Conflicts:
	OpenSim/Server/Handlers/Presence/PresenceServerPostHandler.cs
 2012-07-12 22:42:45 -04: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
BlueWall e28e2ef3ac Merge branch 'master' of /home/opensim/var/repo/opensim 2012-07-11 19:41:17 -04: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
BlueWall 5632e4e002 Merge branch 'master' of /home/opensim/var/repo/opensim 2012-06-29 20:34:11 -04: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
BlueWall ec05e93f85 Merge branch 'master' of /home/opensim/var/repo/opensim 2012-06-14 22:05:27 -04: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
BlueWall d7c5e240a5 Merge branch 'master' of /home/opensim/var/repo/opensim 2012-06-14 21:27:58 -04: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
BlueWall 26c332f5f2 Merge branch 'master' of /home/opensim/var/repo/opensim 2012-05-24 21:53:35 -04: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
BlueWall 14eef0a32b Merge branch 'master' of /home/opensim/var/repo/opensim 2012-05-23 23:57:25 -04: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
BlueWall 2b5e05fad8 Merge branch 'master' of /home/opensim/var/repo/opensim 2012-05-11 09:46:51 -04:00
Justin Clark-Casey (justincc) e813f41478 Escape and unescape xml element names if necessary in 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.
 2012-05-09 21:11:14 +01:00
BlueWall 08cf05a586 Merge branch 'master' of /home/opensim/var/repo/opensim 2012-05-03 15:45:26 -04:00
Justin Clark-Casey (justincc) bf5f8b54ae Remove the somewhat misleading logging of the string length of some unknown 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.
 2012-05-03 02:22:06 +01:00
Justin Clark-Casey (justincc) 231a3bf147 Implement optional name and description on http stream handlers so that we 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.
 2012-05-03 01:45:49 +01:00
Diva Canto 9bc94c502a MapImageService: changed the event at which the map tiles are uploaded, because they were being uploaded before the region was registered with the grid 2012-04-27 11:05:40 -07:00
Diva Canto a9dbe39319 MapImage security issue. Compare strings instead of IPAddresses. 2012-04-27 10:39:20 -07:00