aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim/Framework (follow)
Commit message (Expand)AuthorAgeFilesLines
* Merge branch 'master' into careminsterMelanie2012-11-201-2/+5
|\
| * minor: If logging full incoming HTTP data, don't deceptively print ... at the...Justin Clark-Casey (justincc)2012-11-201-2/+5
* | Merge branch 'avination' into careminsterMelanie2012-11-201-0/+2
|\ \
| * | * Plumbing and basic setting of the GetMesh Cap Throttler.teravus2012-11-171-0/+2
| * | Revert "Merge master into teravuswork", it should have been avination, not ma...teravus2012-11-1531-1808/+639
| * | Merge master into teravusworkteravus2012-11-1531-639/+1808
| |\ \
* | \ \ Merge commit '619c39e5144f15aca129d6d999bcc5c34133ee64' into careminsterMelanie2012-11-201-1/+2
|\ \ \ \ | |/ / /
| * | | * Prep work switching the GetMeshModule over to a poll service.teravus2012-11-091-1/+2
* | | | Merge branch 'avination' into careminsterMelanie2012-11-171-1/+1
|\ \ \ \ | |/ / /
| * | | Pipe Throttle Update Event to EventManager, client --> ScenePresence --> Even...teravus2012-11-041-1/+1
| * | | Add AnimState to CADUMelanie2012-10-301-0/+18
* | | | Merge branch 'master' into careminsterMelanie2012-11-175-174/+363
|\ \ \ \ | | |_|/ | |/| |
| * | | Remove unnecessary ability to directly set InventoryItemBase.CreatorIdAsUuidJustin Clark-Casey (justincc)2012-11-171-17/+5
| * | | refactor: Move stat classes out of StatManager and into their own files for c...Justin Clark-Casey (justincc)2012-11-163-260/+326
| * | | Add a first draft mechanism for the IncomingPacketsProcessedStat to show the ...Justin Clark-Casey (justincc)2012-11-162-4/+139
* | | | Merge branch 'master' into careminsterMelanie2012-11-151-4/+10
|\ \ \ \ | |/ / /
| * | | Make PacketPool class stats pull stats instead of push stats so they can be l...Justin Clark-Casey (justincc)2012-11-151-4/+10
* | | | Merge branch 'master' into careminsterMelanie2012-11-1512-7/+304
|\ \ \ \ | |/ / / | | | / | |_|/ |/| |
| * | A few more AssemblyInfos in a few more dlls.Diva Canto2012-11-1411-4/+301
| * | Updated all existing AssemblyVersions's to 0.7.5.*. Many DLLs still don't hav...Diva Canto2012-11-133-3/+3
* | | Merge branch 'master' into careminsterMelanie2012-10-312-12/+11
|\ \ \ | |/ /
| * | Make "show object part" command correctly display script status.Justin Clark-Casey (justincc)2012-10-312-12/+11
* | | Merge branch 'master' into careminsterMelanie2012-10-311-0/+18
|\ \ \ | |/ /
| * | Add AnimState to CADUMelanie2012-10-301-0/+36
* | | Merge branch 'master' into careminsterMelanie2012-10-302-1/+12
|\ \ \ | |/ /
| * | fixing poorly-formatted xml doc string for Util.IsInsideBoxSignpostMarv2012-10-291-1/+1
| * | Add "force gc" region console command which manually invokes garbage collection.Justin Clark-Casey (justincc)2012-10-291-0/+11
* | | Merge branch 'master' into careminsterMelanie2012-10-264-71/+201
|\ \ \ | |/ /
| * | Fix script error messages not showing up in viewer 3 and associated viewers.Justin Clark-Casey (justincc)2012-10-252-5/+18
| * | Add TestOsNpcLoadAppearance()Justin Clark-Casey (justincc)2012-10-251-0/+3
| * | Allow "show object", "show part", "dump object" and "delete object" to accept...Justin Clark-Casey (justincc)2012-10-241-2/+56
| * | Get "save oar" and "save iar" to tell you in a more friendly manner if the fi...Justin Clark-Casey (justincc)2012-10-241-0/+19
| * | Add "dump object uuid" console command. This allows any object in the scene ...Justin Clark-Casey (justincc)2012-10-241-91/+115
| * | minor: Move co-ordinate related help to object commands to common ConsoleUtil...Justin Clark-Casey (justincc)2012-10-241-0/+17
* | | Merge branch 'master' into careminsterMelanie2012-10-233-27/+87
|\ \ \ | |/ /
| * | Make it possible to turn the base UDP object packet pools on and off whilst r...Justin Clark-Casey (justincc)2012-10-231-13/+1
| * | Add object count stats for new IncomingPacket and UDPPacketBuffer pools if th...Justin Clark-Casey (justincc)2012-10-232-6/+84
| * | minor: Get content type handler logger to log "unset" for the content type in...Justin Clark-Casey (justincc)2012-10-231-1/+1
| * | minor: Use LogIncomingToContentTypeHandler() method for incoming HTTP data wh...Justin Clark-Casey (justincc)2012-10-231-8/+2
* | | Merge branch 'master' into careminsterMelanie2012-10-231-125/+260
|\ \ \ | |/ /
| * | Fix: invinite loading for Viewer3 : parcelinfo request of traffic-value (impl...PixelTomsen2012-10-201-125/+260
| * | If we're avoiding printing a long request warning for a GetTexture CAP call, ...Justin Clark-Casey (justincc)2012-10-181-1/+1
* | | Merge branch 'avination' into careminsterMelanie2012-10-181-8/+20
|\ \ \ | | |/ | |/|
| * | make sure a buffer is closed, and changed a misleading log msgUbitUmarov2012-10-051-8/+20
* | | Merge branch 'master' into careminsterMelanie2012-10-181-0/+15
|\ \ \ | | |/ | |/|
| * | minor: move recent OnAgentUpdate/OnPreAgentUpdate event doc up into IClientAP...Justin Clark-Casey (justincc)2012-10-181-0/+15
* | | Merge branch 'master' into careminsterMelanie2012-10-172-10/+23
|\ \ \ | |/ /
| * | Add LastMemoryChurn stat using existing data so we can more quickly tell how ...Justin Clark-Casey (justincc)2012-10-162-2/+14
* | | Merge branch 'master' into careminsterMelanie2012-10-171-0/+76
|\ \ \ | |/ /
| * | Add optional pool for the UDPPacketBuffer objects that handle all incoming UD...Justin Clark-Casey (justincc)2012-10-161-0/+76