aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim/Region (follow)
Commit message (Expand)AuthorAgeFilesLines
* Rename Bounciness to RestitutionMelanie2013-02-075-10/+10
* Merge branch 'master' into careminsterMelanie2013-02-071-1/+60
|\
| * Merge branch 'master' of ssh://opensimulator.org/var/git/opensimJustin Clark-Casey (justincc)2013-02-075-14/+97
| |\
| * | Add TestJsonWriteReadNotecard() regression testJustin Clark-Casey (justincc)2013-02-071-1/+44
| * | Make json store tests operate on a single thread to ensure we don't run into ...Justin Clark-Casey (justincc)2013-02-071-0/+16
* | | Merge branch 'master' into careminsterMelanie2013-02-078-26/+122
|\ \ \ | | |/ | |/|
| * | Merge branch 'master' of ssh://opensimulator.org/var/git/opensimMic Bowman2013-02-064-11/+22
| |\ \
| | * \ Merge branch 'master' of git://opensimulator.org/git/opensimDan Lake2013-02-0615-443/+358
| | |\ \ | | | |/
| | | * BulletSim: set removing zero width triangles in meshes to be enabled by defau...Robert Adams2013-02-062-1/+2
| | | * BulletSim: check for completely degenerate meshes (ones with allRobert Adams2013-02-061-9/+19
| | * | WebStats will now use actual logfile as specified in OpenSim.exe.config rathe...Dan Lake2013-02-061-1/+1
| * | | Enables script access to the per object dynamic attributes through the JsonStoreMic Bowman2013-02-064-13/+96
| | |/ | |/|
| * | BulletSim: remove an exception which occurs if a physics meshRobert Adams2013-02-061-2/+4
| * | Partial port of Avination's support for the new physics parameters.Melanie2013-02-064-3/+163
* | | Merge branch 'master' into careminsterMelanie2013-02-065-144/+2
|\ \ \ | |/ /
| * | Remove long unused Scene.DumpAssetsToFile boolean.Justin Clark-Casey (justincc)2013-02-062-6/+1
| * | Remove very long unused IScriptHost and NullScriptHostJustin Clark-Casey (justincc)2013-02-063-138/+1
* | | Merge branch 'master' into careminsterMelanie2013-02-0618-447/+370
|\ \ \ | |/ /
| * | Remove unused ScriptEngineLoader and ScriptEngineInterface in OpenSim.Region....Justin Clark-Casey (justincc)2013-02-063-168/+0
| * | Remove wrong code in ScriptUtils.GetAssetIdFromKeyOrItemName which would retu...Justin Clark-Casey (justincc)2013-02-061-15/+0
| * | Allow JsonReadNotecard() to accept the name of the notecard as well as the as...Justin Clark-Casey (justincc)2013-02-061-8/+18
| * | Merge branch 'master' of ssh://opensimulator.org/var/git/opensimJustin Clark-Casey (justincc)2013-02-0611-181/+227
| |\ \
| | * | BulletSim: make removing zero width triangles from meshes optionalRobert Adams2013-02-052-24/+33
| | |/
| | * BulletSim: remove degenerate triangles from meshes. This fixes theRobert Adams2013-02-055-45/+59
| | * BulletSim: add debugging looking for doorway sculpty problemsRobert Adams2013-02-053-4/+33
| | * BulletSim: rework some parameter setting implementation moving functionality ...Robert Adams2013-02-055-158/+152
| | * BulletSim: correct angular vertical attraction to properly correct an upside ...Robert Adams2013-02-051-1/+1
| * | refactor: Move functions that lookup asset ids from task inventory or pass th...Justin Clark-Casey (justincc)2013-02-062-89/+137
| |/
| * * the root prim was being given an OffsetPosition in addition to setting the ...teravus2013-02-051-1/+1
* | Merge branch 'master' into careminsterMelanie2013-02-0529-28/+255
|\ \ | |/
| * Merge branch 'master' of melanie@opensimulator.org:/var/git/opensimMelanie2013-02-0528-26/+253
| |\
| | * Fix bug where viewers would not see the "Module command functions not enabled...Justin Clark-Casey (justincc)2013-02-051-2/+62
| | * Merge branch 'dynamic-attributes2'Justin Clark-Casey (justincc)2013-02-054-1/+168
| | |\
| | | * Added unit tests for Dynamic AttributesOren Hurvitz2013-01-251-0/+37
| | | * Disabled DAExampleModuleOren Hurvitz2013-01-251-5/+13
| | | * Added DynAttrs to the serialized XML format of prims. When copying prims, use...Oren Hurvitz2013-01-252-0/+16
| | | * Changed DAMap to be the container of "data stores", which are OSDMaps. Store ...Oren Hurvitz2013-01-251-12/+13
| | | * Encapsulate an OSDMap in DAMap (was DynAttrsOSDMap) rather than inheriting fr...Justin Clark-Casey (justincc)2013-01-252-3/+3
| | | * Add DAExampleModule to demonstrate dynamic attributesJustin Clark-Casey (justincc)2013-01-251-0/+98
| | | * Implement Dynamic Attributes for SOP and PBS. Implement storage in SQLiteJustin Clark-Casey (justincc)2013-01-251-1/+8
| | * | Bump version and assembly version numbers from 0.7.5 to 0.7.6Justin Clark-Casey (justincc)2013-02-0523-23/+23
| * | | Try to fix uploaded mesh rotations - code from Avination code base.Melanie2013-02-051-12/+27
| |/ /
* | | Merge branch 'master' into careminsterMelanie2013-02-0418-311/+484
|\ \ \ | |/ /
| * | Merge branch 'master' of ssh://opensim/var/git/opensimteravus2013-02-036-28/+54
| |\ \
| | * \ Merge /home/opensim/src/opensimBlueWall2013-02-0123-23/+23
| | |\ \
| | | * | Revert "Update assembly version numbers"BlueWall2013-02-0123-23/+23
| | * | | Merge branch 'master' of ssh://opensimulator.org/var/git/opensimBlueWall2013-02-012-18/+33
| | |\ \ \
| | | * | | minor: change comment about assuming script references are textures in UuidGa...Justin Clark-Casey (justincc)2013-02-021-1/+2
| | | * | | Log missing assets on "fcache assets" found. This ignores references found b...Justin Clark-Casey (justincc)2013-02-022-17/+31
| | * | | | Merge branch 'master' of ssh://opensimulator.org/var/git/opensimBlueWall2013-02-017-31/+57
| | |\ \ \ \ | | | |/ / / | | | | / / | | | |/ / | | |/| |