aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim/Framework (follow)
Commit message (Expand)AuthorAgeFilesLines
* Merge branch 'master' into careminsterMelanie2013-02-271-2/+5
|\
| * Show http poll handlers in separate http (poll) section of "show http-handler...Justin Clark-Casey (justincc)2013-02-271-2/+5
* | Merge branch 'master' into careminsterMelanie2013-02-273-56/+52
|\ \ | |/
| * Make sure we dispose of WebResponse, StreamReader and Stream in various place...Justin Clark-Casey (justincc)2013-02-274-68/+81
* | 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
| * 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
| * Modify StatsManager so console command "show stats category container"Robert Adams2013-02-241-5/+24
* | Merge branch 'master' into careminsterMelanie2013-02-231-0/+38
|\ \ | |/
| * Added new Util function for reading config vars that's more generic than the ...Diva Canto2013-02-221-0/+38
* | 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
| | * Add CounterStat which is a wrapper for a counter stat but, becauseRobert Adams2013-02-212-1/+218
| * | Simplification of HG configs: HomeURI and GatekeeperURI now are defined as de...Diva Canto2013-02-211-1/+21
| |/
| * Add a method to IStatsCollector for returning stats as an OSDMap.Robert Adams2013-02-205-4/+77
| * 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 t...Justin Clark-Casey (justincc)2013-02-201-4/+4
| |/
* | Merge branch 'master' into careminsterMelanie2013-02-153-22/+24
|\ \ | |/
| * 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 WebSock...teravus2013-02-141-0/+2
| * | Use SortedDictionary in StatsManager instead of regular Dictionary so stats w...Dan Lake2013-02-142-22/+22
| |/
* | Merge branch 'master' into careminsterMelanie2013-02-101-5/+6
|\ \ | |/
| * Fixed ReadSculptData(): the check whether there are enough bytes to read was ...Oren Hurvitz2013-02-091-5/+6
| * 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
|\ \ \ | | |/ | |/|
| * | * Adds Websocket support to baseHttpServer and IHttpServer.cs . This allows...teravus2013-02-0717-14/+361
| |\ \
| * | | 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 work...teravus2013-02-052-1/+42
* | | | Merge branch 'master' into careminsterMelanie2013-02-072-2/+29
|\ \ \ \ | | |/ / | |/| |
| * | | 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 m...Justin Clark-Casey (justincc)2013-02-071-1/+2
| | * | | | WebStats will now use actual logfile as specified in OpenSim.exe.config rathe...Dan Lake2013-02-061-1/+15
| * | | | | Enables script access to the per object dynamic attributes through the JsonStoreMic Bowman2013-02-061-0/+8
| | |/ / / | |/| | |
| * | | | Partial port of Avination's support for the new physics parameters.Melanie2013-02-061-0/+50
| |/ / /
* | | | Merge branch 'master' into careminsterMelanie2013-02-0514-13/+273
|\ \ \ \ | |/ / /
| * | | 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, use...Oren Hurvitz2013-01-251-2/+24
| | * | | 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
| | * | | Lock DAMap rather than encapsulated OSDMapJustin Clark-Casey (justincc)2013-01-251-17/+18
| | * | | Encapsulate an OSDMap in DAMap (was DynAttrsOSDMap) rather than inheriting fr...Justin Clark-Casey (justincc)2013-01-253-82/+176
| | * | | 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
| | |/ / | |/| |