aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim/Framework (unfollow)
Commit message (Collapse)AuthorFilesLines
2013-03-19Prevent multiple instances of the same item ID being appended to an ↵Justin Clark-Casey (justincc)1-30/+48
AvatarAppearance It looks like this was happening when AttachmentsModule.RezAttachments was doing a secondary set of each attachment to update with the asset ID (initially they only have the inventory ID). However, with multi-attach this was appending a second copy of the same attachment rather than updating the data that was already there. This commit requires both simulator and service to be updated.
2013-03-19For the moment, disable the output of the 'scene' statistics in ↵Robert Adams1-1/+3
SimExtraStatsCollector and thus for the command 'show stats' because it is ugly and most of the information is already output in the formatted printout that appears before.
2013-03-16*Yet another HTTPServer update code changes in OpenSim Libs. * This fixes a ↵teravus1-3/+14
connection close issue by getting rid of the socket references * This adds a connection timeout checker to shutdown poor or evil connections and combats DOS attempts that just connect and make no complete requests and just wait. It also actually implements KeepAlive... instead of just understanding the connection header in the request... you can test by connecting and requesting a keepalive header and sending another request on the same connection. The new timeout checker closes expired keepalive sessions, just make sure you send the request within 70 seconds of connecting or the timeout checker will timeout the connection.
2013-03-14Log same environment information to Robust log as is already done for ↵Justin Clark-Casey (justincc)2-11/+21
simulator logs, for debug purposes
2013-03-14Add ILandChannel.GetLandObject(Vector3 position) as this is a very common ↵Justin Clark-Casey (justincc)1-0/+7
input to GetLandObject() This conforms to the existing ILandChannel.ParcelsNearPoint() method
2013-03-13minor: Remove some mono compiler warnings in OpenSim.Framework.dllJustin Clark-Casey (justincc)2-3/+3
2013-03-13Add prototype dynamic objects map for scene object partsJustin Clark-Casey (justincc)2-1/+99
This allows region modules to add dynamic objects to SOPs rather than having to continually push and pull OSD dynamic attributes. This is to explore the original MOAP use case for dynamic attributes where it could be very awkward and possibly time-consuming to keep reconstructing MediaEntrys from stored DynamicAttributes. This commit adds a DOExampleModule to demonstrate/evolve this code. Dynamic objects involve no storage or persistence changes - the 'backing store' for any data that does need to be saved will remain the DAMap. DOExampleModule in this commit only attaches a fresh dynamic object. Actually constructing this from stored dynamic attributes and handling persistence is left for later. These changes should affect no existing functionality, though it may or may not reveal necessary changes in DAMap down the road.
2013-03-05* Add a Max Payload size property to the Websocket Server Handler. If you ↵teravus1-1/+16
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-03Add method to remove JsonRpc Handlers from the serverBlueWall2-0/+8
2013-02-27Show http poll handlers in separate http (poll) section of "show ↵Justin Clark-Casey (justincc)1-2/+5
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-27Make sure we dispose of WebResponse, StreamReader and Stream in various ↵Justin Clark-Casey (justincc)4-68/+81
places where we were not already.
2013-02-25Move map related settings from [Startup] to a new [Map] section in OpenSim.iniJustin Clark-Casey (justincc)1-6/+21
Existing map settings in [Startup] will continue to work, and if present will override anything in [Map] However, the proper place for such settings would now be [Map] This is to reduce the use of [Startup] as a bag for non-generic settings which should really go in sections, in common with other settings. This commit also extends Diva's previous work to allow a default setting to be given when looking at multiple sections for settings.
2013-02-24Make StatsManager default output a little more readableRobert Adams1-1/+1
2013-02-24Add EventHistogram.GetHistogramAsOSDMap that returns that parametersRobert Adams1-211/+228
about the histogram as well as the values.
2013-02-24Modify StatsManager so console command "show stats category container"Robert Adams1-5/+24
only outputs the statistics in the specified container in the category.
2013-02-22Added new Util function for reading config vars that's more generic than the ↵Diva Canto1-0/+38
one I added yesterday -- this is for helping move config vars out of [Startup]
2013-02-21Simplification of HG configs: HomeURI and GatekeeperURI now are defined as ↵Diva Canto1-1/+21
default under [Startup]. They can then be overwritten in the other sections (but probably shouldn't). I kept the existing code for backwards compatibility, so this should not cause any breaks from people's current configurations. But people should move to have these 2 vars under [Startup] -- see OpenSim.ini.example and Robust.HG.ini.example. And yes, both names now end with "URI" for consistency.
2013-02-21Add a virtual ToOSDMap() function to Monitoring.Stat for futureRobert Adams1-0/+16
overloading by aggregation statistics and browser based stat viewers.
2013-02-21Add CounterStat which is a wrapper for a counter stat but, becauseRobert Adams2-1/+218
the 'count' event is internal, historical data can be built it. Also includes EventHistogram class for building time based, bucketed history of event occurances. Make Stat implement IDisposable for subclasses that might need it.
2013-02-20Add a method to IStatsCollector for returning stats as an OSDMap.Robert Adams5-4/+77
Extend implementors of IStatsCollector to return an OSDMap of stats. Update UserStatsCollector and AssetStatsCollector to return both string and OSDMap data (as well as console format).
2013-02-20Correct mistake in parsing 'show object pos' and similar pos commands where ↵Justin Clark-Casey (justincc)1-4/+4
the 'to' text would be treat as the end vector rather than discarded. Before this, the commands still work but the help text is wrong - one has to leave out the 'to' in stating the vectors
2013-02-19Deleted all AssemblyFileVersion directivesDiva Canto10-10/+9
2013-02-14Use SortedDictionary in StatsManager instead of regular Dictionary so stats ↵Dan Lake2-22/+22
will interate and print in a defined order
2013-02-14* gracefully handle a Situation where a double close is called on the ↵teravus1-0/+2
WebSocket handler
2013-02-09Fixed ReadSculptData(): the check whether there are enough bytes to read was ↵Oren Hurvitz1-5/+6
incorrect
2013-02-07Plumb the path from the client to the extra physics params and backMelanie1-1/+3
2013-02-07This is the final commit that enables the Websocket handlerteravus2-2/+1095
2013-02-06Enables script access to the per object dynamic attributes through the JsonStoreMic Bowman1-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.
2013-02-06WebStats will now use actual logfile as specified in OpenSim.exe.config ↵Dan Lake1-1/+15
rather than hardcoded ./OpenSim.log. This allows for rotating logs and other file appender types
2013-02-07minor: add method doc to DAMap.ValidateKey()Justin Clark-Casey (justincc)1-0/+4
2013-02-07Add key length validation to DAMap.Add(KeyValuePair<string, OSDMap> kvp) to ↵Justin Clark-Casey (justincc)1-1/+2
match Add(string key, OSDMap store)
2013-02-06Partial port of Avination's support for the new physics parameters.Melanie1-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.
2013-02-05We're not really done here.. but we're getting there. Socket Read is ↵teravus2-1/+42
working.. Still have to do Header.ToBytes and compose a websocket frame with a payload.
2013-02-05Bump version and assembly version numbers from 0.7.5 to 0.7.6Justin Clark-Casey (justincc)13-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.
2013-02-01Revert "Update assembly version numbers"BlueWall12-12/+12
This reverts commit 141ad829f448b9138b12be7cf99c834c1f3977ec.
2013-02-01Update assembly version numbersBlueWall12-12/+12
2013-01-30Allow use of MaptileStaticUUID in Regions.ini to override the global setting ↵Jak Daniels1-1/+26
in OpenSim.ini for each region. Signed-off-by: BlueWall <jamesh@bluewallgroup.com>
2013-01-25Added DynAttrs to the serialized XML format of prims. When copying prims, ↵Oren Hurvitz1-2/+24
use deep copy for DynAttrs.
2013-01-25Stopped storing dynamic attributes in the PrimShapeOren Hurvitz1-7/+0
2013-01-25Changed DAMap to be the container of "data stores", which are OSDMaps. Store ↵Oren Hurvitz1-20/+84
names must have at least 4 characters.
2013-01-25Lock DAMap rather than encapsulated OSDMapJustin Clark-Casey (justincc)1-17/+18
This allows external lockers to preserve atomicity of dynamic attribute changes
2013-01-25Encapsulate an OSDMap in DAMap (was DynAttrsOSDMap) rather than inheriting ↵Justin Clark-Casey (justincc)3-82/+176
from it This is the easier way to give us control over locking, rather than asking that OSDMap IDictionary methods be virtual
2013-01-25Implement Dynamic Attributes for SOP and PBS. Implement storage in SQLiteJustin Clark-Casey (justincc)2-0/+86
2013-01-23Add additional return statusBlueWall2-4/+23
Adding additional return status for JsonRpcMethod. Now returns true/false
2013-01-19Assign the SmartThreadPool name in the constructorOren Hurvitz1-2/+7
This is required because some threads are created in the constructor, so assigning the name afterwards would be too late.
2013-01-19Explicitly stop PollServiceRequestManager() rather than relying on its ↵Justin Clark-Casey (justincc)2-5/+15
destructor. Hopes to address occasional shutdown failures from http://opensimulator.org/mantis/view.php?id=6503
2013-01-17Add utility function to clamp a vector to a maximum magnitude.Robert Adams1-0/+12
2013-01-16Complete removal of the now unused state queueMelanie1-4/+0
2013-01-15Add Json-Rpc 2.0 To Registered HandlersBlueWall5-0/+298
Added registration json-rpc handlers in the http server. Covers version 2.0 See: http://www.jsonrpc.org/specification
2013-01-10revert accidental change to MemoryWatchdog stat calculation in previous b1b4687Justin Clark-Casey (justincc)1-1/+1