aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim (follow)
Commit message (Expand)AuthorAgeFilesLines
* BulletSim: Parameters settable from ini file. Linksets. Physical property val...Robert Adams2011-08-054-213/+316
* BulletSim: fix buoyancy for prims. Start of configurable physics parameters.Robert Adams2011-07-222-17/+92
* Pass collisions and updates in pinned memory (saves marshaling).Robert.Adams2011-07-224-98/+151
* Merge branch 'master' into bulletsimMic Bowman2011-07-226-41/+95
|\
| * Thank you, Michelle Argus, for a patch that adds reading the agent limitMelanie2011-07-221-1/+4
| * Generate the initial maptile asynchronouslyOren Hurvitz2011-07-222-15/+17
| * Merge branch 'master' of melanie@opensimulator.org:/var/git/opensimroot2011-07-211-14/+0
| |\
| * | When an uncached asset is requested multiple times concurrently, only load it...Oren Hurvitz2011-07-211-9/+49
| * | When handling SetAppearance packet, always save the appearance; not only if t...Oren Hurvitz2011-07-211-5/+5
| * | Fixed updating avatar appearanceOren Hurvitz2011-07-212-11/+20
* | | Merge branch 'master' into bulletsimDan Lake2011-07-2047-799/+1417
|\ \ \ | | |/ | |/|
| * | Removed unused AddPrimShape methods in PhysicsScene caused by merge conflictsDan Lake2011-07-201-14/+0
| |/
| * Apply the localID to the Physics actor to prevent null calls laterCareminster Team2011-07-191-3/+3
| * Tidy up a superfluous AddPrimShape override in PhysicsSceneCareminster Team2011-07-191-1/+0
| * On all undo/redo operations, consistently lock the undo object for everything...Justin Clark-Casey (justincc)2011-07-191-5/+1
| * If we store an undo, wipe anything already present on the redo stackJustin Clark-Casey (justincc)2011-07-191-0/+3
| * stop redo throwing an exception if there is nothing to redoJustin Clark-Casey (justincc)2011-07-191-10/+13
| * refator: simplify UndoState.Compare() codeJustin Clark-Casey (justincc)2011-07-191-20/+9
| * rip out pointless null checks in UndoState where part can never be nullJustin Clark-Casey (justincc)2011-07-191-81/+72
| * Fix undo when changing just the root prim's position in a linkset.Justin Clark-Casey (justincc)2011-07-193-9/+11
| * refactor: rename UpdatePrimPosition() to UpdatePrimGroupPosition() for consis...Justin Clark-Casey (justincc)2011-07-193-6/+6
| * comment out all kinds of debugging guffJustin Clark-Casey (justincc)2011-07-194-44/+44
| * Fix undo for rotation of the root prim in a linkset on its own.Justin Clark-Casey (justincc)2011-07-192-8/+15
| * Fix undo of rotation of single prims in a linksetJustin Clark-Casey (justincc)2011-07-192-9/+11
| * Fix undo of prim group rotation.Justin Clark-Casey (justincc)2011-07-193-24/+34
| * Rename UpdatePrimRotation() to UpdatePrimGroupRotation() since this is what i...Justin Clark-Casey (justincc)2011-07-192-7/+11
| * Stop undo of just the root prim position in the linkset from shifting the who...Justin Clark-Casey (justincc)2011-07-194-14/+20
| * fix undo when resizing of non-root individual prims in a linksetJustin Clark-Casey (justincc)2011-07-193-4/+11
| * Fix undo for resizing linksetsJustin Clark-Casey (justincc)2011-07-194-41/+85
| * remove undo state storage in a few places where it's pointlessJustin Clark-Casey (justincc)2011-07-192-5/+1
| * Make various tweaks to undo code in an effort to get things working better.Justin Clark-Casey (justincc)2011-07-186-56/+217
| * use standard sdk stack in terrain model rather than OpenSim.Framework.UndoStack.Justin Clark-Casey (justincc)2011-07-182-153/+1
| * Use a standard generic system stack for the undo/redo stacks instead of our o...Justin Clark-Casey (justincc)2011-07-183-3/+55
| * Merge branch 'master' of ssh://opensimulator.org/var/git/opensimJustin Clark-Casey (justincc)2011-07-186-11/+32
| |\
| | * refactor: Pull up Assembly of the SQLite classes as a protected property, so ...Marck2011-07-166-11/+32
| * | refactor: group all the undo/redo code in SOP into one place for easier code ...Justin Clark-Casey (justincc)2011-07-181-59/+62
| |/
| * Replace ifs in SOG.GroupResize() with Math.Min()Justin Clark-Casey (justincc)2011-07-163-14/+25
| * remove now unncessary parts of SceneObjectGroup.Resize()Justin Clark-Casey (justincc)2011-07-161-21/+5
| * refactor: replace scale limiting code with more elegant Math.Min callsJustin Clark-Casey (justincc)2011-07-161-12/+6
| * refactor: Push all part resize code down into SceneObjectPart.Resize()Justin Clark-Casey (justincc)2011-07-164-56/+32
| * add test for resizing one part in a groupJustin Clark-Casey (justincc)2011-07-163-2/+36
| * refactor: make SceneObjectGroup.GroupScale() a property rather than a mehodJustin Clark-Casey (justincc)2011-07-162-33/+38
| * minor: add a log warning if a sculpt/mesh async asset request returns no dataJustin Clark-Casey (justincc)2011-07-161-0/+4
| * refactor: remove pointless sender != null tests, etc, in AssetReceived, since...Justin Clark-Casey (justincc)2011-07-161-6/+9
| * eliminate unused and redundant SceneObjectGroup.AssetReceived()Justin Clark-Casey (justincc)2011-07-161-17/+0
| * fix build break from last commitJustin Clark-Casey (justincc)2011-07-161-1/+1
| * Eliminate the pointless textured id argument to SculptTextureCallbackJustin Clark-Casey (justincc)2011-07-161-15/+6
| * minor: remove mono compiler warningsJustin Clark-Casey (justincc)2011-07-163-4/+7
| * remove the need to supply SceneObjectGroup.GroupResize() with a localId.Justin Clark-Casey (justincc)2011-07-163-132/+133
| * Add very basic test for resizing a scene object with one primJustin Clark-Casey (justincc)2011-07-162-1/+69