aboutsummaryrefslogtreecommitdiffstatshomepage
Commit message (Expand)AuthorAgeFilesLines
* Merge branch 'master' into careminsterMelanie2013-06-3026-253/+498
|\
| * Groups V2: charge for group creation only after the group has been successful...Diva Canto2013-06-301-1/+4
| * Revert "More debug mantis #6625"Diva Canto2013-06-301-1/+0
| * Revert "One more debug mantis #6625"Diva Canto2013-06-301-1/+0
| * Revert "A little more debug for the Unknown User problem mantis #6625"Diva Canto2013-06-301-3/+0
| * Same fix to LocalInventoryServiceConnector.csDiva Canto2013-06-301-1/+2
| * More on mantis #6625Diva Canto2013-06-291-1/+2
| * More debug mantis #6625Diva Canto2013-06-291-0/+1
| * Fixed previous debug messageDiva Canto2013-06-291-1/+1
| * One more debug mantis #6625Diva Canto2013-06-291-0/+1
| * More debug for mantis #6625. It looks like the home friends list is being fet...Diva Canto2013-06-291-20/+21
| * A little more debug for the Unknown User problem mantis #6625Diva Canto2013-06-291-0/+3
| * Changed HG status notifications timeout down to 15secs from the default 100.Diva Canto2013-06-292-2/+10
| * Remove hack to migrate previous experimental-level os materials data.Justin Clark-Casey (justincc)2013-06-291-9/+0
| * Add materials store null check into UuidGatherer code.Justin Clark-Casey (justincc)2013-06-281-0/+4
| * Merge branch 'master' of ssh://opensimulator.org/var/git/opensimJustin Clark-Casey (justincc)2013-06-281-30/+42
| |\
| | * Merge branch 'master' of ssh://opensimulator.org/var/git/opensimdahlia2013-06-286-107/+179
| | |\
| | * | add some locking to materials storage dictionarydahlia2013-06-281-30/+42
| * | | Add IMG_BLOOM1.jp2 to standard asset set, which is used in stars.Justin Clark-Casey (justincc)2013-06-283-3/+14
| | |/ | |/|
| * | Remove "Asset deletion not supported by database" message from "delete asset"...Justin Clark-Casey (justincc)2013-06-281-7/+5
| * | In XAssetService, on a delete asset request also delete the asset in any chai...Justin Clark-Casey (justincc)2013-06-282-3/+6
| * | Reinsert code for gathering uuids reference by materials back directly into U...Justin Clark-Casey (justincc)2013-06-283-97/+168
| |/
| * add method docs for DAMap.GetStore() and DAMap.SetStore()dahlia2013-06-271-0/+12
| * and yet another check for null returned from DynAttrs.GetStore()dahlia2013-06-271-0/+4
| * test for null return from DynAttrs.GetStore()dahlia2013-06-271-0/+3
| * refactor: Move code for gathering textures referenced by materials into Mater...Justin Clark-Casey (justincc)2013-06-273-69/+103
| * Make the concept of namespaces explicit in dynamic attributesJustin Clark-Casey (justincc)2013-06-2711-172/+257
| * Update temporary "Unknown UserUMMTGUN2" name to "Unknown UserUMMTGUN3" to see...Justin Clark-Casey (justincc)2013-06-251-1/+1
| * Improve situation where editing just the root prim of an attachment causes ot...Justin Clark-Casey (justincc)2013-06-251-1/+10
| * Tidy up SOG.UpdateRootPosition() to eliminate unnecessary copying of Vector3 ...Justin Clark-Casey (justincc)2013-06-251-10/+4
* | Merge branch 'master' into careminsterMelanie2013-06-2335-950/+954
|\ \ | |/
| * Merge branch 'master' of melanie@opensimulator.org:/var/git/opensimMelanie2013-06-2338-957/+963
| |\
| | * Merge branch 'master' of ssh://opensimulator.org/var/git/opensimDiva Canto2013-06-221-29/+35
| | |\
| | | * BulletSim: move new linear deflection code to own routine.Robert Adams2013-06-211-29/+35
| | * | Change IsLocalRegion from using region handle to using regionID. This was aff...Diva Canto2013-06-223-7/+6
| | * | HG: avoid call on localhost between sim and UAS for standalone.Diva Canto2013-06-221-1/+20
| | * | Finally moved HG agent transfers to use agent fatpacks.Diva Canto2013-06-2111-365/+171
| | |/
| | * BulletSim: Implementation of Linear Deflection, it is a partial help for the ...Vegaslon2013-06-201-5/+33
| | * BulletSim: rework velocity updating when not colliding and not flyingRobert Adams2013-06-202-5/+42
| | * 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
| | * minor: fix mono compiler warning in FetchInventory2HandlerJustin Clark-Casey (justincc)2013-06-201-2/+2
| | * 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
| | * Mantis 6608: Math error in parcel dimensions/borders seen with land show commandTalun2013-06-191-10/+10
| | * minor: remove mono compiler warning in OfflineIMServiceJustin Clark-Casey (justincc)2013-06-181-1/+1
| | * Prevent an exception if no offline messages were retrieved.Kevin Cozens2013-06-181-0/+3
generated by cgit v1.1 at 2024-11-17 06:35:47 +0000