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

1105 Commits (a95e28616842f70bb64bf701c2534d75490e539e)

Author SHA1 Message Date
Justin Clark-Casey (justincc) 9f05a7ac7b Include missing reference that probably stops windows build from commit 1299592405 2013-08-01 00:25:59 +01:00
Mic Bowman 1299592405 Experimental comment to eneralize the handling of Linden caps when the 
cap is something other than "localhost". A new interface for handling
external caps is supported with an example implemented for Simian. The
only linden cap supporting this interface right now is the GetTexture
cap.
 2013-07-31 15:37:15 -07:00
Melanie 7830cc9954 Merge branch 'master' into careminster 
Conflicts:
	OpenSim/Capabilities/Handlers/GetTexture/GetTextureHandler.cs
	OpenSim/Region/ClientStack/Linden/Caps/BunchOfCaps/BunchOfCaps.cs
	OpenSim/Region/ClientStack/Linden/Caps/UploadBakedTextureModule.cs
	OpenSim/Region/ClientStack/Linden/UDP/LLUDPServer.cs
	OpenSim/Region/CoreModules/Framework/Caps/CapabilitiesModule.cs
	OpenSim/Region/CoreModules/Scripting/HttpRequest/ScriptsHttpRequests.cs
	OpenSim/Region/CoreModules/ServiceConnectorsOut/Simulation/LocalSimulationConnector.cs
	OpenSim/Region/Framework/Scenes/Scene.cs
	OpenSim/Region/Framework/Scenes/SceneCommunicationService.cs
	OpenSim/Region/Framework/Scenes/SceneObjectPart.cs
	OpenSim/Region/Framework/Scenes/ScenePresence.cs
	OpenSim/Region/ScriptEngine/Shared/Api/Implementation/Plugins/SensorRepeat.cs
	OpenSim/Server/Handlers/Simulation/AgentHandlers.cs
	OpenSim/Services/Connectors/Asset/AssetServicesConnector.cs
	OpenSim/Services/Connectors/Simulation/SimulationServiceConnector.cs
	OpenSim/Services/HypergridService/UserAgentService.cs
 2013-07-18 10:08:10 +01:00
Justin Clark-Casey (justincc) f57f49eede Merge branch 'master' of ssh://opensimulator.org/var/git/opensim 2013-07-11 23:05:10 +01:00
Justin Clark-Casey (justincc) 44e9849ed1 Fix regression where llHTTPRequests which did not get an OK response returned 499 and the exception message in the http_response event rather than the actual response code and body. 
This was a regression since commit 831e4c3 (Thu Apr 4 00:36:15 2013)
This commit also adds a regression test for this case, though this currently only works with Mono
This aims to address http://opensimulator.org/mantis/view.php?id=6704
 2013-07-11 23:02:30 +01:00
Diva Canto 51d106cff8 Added a test for the asset service 2013-07-11 14:21:57 -07:00
justincc ccceb6d6d2 Fix windows build break fromrecent dd1f95 for real this time - put new dll reference in the wrong place 2013-07-06 00:52:54 +01:00
Justin Clark-Casey (justincc) a44ad01492 Fix build break from recent commit dd15f95 on windows 2013-07-06 00:32:11 +01:00
Melanie 5ddcc25ee9 Merge branch 'master' into careminster 2013-07-04 22:32:58 +01:00
Justin Clark-Casey (justincc) 16f40c1a15 Add --default option to "debug lludp packet" command to allow packet logging to be performed immediately from client start 2013-07-04 17:29:53 +01:00
Melanie f70357eaa3 Merge branch 'master' into careminster 
Conflicts:
	OpenSim/Framework/Monitoring/BaseStatsCollector.cs
	OpenSim/Region/ClientStack/Linden/Caps/WebFetchInvDescModule.cs
	OpenSim/Region/CoreModules/Avatar/InstantMessage/OfflineMessageModule.cs
	OpenSim/Region/Framework/Scenes/Scene.Inventory.cs
 2013-06-23 01:59:57 +01:00
Justin Clark-Casey (justincc) 9501a583cb Make number of inbound http requests handled available as a httpserver.<port>.IncomingHTTPRequestsProcessed stat 2013-06-18 23:07:18 +01:00
Justin Clark-Casey (justincc) 0d2fd0d914 Make general server stats available on the robust console as well as the simulator console 
This means the "show stats" command is now active on the robust console.
 2013-06-17 22:39:00 +01:00
Melanie 7c0bfca7a0 Adding Avination's PollService to round out the HTTP inventory changes 2013-06-07 23:43:45 +01:00
Melanie fe4a67efb6 Merge branch 'avination-current' into careminster 
Conflicts:
	OpenSim/Region/CoreModules/Avatar/Inventory/Transfer/InventoryTransferModule.cs
	OpenSim/Region/Framework/Interfaces/IDynamicMenuModule.cs
	OpenSim/Region/OptionalModules/ViewerSupport/DynamicMenuModule.cs
	OpenSim/Region/OptionalModules/World/MoneyModule/SampleMoneyModule.cs
 2013-06-06 03:20:15 +01:00
Melanie a7dbafb0e3 Port Avination's inventory send throttling 2013-06-05 23:42:50 +01:00
Melanie 648e258b8e Merge branch 'master' into careminster 
Conflicts:
	OpenSim/Region/CoreModules/Avatar/Gods/GodsModule.cs
	OpenSim/Region/ScriptEngine/Shared/Api/Implementation/AsyncCommandManager.cs
 2013-06-04 21:09:25 +01:00
BlueWall 328883700a UserProfiles 
UserProfiles for Robust and Standalone. Includes service and connectors for Robust and standalone opensim plus matching region module.
 2013-05-30 17:59:18 -04:00
Melanie 669fa3ff9a Merge branch 'master' into careminster 
Conflicts:
	OpenSim/Region/ClientStack/Linden/UDP/LLClientView.cs
	OpenSim/Region/OptionalModules/Avatar/Voice/VivoxVoice/VivoxVoiceModule.cs
 2013-05-30 21:48:09 +01:00
Justin Clark-Casey (justincc) 4898f18f89 Add HG regression TestCachedUserNameForNewAgent() 2013-05-29 21:28:38 +01:00
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 4275d7a839 Merge branch 'avination-current' of ssh://3dhosting.de/var/git/careminster into avination-current 
Conflicts:
	bin/Regions/Regions.ini.example
 2013-04-28 19:03:39 +02: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
ubit 2eab339b87 Merge branch 'ubitwork' of ssh://3dhosting.de/var/git/careminster into ubitwork 2013-01-26 04:40:48 +01: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
Melanie 818254916c JustinCC's core re-merge 2013-01-16 15:47:55 +00:00
Justin Clark-Casey (justincc) 0963ece25b Implement co-operative script termination if termination comes during a script wait event (llSleep(), etc.) 
This makes use of EventWaitHandles since various web references indicate that Thread.Interrupt() can also cause runtime instability.
If co-op termination is enabled, then termination sets the wait handle instead of waiting for a timeout before possibly aborting the thread.
This allows the script to cleanly terminate if it's in a llSleep/LL function delay or the next time it enters such a wait without any timeout period.
Co-op termination is not yet testable since checking for termination request within loops that never trigger a wait is not yet implemented.
This commit, unlike 1b5c41c, passes the wait handle as an extra parameter through IScript.Initialize() instead of passing IScriptInstance itself.
 2013-01-16 02:07:43 +00:00
Justin Clark-Casey (justincc) b8949024bc Revert "Implement co-operative script termination if termination comes during a script wait event (llSleep(), etc.)" 
Doing this as a favour to Melanie.  This will be back with passing the wait handles directly to the api.

This reverts commit 1b5c41c14a.
 2013-01-16 01:45:09 +00:00
Justin Clark-Casey (justincc) 1b5c41c14a Implement co-operative script termination if termination comes during a script wait event (llSleep(), etc.) 
This makes use of EventWaitHandles since various web references indicate that Thread.Interrupt() can also cause runtime instability.
If co-op termination is enabled, then termination sets the wait handle instead of waiting for a timeout before possibly aborting the thread.
This allows the script to cleanly terminate if it's in a llSleep/LL function delay or the next time it enters such a wait without any timeout period.
Co-op termination is not yet testable since checking for termination request within loops that never trigger a wait is not yet implemented.
 2013-01-16 00:12:40 +00:00
Justin Clark-Casey (justincc) fccb03227e Instead of passing separate engine, part and item components to script APIs, pass down IScriptInstance instead. 
This is to allow the future co-operative script thread terminate feature to detect and act upon termination requests.
This splits the assembly and state loading out from the ScriptInstance() constructor to a separate Load() method
in order to facilititate continued script logic regression testing.
 2013-01-15 21:13:22 +00:00
Melanie 7943c8d11c Merge branch 'master' into careminster 
Conflicts:
	OpenSim/Region/ScriptEngine/Shared/Api/Implementation/LSL_Api.cs
 2013-01-02 11:52:37 +00:00
Robert Adams 48f718f39f BulletSim: first round of conversion from direct BulletSimAPI interfacing by BulletSim core to using the BulletSimAPITemplate. Physical object creation and destruction first. 2012-12-31 19:57:21 -08:00
Melanie 258588d5b5 Merge branch 'master' into careminster 2012-12-26 01:16:08 +00:00
teravus 92e4f9f412 * Initial commit of BulletSimN (BulletSNPlugin). Purely C# implementation of BulletSim. This is designed to be /as close as possible/ to the BulletSim plugin while still being entirely in the managed space to make keeping it up to date easy as possible (no thinking work). This implementation is /slower/ then the c++ version just because it's fully managed, so it's not appropriate for huge sims, but it will run small ones OK. At the moment, it supports all known features of BulletSim. Think of it like.. POS but everything works. To use this plugin, set the physics plugin to BulletSimN. 2012-12-23 15:21:25 -05:00
Melanie f30d519bcc Merge branch 'master' into careminster 2012-12-09 21:27:32 +00:00
BlueWall 063f37cf73 One more time... 
needed one more "../" in the path (copy paste): Thanks BrucePatton for catching that one
 2012-12-07 20:03:15 -05:00
BlueWall a6e5a2f4df Prebuild fix 
Had moved the class to a different namespace but failed to add the reference
 2012-12-07 19:41:07 -05:00
BlueWall 0b455d2882 Merge branch 'master' into connector_plugin 2012-12-07 15:36:43 -05:00
Melanie 2cb824d3fc Merge branch 'master' into careminster 
Conflicts:
	OpenSim/Region/CoreModules/Avatar/InstantMessage/MessageTransferModule.cs
	OpenSim/Region/Framework/Scenes/Scene.cs
 2012-12-07 03:49:04 +00:00
Justin Clark-Casey (justincc) 7fdc251774 Add path references for Mono.Addins where they were missing for DataSnapshot and UserStatistics. 
Should address http://opensimulator.org/mantis/view.php?id=6444
Appears that nant doesn't need these paths but building directly in monodevelop does.
 2012-12-04 22:24:51 +00:00
ubit 5d4b7d537d Merge branch 'ubitwork' of ssh://3dhosting.de/var/git/careminster into ubitwork 2012-12-03 21:26:36 +01:00
BlueWall c754003944 Merge branch 'master' into connector_plugin 
Conflicts:
	OpenSim/Server/Base/ServicesServerBase.cs
 2012-11-25 17:03:14 -05:00
Melanie fd7a83f439 Merge branch 'master' into careminster 
Conflicts:
	OpenSim/Region/CoreModules/World/Estate/EstateManagementModule.cs
	OpenSim/Region/CoreModules/World/Land/LandManagementModule.cs
 2012-11-25 14:13:50 +00:00
Justin Clark-Casey (justincc) 22d4c52ffc Consistenly make NUnit test cases inherit from OpenSimTestCase which automatically turns off any logging enabled between tests 2012-11-24 03:15:24 +00:00
Justin Clark-Casey (justincc) 82690e1384 Fix bug where loading an OAR with a deeded parcel would always set the parcel owner ID to the estate owner even if the group UUID was present. 
Aims to address http://opensimulator.org/mantis/view.php?id=6355
As part of this work, an incomplete IXGroupsData was added which currently only allows store/fetch/delete of group records
(i.e. no membership data etc)
This is subject to change and currently only an in-memory storage implementation exists for regression test purposes.
 2012-11-24 02:43:31 +00:00
Melanie c2e89334b8 Merge branch 'master' into careminster 2012-11-23 01:44:35 +00:00
justincc 7133b6bb4f Fix recent windows build break. 
Add missing OpenSim.Framework.Servers reference
 2012-11-23 01:43:11 +00:00
Melanie 3c1a58c67a Merge branch 'master' into careminster 2012-11-22 13:37:27 +00:00
Justin Clark-Casey (justincc) 45d1e6ab09 Make "show info" command available across all servers 
This helpfully lists version information, startup location and console log level
 2012-11-22 04:45:53 +00:00
Melanie c4c6121752 Merge branch 'master' into careminster 2012-11-22 03:17:33 +00:00
Justin Clark-Casey (justincc) bac8ac32da Add regression test for a good request made to the asset service post handler. 
Adds new OpenSim.Server.Handlers.Tests.dll to test suite
 2012-11-21 23:42:34 +00:00
Melanie e4659a83f1 Merge branch 'master' into careminster 2012-11-17 02:03:24 +00:00
Justin Clark-Casey (justincc) e25c51330a Add basic XInventoryServicesTests.TestAddItem() regression test. 2012-11-17 00:12:25 +00:00
Melanie 5895c4cc6f Merge branch 'master' into careminster 
Conflicts:
	OpenSim/Region/ClientStack/Linden/UDP/LLUDPServer.cs
 2012-11-15 03:46:10 +00:00
Justin Clark-Casey (justincc) 0c4efdc6a8 Fix build break from 1aa0271 by adding System.Core to prebuild.xml 2012-11-15 03:32:03 +00:00
BlueWall 07f1d44174 Merge branch 'master' into connector_plugin 2012-10-20 05:25:58 -04:00
BlueWall 99bb6c9304 Move PluginManager 
Move PluginManager out to OpenSimFramework for general use
 2012-10-19 07:38:36 -04:00
Melanie 6ce93b22d1 Merge branch 'master' into careminster 
Conflicts:
	OpenSim/Region/ClientStack/Linden/UDP/LLClientView.cs
	OpenSim/Region/ClientStack/Linden/UDP/LLUDPServer.cs
	OpenSim/Region/Framework/Scenes/Scene.cs
 2012-10-12 19:05:06 +01:00
Justin Clark-Casey (justincc) 1e86c58822 Remove now unnecessary OpenSim.Framework.Console reference from Monitoring. 
Properly resolve circular reference which no longer appeared in Mono build as there were no using statements for it.
 2012-10-12 01:58:46 +01:00
Justin Clark-Casey (justincc) 387ce8ef35 Fix build break by moving OpenSim.Framework.Console back below HttpServer in the build order. 
Luckily, it turns out Framework.Monitoring doesn't need to reference Console directly.
 2012-10-12 00:10:51 +01:00
Justin Clark-Casey (justincc) 1f2472d0fc Extend "show stats" command to "show stats [list|all|<category name>]" 
This allows different categories of stats to be shown, with options to list categories or show all stats.
Currently categories are scene and simulator and only a very few stats are currently registered via this mechanism.
This commit also adds percentage stats for packets and blocks reused from the packet pool.
 2012-10-11 23:28:53 +01:00
BlueWall 08f6c8065e Add System.Core to references 2012-10-10 09:32:31 -04:00
BlueWall 252af020b0 Merge branch 'master' into connector_plugin 
Conflicts:
	OpenSim/Server/ServerMain.cs
 2012-10-09 06:44:14 -04:00
Melanie f7df68d922 Merge branch 'master' into careminster 
Conflicts:
	OpenSim/Region/CoreModules/Avatar/Lure/LureModule.cs
	OpenSim/Region/Framework/Scenes/Scene.cs
	OpenSim/Region/ScriptEngine/Shared/Api/Implementation/LSL_Api.cs
	OpenSim/Services/Connectors/Asset/AssetServicesConnector.cs
 2012-10-07 02:48:28 +01:00
BlueWall 440726250c Added parts to manage repositories and plugin management 
This is working - more testing to follow, then soem documentation
 2012-10-06 11:48:21 -04:00
Justin Clark-Casey (justincc) d87813a194 Finally fix build break by allowing UserManagementModule (which constructs a packet directly) to reference OpenSim.Region.ClientStack.LindenUDP. 
This time I actually properly did a clean build
 2012-10-05 02:02:19 +01:00
Melanie 001ec0e2e6 Merge branch 'avination' into careminster 
Conflicts:
	OpenSim/Region/CoreModules/Agent/AssetTransaction/AgentAssetsTransactions.cs
	OpenSim/Region/Framework/Scenes/Scene.cs
 2012-09-27 17:29:44 +01:00
ubit de77bf7c5b Merge branch 'ubitwork' of ssh://3dhosting.de/var/git/careminster into ubitwork 2012-09-24 23:58:44 +02:00
UbitUmarov a1a0a90720 more upload changes (plus untouch prebuild.xml) 2012-09-24 22:57:33 +01:00
ubit 23972a8ae2 Merge branch 'ubitwork' of ssh://3dhosting.de/var/git/careminster into ubitwork 2012-09-24 22:28:26 +02:00
UbitUmarov 7ae0b5e605 touch prebuild.xml 2012-09-24 21:28:03 +01:00
ubit 653d97b739 Merge branch 'ubitwork' of ssh://3dhosting.de/var/git/careminster into ubitwork 2012-09-24 22:25:21 +02:00
Melanie 2d02405186 Change the poll service to use a thread pool for replies to make sure the 
event queues aren't blocked by other traffic.
 2012-09-23 23:16:25 +02:00
ubit 279c87d0f3 Merge branch 'ubitwork' of ssh://3dhosting.de/var/git/careminster into ubitwork 2012-09-17 14:52:49 +02:00
UbitUmarov f79de2232e fix build 2012-09-17 13:52:27 +01:00
ubit 434704fa99 Merge branch 'ubitwork' of ssh://3dhosting.de/var/git/careminster into ubitwork 2012-09-17 14:35:01 +02:00
UbitUmarov bc85c1d084 add suport funtions for mesh upload costs 2012-09-17 13:32:58 +01:00
Melanie 66bf1376b5 Merge branch 'avination' into careminster 
Conflicts:
	OpenSim/Capabilities/Handlers/GetTexture/GetTextureHandler.cs
 2012-09-16 04:21:18 +01:00
Melanie db774d4292 Merge branch 'master' into careminster 
Conflicts:
	OpenSim/Region/CoreModules/Framework/EntityTransfer/HGEntityTransferModule.cs
	OpenSim/Region/Framework/Scenes/EventManager.cs
 2012-09-16 04:11:20 +01:00
Justin Clark-Casey (justincc) 1ec84ac8b1 Add basic asset connector tests to check behaviour for normal, local and temporary assets. 
Make AssetServiceConnector return more useful data on failure, such as what DLL it was trying to load
Allow LocalAssetServiceConnector.GetData() to work without a cache present, as works for the other lasc Get* methods.
 2012-09-15 02:12:26 +01:00
BlueWall 81fda6f947 Revert "Fix prebuild.xml format for reference" 
This reverts commit 96f889b20e.
 2012-09-11 23:43:37 -04:00
BlueWall 96f889b20e Fix prebuild.xml format for reference 
Mono.Data.SQL entry was bad
 2012-09-11 22:56:29 -04:00
ubit 277d0923e7 Merge branch 'ubitwork' of ssh://3dhosting.de/var/git/careminster into ubitwork 2012-09-11 13:35:08 +02:00
UbitUmarov 0d5023b46b fix prebuild.xml 2012-09-11 12:34:44 +01:00
ubit ba6a2ec526 Merge branch 'ubitwork' of ssh://3dhosting.de/var/git/careminster into ubitwork 2012-09-11 13:32:26 +02:00
ubit 56105384ec dummy commit 2012-09-11 13:32:05 +02:00
Melanie a6753c14a5 Revamp the v3 inventory sending. Uses threads and some nifty mechanics to 
leverage the Poll Service without blocking it's workers.
 2012-09-11 10:39:43 +02:00
Melanie e2e8b09059 Merge branch 'master' into careminster 2012-09-02 22:15:55 +01:00
BlueWall a0eda6eb16 Fix Windows build 
Add reference to fix Windows build: no windows here to test, please report any issues back to IRC #opensim-dev ASAP
 2012-08-31 13:09:54 -04:00
Melanie 1b15144208 Merge branch 'master' into careminster 
Conflicts:
	OpenSim/Data/MySQL/MySQLSimulationData.cs
	OpenSim/Region/ClientStack/Linden/UDP/LLClientView.cs
	OpenSim/Region/CoreModules/Scripting/LSLHttp/UrlModule.cs
	OpenSim/Region/ScriptEngine/Shared/Api/Implementation/OSSL_Api.cs
 2012-08-31 01:32:18 +01:00
Justin Clark-Casey (justincc) adce58b33a Renaming existing 'torture' tests to 'performance' tests instead, since this better matches what they really do. 
nant target name changes to test-perf instead of torture, to match test-stress
still not run by default
 2012-08-29 23:19:21 +01:00
Justin Clark-Casey (justincc) ec726413dd Add VectorRenderModuleStressTests that contains a long running test that generates thousands of vector textures concurrently. 
Intended for use if there are future issues with mono crashes whilst generate dynamic textures.
This test is triggered via a new test-stress nant target.
Not run by default.
 2012-08-29 23:04:00 +01:00
Melanie f8603a215d Merge branch 'master' into careminster 
Conflicts:
	OpenSim/Framework/IClientAPI.cs
	OpenSim/Region/ClientStack/Linden/UDP/LLClientView.cs
	OpenSim/Region/CoreModules/ServiceConnectorsOut/Simulation/LocalSimulationConnector.cs
	OpenSim/Region/Framework/Scenes/Scene.cs
	OpenSim/Region/OptionalModules/Agent/InternetRelayClientView/Server/IRCClientView.cs
	OpenSim/Region/OptionalModules/World/NPC/NPCAvatar.cs
	OpenSim/Region/ScriptEngine/Shared/Api/Implementation/LSL_Api.cs
 2012-08-23 01:41:47 +01:00
Justin Clark-Casey (justincc) bcbd450fe4 Add --force flag to "kick user" console command to allow bypassing of recent race condition checks. 
This is to allow a second attempt to remove an avatar even if "show connections" shows them as already inactive (i.e. close has already been attempted once).
You should only attempt --force if a normal kick fails.
This is partly for diagnostics as we have seen some connections occasionally remain on lbsa plaza even if they are registered as inactive.
This is not a permanent solution and may not work anyway - the ultimate solution is to stop this problem from happening in the first place.
 2012-08-20 20:24:54 +01:00
ubit d1b3f68df4 try fixing building.. 2012-08-16 16:53:43 +02:00
UbitUmarov df2f9b1885 *** TESTTTTT ** downgrade from .net 4.0 to .net3.5 2012-08-06 11:04:29 +01:00
Melanie 0c00abcce1 Merge branch 'master' into careminster 
Conflicts:
	OpenSim/Region/Framework/Scenes/SceneObjectGroup.cs
 2012-08-03 16:46:11 +01:00
Justin Clark-Casey (justincc) 86b005de1d Add simple draw test for the VectorRenderModule 2012-08-02 22:14:09 +01:00
Melanie 45b72bf01c Fix some merge issues and a functional issue in the scene manager 2012-07-28 01:06:28 +01:00
Melanie 771d79e83e Merge branch 'master' into careminster 
Conflicts:
	OpenSim/Framework/Monitoring/BaseStatsCollector.cs
	OpenSim/Region/Application/OpenSim.cs
	OpenSim/Region/Application/OpenSimBase.cs
	OpenSim/Region/Framework/Scenes/SceneManager.cs
	bin/OpenMetaverse.Rendering.Meshmerizer.dll
	bin/OpenMetaverse.StructuredData.dll
	bin/OpenMetaverse.dll
	bin/OpenMetaverseTypes.dll
	prebuild.xml
 2012-07-28 00:39:36 +01:00
Justin Clark-Casey (justincc) 5aec0ff207 Move Watchdog and MemoryWatchdog classes into OpenSim.Framework.Monitoring with other monitoring code from OpenSim.Framework 2012-07-25 23:27:00 +01:00
Justin Clark-Casey (justincc) 35efa88c26 Rename OpenSim.Framework.Statistics to OpenSim.Framework.Monitoring. 
This better reflects the long-term purpose of that project and matches Monitoring modules.
 2012-07-25 23:11:50 +01:00
Justin Clark-Casey (justincc) a1e99642c1 Add experimental "OpenSim object memory churn" statistics to output of region console "show stats" command 
This aims to capture the amount of memory that OpenSim turns over whilst operating a region.
This memory is not lost - apart from leaks it is reclaimed by the garbage collector.
However, the more memory that gets turned over the more work the GC has to do to reclaim it.
 2012-07-25 22:29:40 +01:00