Commit Graph

694 Commits (3076761d774479b428b5439f402490532d8193d6)

Author SHA1 Message Date
Dan Lake 0445e6e251 Merge branch 'master' of git://opensimulator.org/git/opensim into dev 2011-03-29 13:42:01 -07:00
Justin Clark-Casey (justincc) de0730a54c Add OpenSim.Server.Base reference in prebuild.xml. Initialize svc_checks dictionary in WebkeyOrPasswordAuthenticationService, which was what was causing the load failure. 2011-03-26 02:42:50 +00:00
Justin Clark-Casey (justincc) ea72745d43 Log the xml/ini regions config files that opensim loads from, and the regions that it loaded from them
This will show up with the lines [REGION LOADER FILE SYSTEM]: Loading config files from ./Regions, etc.
2011-03-25 23:18:47 +00:00
Justin Clark-Casey (justincc) b34743e5fe Add an initial confidence-building TestAddObject() for prim counts. 2011-03-22 23:47:36 +00:00
BlueWall 97d46648cd More SQLite work. 2011-03-22 16:42:12 -04:00
Dan Lake b1114dcb98 Merge branch 'master' of git://opensimulator.org/git/opensim into dev
Conflicts:
	OpenSim/Region/CoreModules/World/Media/Moap/MoapModule.cs
2011-03-07 16:03:50 -08:00
Justin Clark-Casey (justincc) 481ca910da add test for MoapModule.SetMediaUrl() 2011-03-05 01:07:05 +00:00
Dan Lake cf15fc0b97 Merge branch 'master' of git://opensimulator.org/git/opensim into dev
Conflicts:
	OpenSim/Services/Connectors/Simulation/SimulationServiceConnector.cs
2011-01-24 20:03:20 -08:00
Justin Clark-Casey (justincc) 6ef7ea454c Remove old 2 year unused linden stack region module shell 2011-01-21 22:48:04 +00:00
Justin Clark-Casey (justincc) c383dbd06d implement "show throttles" command for showing current agent throttles and the server settings.
This is in a very crude state, currently.
The LindenUDPModule was renamed LindenUDPInfoModule and moved to OptionalModules
OptionalModules was given a direct reference to OpenSim.Region.ClientStack.LindenUDP so that it can inspect specific LindenUDP settings without having to generalize those to all client views (some of which may have no concept of the settings involved).
This might be ess messy if OpenSim.Region.ClientStack.LindenUDP were a region module instead, like MXP, IRC and NPC
2011-01-21 00:38:16 +00:00
Justin Clark-Casey (justincc) df740d8e5c remove reference to CoreModules from ClientStack.LindenUDP
client stack uses modules in the same way that scene does - through their interfaces
2011-01-20 23:21:25 +00:00
BlueWall 69c8cc787f Make FireAndForgetWrapper a singleton class
Made FireAndForgetWrapper a singleton class to allow us to drop
	dependancy on the BclExtras35 library. BclExtras is broken in
	Mono 2.8.2 and we used the library in only one function.
2011-01-13 19:52:34 +00:00
Robert Adams be2af26231 Merge branch 'dev' into physics
Conflicts:
	OpenSim/Region/ClientStack/LindenUDP/LLClientView.cs
	OpenSim/Region/CoreModules/RegionSync/RegionSyncModule/RegionSyncClient.cs
	OpenSim/Region/Framework/Scenes/Scene.cs
	OpenSim/Region/Framework/Scenes/SceneObjectGroup.cs
2011-01-03 10:47:19 -08:00
Dan Lake adeab48e7e Merge branch 'master' into danmerge 2011-01-02 18:38:58 -08:00
justincc eb07dfc900 Fix windows compile break 2010-12-15 01:06:20 +00:00
Justin Clark-Casey (justincc) 81bccd6d13 Start implementing a test for 'share with group' object functionality. Not yet complete.
While implementing this, a bug was fixed in scene setup helpers where module RegionLoaded() was called immediately after AddRegion() instead of waiting for all AddRegions() to complete.
Also, XmlRpcGroupsModule non-message functionality will now work without a message transfer module (as indicated in the comments but with a contradictory implementation)
2010-12-14 23:36:34 +00:00
Justin Clark-Casey (justincc) 42c9c30e4c Add mock group services connector and use this in tests 2010-12-14 22:57:36 +00:00
Justin Clark-Casey (justincc) c620e4c822 add infrastructure for groups module tests 2010-12-14 22:25:01 +00:00
Dan Lake c7923338bc Merge branch 'master' into danmerge
Conflicts:
	OpenSim/Region/Framework/Scenes/ScenePresence.cs
	bin/OpenSim.exe.config
2010-12-09 15:49:40 -08:00
Robert Adams a036426f18 PhysActor update messages working. Avatar and prim neither move nor position correctly 2010-12-08 17:19:06 -08:00
Robert Adams 24bef963c7 Initial connection of phys actor 2010-12-06 10:57:39 -08:00
Dan Lake 681190f682 Merge branch 'master' into danmerge
Conflicts:
	.nant/local.include
	OpenSim/Client/Sirikata/ClientStack/SirikataClientView.cs
	OpenSim/Framework/AvatarAppearance.cs
	OpenSim/Framework/IClientAPI.cs
	OpenSim/Region/Application/OpenSim.cs
	OpenSim/Region/ClientStack/LindenUDP/LLClientView.cs
	OpenSim/Region/Framework/Scenes/EventManager.cs
	OpenSim/Region/Framework/Scenes/Scene.cs
	OpenSim/Region/Framework/Scenes/SceneGraph.cs
	OpenSim/Region/Framework/Scenes/SceneObjectGroup.cs
	OpenSim/Region/Framework/Scenes/SceneObjectPart.cs
	OpenSim/Region/Framework/Scenes/ScenePresence.cs
	OpenSim/Region/Framework/Scenes/Serialization/SceneObjectSerializer.cs
	OpenSim/Region/Framework/Scenes/Tests/SceneTests.cs
	OpenSim/Region/ScriptEngine/Shared/Api/Implementation/LSL_Api.cs
	bin/config-include/SimianGrid.ini
	prebuild.xml
2010-11-30 17:36:36 -08:00
Diva Canto f86c438653 Preservation of creator information now also working in IARs. Cleaned up usage help. Moved Osp around, deleted unnecessary OspInventoryWrapperPlugin, added manipulation of SOP's xml representation in a generic ExternalRepresentationUtils function. 2010-11-29 08:43:33 -08:00
Diva Canto ae4b02e115 WARNING: LOTS OF CONFIGURATION CHANGES AFFECTING PRIMARILY HG CONFIGS. Added capability to preserve creator information on HG asset transfers. Added a new HGAssetService that is intended to be the one outside the firewall. It processes and filters the assets that go out of the grid. Also fixed the normal AssetService to do special things for the main instance (console commands, etc). Moved HGInventoryService to OpenSim.Services.HypergridService. Changed the way the login service gets the ServiceURL configs. 2010-11-25 11:14:16 -08:00
Robert Adams 9e68de6b8f PE physics plugin stubs 2010-11-23 13:32:46 -08:00
Melanie 2b0ef9ad1d Implement a method to allow regions to query the gridwide Freeswitch
configuration from ROBUST
2010-11-21 22:17:25 +00:00
Marck 98f29a47c0 Do not include hyperlinks in a random region search during a login.
Before a random region is chosen, available fallback regions are used for the login.
2010-11-13 00:40:03 +00:00
BlueWall 9c8680cd69 Fix prebubild.exe for Nant add missing "/" fixes Nant builds 2010-11-12 17:35:06 +00:00
BlueWall 672ee2a888 Prebuild fix
Make prebuild fix for monodevelop. Needed path to reference
	legacy Mono.Data.SQLite in ./bin/Mono.Data.SQLite.dll.
2010-11-12 01:17:33 +00:00
Marck 7b0d643999 HypergridLinker optimizations and enable use of owner_uuid/EstateOwner with linked regions.
* Added check for already occupied region coordinates.
* Optimized Check4096.
2010-10-28 17:21:17 -07:00
Justin Clark-Casey (justincc) 199b61f1b2 start parsing iar control file
This change requires a prebuild[.sh|.bat] since a System.Xml.Linq reference is added to prebuild.xml
2010-10-22 19:24:42 +01:00
dahlia 7fa3335fd5 initial support for meshies physics. Must set ini option UseMeshiesPhysicsMesh = true to enable. See file OpenSimDefaults.ini for example. 2010-10-18 04:17:36 -07:00
dahlia bcdd03c1cf more work in progress on mesh physics - still non-functional 2010-10-14 20:25:31 -07:00
Melanie 6ac6ca057d Kill some magic numbers in the caps module 2010-10-14 07:28:20 +01:00
Melanie 613bdb40bd Remove sirikata project 2010-10-06 00:22:08 +01:00
Melanie ab4be3ffdf Initial port of the Warp3D map tile renderer 2010-10-03 16:34:17 +01:00
Teravus Ovares (Dan Olivares) 983c6a74b1 * Add CSharpSqlite to prebuild
* Use a conditional define to determine whether we're using CSharpSqlite or Mono.Data.Sqlite
#if CSharpSqlite
    using Community.CsharpSqlite.Sqlite;
#else
    using Mono.Data.Sqlite;
#endif
* Hopefully, this will restore sqlite functionality on a Mac.  In visual studio, you can edit the OpenSim.Data.SQLite project, go to the Build tab and enter CSharpSqlite in the box.  I'm not sure how to define CSharpSqlite in Mono, someone better at it then me will have to take the job of figuring out the best way to define it in Mono.
2010-09-23 01:21:08 -04:00
John Hurliman 0db1ed0b5a * Added ISimulationDataService and IEstateDataService
* Removed StorageManager
* CONFIG CHANGE: There are no more database settings in OpenSim.ini. Check the config-include configuration files for region store and estate store database settings
2010-09-12 14:20:26 -07:00
BlueWall 1e44ec84bd Build system upgrade:
Upgrading Prebuild.exe to correctly construct build solutions
	for crossplatform tools such as xbuild, monodevelop and nant.

	NOTE: Module prebuild files will need modification to work,
	as the prebuild must correctly define the reference path for
	all assemblies shipped in the OpenSimulator ./bin directory.
	These include assemblies such as XMLRPC.dll, OpenMetaverse.dll,
	Nini.dll, etc. . The entries should follow the form:

		<Reference name="Nini" path="../../../bin/"/>

	See the distributed prebuild.xml for further examples.

	Crossplatform tools: xbuild and monodevelop use the
	vs2008 OpenSim.sln and the .csproj files in each namespace.

	Changes to the Prebuild.exe are against svn 322 and are included
	in a patch attached to the mantis. And the dnpb source are
	available@ svn co https://dnpb.svn.sourceforge.net/svnroot/dnpb dnpb
	The patches are pending application by the dnpb team. After which,
	the un-modified upstream Prebuild.exe will work as expected.
2010-09-04 02:12:21 +01:00
Marck fcc83f2305 Unit test for ConfigurationLoader.
Adds a new test assembly for OpenSim.
2010-08-13 23:59:33 +01:00
justincc 1cffeab99d Relocate one System.Core reference from last commit to the Tests project
Ooops, shouldn't have assumed that the tests project came after the main on
2010-08-06 22:53:43 +01:00
Justin Clark-Casey (justincc) a9bbff0cd3 Add System.Core references to OpenSim.Region.CoreModules.* to fix windows build
This addresses http://opensimulator.org/mantis/view.php?id=4923
2010-08-06 22:44:44 +01:00
Justin Clark-Casey (justincc) 1270727c96 Merge branch 'moap' 2010-08-06 18:29:30 +01:00
Melanie 71cd4d6e84 Revert "remove long unused OpenSim/Framework/Configuration/* projects"
This reverts commit cdd3f17b2b.
2010-08-04 01:10:01 +01:00
Justin Clark-Casey (justincc) c6bc1d28ec move ChannelDigger from its own project into the main terrain module with the rest of the effects 2010-07-30 20:34:14 +01:00
Justin Clark-Casey (justincc) cdd3f17b2b remove long unused OpenSim/Framework/Configuration/* projects 2010-07-30 20:19:46 +01:00
Justin Clark-Casey (justincc) 9682e0c733 Implement media texture persistence over server restarts for sqlite
This is currently persisting media as an OSDArray serialized to LLSD XML.
2010-07-26 23:34:19 +01:00
Dan Lake 9ada2a1f34 Client manager changes as of R@I 2010-07-19 13:03:04 -07:00
Dan Lake 9afa8b990d Merged from master 2010-06-02 14:40:10 -07:00
Dan Lake 6818427f1c More Scene API changes 2010-06-01 16:13:38 -07:00