OpenSim
/
OpenSimMirror
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity
23,428 Commits
104 Branches
0 Tags
299 MiB
Commit Graph

23428 Commits (70d5c29310492e0481b6df91edefdce729573e2e)

Author SHA1 Message Date
Melanie 45f5a6a6db Merge branch 'master' into careminster 
Conflicts:
	bin/HttpServer_OpenSim.dll
 2013-02-07 20:51:51 +00:00
Robert Adams c658fa1c0d Add plumbing for physics properties to get to the physics engine. 
Addition of entries to PhysicsActor and setting code in SceneObjectPart.
 2013-02-07 11:10:15 -08:00
Robert Adams af73ea909c Change passed PhysicsParameter value from float to the more general string value 2013-02-07 11:10:14 -08:00
teravus a5c83f7505 Websocket Echo module should not be on by default. 2013-02-07 12:22:03 -05:00
teravus 4bd1794b5a * missing example module.. Oops. 2013-02-07 12:19:54 -05:00
teravus 94a5232d3a * Adds Websocket support to baseHttpServer and IHttpServer.cs . This allows modules to set up a websocket server that websocket clients can connect to. An example module is in OptionalModules/Example/WebSocketEchoTest/WebSocketEchoModule.cs 2013-02-07 10:50:17 -05:00
teravus 4867a7cbbf This is the final commit that enables the Websocket handler 2013-02-07 10:27:18 -05:00
Melanie 6aa876a83b Rename Bounciness to Restitution 2013-02-07 03:40:48 +00:00
Melanie b64460e541 Merge branch 'master' into careminster 2013-02-07 03:30:44 +00:00
Melanie 6504e3d4ce Rename "Bounciness" to "Restitution" 2013-02-07 03:30:02 +00:00
Melanie 529489e73a Merge branch 'master' into careminster 2013-02-07 03:20:16 +00:00
Justin Clark-Casey (justincc) 2c5d24d394 Merge branch 'master' of ssh://opensimulator.org/var/git/opensim 2013-02-07 02:19:53 +00:00
Justin Clark-Casey (justincc) 3657a08844 Add TestJsonWriteReadNotecard() regression test 2013-02-07 02:19:26 +00:00
Melanie 375114bea3 Merge branch 'master' into careminster 
Conflicts:
	OpenSim/Region/Physics/BulletSPlugin/BSShapeCollection.cs
 2013-02-07 01:40:11 +00:00
Mic Bowman 274d376c82 Merge branch 'master' of ssh://opensimulator.org/var/git/opensim 2013-02-06 17:32:57 -08:00
Mic Bowman e17392acbb Enables script access to the per object dynamic attributes through the JsonStore 
script functions. Adds JsonAttachObjectStore to associate a store identifier with
an object (scripts can only access the store in their host object, this could be
extended but isn't necessary for now).

Note this opens a method to the DAMap OSDMap. This will be removed later, but
greatly simplifies the code for now.

The JsonStore and these scripts are disabled by default.
 2013-02-06 17:29:17 -08:00
Melanie a4b22f3882 Merge branch 'master' into careminster 2013-02-07 01:25:50 +00:00
Justin Clark-Casey (justincc) 4d1758985f Make json store tests operate on a single thread to ensure we don't run into any race related test failures in the future. 2013-02-07 00:54:09 +00:00
Dan Lake 7590ebc934 Merge branch 'master' of git://opensimulator.org/git/opensim 2013-02-06 16:45:47 -08:00
Dan Lake df37738ce7 WebStats will now use actual logfile as specified in OpenSim.exe.config rather than hardcoded ./OpenSim.log. This allows for rotating logs and other file appender types 2013-02-06 16:44:59 -08:00
Justin Clark-Casey (justincc) c8c5d74c22 minor: add method doc to DAMap.ValidateKey() 2013-02-07 00:22:39 +00:00
Robert Adams 5d523ea493 Merge branch 'master' of ssh://opensimulator.org/var/git/opensim 2013-02-06 16:18:27 -08:00
Justin Clark-Casey (justincc) e2c1e37b07 Add key length validation to DAMap.Add(KeyValuePair<string, OSDMap> kvp) to match Add(string key, OSDMap store) 2013-02-07 00:15:50 +00:00
Robert Adams d2ece00e68 BulletSim: set removing zero width triangles in meshes to be enabled by default. This should fix the invisible barrier in sculptie doorways bug. 2013-02-06 15:59:59 -08:00
Robert Adams 0baa2590be BulletSim: check for completely degenerate meshes (ones with all 
triangles having zero width) and output an error rather than
throwing and exception.
 2013-02-06 15:52:28 -08:00
Robert Adams 67d92e4e16 BulletSim: remove an exception which occurs if a physics mesh 
asset is not found.
 2013-02-06 14:00:27 -08:00
Melanie 054a9928a0 Fix a bug I brought in by manually editing a diff file. Terrain is if cource not always at 20m. 2013-02-06 18:13:02 +00:00
Melanie e5beb480ea Partial port of Avination's support for the new physics parameters. 
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.
 2013-02-06 08:03:04 +00:00
Melanie 598f891d70 Move SoubleQueu to Util. Change HTTP inv to prioritize COF. Determine COF for SP 2013-02-06 04:03:32 +01:00
Justin Clark-Casey (justincc) 07a7ec4d1b minor: Add explanation of MaptileStaticUUID setting in Regions.ini.example 2013-02-06 02:40:32 +00:00
Melanie d8c27de395 Merge branch 'master' into careminster 2013-02-06 02:38:30 +00:00
Melanie f567ff9f51 Merge branch 'master' into careminster 
Conflicts:
	OpenSim/Region/Physics/BulletSPlugin/BSShapeCollection.cs
 2013-02-06 02:22:12 +00:00
Justin Clark-Casey (justincc) 145e38e5e9 Remove long unused Scene.DumpAssetsToFile boolean. 2013-02-06 02:21:17 +00:00
Justin Clark-Casey (justincc) 2ce8a050e4 Remove very long unused IScriptHost and NullScriptHost 2013-02-06 02:15:54 +00:00
Justin Clark-Casey (justincc) 9ebad38c34 Remove unused ScriptEngineLoader and ScriptEngineInterface in OpenSim.Region.Framework.dll 
I believe this predates the generic system of registering interfaces and is very long unused.
 2013-02-06 02:08:44 +00:00
Justin Clark-Casey (justincc) dfe5826f9f Remove wrong code in ScriptUtils.GetAssetIdFromKeyOrItemName which would 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.
 2013-02-06 01:49:32 +00:00
Justin Clark-Casey (justincc) eddfed3812 Allow JsonReadNotecard() to accept the name of the notecard as well as the 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.
 2013-02-06 01:37:22 +00:00
Justin Clark-Casey (justincc) 0d4df99d04 Merge branch 'master' of ssh://opensimulator.org/var/git/opensim 2013-02-06 01:35:25 +00:00
Robert Adams 3646361279 BulletSim: make removing zero width triangles from meshes optional 
and, for the moment, default to 'off'.
 2013-02-05 17:19:55 -08:00
Justin Clark-Casey (justincc) 5c94346bd7 refactor: Move functions that lookup asset ids from task inventory or pass 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.
 2013-02-06 01:17:19 +00:00
Robert Adams dce9e323f4 BulletSim: remove degenerate triangles from meshes. This fixes the 
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.
 2013-02-05 16:56:33 -08:00
Robert Adams 13233da66c BulletSim: add debugging looking for doorway sculpty problems 2013-02-05 16:56:28 -08:00
Robert Adams ad438ee59f BulletSim: rework some parameter setting implementation moving functionality 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. 2013-02-05 16:56:23 -08:00
Robert Adams 2b6d226911 BulletSim: correct angular vertical attraction to properly correct an upside down vehicle. 2013-02-05 16:56:17 -08:00
Diva Canto 4cdee3dd3c Changed protection of CreateDefaultAppearanceEntries to protected, so extensions of the UserAccountService can reuse this. 2013-02-05 16:28:25 -08:00
teravus 2104e4d4d4 * the root prim was being given an OffsetPosition in addition to setting the 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. 2013-02-05 18:46:02 -05:00
Melanie 364a4604c3 Merge branch 'master' into careminster 2013-02-05 23:37:29 +00:00
teravus 1dc09d8e8f We're not really done here.. but we're getting there. Socket Read is working.. Still have to do Header.ToBytes and compose a websocket frame with a payload. 2013-02-05 18:02:25 -05:00
Melanie d3892bbd06 Merge branch 'master' into careminster 
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
 2013-02-05 21:30:12 +00:00
Melanie 6bce4bc112 Merge branch 'master' of melanie@opensimulator.org:/var/git/opensim 2013-02-05 20:09:45 +00:00