aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim/Region (follow)
Commit message (Expand)AuthorAgeFilesLines
* Merge branch 'master' into careminsterMelanie2013-06-3012-110/+273
|\
| * Revert "One more debug mantis #6625"Diva Canto2013-06-301-1/+0
| * Same fix to LocalInventoryServiceConnector.csDiva Canto2013-06-301-1/+2
| * More on mantis #6625Diva Canto2013-06-291-1/+2
| * 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
| * 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/opensimdahlia2013-06-283-97/+168
| |\
| | * Reinsert code for gathering uuids reference by materials back directly into U...Justin Clark-Casey (justincc)2013-06-283-97/+168
| * | add some locking to materials storage dictionarydahlia2013-06-281-30/+42
| |/
| * 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-276-43/+72
| * 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-2311-384/+135
|\ \ | |/
| * Merge branch 'master' of melanie@opensimulator.org:/var/git/opensimMelanie2013-06-2314-392/+145
| |\
| | * 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-221-5/+5
| | * | 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-211-1/+1
| | |/
| | * 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
| | * Mantis 6608: Math error in parcel dimensions/borders seen with land show commandTalun2013-06-191-10/+10
| | * Prevent an exception if no offline messages were retrieved.Kevin Cozens2013-06-181-0/+3
| | * Fix other places when saving scripts or notecards in prim inventories where m...Justin Clark-Casey (justincc)2013-06-181-5/+5
| | * minor: remove mono compiler warnings in WebFetchInvDescModuleJustin Clark-Casey (justincc)2013-06-171-3/+2
| | * Fix test failure in BasicCircuitTests from previous commit 0d2fd0d9Justin Clark-Casey (justincc)2013-06-171-2/+2
| | * Make general server stats available on the robust console as well as the simu...Justin Clark-Casey (justincc)2013-06-174-344/+5
* | | Merge branch 'avination-current' into careminsterMelanie2013-06-233-6/+13
|\ \ \
| * | | Fix prim locking to behave like SLMelanie2013-06-231-2/+2
| * | | Allow coalesced objects to be rezzed even if they extend past the sim boundsMelanie2013-06-181-2/+6
| * | | Forward the reason to the scriptMelanie2013-06-131-1/+1
| * | | Add a result param to te money module interfaceMelanie2013-06-132-3/+6
| * | | * This fixes having to select and deselect prim to get keyframemotion to star...Melanie2013-06-131-0/+5
* | | | Merge branch 'master' into careminsterMelanie2013-06-231-2/+2
|\ \ \ \ | | |/ / | |/| |
| * | | Fix prim locking to behave like SLMelanie2013-06-231-2/+2
| | |/ | |/|
* | | Merge branch 'master' into careminsterMelanie2013-06-187-59/+171
|\ \ \ | |/ /
| * | correct method doc for llRot2Axis()dahlia2013-06-141-1/+1
| * | Lock m_classifiedCache and m_classifiedInterest dictionary reads in UserProfi...Justin Clark-Casey (justincc)2013-06-151-14/+13
| * | Correct build break in previous commit 9c530d7Justin Clark-Casey (justincc)2013-06-151-10/+7
| * | refactor: In UserProfileModule, change classifiedCache and classifiedInterest...Justin Clark-Casey (justincc)2013-06-151-19/+23
| * | Add the standard OpenSimulator copyright notice to the top of InventoryCache.csJustin Clark-Casey (justincc)2013-06-151-1/+28
| * | Adjust the locking on InventoryCache. Locking for r/w of the ExpiringCache i...Justin Clark-Casey (justincc)2013-06-151-14/+23
| * | minor: remove mono compiler warnings from LSL_Api, properly format method doc...Justin Clark-Casey (justincc)2013-06-151-7/+5
| * | Mantis 6280: llSetContentType(). An implementation.Talun2013-06-154-0/+84