aboutsummaryrefslogtreecommitdiffstatshomepage
Commit message (Expand)AuthorAgeFilesLines
* Merge branch 'master' into careminsterMelanie2013-02-0624-462/+373
|\
| * 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-0617-196/+230
| |\
| | * BulletSim: make removing zero width triangles from meshes optionalRobert Adams2013-02-054-24/+33
| | * BulletSim: remove degenerate triangles from meshes. This fixes theRobert Adams2013-02-056-59/+61
| | * BulletSim: add debugging looking for doorway sculpty problemsRobert Adams2013-02-053-4/+33
| | * BulletSim: rework some parameter setting implementation moving functionality ...Robert Adams2013-02-059-158/+152
| | * BulletSim: correct angular vertical attraction to properly correct an upside ...Robert Adams2013-02-051-1/+1
| | * Changed protection of CreateDefaultAppearanceEntries to protected, so extensi...Diva Canto2013-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
| |/
* | Merge branch 'master' into careminsterMelanie2013-02-050-0/+0
|\ \ | |/
| * * the root prim was being given an OffsetPosition in addition to setting the ...teravus2013-02-051-1/+1
* | Merge branch 'master' into careminsterMelanie2013-02-0584-85/+630
|\ \ | |/
| * Merge branch 'master' of melanie@opensimulator.org:/var/git/opensimMelanie2013-02-0583-83/+630
| |\
| | * 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-0512-10/+497
| | |\
| | | * Remove the accidental PrimShapes column that I added back to the SQLite regio...Justin Clark-Casey (justincc)2013-01-251-2/+1
| | | * Fix tests by adding DynAttrs add column commands to RegionStore.migrations (t...Justin Clark-Casey (justincc)2013-01-251-0/+6
| | | * Added unit tests for Dynamic AttributesOren Hurvitz2013-01-252-0/+38
| | | * Disabled DAExampleModuleOren Hurvitz2013-01-251-5/+13
| | | * Added DynAttrs to the serialized XML format of prims. When copying prims, use...Oren Hurvitz2013-01-253-2/+40
| | | * Store NULL in the 'DynAttrs' column if the prim doesn't have any dynamic attr...Oren Hurvitz2013-01-253-3/+15
| | | * Stopped storing dynamic attributes in the PrimShapeOren Hurvitz2013-01-256-35/+5
| | | * Changed DAMap to be the container of "data stores", which are OSDMaps. Store ...Oren Hurvitz2013-01-252-32/+97
| | | * Added missing DynAttrs references in MySQLOren Hurvitz2013-01-251-3/+6
| | | * Lock DAMap rather than encapsulated OSDMapJustin Clark-Casey (justincc)2013-01-251-17/+18
| | | * Encapsulate an OSDMap in DAMap (was DynAttrsOSDMap) rather than inheriting fr...Justin Clark-Casey (justincc)2013-01-258-97/+191
| | | * Implement dynamic attribute persistence on mysql and mssqlJustin Clark-Casey (justincc)2013-01-254-8/+49
| | | * 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-254-1/+115
| | * | Bump version and assembly version numbers from 0.7.5 to 0.7.6Justin Clark-Casey (justincc)2013-02-0570-71/+71
| * | | Try to fix uploaded mesh rotations - code from Avination code base.Melanie2013-02-051-12/+27
| |/ /
* | | Merge branch 'master' into careminsterMelanie2013-02-0420-315/+488
|\ \ \ | |/ /
| * | Merge branch 'master' of ssh://opensimulator.org/var/git/opensimJustin Clark-Casey (justincc)2013-02-042-47/+73
| |\ \
| | * \ Merge branch 'master' of ssh://opensim/var/git/opensimteravus2013-02-038-31/+72
| | |\ \
| | | * \ Merge /home/opensim/src/opensimBlueWall2013-02-0168-69/+69
| | | |\ \
| | | | * | Revert "Update assembly version numbers"BlueWall2013-02-0168-69/+69
| | | * | | Merge branch 'master' of ssh://opensimulator.org/var/git/opensimBlueWall2013-02-012-18/+33
| | | |\ \ \
| | | * \ \ \ Merge branch 'master' of ssh://opensimulator.org/var/git/opensimBlueWall2013-02-019-34/+75
| | | |\ \ \ \ | | | | |_|/ / | | | |/| | |
| | | * | | | Update assembly version numbersBlueWall2013-02-0168-69/+69
| | * | | | | Adds the ability to load more then one IClientNetworkServer thereby allowing ...teravus2013-02-032-47/+73
| * | | | | | Remove [XMLRPC] section I added by accident to the top of OpenSimDefaults.ini...Justin Clark-Casey (justincc)2013-02-041-15/+0
| | |_|_|/ / | |/| | | |
| * | | | | 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
| | |_|/ / | |/| | |
| * | | | Correct spelling mistake in new RayFilterFlags, LSLPhanton -> LSLPhantomJustin Clark-Casey (justincc)2013-02-022-3/+3
| * | | | Stop exceptions being thrown if GenerateMapTiles = false but no static map ti...Justin Clark-Casey (justincc)2013-02-024-10/+36
| |/ / /
| * | | Sit and Spin reduction. If sitting, slam avatar angular velocity to zero.teravus2013-02-011-2/+3
| * | | BulletSim: fix problem where editting a physical linkset caused theRobert Adams2013-02-012-19/+33
| |/ /