2f1aa87eb5
One more comment inconsistency fixed.
2013-03-07 08:02:48 -08:00
fdebee25db
Merge branch 'master' of ssh://opensimulator.org/var/git/opensim
2013-03-07 06:41:03 -08:00
2b0056eaca
Fixed inconsistency in comments. Thanks Ai Austin.
2013-03-07 06:40:39 -08:00
6706e189d5
minor: remove some completely unused string local vars added recently in commit 984faf2
2013-03-06 23:11:32 +00:00
2fe938d11d
Merge branch 'master' of ssh://opensimulator.org/var/git/opensim
2013-03-06 23:07:04 +00:00
5751ecde52
Add code for testing event queue messages recevied on region cross.
...
This is currently disabled pending an improvement in the test code to properly add avatars when an event queue module is present.
2013-03-06 23:06:00 +00:00
f954c53ddb
* Separate two if trees that got merged into one if tree with borked logic.
2013-03-06 17:02:53 -05:00
8960418e7d
Add regression test for presence crossing between regions on the same simulator.
...
Unlike a much earlier commented out version of this test, this is done in synchronous mode.
2013-03-06 21:37:53 +00:00
9875e840f7
Per discussions with justincc... split the JsonStore type
...
functions into one for node type and one for value type.
Define and export constants for both nodes and values.
2013-03-05 20:33:17 -08:00
30e06b0742
Convert doubles passed back through the MOD interface into LSL_Floats
2013-03-05 20:32:06 -08:00
a9f380d124
Fix bug in osGetPrimitiveParams() so that it works for prims with the same owner as the script and not ones with different owners.
...
Addresses http://opensimulator.org/mantis/view.php?id=6560
2013-03-06 00:22:58 +00:00
339d8ef2a6
Merge branch 'avination' into careminster
...
Conflicts:
OpenSim/Region/CoreModules/Avatar/Attachments/AttachmentsModule.cs
2013-03-06 00:15:54 +00:00
b272b91317
minor: Fix mono compiler warning in MonitorModule
2013-03-05 23:59:39 +00:00
81552f41c6
Merge branch 'master' into careminster
...
Conflicts:
OpenSim/Region/ClientStack/Linden/Caps/MeshUploadFlagModule.cs
OpenSim/Region/ClientStack/Linden/UDP/LLClientView.cs
OpenSim/Region/CoreModules/Avatar/Attachments/AttachmentsModule.cs
OpenSim/Region/OptionalModules/Avatar/Attachments/TempAttachmentsModule.cs
2013-03-05 23:57:53 +00:00
5cd38d680a
Merge branch 'master' of ssh://opensimulator.org/var/git/opensim
2013-03-05 23:52:52 +00:00
ccd6f443e1
Get attachment script state before taking sp.AttachmentsSyncLock() to avoid race conditions between closing agents and scripts that may be doing attachment manipulation.
...
This is in an effort to resolve http://opensimulator.org/mantis/view.php?id=6557
2013-03-05 23:47:36 +00:00
f676408e2a
Merge branch 'master' of ssh://opensimulator.org/var/git/opensim
2013-03-05 15:30:54 -05:00
9ffa08ea6b
Limit each attachment point to 5 items as per spec
2013-03-05 15:11:30 +01:00
51de85b503
Multiattach, part 2
2013-03-05 13:14:06 +01:00
797bfbfcfa
Multiattach, part 1
2013-03-05 12:02:22 +01:00
69fbcdf14c
* Add a Max Payload size property to the Websocket Server Handler. If you would like to restrict the maximum packet size, (and therefore protect against Memory DOSing) then you should set this. I defaulted it to 40MB. This means that in theory, a malicious user could connect and send a packet that claims that the payload is up to 40 mb (even if it doesn't actually turn out to be 40mb. More testing needs to be done on it where the packets are maliciously malformed.
2013-03-05 00:04:09 -05:00
7556b42d7a
* Update LibOMV to f8f8e616b37a7ea22b7922b2331999bc06725bf9
...
* Add zero length blocks to the new packet blocks to remain compatible with older viewers and avoid a NullRef when _packets_.cs calls the Length parameter.. which adds up the Length property all of the blocks.
2013-03-04 21:26:26 -05:00
fa9f4ef1ba
Fix issue in the mesh upload flag module where the ID of the last agent to request the capability was always used instead of the original requesting agent for each cap.
...
Should address http://opensimulator.org/mantis/view.php?id=6556
2013-03-04 23:20:00 +00:00
aadf7d32d1
GridUserService was missing from [Gatekeeper]
2013-03-04 12:52:28 -08:00
82ac1763fb
Add support for void return type
2013-03-03 22:50:20 +01:00
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
Diva Canto