aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim/Framework (follow)
Commit message (Collapse)AuthorAgeFilesLines
* Merge branch 'master' into careminsterMelanie2013-03-053-1/+24
|\ | | | | | | | | | | | | | | 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
| * Merge branch 'master' of ssh://opensimulator.org/var/git/opensimBlueWall2013-03-051-1/+16
| |\
| | * * Add a Max Payload size property to the Websocket Server Handler. If you ↵teravus2013-03-051-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.
| * | Add method to remove JsonRpc Handlers from the serverBlueWall2013-03-032-0/+8
| |/
* | Merge branch 'master' into careminsterMelanie2013-02-271-2/+5
|\ \ | |/ | | | | | | Conflicts: OpenSim/Region/CoreModules/Scripting/LSLHttp/UrlModule.cs
| * Show http poll handlers in separate http (poll) section of "show ↵Justin Clark-Casey (justincc)2013-02-271-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.
* | Merge branch 'master' into careminsterMelanie2013-02-273-56/+52
|\ \ | |/ | | | | | | | | | | Conflicts: OpenSim/Framework/RegionLoader/Web/RegionLoaderWebServer.cs OpenSim/Region/CoreModules/Scripting/LSLHttp/UrlModule.cs OpenSim/Region/CoreModules/World/WorldMap/WorldMapModule.cs
| * Make sure we dispose of WebResponse, StreamReader and Stream in various ↵Justin Clark-Casey (justincc)2013-02-274-68/+81
| | | | | | | | places where we were not already.
* | Merge branch 'master' into careminsterMelanie2013-02-264-223/+274
|\ \ | |/
| * Move map related settings from [Startup] to a new [Map] section in OpenSim.iniJustin Clark-Casey (justincc)2013-02-251-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.
| * Make StatsManager default output a little more readableRobert Adams2013-02-241-1/+1
| |
| * Add EventHistogram.GetHistogramAsOSDMap that returns that parametersRobert Adams2013-02-241-211/+228
| | | | | | | | about the histogram as well as the values.
| * Modify StatsManager so console command "show stats category container"Robert Adams2013-02-241-5/+24
| | | | | | | | only outputs the statistics in the specified container in the category.
* | Merge branch 'master' into careminsterMelanie2013-02-231-0/+38
|\ \ | |/ | | | | | | Conflicts: OpenSim/Region/CoreModules/Framework/EntityTransfer/EntityTransferModule.cs
| * Added new Util function for reading config vars that's more generic than the ↵Diva Canto2013-02-221-0/+38
| | | | | | | | one I added yesterday -- this is for helping move config vars out of [Startup]
* | Merge branch 'master' into careminsterMelanie2013-02-2219-20/+345
|\ \ | |/
| * Merge branch 'master' of ssh://opensimulator.org/var/git/opensimDiva Canto2013-02-212-1/+234
| |\
| | * Add a virtual ToOSDMap() function to Monitoring.Stat for futureRobert Adams2013-02-211-0/+16
| | | | | | | | | | | | overloading by aggregation statistics and browser based stat viewers.
| | * Add CounterStat which is a wrapper for a counter stat but, becauseRobert Adams2013-02-212-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.
| * | Simplification of HG configs: HomeURI and GatekeeperURI now are defined as ↵Diva Canto2013-02-211-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.
| * Add a method to IStatsCollector for returning stats as an OSDMap.Robert Adams2013-02-205-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).
| * Merge branch 'master' of ssh://opensimulator.org/var/git/opensimJustin Clark-Casey (justincc)2013-02-2010-10/+9
| |\
| | * Deleted all AssemblyFileVersion directivesDiva Canto2013-02-1910-10/+9
| | |
| * | Correct mistake in parsing 'show object pos' and similar pos commands where ↵Justin Clark-Casey (justincc)2013-02-201-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
* | Merge branch 'master' into careminsterMelanie2013-02-153-22/+24
|\ \ | |/ | | | | | | Conflicts: OpenSim/Region/Framework/Scenes/SceneObjectPart.cs
| * 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
* | Merge branch 'master' into careminsterMelanie2013-02-101-5/+6
|\ \ | |/ | | | | | | | | Conflicts: OpenSim/Data/MySQL/MySQLSimulationData.cs OpenSim/Data/MySQL/Resources/RegionStore.migrations
| * 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
| |
* | Merge branch 'avination' into careminsterMelanie2013-02-071-0/+108
|\ \
| * | Move SoubleQueu to Util. Change HTTP inv to prioritize COF. Determine COF for SPMelanie2013-02-061-0/+108
| | |
* | | Merge branch 'master' into careminsterMelanie2013-02-074-1/+1145
|\ \ \ | | |/ | |/| | | | | | | Conflicts: bin/HttpServer_OpenSim.dll
| * | * 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
| * | | 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.
* | | | Merge branch 'master' into careminsterMelanie2013-02-072-2/+29
|\ \ \ \ | | |/ / | |/| | | | | | | | | | Conflicts: OpenSim/Region/Physics/BulletSPlugin/BSShapeCollection.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 'master' into careminsterMelanie2013-02-0514-13/+273
|\ \ \ \ | |/ / / | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: OpenSim/Data/MySQL/MySQLSimulationData.cs OpenSim/Framework/Servers/VersionInfo.cs OpenSim/Region/ClientStack/Linden/Caps/BunchOfCaps/BunchOfCaps.cs OpenSim/Region/Framework/Scenes/SceneObjectPart.cs
| * | | 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.
generated by cgit v1.1 at 2024-12-22 17:09:45 +0000