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

973 Commits (e2e839a0cd4035ffacfcdc601dfc534a05bc4e0f)

Author SHA1 Message Date
Melanie 09c2cd0d76 Merge branch 'master' into careminster 
Conflicts:
	OpenSim/Region/Framework/Scenes/SceneObjectPart.cs
	OpenSim/Region/Physics/BulletSPlugin/BSShapes.cs
	OpenSim/Region/ScriptEngine/Shared/Api/Implementation/LSL_Api.cs
 2013-05-24 00:45:08 +01:00
Robert Adams f490522082 BulletSim: specify directory for OpenSim.Region.Physics.Meshing 
DLL file in prebuild.xml since that file ends up in bin/Physics
directory.
 2013-05-22 21:09:37 -07:00
Robert Adams ffc9b3dda7 BulletSim: add code to experimentally use asset hull data. 
Default to 'off' as it needs debugging.
 2013-05-22 21:01:00 -07:00
Robert Adams 6596a1de80 Revert "BulletSim: add code to experimentally use asset hull data." 
This reverts commit 2fd8819a04.

Remove this code until I can figure out why the references that are
clearly in prebuild.xml doesn't work for the
'using OpenSim.Region.Physics.Meshing' in BSShape.cs.
 2013-05-21 22:16:18 -07:00
Robert Adams 2fd8819a04 BulletSim: add code to experimentally use asset hull data. 
Default to 'off' as it needs debugging.
 2013-05-21 21:32:30 -07:00
Melanie b89d18e6f4 Merge branch 'master' into careminster 
Conflicts:
	OpenSim/Region/Framework/Scenes/Scene.cs
 2013-04-30 23:45:38 +01:00
Justin Clark-Casey (justincc) a7cbb9edc9 Add regression test for offer, accept and subsequent receiver delete of an item offered via instant message. 2013-04-29 20:50:49 +01:00
Melanie 231c298ca5 Merge branch 'master' into careminster 
Conflicts:
	OpenSim/Region/ClientStack/Linden/UDP/LLClientView.cs
	bin/OpenMetaverse.StructuredData.XML
	bin/OpenMetaverse.XML
	bin/OpenMetaverseTypes.XML
 2013-04-21 14:11:39 +01:00
BlueWall f40abc493a Small fix to prebuild xml for building with mono tools 2013-04-20 11:54:05 -04:00
dahlia d5419f0a46 Initial experimental support for materials-capable viewers. This is in a very early stage and this module is disabled by default and should only be used by developers for testing as this module could cause data corruption and/or viewer crashes. No materials are persisted yet. 2013-04-18 01:03:19 -07:00
Kevin Cozens cbc9ae898c Added missing functionality (mainly custom headers) to llHTTPRequest. 2013-03-29 23:32:11 +00:00
Melanie 5b950ca36a Merge commit '464201b41d5f5fdd7c88ab5e95dd7b6fbae6d766' into careminster 2013-03-19 00:54:23 +00:00
Justin Clark-Casey (justincc) 03075359b5 Finally remove the 'REST' ApplicationPlugins code which has been non-functional and largely commented out for many years. 2013-03-15 23:48:40 +00:00
Melanie b9146a7922 Merge branch 'master' into careminster 
Conflicts:
	OpenSim/Framework/Servers/BaseOpenSimServer.cs
	OpenSim/Region/ScriptEngine/Shared/Api/Implementation/LSL_Api.cs
 2013-03-15 23:45:32 +00:00
Justin Clark-Casey (justincc) 924d6e892a Make it possible to chain another asset service underneath the de-duplicating XAssetService. 
This makes it possible to use the dedupliicating service without needing to migrate all the existing asset data beforehand.
Currently controlled by a ChainedServiceModule setting in [AssetService] (e.g. ChainedServiceModule = "OpenSim.Services.AssetService.dll:AssetService")
Not yet ready for use.
 2013-03-15 21:53:39 +00:00
Melanie 70f0587558 Merge branch 'master' into careminster 
Conflicts:
	OpenSim/Region/CoreModules/Framework/EntityTransfer/EntityTransferModule.cs
 2013-03-08 01:07:05 +00:00
Justin Clark-Casey (justincc) 5751ecde52 Add code for testing event queue messages recevied on region cross. 
This is currently disabled pending an improvement in the test code to properly add avatars when an event queue module is present.
 2013-03-06 23:06:00 +00:00
Melanie a675f7d4c3 Merge branch 'master' into careminster 2013-03-01 23:54:00 +00:00
Robert Adams b2087add96 Add missing prebuild.xml dependency for System.Action2<t1,t2> in recent additions 
to ScriptEngine tests. Compiles some places but not others.
 2013-02-28 15:17:07 -08:00
Melanie 578174d21c Merge branch 'master' into careminster 
Conflicts:
	OpenSim/Framework/RegionLoader/Web/RegionLoaderWebServer.cs
	OpenSim/Region/CoreModules/Scripting/LSLHttp/UrlModule.cs
	OpenSim/Region/CoreModules/World/WorldMap/WorldMapModule.cs
 2013-02-27 18:05:04 +00:00
Justin Clark-Casey (justincc) 2bfbfc5725 minor: Remove unnecessary very old System.Net reference in OpenSim.Region.ScriptEngine.Shared 2013-02-26 23:43:06 +00:00
Justin Clark-Casey (justincc) b8a7c8b26f Add regression test for llRequestUrl() 2013-02-26 23:36:36 +00:00
Melanie 9534d5f929 Merge branch 'master' into careminster 2013-02-22 01:28:54 +00:00
Diva Canto 036d73c52a This should fix the build fail. Fingers crossed. 2013-02-19 07:55:20 -08:00
Diva Canto 9380d01976 First commit of Diva Groups. The Data bits went to OpenSim.Data core, the rest to Addons.Groups.dll. 2013-02-19 07:26:40 -08:00
Diva Canto 5e709b087c Donating Diva OfflineIM as an addon in a single dll, OpenSim.Addons.OpenSim.dll 2013-02-18 15:44:00 -08:00
Melanie 8b78b9429d Merge branch 'avination' into careminster 2013-02-07 21:26:55 +00:00
Melanie 45f5a6a6db Merge branch 'master' into careminster 
Conflicts:
	bin/HttpServer_OpenSim.dll
 2013-02-07 20:51:51 +00: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
Melanie 598f891d70 Move SoubleQueu to Util. Change HTTP inv to prioritize COF. Determine COF for SP 2013-02-06 04:03:32 +01: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
Justin Clark-Casey (justincc) 1fc9f282fa Merge branch 'dynamic-attributes2' 2013-02-05 00:35:15 +00:00
teravus 27a0b3ecbd Commit 1 in of this branch feature. This is one of many... 2013-02-03 06:49:17 -05:00
Melanie 9a4de546fe Merge branch 'master' into careminster 
Conflicts:
	OpenSim/Region/ClientStack/Linden/UDP/LLClientView.cs
 2013-01-31 02:53:11 +00:00
Robert Adams 531d0429d1 BulletSim: first unit test: vehicle angular attraction 2013-01-28 17:08:34 -08:00
Robert Adams aea90c198f BulletSim: reorder dependencies for tests and specify path for meshing dll since it is placed in the Physics directory 2013-01-27 13:37:58 -08:00
Robert Adams 2c5f0677e5 BulletSim: fix reference path for BulletSim tests in prebuild.xml 2013-01-27 13:09:18 -08:00
Robert Adams a345a2feb7 BulletSim: add framework for BulletSim unit tests. No tests yet. 2013-01-27 12:50:06 -08:00
Melanie e28c042dce Merge branch 'master' into careminster 2013-01-26 01:56:23 +00:00
Oren Hurvitz 6daf559fb6 Added unit tests for Dynamic Attributes 2013-01-25 04:03:30 +00:00
Justin Clark-Casey (justincc) f557d7e828 Add basic JsonCreateStore() regression test 2013-01-25 01:48:31 +00:00
Melanie be4c8c4931 Merge branch 'master' into careminster 
Conflicts:
	OpenSim/Region/ScriptEngine/XEngine/XEngine.cs
 2013-01-24 00:25:08 +00:00
Justin Clark-Casey (justincc) 55c6753b13 Merge branch 'master' into cooptermination 2013-01-24 00:03:44 +00:00
Melanie fc1c77b42d Merge branch 'avination' into careminster 2013-01-23 19:31:27 +00:00
Melanie cc4cfd9fa8 Merge branch 'master' into careminster 
Conflicts:
	OpenSim/Region/Framework/Scenes/SceneObjectPart.cs
	OpenSim/Region/Physics/BulletSNPlugin/BSShapeCollection.cs
 2013-01-23 02:38:59 +00:00
Justin Clark-Casey (justincc) cf168194e5 If ScriptStopStrategy hasn't been set to co-op in [XEngine] config, then continue to generate C# that is functionality identical to historical generation 
This is to eliminate disruption until co-op termination has been well-tested.
In non co-op mode, XEngine will continue to load DLLs of the existing Script class and the new XEngineScript class.
Moving to co-op mode still requires existing script DLL deletion to force recompilation, either manually or by setting DeleteScriptsOnStartup = true for one run.
This change also means that scripts which fail to initialize do not still show up as running scripts.
 2013-01-23 02:36:43 +00:00
Melanie b7b3063849 Implement HTTP Request froma thread pool to avoid packet congestion 2013-01-20 18:38:00 +01:00
teravus 2c517d792f This updates prebuild to remove BulletSimN, implements the BulletSim API in BulletSPlugin using the BulletXNA Bullet physics engine. It also updates the BulletXNA library to be compatible with the changes. OpenSimDefaults has been updated to describe how to switch engines and terrain implementations. 2013-01-20 08:18:16 -05:00
teravus 10de5d8169 * Allow unsafe code with BulletSim 2013-01-20 08:03:17 -05:00
Justin Clark-Casey (justincc) c8afc8523b Implement non-wait co-operative termination of scripts for XEngine in addition to termination on wait. 
This involves inserting opensim_reserved_CheckForCoopTermination() calls in lsl -> c# translation at any place where the script could be in a loop with no wait calls.
These places are for, while, do-while, label, user function call and manual event function call.
Call goes through to an XEngineScriptBase which extends ScriptBase.
IEngine is extended to supply necessary engine-specific parent class references and constructor parameters to Compiler.
Unfortunately, since XEngineScriptBase has to be passed WaitHandle in its constructor, older compiled scripts will fail to load with an error on the OpenSim console.
Such scripts will need to be recompiled, either by removing all *.dll files from the bin/ScriptEngines/<region-id> or by setting DeleteScriptsOnStartup = true in [XEngine] for one run.
Automatic recompilation may be implemented in a later commit.
This feature should not yet be used, default remains termination with Thread.Abort() which will work as normal once scripts are recompiled.
 2013-01-17 23:39:09 +00:00