aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim/Framework (follow)
Commit message (Expand)AuthorAgeFilesLines
* Merge branch 'master' into careminsterMelanie2013-06-303-125/+192
|\
| * Changed HG status notifications timeout down to 15secs from the default 100.Diva Canto2013-06-291-1/+9
| * Remove hack to migrate previous experimental-level os materials data.Justin Clark-Casey (justincc)2013-06-291-9/+0
| * add method docs for DAMap.GetStore() and DAMap.SetStore()dahlia2013-06-271-0/+12
| * Make the concept of namespaces explicit in dynamic attributesJustin Clark-Casey (justincc)2013-06-272-126/+182
* | Merge branch 'master' into careminsterMelanie2013-06-2310-185/+635
|\ \ | |/
| * minor: remove mono compiler warnings in WebsocketServerHandler.csJustin Clark-Casey (justincc)2013-06-201-13/+7
| * Change "ObjectMemory" stat to "HeapMemory" to align with other stat names. A...Justin Clark-Casey (justincc)2013-06-201-3/+3
| * Allow more than one stat category to be specified in "show stats"Justin Clark-Casey (justincc)2013-06-201-30/+34
| * minor: Change "memory churn" terminology in statistics to "heap allocation ra...Justin Clark-Casey (justincc)2013-06-203-14/+14
| * Fix minor bug where the check whether to display SmartThreadPool stats was ac...Justin Clark-Casey (justincc)2013-06-201-1/+1
| * Make it possible to specify display of stats in a particular 'container' by s...Justin Clark-Casey (justincc)2013-06-202-3/+17
| * Display existing statistic of how many http requests a server is making as se...Justin Clark-Casey (justincc)2013-06-193-5/+23
| * minor: tidy up spacing if display a unit for additional stat informationJustin Clark-Casey (justincc)2013-06-181-1/+1
| * Make number of inbound http requests handled available as a httpserver.<port>...Justin Clark-Casey (justincc)2013-06-182-6/+31
| * Fix issue where stat samples were accidentally static, so that any additional...Justin Clark-Casey (justincc)2013-06-181-1/+1
| * If SmartThreadPool is active, display statistical information about it in "sh...Justin Clark-Casey (justincc)2013-06-181-2/+13
| * refactor: Move existing code to generate report information on the threadpool...Justin Clark-Casey (justincc)2013-06-172-64/+103
| * Fix bug where no threadpool data would be displayed in the "show threads" com...Justin Clark-Casey (justincc)2013-06-171-1/+1
| * Drop server level stats to debug instead of info.Justin Clark-Casey (justincc)2013-06-171-1/+1
| * Add server stats for available builtin threadpool and iocp workersJustin Clark-Casey (justincc)2013-06-171-0/+16
| * Make general server stats available on the robust console as well as the simu...Justin Clark-Casey (justincc)2013-06-174-65/+394
* | Merge branch 'avination-current' into careminsterMelanie2013-06-231-1/+1
|\ \
| * | Add a result param to te money module interfaceMelanie2013-06-131-1/+1
* | | Merge branch 'master' into careminsterMelanie2013-06-133-8/+59
|\ \ \ | | |/ | |/|
| * | Merge branch 'master' of ssh://opensimulator.org/var/git/opensimJustin Clark-Casey (justincc)2013-06-121-3/+2
| |\ \
| | * | Add TriggerScenePresenceUpdated events when an animation is addedRobert Adams2013-06-111-3/+2
| * | | Implement logging of first 80 characters (debug level 5) or full body data (d...Justin Clark-Casey (justincc)2013-06-122-5/+57
| |/ /
* | | Merge branch 'avination-current' into careminsterMelanie2013-06-112-319/+0
|\ \ \ | | |/ | |/|
| * | Clean up poll serviceMelanie2013-06-072-319/+0
* | | Merge branch 'master' into careminsterMelanie2013-06-112-7/+9
|\ \ \ | | |/ | |/|
| * | Add port numbers to poll service thread names so that we can tell which belon...Justin Clark-Casey (justincc)2013-06-101-2/+2
| * | Reinstate explicit starting and stopping of PollServiceRequestManager added i...Justin Clark-Casey (justincc)2013-06-102-4/+7
| * | Supply proper type information for the various types of requestsMelanie2013-06-071-3/+1
| * | Adding Avination's PollService to round out the HTTP inventory changesMelanie2013-06-075-228/+211
| * | Port Avination's inventory send throttlingMelanie2013-06-051-0/+108
* | | Merge branch 'avination-current' into careminsterMelanie2013-06-061-1/+1
|\ \ \ | | |/ | |/|
| * | Update the money framework to allow sending the new style linden "serverside ...Melanie2013-05-252-4/+4
| * | Change EconomyDataRequest signature to use an IClientAPI rather than UUID. Th...Melanie2013-04-251-1/+1
| * | Send 503 when throttling texturesMelanie2013-04-251-1/+1
* | | Merge branch 'master' into careminsterMelanie2013-06-042-0/+137
|\ \ \ | | |/ | |/|
| * | Adding standard OpenSim header to source filesBlueWall2013-05-311-0/+27
| * | Merge branch 'master' of ssh://opensimulator.org/var/git/opensimRobert Adams2013-05-301-0/+90
| |\ \
| | * | UserProfilesBlueWall2013-05-301-0/+90
| * | | Add methods to Animation and AnimationSet for easier manipulation andRobert Adams2013-05-301-0/+20
| |/ /
* | | Merge branch 'master' into careminsterMelanie2013-05-302-4/+4
|\ \ \ | |/ /
| * | Update the money framework to allow sending the new style linden "serverside ...Melanie2013-05-252-4/+4
| * | This is an experimental patch that adds support for comparing textureMic Bowman2013-05-242-33/+67
* | | Merge branch 'master' into careminsterMelanie2013-05-241-1/+1
|\ \ \ | |/ /
| * | To further help with tracking down the apperance of too much "Unknown User" i...Justin Clark-Casey (justincc)2013-05-211-1/+1