aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim/Framework (follow)
Commit message (Expand)AuthorAgeFilesLines
* Merge commit '464201b41d5f5fdd7c88ab5e95dd7b6fbae6d766' into careminsterMelanie2013-03-191-3/+14
|\
| * *Yet another HTTPServer update code changes in OpenSim Libs. * This fixes a c...teravus2013-03-161-3/+14
* | Merge branch 'master' into careminsterMelanie2013-03-153-1/+28
|\ \ | |/
| * Log same environment information to Robust log as is already done for simulat...Justin Clark-Casey (justincc)2013-03-142-11/+21
| * Add ILandChannel.GetLandObject(Vector3 position) as this is a very common inp...Justin Clark-Casey (justincc)2013-03-141-0/+7
* | Merge branch 'master' into careminsterMelanie2013-03-144-4/+102
|\ \ | |/
| * minor: Remove some mono compiler warnings in OpenSim.Framework.dllJustin Clark-Casey (justincc)2013-03-132-3/+3
| * Add prototype dynamic objects map for scene object partsJustin Clark-Casey (justincc)2013-03-132-1/+99
* | Merge branch 'avination' into careminsterMelanie2013-03-061-3/+2
|\ \
| * | Multiattach, part 1Melanie2013-03-051-3/+2
| * | Revert "Push updates from keyframe directly to the front of the output queue ...Melanie2013-02-121-2/+1
| * | Push updates from keyframe directly to the front of the output queue ratherMelanie2013-02-121-1/+2
* | | Merge branch 'master' into careminsterMelanie2013-03-053-1/+24
|\ \ \ | | |/ | |/|
| * | 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
| * | | Add method to remove JsonRpc Handlers from the serverBlueWall2013-03-032-0/+8
| |/ /
* | | 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
|\ \ \ \ | | |/ / | |/| |