ogb912/opensim
1
0
Fork 0
mirror of https://github.com/opensim/opensim.git synced 2026-05-20 23:35:47 +08:00
Code Issues Packages Projects Releases Wiki Activity
18,978 Commits 5 Branches 93 Tags
2b5eba9c7438ef0175c91c1910ce2d660d930fed
Commit Graph

3428 Commits

Author SHA1 Message Date
Melanie
7bf33d333a Plumb the path from the client to the extra physics params and back 2013-02-07 22:25:28 +00:00
teravus
94a5232d3a * Adds Websocket support to baseHttpServer and IHttpServer.cs . This allows modules to set up a websocket server that websocket clients can connect to. An example module is in OptionalModules/Example/WebSocketEchoTest/WebSocketEchoModule.cs 2013-02-07 10:50:17 -05:00
teravus
4867a7cbbf This is the final commit that enables the Websocket handler 2013-02-07 10:27:18 -05:00
Mic Bowman
274d376c82 Merge branch 'master' of ssh://opensimulator.org/var/git/opensim 2013-02-06 17:32:57 -08:00
Mic Bowman
e17392acbb Enables script access to the per object dynamic attributes through the JsonStore 
script functions. Adds JsonAttachObjectStore to associate a store identifier with
an object (scripts can only access the store in their host object, this could be
extended but isn't necessary for now).

Note this opens a method to the DAMap OSDMap. This will be removed later, but
greatly simplifies the code for now.

The JsonStore and these scripts are disabled by default.
 2013-02-06 17:29:17 -08:00
Dan Lake
7590ebc934 Merge branch 'master' of git://opensimulator.org/git/opensim 2013-02-06 16:45:47 -08:00
Dan Lake
df37738ce7 WebStats will now use actual logfile as specified in OpenSim.exe.config rather than hardcoded ./OpenSim.log. This allows for rotating logs and other file appender types 2013-02-06 16:44:59 -08:00
Justin Clark-Casey (justincc)
c8c5d74c22 minor: add method doc to DAMap.ValidateKey() 2013-02-07 00:22:39 +00:00
Justin Clark-Casey (justincc)
e2c1e37b07 Add key length validation to DAMap.Add(KeyValuePair<string, OSDMap> kvp) to match Add(string key, OSDMap store) 2013-02-07 00:15:50 +00:00
Melanie
e5beb480ea Partial port of Avination's support for the new physics parameters. 
Implements the parameters as properties, the serialization and
database storage (MySQL only). Implements llSetPrimitiveParams for
prim physics shape and the other 4 extra params. Only the prim shape type
"None" is currently functional. No support for the Viewer UI (yet), that
will be ported in due course. Lots more to port, this is a large-ish changeset.
 2013-02-06 08:03:04 +00:00
teravus
1dc09d8e8f We're not really done here.. but we're getting there. Socket Read is working.. Still have to do Header.ToBytes and compose a websocket frame with a payload. 2013-02-05 18:02:25 -05:00
Justin Clark-Casey (justincc)
1fc9f282fa Merge branch 'dynamic-attributes2' 2013-02-05 00:35:15 +00:00
Justin Clark-Casey (justincc)
1f1da23097 Bump version and assembly version numbers from 0.7.5 to 0.7.6 
This is mostly Bluewall's work but I am also bumping the general version number
OpenSimulator 0.7.5 remains in the release candidate stage.
I'm doing this because master is significantly adding things that will not be in 0.7.5
This update should not cause issues with existing external binary DLLs because our DLLs do not have strong names
and so the exact version match requirement is not in force.
 2013-02-05 00:23:17 +00:00
Jak Daniels
fac72d540b Allow use of MaptileStaticUUID in Regions.ini to override the global setting in OpenSim.ini for each region. 
Signed-off-by: BlueWall <jamesh@bluewallgroup.com>
 2013-01-30 23:37:02 -05:00
Oren Hurvitz
af6a7cf95d Added DynAttrs to the serialized XML format of prims. When copying prims, use deep copy for DynAttrs. 2013-01-25 04:03:26 +00:00
Oren Hurvitz
fdec05a15e Stopped storing dynamic attributes in the PrimShape 2013-01-25 04:03:20 +00:00
Oren Hurvitz
8b4441d940 Changed DAMap to be the container of "data stores", which are OSDMaps. Store names must have at least 4 characters. 2013-01-25 04:03:18 +00:00
Justin Clark-Casey (justincc)
1650846df3 Lock DAMap rather than encapsulated OSDMap 
This allows external lockers to preserve atomicity of dynamic attribute changes
 2013-01-25 04:03:13 +00:00
Justin Clark-Casey (justincc)
a6d9c26365 Encapsulate an OSDMap in DAMap (was DynAttrsOSDMap) rather than inheriting from it 
This is the easier way to give us control over locking, rather than asking that OSDMap IDictionary methods be virtual
 2013-01-25 04:03:11 +00:00
Justin Clark-Casey (justincc)
1bd0b06ec1 Implement Dynamic Attributes for SOP and PBS. Implement storage in SQLite 2013-01-25 04:03:04 +00:00
BlueWall
2841ed05cf Merge branch 'master' of /home/opensim/var/repo/opensim 2013-01-23 08:16:18 -05:00
BlueWall
1776986dc3 Add additional return status 
Adding additional return status for JsonRpcMethod. Now returns true/false
 2013-01-23 08:14:21 -05:00
Oren Hurvitz
b77da5039e Assign the SmartThreadPool name in the constructor 
This is required because some threads are created in the constructor, so assigning the name afterwards would be too late.
 2013-01-19 02:08:58 +00:00
Justin Clark-Casey (justincc)
3eee991935 Explicitly stop PollServiceRequestManager() rather than relying on its destructor. 
Hopes to address occasional shutdown failures from http://opensimulator.org/mantis/view.php?id=6503
 2013-01-19 02:04:36 +00:00
Robert Adams
a6afd2f706 Merge branch 'master' of ssh://opensimulator.org/var/git/opensim 2013-01-17 14:51:52 -08:00
Robert Adams
caad1edabf Add utility function to clamp a vector to a maximum magnitude. 2013-01-17 14:44:54 -08:00
Melanie
9c99ed26eb Merge branch 'master' of melanie@opensimulator.org:/var/git/opensim 2013-01-16 16:52:57 +00:00
Melanie
5563a8916e Complete removal of the now unused state queue 2013-01-16 16:45:18 +00:00
BlueWall
ca3e0d67d2 Add Json-Rpc 2.0 To Registered Handlers 
Added registration json-rpc handlers in the http server. Covers version 2.0
  See: http://www.jsonrpc.org/specification
 2013-01-15 10:04:16 -05:00
Justin Clark-Casey (justincc)
84407e322f revert accidental change to MemoryWatchdog stat calculation in previous b1b4687 2013-01-10 01:30:00 +00:00
Justin Clark-Casey (justincc)
b1b4687250 Add "show script timers" command to show script timers. For debug purposes. 
Also, "show sensors" changes to "show script sensors".
 2013-01-10 00:57:49 +00:00
Justin Clark-Casey (justincc)
290dc274ec minor: Remove unnecessary commented out code from last commit c28a2f05 and fix up code comment 2013-01-09 01:04:43 +00:00
Justin Clark-Casey (justincc)
c28a2f05ca minor: make spacing consistent in console help output 2013-01-09 00:54:28 +00:00
Oren Hurvitz
1b826b4877 Allow registering regions whose names are equivalent under LIKE but not truly equal 2013-01-02 23:31:19 +00:00
Justin Clark-Casey (justincc)
8f31649fad Fix indenting on ConsoleDisplayTable, align indenting on "show animations" console command 2013-01-02 22:37:50 +00:00
Justin Clark-Casey (justincc)
6b55f51837 minor: Allow objects to be added directly to a row on a ConsoleDisplayTable rather than having to ToString() them first 2013-01-02 22:11:13 +00:00
Justin Clark-Casey (justincc)
addab1244e Add "show animations" console command for debug purposes. 
This shows the current animation sequence and default anims for avatars.
 2013-01-02 21:38:00 +00:00
Justin Clark-Casey (justincc)
bc9a7ba0d6 minor: Assign names to the different SmartThreadPools for debugging purposes. 
A different approach to the patch in http://opensimulator.org/mantis/view.php?id=6462
that doesn't involve further forking of SmartThreadPool
 2013-01-01 23:57:20 +00:00
Justin Clark-Casey (justincc)
416244051d refactor: call Util.InitThreadPool() if we are initializing an uninitialized pool on first use rather than constructing it ourselves. 
No functional change.
 2013-01-01 23:50:38 +00:00
Robert Adams
3e3c168987 Add helper routine Util.InRange() 2012-12-22 17:04:53 -08:00
Robert Adams
21dc5f4a1a Add stack dump function that takes an alternate printer outter. I've found that log4net can be slowish so, if one is generating A LOT of debug output, alternate printers are better 2012-12-16 21:19:11 -08:00
BlueWall
7a87c35f94 Merge branch 'master' of /home/opensim/var/repo/opensim 2012-12-12 23:34:20 -05:00
Justin Clark-Casey (justincc)
047270bdc8 Add "debug script log" command to allow setting a numeric debug level on individual IScriptInstances for debugging purposes. 
Current, state changes and event fires can be logged for individual scripts.
See command help for more details.
 2012-12-12 23:13:34 +00:00
BlueWall
b1849e7fde Hide some console output when initializing addin repository 
We do this in OpenSim.exe to hide output when unmanaged dll are scanned by mono addins. Libomv has hard-coded path to "." for the openjpeg libraries, causing output to the console when they are scanned. We will cover this up for now, then look at getting libomv to look for the libs outside the "." later.
 2012-12-11 17:03:42 -05:00
BlueWall
77e88fab06 Format change 
Removed some white space in a line, looking to trigger a build
 2012-12-07 20:19:16 -05:00
BlueWall
0b455d2882 Merge branch 'master' into connector_plugin 2012-12-07 15:36:43 -05:00
Justin Clark-Casey (justincc)
0568c76a88 Use a thread abort safe version of OpenMetaverse.DoubleDictionary with the aim of avoiding OpenSimulator problems due to script thread aborts. 
When an object is removed, its scripts are stopped and then the thread running them is aborted if stop takes too long.
However, it appears that aborting a thread at just the wrong moment when it is obtaining a ReaderWriterLockSlim lock can leave this lock in an inconsistent state.
One symptom of this is that mono leaps to 100% cpu and a vm thread dump reveals lots of threads waiting for a ReaderWriterLockSlim lock without any thread actually holding it.
This is probably the same problem as encountered originally in commit 12cebb12
This commit looks to plaster this problem by putting lock obtaining methods inside finally blocks which should be uninterruptible by thread aborts.
 2012-12-07 00:47:04 +00:00
Justin Clark-Casey (justincc)
0f3ebe0971 Remove very probably unused PrimitiveBaseShape(bool) constructor to reduce code complexity 2012-12-05 22:12:45 +00:00
Justin Clark-Casey (justincc)
b60c6bc3f8 Don't pointlessly set ExtraParams = byte[1] in PrimitiveBaseShape since this is ignored by the ExtraParams properly anyway 2012-12-05 22:01:47 +00:00
Justin Clark-Casey (justincc)
2342d20a7e minor: tidy up spacing at bottom of MundaneFrameworkTests 2012-12-05 21:53:25 +00:00