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

1789 Commits (27d345c9a0047af44296184557aed25719b2759e)

Author SHA1 Message Date
Diva Canto 2970a18e54 Merge branch 'master' of ssh://opensimulator.org/var/git/opensim 2012-04-27 09:26:14 -07:00
Diva Canto e4e754ee93 MapImageService: added an additional security check for OSGrid and other grids like it. 2012-04-27 09:23:56 -07:00
Melanie 90305001de Merge branch 'master' into careminster 
Conflicts:
	OpenSim/Region/CoreModules/Framework/EntityTransfer/EntityTransferModule.cs
	OpenSim/Region/Framework/Scenes/Scene.Inventory.cs
	OpenSim/Region/Framework/Scenes/Scene.cs
 2012-04-27 17:09:49 +01:00
Mic Bowman a2d544c938 Add a configuration switch to turn on/off the use of the trash 
folder when deleting objects from a scene. The use of the trash
folder causes assets to be created and stored everytime you delete
an object from the scene (slows down the delete and adds mostly useless
assets to your database).

Default is on (use the trash folder) which is the standard behavior.
 2012-04-25 11:54:57 -07:00
Melanie fc9f244a7d Merge branch 'master' into careminster 2012-04-18 00:28:33 +01:00
Mic Bowman 2d45ba47ac add configuration for jsonstore module, disabled by default 2012-04-17 13:55:00 -07:00
Melanie fe65b51876 Merge branch 'master' into careminster 
Conflicts:
	OpenSim/Region/Framework/Scenes/SceneObjectPartInventory.cs
 2012-04-13 03:00:48 +01:00
nebadon 30d8506bc2 make changes to FlotsamCache.ini.example as noted in mantis #5960 
http://opensimulator.org/mantis/view.php?id=5960
 2012-04-12 18:27:14 -07:00
Melanie 4a67e8b98f Merge branch 'master' into careminster 
Conflicts:
	OpenSim/Region/Framework/Interfaces/IEstateModule.cs
 2012-04-11 23:35:27 +01:00
Snoopy Pfeffer 1f4d3d3582 HGFriendsModule: Added optional user level based restriction to send friendship invitations to foreign users. 2012-04-11 18:52:07 +02:00
Justin Clark-Casey (justincc) fb44e7b636 minor: convert tabs to spaces in config example files from recent 7c534e5 2012-04-10 17:46:34 +01:00
Justin Clark-Casey (justincc) 2b339bfd97 Correct max_listeners_per_region in OpenSimDefaults.ini to max_listens_per_region 
Value for this setting in OpenSimDefaults.ini (1000) is same as setting in code (1000) so this should have no effect
Thanks to Ovi Chris Rouly for pointing this out.
 2012-04-10 17:22:02 +01:00
Melanie a25d12d166 Merge branch 'master' into careminster 2012-04-08 02:25:48 +01:00
Diva Canto 7c534e558d Added gatekeeper and uas addresses to grid info, so that viewers can take advantage of that info. 2012-04-07 14:38:32 -07:00
Robert Adams 4138880464 BulletSim: update 64 bit libraries and change Linux configuration to use the files in the lib32 and lib64 directories as needed. 2012-03-28 15:36:20 -07:00
Melanie 7dad1ded2e Merge branch 'master' into careminster 
Conflicts:
	OpenSim/Region/CoreModules/Avatar/Friends/FriendsModule.cs
 2012-03-29 00:27:35 +01:00
Melanie b18b1b1d70 Merge branch 'master' into careminster 
Conflicts:
	OpenSim/Region/ScriptEngine/Shared/Api/Implementation/LSL_Api.cs
 2012-03-27 23:14:43 +01:00
Snoopy Pfeffer 7223b63563 User level based restrictions for HyperGrid teleports, asset uploads, group creations and getting contacted from other grids. Incoming HyperGrid teleports can also be restricted to local users. 2012-03-27 22:09:58 +02:00
Melanie 6b5f3b49e7 Merge branch 'master' into careminster 2012-03-27 18:11:05 +01:00
Robert Adams 84c9bd52d3 BulletSim: update BulletSim binaries and configuration fixing a crash which happens when there are more than a few hundred physical objects. 2012-03-26 13:48:15 -07:00
Melanie 0bd0514e81 Merge branch 'master' into careminster 2012-03-26 16:47:02 +01:00
Robert Adams 3691e39178 BulletSim: update BulletSim.dll and libBulletSim.so with latest versions 2012-03-26 08:48:51 -07:00
Robert Adams ff54b3c366 BulletSim: change default of shouldDisableContactPoolDynamicAllocation from False to True. It seems that collisions don't happen well when it is False (things fall through terrain). 2012-03-23 15:50:32 -07:00
Robert Adams 142de1d02f BulletSim: add a bunch of internal Bullet configuration parameters to OpenSimDefaults.ini and the code. 2012-03-23 13:15:23 -07:00
Robert Adams 2f6e8564fe BulletSim: add updated (but not working) BulletSim dlls 2012-03-23 13:15:20 -07:00
Robert Adams de24feb275 BulletSim: Add AvatarRestitution parameter. Centralize computation of buoyancy for flying. Tweek avatar default friction and resititution 2012-03-23 13:15:17 -07:00
Robert Adams b22d040169 BulletSim: add some new runtime setable parameters to match the dll. 2012-03-23 13:15:14 -07:00
Robert Adams 6c50442625 BulletSim: update BulletSim.dll to Bullet 2.80 and add libBulletSim.so to the new lib32 and lib64 binary directories 2012-03-23 13:15:13 -07:00
Melanie 9a67baae21 Merge branch 'master' into careminster 
Conflicts:
	OpenSim/Region/Framework/Scenes/Scene.cs
 2012-03-23 14:24:55 +00:00
Justin Clark-Casey (justincc) e5b182fb41 Add information about SendPeriodicAppearanceUpdates to OpenSimDefaults.ini for now. 
Default remains false.
 2012-03-23 03:38:33 +00:00
Melanie 9edf99703a Merge commit 'df624c13c98b06d57311c1d93ecbd4790553f3b3' into careminster 2012-03-22 23:01:50 +00:00
Diva Canto 25e5b6a76c Added new simple_build_permissions config to the .ini and .example files. 2012-03-22 14:21:07 -07:00
Melanie 3381899481 Merge branch 'master' into careminster 
Conflicts:
	OpenSim/Region/CoreModules/World/Land/LandObject.cs
	OpenSim/Region/ScriptEngine/Shared/Api/Implementation/LSL_Api.cs
 2012-03-22 20:38:49 +00:00
Melanie 45b588cf00 Revert "Simple build permissions feature. NOTE: EXPERIMENTAL, DISABLED BY DEFAULT. Turns out that this can't be expressed by cascading Permission modules, so I did it as per this patch." 
This reverts commit 6146e7ef25.
 2012-03-22 20:10:38 +00:00
Diva Canto 6146e7ef25 Simple build permissions feature. NOTE: EXPERIMENTAL, DISABLED BY DEFAULT. Turns out that this can't be expressed by cascading Permission modules, so I did it as per this patch. 2012-03-22 12:57:12 -07:00
BlueWall 06c81a2afe Fix typo 
Add enclosing " to urls
 2012-03-21 20:33:45 -04:00
Diva Canto 91cc09b7bf HG Friends config for Robust.HG.ini.example 2012-03-20 21:36:24 -07:00
Melanie ee9210f656 Merge branch 'master' into careminster 
Conflicts:
	OpenSim/Region/CoreModules/Avatar/Friends/FriendsModule.cs
 2012-03-21 00:26:02 +00:00
Diva Canto 3fa51f66ec Merge branch 'master' of ssh://opensimulator.org/var/git/opensim 
Conflicts:
	OpenSim/Framework/Util.cs
 2012-03-20 17:19:14 -07:00
Diva Canto d08ad6459a HG Friends: allow the establishment of HG friendships without requiring co-presence in the same sim. Using avatar picker, users can now search for names such as "first.last@grid.com:9000", find them, and request friendship. Friendship requests are stored if target user is offline. TESTED ON STANDALONE ONLY. 2012-03-20 17:14:19 -07:00
Melanie 5768a151ff Merge branch 'master' into careminster 
Conflicts:
	OpenSim/Data/MySQL/MySQLXAssetData.cs
 2012-03-20 02:48:11 +00:00
Justin Clark-Casey (justincc) 4972491efb Move startup/shutdown command .txt files to .txt.example files to avoid clobbering on updates. 
Thanks to Whitestar in http://opensimulator.org/mantis/view.php?id=5938 for pointing out this problem.
 2012-03-19 00:29:02 +00:00
Justin Clark-Casey (justincc) ab54ce1907 Fix configuration problems where XAssetDatabasePlugin was picked up accidentally. 
The asset data plugin now implements IXAssetData rather than IAssetData so the ordinary AssetService should no longer pick it up.
This replaces the changes in 92b1ade.  There is no longer any need to adjust your StandaloneCommon.ini/Robust.ini/Robust.HG.ini files.
This may explain very recent issues in the last few weeks where textures have been disappearing or turning white (as they were going to different places).
Unfortunately, you will need to rollback to an earlier database backup or reupload the textures.
 2012-03-19 00:18:04 +00:00
Melanie c7e302864a Merge branch 'master' into careminster 
Conflicts:
	OpenSim/Region/CoreModules/World/Estate/EstateManagementModule.cs
	OpenSim/Region/Framework/Scenes/Scene.PacketHandlers.cs
	OpenSim/Region/Framework/Scenes/Scene.cs
 2012-03-18 20:44:56 +00:00
Diva Canto 7dfa0309c6 More on HG access control. This commit splits the UserManagementModule into the Basic one and the HG one, so that we can do everything that needs to be done for HG ACLs to work without interfering with the vanilla opensim. For the moment, it finds foreign users who have left a trace in the region, e.g. an object. This makes it possible to ban/IM/etc these users using the regular avatar picker. TODO: contact the UAS directly given a name of the form First.Last @foo.com. 2012-03-17 15:36:20 -07:00
Diva Canto 92b1ade78e BAD JUSTIN! 
People using standalone in master, please update your StandaloneCommon.ini according to this change.
People using robust in master, please update your Robust.HG.ini.example[.HG].ini according to this change.
 2012-03-17 15:01:10 -07:00
Diva Canto 33c14cb107 Region access control! Region operators can now specify things like DisallowForeigners (means what it says) and DisallowResidents (means that only admins and managers can get into the region). This puts the never-completed AuthorizationService to good use. Note that I didn't implement a grid-wide Authorization service; this service implementation is done entirely locally on the simulator. This can be changed as usual by pluging in a different AuthorizationServicesConnector. 2012-03-17 10:00:11 -07:00
Diva Canto a2009ffe2e Terrain: added [Terrain] section with an option to load an initial flat terrain. Default is still pinhead island. I much rather have a flat land in the beginning. 2012-03-16 13:08:05 -07:00
Justin Clark-Casey (justincc) 78e992dbd0 Move startup_commands.txt.example to startup_commands.txt for consistency with the existing shutdown_commands.txt. 
Add comments to both files saying what they are (files that can contain console commands to execute on sim startup/shutdown) with an example.
 2012-03-16 02:13:45 +00:00
Justin Clark-Casey (justincc) b19be657b6 Remove unnecessary "backup" command in shutdown_commands.txt 
The simulator is already doing this internally.
 2012-03-16 02:10:59 +00:00
Justin Clark-Casey (justincc) 34f6f87b6c Remove unused bin/ScriptEngines/Default.lsl 
It would certainly be nice to change the default script on disk, but this is currently unused and isn't a suitable default.
At this location it would also stop an easy manual deletion of script engine compiles and state.
 2012-03-16 01:51:16 +00:00
Melanie c0f70d17fc Merge branch 'master' into careminster 
Conflicts:
	OpenSim/Region/ScriptEngine/Shared/Instance/ScriptInstance.cs
	OpenSim/Region/ScriptEngine/XEngine/XEngine.cs
 2012-03-14 11:33:51 +00:00
Melanie 1547fe959e Change OpenSim.ini.example to reflect how to actually enable prim limits, 
as opposed to how it was first designed.
 2012-03-12 16:06:35 +00:00
Melanie f292e19689 Merge branch 'master' into careminster 
Conflicts:
	OpenSim/Region/Application/OpenSimBase.cs
 2012-03-11 02:29:43 +00:00
Justin Clark-Casey (justincc) d6ebf2d6ca Add ability to specify a default estate to be used when creating regions. 
This is configured in the new [Estates] section of OpenSim.ini.
If a default estate is configured then all new regions are automatically joined to it instead of asking the user.
If the default estate does not already exist then it is created.
Current default behaviour remains the same - the user is asked for estate details when necessary.
Thanks to Frenando Oliveira for the patch which I adapated further.
 2012-03-10 01:27:05 +00:00
Melanie c521f3b348 Fix UbitODE dll mappping by simply copying the one from ODE.Net 2012-03-09 02:39:02 +01:00
Melanie 6338996f87 Merge branch 'master' into careminster 
Conflicts:
	OpenSim/Services/AuthenticationService/PasswordAuthenticationService.cs
 2012-03-04 16:23:19 +00:00
BlueWall ac934e2dbb Add WebProfiles config to other config example 2012-03-04 11:11:01 -05:00
Melanie 1f32730798 Merge branch 'master' into careminster 
Conflicts:
	OpenSim/Framework/Servers/VersionInfo.cs
	OpenSim/Region/CoreModules/World/WorldMap/WorldMapModule.cs
	OpenSim/Region/Framework/Scenes/ScenePresence.cs
 2012-03-03 09:58:57 +00:00
BlueWall 6fc350725d Merge branch 'master' into v3_support 2012-03-02 15:02:09 -05:00
Justin Clark-Casey (justincc) 255afbf08a Remove more now unused third party libraries. 2012-03-01 02:11:15 +00:00
BlueWall 4177571a78 Merge branch 'master' of ssh://opensimulator.org/var/git/opensim into v3_support 2012-02-25 14:33:56 -05:00
Melanie 6386fdcda7 Merge branch 'master' into careminster 
Conflicts:
	OpenSim/Region/ScriptEngine/Shared/Api/Implementation/LSL_Api.cs
	OpenSim/Region/ScriptEngine/Shared/Api/Interface/ILSL_Api.cs
	OpenSim/Region/ScriptEngine/Shared/Api/Runtime/LSL_Stub.cs
 2012-02-25 16:24:01 +00:00
Justin Clark-Casey (justincc) 4a5f9fe6a2 Move libopenjpeg native libraries into lib32 and lib64 as appropriate. 2012-02-25 04:26:32 +00:00
Justin Clark-Casey (justincc) 6159110258 Remove some more unused Bullet libraries. 2012-02-25 04:22:59 +00:00
Justin Clark-Casey (justincc) ca19b9078f Remove old libbulletnet native libraries. These are not used in the current generation bullet physics plugin. 2012-02-25 03:36:43 +00:00
Justin Clark-Casey (justincc) 6138662716 Move other sqlite and ode 32-bit and 64-bit libraries into lib32 or lib64 as appropriate. 2012-02-25 03:25:56 +00:00
Justin Clark-Casey (justincc) 3fbcd21916 Remove xunit.dll, Fadd.Globalization.Yaml.dll and Fadd.dll. It looks like these were once connected with HttpServer.dll but are now unused. 2012-02-25 03:12:41 +00:00
BlueWall 165ae251ec V3 Support 
The V3 webapps need SSO capability and use OpenID. We need to send both our OpenID server url and a token for the user in the login response.
 2012-02-22 16:36:28 -05:00
BlueWall 67bea681e2 Add web profile url setting to ini 2012-02-21 23:04:49 -05:00
Melanie 03e7bc1526 Merge branch 'master' into careminster 
Conflicts:
 2012-02-21 10:20:56 +00:00
Justin Clark-Casey (justincc) a27e5a9c95 Both 32-bit and 64-bit BulletSim.dll must have the same name. Rename the 64 bit one in lib64 2012-02-21 04:12:17 +00:00
Justin Clark-Casey (justincc) daee2eda93 Load 32-bit or 64-bit BulletSim Windows library automatically as appropriate. 
This uses the same approach as ODE.
radams, if this doesn't work for you please feel free to revert.
 2012-02-21 04:10:39 +00:00
Justin Clark-Casey (justincc) a15b00d3ef Replace previous windows 64-bit sqlite3.dll with one from http://system.data.sqlite.org/downloads/1.0.79.0/sqlite-netFx35-binary-bundle-x64-2008-1.0.79.0.zip 
In this zip, it's called System.Data.SQLite.dll.  We rename it to lib64/sqlite3.dll
This is a little unexpected but it works.  For some reason my hand-rolled one in Visual Studio 2008 did not.
This is sqlite 3.7.10.  Other libraries are still currently 3.7.6 but this should make no difference.
This should make it possible to use OpenSim.exe on 64-bit Windows now, though currently the bullet physics plugin will still complain (can be ignored if you are not using bullet).
 2012-02-21 04:01:27 +00:00
Justin Clark-Casey (justincc) 1b906ef2ad Replace win 64-bit sqlite3.dll with another version, though I suspect this one won't work either. 2012-02-21 03:24:01 +00:00
Justin Clark-Casey (justincc) 68a4ef5ef6 Add 64 bit Windows sqlite3.dll and use this if running a 64-bit windows process. 2012-02-21 02:52:20 +00:00
Justin Clark-Casey (justincc) 19d271d3fc Remove PhysXPlugin and wrappers. 
In over 4 years this never progressed beyond an unimplemented stub.
This doesn't mean that it can't come back if someone is interested in implementing PhysX support.
 2012-02-21 01:45:17 +00:00
Melanie 96409cc2ee Merge branch 'ubitwork' 
Conflicts:
	OpenSim/Region/Physics/ChOdePlugin/ODEPrim.cs
	OpenSim/Region/Physics/ChOdePlugin/OdePlugin.cs
 2012-02-19 20:08:01 +01:00
Melanie 985526b662 Merge branch 'master' into careminster 
Conflicts:
	OpenSim/Region/Framework/Scenes/Scene.Inventory.cs
	OpenSim/Region/Framework/Scenes/Serialization/SceneObjectSerializer.cs
 2012-02-18 22:21:10 +00:00
Justin Clark-Casey (justincc) 0ef64fbe03 Actually add the Windows 64-bit ode.dll file. 
This might be why it didn't work.
 2012-02-18 02:46:07 +00:00
Justin Clark-Casey (justincc) b817c337dc On Windows automatically load the correct native ODE library depending on whether the process is 32-bit or 64-bit 
In theory, this means that a 64-bit Windows OS user can now run OpenSim.exe with ODE and use more than 2 (or 3) GB of memory.
However, this is completely untested since I don't currently own a 64-bit Windows box.  Feedback appreciated.
Using OpenSim.32BitLaunch.exe should continue to work.  Other platforms are unaffected.
This will currently not work with sqlite - I will add that too if this works.
 2012-02-18 00:33:52 +00:00
UbitUmarov 04279e36d1 Merge branch 'master' of ssh://3dhosting.de/var/git/careminster into ubitwork 2012-02-15 03:51:30 +00:00
Melanie 272ba5a741 Merge branch 'master' into careminster 2012-02-15 01:11:17 +00:00
PixelTomsen 33e66107be Fix: Lightshare Module(Windlight)-Region settings are not applicable for database sqlite mantis: http://opensimulator.org/mantis/view.php?id=5888 2012-02-14 02:06:42 +00:00
Justin Clark-Casey (justincc) 48b962c401 Update [XEngine] AppDomainLoading advice in OpenSim.ini.example 2012-02-14 00:00:49 +00:00
Justin Clark-Casey (justincc) f49897a419 Clamp ODE character velocity. Make ODE falling character 54m/s by default. 
If velocity reaches 256 in any vector then bad things happen with ODE, so we now clamp this value.
In addition, a falling avatar is clamped by default at 54 m/s, which is the same as a falling skydiver.
This also appears to be the value used on the linden lab grid.
This should resolve http://opensimulator.org/mantis/view.php?id=5882
 2012-02-11 02:28:40 +00:00
UbitUmarov 754129b903 files need to run UbitODE in linux ( untested ) 2012-02-08 15:33:51 +00:00
Melanie 236e1c45f2 Merge branch 'master' into careminster 2012-02-07 23:30:48 +00:00
Justin Clark-Casey (justincc) a4367e75d3 Set UseMeshiesPhysicsMesh = true in [Mesh] by default 
This means that uploaded meshes will get a physics (collision) mesh if uploaded with that option via a viewer.
 2012-02-07 23:15:23 +00:00
Justin Clark-Casey (justincc) 773994723a Add warning about only uncommenting EstateConnectionString if you know what you're doing to GridCommon.ini.example (was already in StandaloneCommon.ini.example) 2012-02-07 20:35:04 +00:00
Melanie 37049180f6 Merge branch 'master' into careminster 
Conflicts:
	OpenSim/Region/Framework/Scenes/SceneObjectPartInventory.cs
	OpenSim/Region/ScriptEngine/XEngine/XEngine.cs
 2012-02-07 21:09:04 +00:00
Melanie 54fc78013d Merge branch 'master' into careminster 
Conflicts:
	OpenSim/Region/Framework/Scenes/Scene.cs
 2012-02-05 20:58:04 +00:00
nebadon 44badf452e change NonPhysicalPrimMax to NonphysicalPrimMax to make this variable 
work correctly, it was being ignored because of the case, this effects
OpenSim.ini.example and OpenSimDefaults.ini
 2012-02-04 19:41:25 -07:00
Melanie ce5e900721 Merge branch 'master' into careminster 
Conflicts:
	OpenSim/Data/MySQL/Resources/RegionStore.migrations
	OpenSim/Region/Framework/Scenes/Scene.Inventory.cs
 2012-02-04 11:48:20 +00:00
Justin Clark-Casey (justincc) f17066b7bf Change LandDataSerializer deserialization so that in the future it won't care about extra elements or element order. 
This brings it into line with other deserializations such as object and will improve future backward compatibility.
 2012-02-03 22:21:54 +00:00
Melanie 1b63b21a4d Merge branch 'master' into careminster 
Conflicts:
	OpenSim/Region/Application/OpenSimBase.cs
 2012-01-31 20:53:49 +00:00
Justin Clark-Casey (justincc) f3780b9eae Add torture tests to test adding 10,000, 100,000 and 200,000 single prim scene objects. 
These can be run using the "nant torture" target.  They are not part of "nant test" due to their long-run future nature.
Such tests are designed to do some testing of extreme situations and give some feedback on memory usage, etc.
However, data can be inconsistent due to different machine circumstances and virtual machine actions.
This area is under development.
 2012-01-31 19:56:37 +00:00
Melanie 9a86a713d3 Merge branch 'master' into careminster 2012-01-29 22:50:59 +00:00
PixelTomsen e8b688b61f Fix:Get embedded objects in notecard http://opensimulator.org/mantis/view.php?id=2607 
Signed-off-by: nebadon <michael@osgrid.org>
 2012-01-29 12:40:43 -07:00
Melanie abffda269f Merge branch 'master' into careminster 
Conflicts:
	OpenSim/Region/Framework/Scenes/Scene.Inventory.cs
 2012-01-28 04:05:53 +00:00
Justin Clark-Casey (justincc) 088f1213b4 Remove accidental /user postfix from HomeURI in [HGInventoryAccessModule] in GridCommon.ini.example and from SRV_ProfileServerURI in [LoginService] in Robust.HG.ini.example 
As per http://opensimulator.org/mantis/view.php?id=5852, confirmed by diva via aiaustin
 2012-01-28 01:01:19 +00:00
Melanie 4ce42762ee Merge branch 'master' into careminster 
Conflicts:
	OpenSim/Region/Framework/Scenes/Scene.Inventory.cs
	OpenSim/Region/ScriptEngine/Shared/Api/Implementation/LSL_Api.cs
 2012-01-26 00:21:21 +00:00
Robert Adams e9de7e7107 Update BulletSim.dll with some interface changes and tuning (see opensim-libs). Change BSScene to use new interface. 2012-01-25 14:40:38 -08:00
Melanie ba3b0c69f1 Merge branch 'master' into careminster 2012-01-21 19:52:33 +00:00
Justin Clark-Casey (justincc) a0fb1e1788 Revert "Change linux, windows and mac ODE libraries to use the GIMPACT collider rather than OPCODE." 
This reverts commit 4eef6725f4.

Reverting for now since this fails with "terminate called after throwing an instance of 'std::bad_alloc'" on Wright Plaza instances.
 2012-01-20 17:51:12 +00:00
BlueWall 717656c453 Merge branch 'master' of /home/opensim/src/opensim 2012-01-17 22:10:47 -05:00
BlueWall 9ed9720861 Update osGetGrid**** functions 
The osGetGrid**** functions will now get the grid settings from the GridInfoService. Set the GridInfoURI in your ./bin/config-include/GridCommon.ini [GridInfo] section.
 2012-01-17 22:07:40 -05:00
Justin Clark-Casey (justincc) 4eef6725f4 Change linux, windows and mac ODE libraries to use the GIMPACT collider rather than OPCODE. 
As discussed on the opensim-dev mailing list, this is to avoid a demonstrated ODE collider segfault when stress-testing a simulator running more than one region using the bundled pCampbot.exe
As before, the ODE revision used is r1755 - only the collider has changed.
Tests so far reveal little performance change.
However, if noticeable issues do arise, please report on mantis and/or the opensim-dev mailing list.
The previous libraries are temporarily in bin/Physics-previous-ode-libs
These can be copied back to bin if one wants to compare behaviour with the previous libraries.
 2012-01-17 20:49:20 +00:00
Justin Clark-Casey (justincc) 59a0c50d48 Comment out noisy log lines I accidentally included in the nant build target adjustment commit. 
Left in the method doc.
 2012-01-16 23:04:08 +00:00
Justin Clark-Casey (justincc) 82ad9d4e04 Remove monocov and other obsolete nant build targets. 
monocov was a code coverage attempt 3 years ago which no longer works.
other removed targets have been commented out or unused for a very long time
 2012-01-16 22:58:58 +00:00
Diva Canto 8bdd80abfa HG: normalize all externalized user ULRs to be the Home URL, i.e. the location of the user's UAS. This corrects an earlier design which had some cases pointing to the profile server. WARNING: CONFIGURATION CHANGES in both the sims (*Common.ini) and the Robust configs (Robust.HG.ini). Please check diff of the example files, but basically all vars that were pointing to profile should point to the UAS instead and should be called HomeURI. 2012-01-12 09:56:35 -08:00
Melanie 4492bc1bcd Merge branch 'master' into careminster 2012-01-12 17:52:29 +00:00
Michelle Argus 34137ed4ea Correcting ini.example were permissionmodules uses komma instead of space as separator 2012-01-12 12:27:41 -05:00
Melanie a4c2e7f599 Merge branch 'master' into careminster 2012-01-10 20:34:43 +00:00
BlueWall a2fe3e2081 Remove DEBUG option 
Remove DEBUG option from OpenSim.ini.example as it is handled in the console now with "debug teleport"
 2012-01-10 15:29:08 -05:00
Melanie 1cc685e820 Merge branch 'master' into careminster 
Conflicts:
	OpenSim/Region/Framework/Scenes/ScenePresence.cs
 2012-01-10 18:33:32 +00:00
BlueWall 707c8c6f2b Add some run-time debugging support 
Add configuration option - DEBUG to enable debugging methods. This is temporary for helping users testing teleport routing be able to report back the data with the test cases. We can remove when finished with this, or leave it if it proves to be useful.

	Users: set DEBUG = true in OpenSim.ini to get more information from teleport routing. The default is false. It presently prints the TeleportFlags value.
 2012-01-09 18:19:55 -05:00
Justin Clark-Casey (justincc) 9bab43b4d1 eliminate a few tabs from OpenSimDefaults.ini 2012-01-06 21:36:30 +00:00
Justin Clark-Casey (justincc) 5f682b51ec Add disabled Cap_FetchInventory2 = "" reference to [ClientStack.LindenCaps] in line with all the other ones that are there 2012-01-06 21:29:18 +00:00
Melanie 11c48ac807 Merge branch 'master' into careminster 
Conflicts:
	OpenSim/Region/ScriptEngine/Shared/Api/Implementation/LSL_Api.cs
	OpenSim/Region/ScriptEngine/Shared/Tests/LSL_ApiTest.cs
 2012-01-06 21:41:36 +00:00
Melanie 1ebc9d04aa Merge branch 'master' into careminster 
Conflicts:
	OpenSim/Region/CoreModules/Avatar/AvatarFactory/AvatarFactoryModule.cs
	OpenSim/Region/Framework/Scenes/SceneObjectPart.cs
 2012-01-05 08:15:33 +00:00
Justin Clark-Casey (justincc) 6166a40440 Update C5.dll to version 1.1.1 from 1.1.0 
C5 is a collections library and can be found at http://www.itu.dk/research/c5/
This is used in the UDP texture (image) sending code.
 2012-01-03 20:22:15 +00:00
Melanie a6e305063e Merge branch 'master' into careminster 
Conflicts:
	OpenSim/Region/CoreModules/Scripting/HttpRequest/ScriptsHttpRequests.cs
	OpenSim/Region/Framework/Scenes/Scene.cs
	OpenSim/Services/Connectors/Asset/AssetServiceConnector.cs
	OpenSim/Services/Interfaces/IUserAccountService.cs
 2012-01-02 21:41:36 +00:00
Diva Canto 5d8ed077bc Bring back the Hyperlinker to the Robust console. Moved the config to [GridService]. Changed all HG-related .inis, including HyperSimianGrid. No changes in user-facing inis. 2011-12-30 19:17:35 -08:00
Melanie bde004c08e Merge branch 'master' into careminster 2011-12-28 09:24:35 +00:00
BlueWall f36fe45fa7 Add Copy task to Prebuild.exe (vsxxxx targets) 
<Files>
    <Match pattern="*.cs" recurse="true"/>
    <Match pattern="../bin/MyConfig.xml" buildAction="Copy" recurse="false" destination="$(OutputPath)" />
  </Files>
 2011-12-25 00:04:42 -05:00
Melanie eef6f92029 Merge branch 'master' into careminster 2011-12-22 19:52:59 +00:00
Justin Clark-Casey (justincc) 48113f0fc8 Make it possible to force all prims to be phantom via the collidable_prim boolean setting in the OpenSim.ini config [Startup] section. 
Naturally, default is true.
When set to false, "phantom" flags on prims can be set as usual but all prims remain phantom.
This setting is for test purposes.
This switch does not affect the collision of avatars with the terrain.
 2011-12-22 19:44:52 +00:00
Melanie 759f1d2dbe Merge branch 'master' into careminster 2011-12-18 10:49:45 +00:00
Justin Clark-Casey (justincc) 4f628849f3 Add more documentation to EstateConnectorString in StandaloneCommon.ini.example 2011-12-17 00:14:48 +00:00
Melanie 898549d13e Merge branch 'master' into careminster 2011-12-14 08:57:55 +00:00
Justin Clark-Casey (justincc) 3a06640730 Get rid of the 'lolcat' library asset. 
This was both unused and an invalid jpeg2000 texture from way back in 2008
 2011-12-12 21:17:01 +00:00
Justin Clark-Casey (justincc) e9b59e7627 Remove long unused libdb_dotNET43.dll 2011-12-12 19:31:12 +00:00
Melanie f025387f10 Set adaptive throttles false by default because it doesn't play nice with AVN 
code
 2011-12-09 19:56:03 +01:00
Melanie d913303875 Merge branch 'master' into bigmerge 2011-12-09 08:13:57 +00:00
Justin Clark-Casey (justincc) bc13855e64 Reactivate BasicCircuitTests.TestAddClient() 
This checks that the initial UseCircuitCode packet is handled correctly for a normal client login.
 2011-12-08 20:52:34 +00:00
Melanie 50aa89dae6 Merge commit 'eda770e978c09c756d15ba62dbbf6ee34a61b2f5' into bigmerge 
Conflicts:
	OpenSim/Region/Framework/Scenes/Scene.cs
 2011-12-08 03:24:25 +00:00
BlueWall fd023b317a Update libomv to 0.9.1 2011-12-07 09:56:15 -05:00
Melanie 5ab536a1e9 Merge branch 'master' into bigmerge 
Conflicts:
	OpenSim/Region/CoreModules/Framework/EntityTransfer/EntityTransferModule.cs
	OpenSim/Region/Framework/Scenes/ScenePresence.cs
 2011-12-05 17:10:51 +00:00
BlueWall 6541fc08d4 Merge branch 'master' of /home/opensim/var/repo/opensim 2011-12-02 22:46:37 -05:00
Justin Clark-Casey (justincc) e26ef8aeca change misleading login = http://127.0.0.1:9000/ in GridInfoService in Robust.ini.example to 8002 2011-12-03 02:48:16 +00:00
BlueWall e7930b1d0f Make fix to Nini for null references in some cases. 2011-11-29 22:25:03 -05:00
Melanie dc612d0f08 Merge branch 'master' into bigmerge 
Conflicts:
	OpenSim/Region/Framework/Scenes/SceneObjectPartInventory.cs
 2011-11-28 11:06:38 +00:00
Justin Clark-Casey (justincc) 676d32974a Implement the FetchInventoryDescendents2 capability using the same code as WebFetchInventoryDescendents. 
Enabling this by setting Cap_FetchInventoryDescendents2 = "localhost" in the [ClientStack.LindenCaps] section of OpenSim.ini downloads inventory via http rather than udp in later viewers.
 2011-11-25 22:46:42 +00:00
Justin Clark-Casey (justincc) b785f204ce remove some mono compiler warnings 2011-11-25 22:19:57 +00:00
Melanie a8270cb48c Merge branch 'master' into bigmerge 2011-11-24 01:16:37 +00:00
BlueWall d4e3a7fe81 Shell Environment Variables in config 
Adding updated Nini and support to use shell environment variables in OpenSimulator configuration.

  Nini @ https://github.com/BlueWall/Nini-Dev
 2011-11-23 10:11:47 -05:00
Justin Clark-Casey (justincc) a94ce3f1df Move DeleteScriptsOnStartup switch from [Startup] to [XEngine] in OpenSim.ini.example. 
If anybody was changing this and wondering why there was no effect, this is why.
 2011-11-21 15:30:00 +00:00
Melanie bdb5ac96d9 Merge branch 'master' into bigmerge 
Conflicts:
	OpenSim/Region/Framework/Scenes/SceneCommunicationService.cs
	OpenSim/Region/ScriptEngine/XEngine/XEngine.cs
 2011-11-19 22:39:15 +00:00
Justin Clark-Casey (justincc) 21353de9b7 Enable v2/v3 map tile url setting on robust as default in config 
This is necessary to see map tiles on v2/v3 viewers and appears to work fine
 2011-11-19 00:34:56 +00:00