1ef50fef44
Experimental - add void return support to modSendCommand
2013-03-03 20:30:59 +01:00
66d74e76b1
Add method to remove JsonRpc Handlers from the server
2013-03-03 09:40:44 -05:00
f39e4abf0e
Merge branch 'avination' into careminster
...
Conflicts:
OpenSim/Region/ScriptEngine/Shared/Api/Interface/IOSSL_Api.cs
2013-03-03 13:24:37 +00:00
34bb2fd015
Make Keyframe motion cross regions again
2013-03-03 12:48:56 +01:00
2ad72db0ec
Make a viewer sent XML error prettier
2013-03-03 11:40:46 +01:00
e70c71a175
Merge branch 'master' of ssh://opensimulator.org/var/git/opensim
2013-03-02 17:54:19 -08:00
b0985f7019
Fixed typos in TempAttachmentsModule. No changes.
2013-03-02 17:53:57 -08:00
b47ffb5dc4
Added existance and default value for [XEngine]MinTimerInterval to OpenSimDefaults.ini
2013-03-02 13:02:02 -08:00
1bc8692a99
Move AllowedClients and BannedClients section to new [AccessControl] section in OpenSim.ini from [Startup]
...
This change also corrects the setting names - they were actually wrong (though the text in {} was correct).
If there are settings in [Startup] they will continue to be used and anything there will override settings in [AccessControl]
2013-03-02 01:43:54 +00:00
4999d7920a
Revert "Removed more vars from [Startup]. I think these were already moved elsewhere, because I can't find any reference to them in the code."
...
This reverts commit efa7227865
2013-03-02 01:23:01 +00:00
1a98ce5f64
minor: Quieten down the parts of the WebSocketEcho module logging for now where it tells us it is added/loaded/removed from regions
2013-03-02 01:06:08 +00:00
c91753c065
minor: Log number of region modules loaded from each plugin
2013-03-02 00:56:53 +00:00
a675f7d4c3
Merge branch 'master' into careminster
2013-03-01 23:54:00 +00:00
20530ee667
Moved permissions config vars out of [Startup] into [Permissions]. Backwards compatible ([Startup] still being looked up), but please update your configs sometime soon.
2013-03-01 15:24:22 -08:00
efa7227865
Removed more vars from [Startup]. I think these were already moved elsewhere, because I can't find any reference to them in the code.
2013-03-01 14:18:01 -08:00
90a19fb573
Merge branch 'master' of ssh://opensimulator.org/var/git/opensim
2013-03-01 21:49:05 +00:00
c851ebcd8c
Add the Mono AddinDependency attribute to the example region modules.
...
It turns out this is required to get Mono.Addins to pick up plugin DLLs
2013-03-01 21:47:17 +00:00
326634a0b3
BulletSim: more things into the TODO list.
2013-03-01 09:44:39 -08:00
1c740798b4
BulletSim: add parameters, code cleanup around checking and enforcing
...
maximum velocity and angular velocity values for prims.
2013-03-01 09:44:37 -08:00
862c3fd446
Merge branch 'master' of ssh://opensimulator.org/var/git/opensim
2013-03-01 00:21:56 +00:00
faf96f5c85
minor: Log location in which simulator/robust was started.
...
Useful information for system debugging, especially if logging and ini files locations have been changed from defaults.
2013-02-28 23:59:26 +00:00
b2087add96
Add missing prebuild.xml dependency for System.Action2<t1,t2> in recent additions
...
to ScriptEngine tests. Compiles some places but not others.
2013-02-28 15:17:07 -08:00
433102108b
Merge branch 'master' of ssh://opensimulator.org/var/git/opensim
2013-02-28 14:20:31 -08:00
ea3e0ef8a3
Bug fix in DataSnapshot, where a var was being used before being initialized.
2013-02-28 14:20:07 -08:00
eb9458fd7e
Merge branch 'master' into careminster
...
Conflicts:
OpenSim/Region/Framework/Scenes/SceneManager.cs
2013-02-28 21:20:07 +00:00
239a8da74e
Fix potential concurrency issue since the LSL notecard cache was not being checked for expiry under lock
2013-02-28 21:19:23 +00:00
a523ed1e4d
Fix bug where simultaneous calls by different scripts to llGetNotecardLine() or llGetNumberOfNotecardLines() would sometimes not trigger a dataserver event.
...
This was because the notecard asset ID was being used as the request identifier.
Now using a random ID, in common with other code using the DataServer
2013-02-28 21:15:14 +00:00
14684116f8
Add regression tests for llGetNotecardLine()
2013-02-28 20:57:03 +00:00
9e0c678c1e
Robust.HG.ini.example updated to get an [Hypergrid] section too.
2013-02-28 06:24:09 -08:00
3cc3a8e5bf
Removed duplicate 'using' statement.
2013-02-27 21:12:27 -08:00
bb44758179
Switched to using the other Util function with a default value.
2013-02-27 20:59:16 -08:00
64b8ce73da
Merge branch 'master' of ssh://opensimulator.org/var/git/opensim
2013-02-27 20:50:03 -08:00
f1010d7b15
Moved the HG default variables out of [Startup] and into their own section [Hypergrid] in *Common.ini.example. Backwards compatible for now.
2013-02-27 20:49:41 -08:00
b892411575
Add comment to example region modules about need to add Assembly annotation if adding modules to a DLL which does not already have this
2013-02-27 22:54:51 +00:00
0e8ec5649e
Get "show modules" console command to obey selected command line region/s
2013-02-27 22:32:14 +00:00
647cb278c7
Get "show modules" console command to show modules in alphabetical order, and group shared and non-shared modules together
...
This is to make it easier to tell if a region has a certain module active or not
2013-02-27 22:25:03 +00:00
1bef19b914
Do not have the Freeswitch connector on by default in Robust ini example files.
...
This is not widely used (may even be currently broken), only allows very poor quality voice (not the fault of FreeSwitch)
and requires a complicated Freeswitch setup.
Having it on but not configured results in spurious warnings in the logs
2013-02-27 21:45:31 +00:00
9b045e72b6
Add asset name and description truncation warnings to SQLite database plugin for consistency.
2013-02-27 21:41:21 +00:00
74916ed777
Add more information to warnings logged when asset names and descriptions have to be truncated for database storage
...
On balance, I still think this is useful because asset names and descriptions can sometimes be helpful in determining what things are.
Even though they are never subsequently (inventory names/descriptions are always used instead).
2013-02-27 21:35:54 +00:00
ba0819be9e
Merge branch 'master' into careminster
...
Conflicts:
OpenSim/Region/CoreModules/Scripting/LSLHttp/UrlModule.cs
2013-02-27 20:40:48 +00:00
61ba02e95f
minor: remove some mono compiler warnings in script regression tests
2013-02-27 20:38:10 +00:00
056f11c297
Show http poll handlers in separate http (poll) section of "show http-handlers" console command instead of never showing them (due to a previous bug).
...
The code was assuming that poll handlers were also included in general http handlers but this was not the case.
2013-02-27 20:33:11 +00:00
59bd099b03
Add regression test for llReleaseUrl() (and for llRequestUrl)
...
Forgot to add file for llRequestUrl() test in commit b8a7c8b
2013-02-27 20:12:58 +00:00
578174d21c
Merge branch 'master' into careminster
...
Conflicts:
OpenSim/Framework/RegionLoader/Web/RegionLoaderWebServer.cs
OpenSim/Region/CoreModules/Scripting/LSLHttp/UrlModule.cs
OpenSim/Region/CoreModules/World/WorldMap/WorldMapModule.cs
2013-02-27 18:05:04 +00:00
adf03ad2e5
Reinstate uploading temporary textures
2013-02-27 18:43:51 +01:00
698363990b
Try to update inventory items when there is a valid asset - may fix temp textures
2013-02-27 18:19:38 +01:00
20760fde25
Improve description of GenerateMapTiles config option
2013-02-27 00:31:54 +00:00
917c1695a1
Add documentation on default or Warp3D image module choice to OpenSim.ini.example.
...
As before, default is MapImageModule.
Thanks to Ai Austin for pointing out this omission.
2013-02-27 00:27:21 +00:00
80c19b7cac
Make sure we dispose of WebResponse, StreamReader and Stream in various places where we were not already.
2013-02-27 00:21:02 +00:00
2bfbfc5725
minor: Remove unnecessary very old System.Net reference in OpenSim.Region.ScriptEngine.Shared
2013-02-26 23:43:06 +00:00
Melanie