aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim/Framework (follow)
Commit message (Collapse)AuthorAgeFilesLines
* Deleted all AssemblyFileVersion directivesDiva Canto2013-02-1910-10/+9
|
* Merge branch 'master' of git://opensimulator.org/git/opensimDan Lake2013-02-141-0/+2
|\
| * * gracefully handle a Situation where a double close is called on the ↵teravus2013-02-141-0/+2
| | | | | | | | WebSocket handler
* | Use SortedDictionary in StatsManager instead of regular Dictionary so stats ↵Dan Lake2013-02-142-22/+22
|/ | | | will interate and print in a defined order
* Fixed ReadSculptData(): the check whether there are enough bytes to read was ↵Oren Hurvitz2013-02-091-5/+6
| | | | incorrect
* Plumb the path from the client to the extra physics params and backMelanie2013-02-071-1/+3
|
* * Adds Websocket support to baseHttpServer and IHttpServer.cs . This ↵teravus2013-02-0717-14/+361
|\ | | | | | | allows modules to set up a websocket server that websocket clients can connect to. An example module is in OptionalModules/Example/WebSocketEchoTest/WebSocketEchoModule.cs
| * Merge branch 'master' of ssh://opensimulator.org/var/git/opensimMic Bowman2013-02-062-2/+21
| |\
| | * Merge branch 'master' of git://opensimulator.org/git/opensimDan Lake2013-02-062-1/+56
| | |\
| | | * minor: add method doc to DAMap.ValidateKey()Justin Clark-Casey (justincc)2013-02-071-0/+4
| | | |
| | | * Add key length validation to DAMap.Add(KeyValuePair<string, OSDMap> kvp) to ↵Justin Clark-Casey (justincc)2013-02-071-1/+2
| | | | | | | | | | | | | | | | match Add(string key, OSDMap store)
| | * | WebStats will now use actual logfile as specified in OpenSim.exe.config ↵Dan Lake2013-02-061-1/+15
| | | | | | | | | | | | | | | | rather than hardcoded ./OpenSim.log. This allows for rotating logs and other file appender types
| * | | Enables script access to the per object dynamic attributes through the JsonStoreMic Bowman2013-02-061-0/+8
| | |/ | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | 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.
| * | Partial port of Avination's support for the new physics parameters.Melanie2013-02-061-0/+50
| |/ | | | | | | | | | | | | | | 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.
| * Merge branch 'dynamic-attributes2'Justin Clark-Casey (justincc)2013-02-051-0/+260
| |\
| | * Added DynAttrs to the serialized XML format of prims. When copying prims, ↵Oren Hurvitz2013-01-251-2/+24
| | | | | | | | | | | | use deep copy for DynAttrs.
| | * Stopped storing dynamic attributes in the PrimShapeOren Hurvitz2013-01-251-7/+0
| | |
| | * Changed DAMap to be the container of "data stores", which are OSDMaps. Store ↵Oren Hurvitz2013-01-251-20/+84
| | | | | | | | | | | | names must have at least 4 characters.
| | * Lock DAMap rather than encapsulated OSDMapJustin Clark-Casey (justincc)2013-01-251-17/+18
| | | | | | | | | | | | This allows external lockers to preserve atomicity of dynamic attribute changes
| | * Encapsulate an OSDMap in DAMap (was DynAttrsOSDMap) rather than inheriting ↵Justin Clark-Casey (justincc)2013-01-253-82/+176
| | | | | | | | | | | | | | | | | | from it This is the easier way to give us control over locking, rather than asking that OSDMap IDictionary methods be virtual
| | * Implement Dynamic Attributes for SOP and PBS. Implement storage in SQLiteJustin Clark-Casey (justincc)2013-01-252-0/+86
| | |
| * | Bump version and assembly version numbers from 0.7.5 to 0.7.6Justin Clark-Casey (justincc)2013-02-0513-13/+13
| | | | | | | | | | | | | | | | | | | | | | | | 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.
* | | This is the final commit that enables the Websocket handlerteravus2013-02-072-2/+1095
| | |
* | | We're not really done here.. but we're getting there. Socket Read is ↵teravus2013-02-052-1/+42
|/ / | | | | | | working.. Still have to do Header.ToBytes and compose a websocket frame with a payload.
* | Allow use of MaptileStaticUUID in Regions.ini to override the global setting ↵Jak Daniels2013-01-301-1/+26
|/ | | | | | in OpenSim.ini for each region. Signed-off-by: BlueWall <jamesh@bluewallgroup.com>
* Merge branch 'master' of /home/opensim/var/repo/opensimBlueWall2013-01-233-7/+22
|\
| * Assign the SmartThreadPool name in the constructorOren Hurvitz2013-01-191-2/+7
| | | | | | | | This is required because some threads are created in the constructor, so assigning the name afterwards would be too late.
| * Explicitly stop PollServiceRequestManager() rather than relying on its ↵Justin Clark-Casey (justincc)2013-01-192-5/+15
| | | | | | | | | | | | destructor. Hopes to address occasional shutdown failures from http://opensimulator.org/mantis/view.php?id=6503
* | Add additional return statusBlueWall2013-01-232-4/+23
|/ | | | Adding additional return status for JsonRpcMethod. Now returns true/false
* Merge branch 'master' of ssh://opensimulator.org/var/git/opensimRobert Adams2013-01-171-4/+0
|\
| * Merge branch 'master' of melanie@opensimulator.org:/var/git/opensimMelanie2013-01-165-0/+298
| |\
| * | Complete removal of the now unused state queueMelanie2013-01-161-4/+0
| | |
* | | Add utility function to clamp a vector to a maximum magnitude.Robert Adams2013-01-171-0/+12
| |/ |/|
* | Add Json-Rpc 2.0 To Registered HandlersBlueWall2013-01-155-0/+298
|/ | | | | Added registration json-rpc handlers in the http server. Covers version 2.0 See: http://www.jsonrpc.org/specification
* revert accidental change to MemoryWatchdog stat calculation in previous b1b4687Justin Clark-Casey (justincc)2013-01-101-1/+1
|
* Add "show script timers" command to show script timers. For debug purposes.Justin Clark-Casey (justincc)2013-01-101-1/+1
| | | | Also, "show sensors" changes to "show script sensors".
* minor: Remove unnecessary commented out code from last commit c28a2f05 and ↵Justin Clark-Casey (justincc)2013-01-091-4/+1
| | | | fix up code comment
* minor: make spacing consistent in console help outputJustin Clark-Casey (justincc)2013-01-091-3/+6
|
* Allow registering regions whose names are equivalent under LIKE but not ↵Oren Hurvitz2013-01-021-0/+11
| | | | truly equal
* Fix indenting on ConsoleDisplayTable, align indenting on "show animations" ↵Justin Clark-Casey (justincc)2013-01-021-2/+3
| | | | console command
* minor: Allow objects to be added directly to a row on a ConsoleDisplayTable ↵Justin Clark-Casey (justincc)2013-01-021-1/+1
| | | | rather than having to ToString() them first
* Add "show animations" console command for debug purposes.Justin Clark-Casey (justincc)2013-01-021-4/+4
| | | | This shows the current animation sequence and default anims for avatars.
* minor: Assign names to the different SmartThreadPools for debugging purposes.Justin Clark-Casey (justincc)2013-01-011-0/+1
| | | | | A different approach to the patch in http://opensimulator.org/mantis/view.php?id=6462 that doesn't involve further forking of SmartThreadPool
* refactor: call Util.InitThreadPool() if we are initializing an uninitialized ↵Justin Clark-Casey (justincc)2013-01-011-1/+1
| | | | | | pool on first use rather than constructing it ourselves. No functional change.
* Add helper routine Util.InRange()Robert Adams2012-12-221-0/+7
|
* Add stack dump function that takes an alternate printer outter. I've found ↵Robert Adams2012-12-161-1/+7
| | | | that log4net can be slowish so, if one is generating A LOT of debug output, alternate printers are better
* Merge branch 'master' of /home/opensim/var/repo/opensimBlueWall2012-12-121-4/+24
|\
| * Add "debug script log" command to allow setting a numeric debug level on ↵Justin Clark-Casey (justincc)2012-12-121-4/+24
| | | | | | | | | | | | | | individual IScriptInstances for debugging purposes. Current, state changes and event fires can be logged for individual scripts. See command help for more details.
* | Hide some console output when initializing addin repositoryBlueWall2012-12-111-0/+2
|/ | | | 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.
* Format changeBlueWall2012-12-071-1/+1
| | | | Removed some white space in a line, looking to trigger a build