aboutsummaryrefslogtreecommitdiffstatshomepage
Commit message (Collapse)AuthorAgeFilesLines
* Merge branch 'master' into careminsterMelanie2013-02-070-0/+0
|\
| * Fix a bug I brought in by manually editing a diff file. Terrain is if cource ↵Melanie2013-02-061-1/+1
| | | | | | | | not always at 20m.
| * Partial port of Avination's support for the new physics parameters.Melanie2013-02-067-21/+264
| | | | | | | | | | | | | | | | Implements the parameters as properties, the serialization and database storage (MySQL only). Implements llSetPrimitiveParams for prim physics shape and the other 4 extra params. Only the prim shape type "None" is currently functional. No support for the Viewer UI (yet), that will be ported in due course. Lots more to port, this is a large-ish changeset.
* | Merge branch 'master' into careminsterMelanie2013-02-068-147/+8
|\ \ | |/
| * minor: Add explanation of MaptileStaticUUID setting in Regions.ini.exampleJustin Clark-Casey (justincc)2013-02-061-0/+4
| |
| * Remove long unused Scene.DumpAssetsToFile boolean.Justin Clark-Casey (justincc)2013-02-064-9/+3
| |
| * Remove very long unused IScriptHost and NullScriptHostJustin Clark-Casey (justincc)2013-02-063-138/+1
| |
* | Merge branch 'master' into careminsterMelanie2013-02-0624-462/+373
|\ \ | |/ | | | | | | Conflicts: OpenSim/Region/Physics/BulletSPlugin/BSShapeCollection.cs
| * Remove unused ScriptEngineLoader and ScriptEngineInterface in ↵Justin Clark-Casey (justincc)2013-02-063-168/+0
| | | | | | | | | | | | OpenSim.Region.Framework.dll I believe this predates the generic system of registering interfaces and is very long unused.
| * Remove wrong code in ScriptUtils.GetAssetIdFromKeyOrItemName which would ↵Justin Clark-Casey (justincc)2013-02-061-15/+0
| | | | | | | | | | | | | | | | | | return the item ID instead of the asset ID if the identifier was a uuid that matched an inventory item name. This would practically never happen. This makes this overloaded version of the function consistent with the other version. It looks like this accidentally came over in commit c5af16a from Tue Oct 16 12:40:21 2012 However, there's arguably a case for looking for an item name that matches a UUID before assuming that the identifier is already an asset ID.
| * Allow JsonReadNotecard() to accept the name of the notecard as well as the ↵Justin Clark-Casey (justincc)2013-02-061-8/+18
| | | | | | | | | | | | | | asset ID. Agreed in discussion with cmickeyb. This is to make this consistent with similar existing LSL/OSSL functions such as llTriggerSound() and osNpcLoadAppearance() that allow an item name or an asset id.
| * 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
| | | | | | | | | | | | and, for the moment, default to 'off'.
| | * BulletSim: remove degenerate triangles from meshes. This fixes theRobert Adams2013-02-056-59/+61
| | | | | | | | | | | | | | | | | | | | | | | | | | | invisible barriers in sculptie doorways (Mantis 6529). Bump up level-of-detail for physical meshes to 32 (the max). This fixes the invisible barriers that showed up in prim cut arches. NOTE: the default LOD values are removed from OpenSimDefaults.ini. If you don't change your OpenSimDefaults.ini, you will continue to see the arch problem.
| | * 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
| | | | | | | | | | | | that was in BSScene to BSParam. Remove unused parameters that were passed to the unmanaged code. Update DLLs and SOs for the new param block.
| | * BulletSim: correct angular vertical attraction to properly correct an upside ↵Robert Adams2013-02-051-1/+1
| | | | | | | | | | | | down vehicle.
| | * Changed protection of CreateDefaultAppearanceEntries to protected, so ↵Diva Canto2013-02-051-1/+1
| | | | | | | | | | | | extensions of the UserAccountService can reuse this.
| * | refactor: Move functions that lookup asset ids from task inventory or pass ↵Justin Clark-Casey (justincc)2013-02-062-89/+137
| |/ | | | | | | | | | | | | them through to ScriptUtils class in OpenSim.Region.Framework.dll Renames functions to better reflect what they do. This is so that code registering with modInvoke() can reuse this code to provide functions that behave in a consistent manner with existing LSL/OSSL functions.
* | 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
| | | | | | | | position when creating the root prim. The offset position caused the positioning code to re-move the root prim when you selected it and released it.
* | Merge branch 'master' into careminsterMelanie2013-02-0584-85/+630
|\ \ | |/ | | | | | | | | | | | | Conflicts: OpenSim/Data/MySQL/MySQLSimulationData.cs OpenSim/Framework/Servers/VersionInfo.cs OpenSim/Region/ClientStack/Linden/Caps/BunchOfCaps/BunchOfCaps.cs OpenSim/Region/Framework/Scenes/SceneObjectPart.cs
| * 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 ↵Justin Clark-Casey (justincc)2013-02-051-2/+62
| | | | | | | | | | | | | | | | | | enabled" error if these were disabled and a viewer attempted to call one. This was not working because the shouter was wrongly signalled as an agent rather than a prim
| | * 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 ↵Justin Clark-Casey (justincc)2013-01-251-2/+1
| | | | | | | | | | | | | | | | region store
| | | * Fix tests by adding DynAttrs add column commands to RegionStore.migrations ↵Justin Clark-Casey (justincc)2013-01-251-0/+6
| | | | | | | | | | | | | | | | (these were originally in 021_RegionStore.sql which I might have forgotton to add 2 years ago).
| | | * 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, ↵Oren Hurvitz2013-01-253-2/+40
| | | | | | | | | | | | | | | | use deep copy for DynAttrs.
| | | * Store NULL in the 'DynAttrs' column if the prim doesn't have any dynamic ↵Oren Hurvitz2013-01-253-3/+15
| | | | | | | | | | | | | | | | attributes
| | | * 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
| | | | | | | | | | | | | | | | names must have at least 4 characters.
| | | * 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
| | | | | | | | | | | | | | | | This allows external lockers to preserve atomicity of dynamic attribute changes
| | | * Encapsulate an OSDMap in DAMap (was DynAttrsOSDMap) rather than inheriting ↵Justin Clark-Casey (justincc)2013-01-258-97/+191
| | | | | | | | | | | | | | | | | | | | | | | | from it This is the easier way to give us control over locking, rather than asking that OSDMap IDictionary methods be virtual
| | | * Implement dynamic attribute persistence on mysql and mssqlJustin Clark-Casey (justincc)2013-01-254-8/+49
| | | | | | | | | | | | | | | | mssql is untested
| | | * Add DAExampleModule to demonstrate dynamic attributesJustin Clark-Casey (justincc)2013-01-251-0/+98
| | | | | | | | | | | | | | | | | | | | | | | | This module demonstrates that we can add an arbitrary persisted value to SOP without any changes to core code. Every time the object is moved, the move record is updated and the users in the scene alerted The number of moves is persisted over server restarts in sqlite
| | | * 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
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This is mostly Bluewall's work but I am also bumping the general version number OpenSimulator 0.7.5 remains in the release candidate stage. I'm doing this because master is significantly adding things that will not be in 0.7.5 This update should not cause issues with existing external binary DLLs because our DLLs do not have strong names and so the exact version match requirement is not in force.
| * | | 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
| | | | | | | | | | | | | | | | | | | | | | | | This reverts commit 141ad829f448b9138b12be7cf99c834c1f3977ec.
| | | * | | 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
| | | | | | | | | | | | | | | | | | | | | | | | | | | | additional client network servers at the same time. Use comma separated values in clientstack_plugin in your config. Additional plugins lying around shouldn't be picked up because the loader only loads configured dll assemblies and breaks at the first IClientNetworkServer found in the assembly. (the only new functionality is the ability to specify more in config). Note: The existing functionality also passes in a nini config.. and has a boolean to determine if the client network server should be initialized for a specific scene.
generated by cgit v1.1 at 2024-12-30 18:11:34 +0000