aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim/Region (follow)
Commit message (Expand)AuthorAgeFilesLines
* 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
| * | Mantis 6108: ossetprimitiveparams temporary/phantom problemTalun2013-06-151-2/+2
| * | Merge branch 'master' of ssh://opensimulator.org/var/git/opensimJustin Clark-Casey (justincc)2013-06-142-8/+8
| |\ \
| * | | Don't try to abort worker threads in WebFetchInvDescModule if module was not ...Justin Clark-Casey (justincc)2013-06-141-6/+4
* | | | Merge branch 'master' into careminsterMelanie2013-06-1310-99/+144
|\ \ \ \ | | |/ / | |/| |
| * | | Merge branch 'master' of ssh://opensimulator.org/var/git/opensimDiva Canto2013-06-127-40/+85
| |\ \ \ | | |/ /
| | * | * This fixes having to select and deselect prim to get keyframemotion to star...teravus2013-06-121-0/+5
| | * | BulletSim: when meshing or asset fetching fails, include positionRobert Adams2013-06-112-14/+30
| | * | Add TriggerScenePresenceUpdated events when an animation is addedRobert Adams2013-06-113-3/+9
| | * | Uncomment Mic's code and split to create new regression TestAddTemporaryAsset...Justin Clark-Casey (justincc)2013-06-111-23/+41
| * | | DataSnapshot: changed those annoying messages to Debug instead of Info.Diva Canto2013-06-122-8/+8
| |/ /
| * | Removed the lock entirelyDiva Canto2013-06-111-56/+52
| * | Merge branch 'master' of ssh://opensimulator.org/var/git/opensimDiva Canto2013-06-119-68/+112
| |\ \
| | * | Put the "script saved" and "notecard saved" messages back into the bottomMelanie2013-06-111-2/+2
| * | | Really bad idea to lock m_UserCache for so long in UserManagementModule. Adde...Diva Canto2013-06-111-13/+17
* | | | Merge branch 'avination-current' into careminsterMelanie2013-06-113-13/+16
|\ \ \ \ | | |_|/ | |/| |
| * | | Put the "script saved" and "notecard saved" messages back into the bottomMelanie2013-06-111-2/+2
| * | | Explicitly set uploaded mesh object permsMelanie2013-06-101-10/+13
| * | | Make objects attached from the ground appear in inventory again. Fixes a numberMelanie2013-06-081-1/+1