dcbcbd697f 
								
							
								 
							
						 
						
							
							
								
								Merge branch 'master' into careminster  
							
							... 
							
							
							
							Conflicts:
	OpenSim/Region/ScriptEngine/Shared/Api/Implementation/Plugins/SensorRepeat.cs 
							
						 
						
							2012-04-27 22:28:09 +01:00  
				
					
						
							
							
								 
						
							
							
								37d770f814 
								
							
								 
							
						 
						
							
							
								
								Use DotNetZip to compress OARs and IARs.  
							
							... 
							
							
							
							DotNetZip provides much better compression than standard .NET. 
							
						 
						
							2012-04-27 19:46:31 +01:00  
				
					
						
							
							
								 
						
							
							
								ac64fe03d8 
								
							
								 
							
						 
						
							
							
								
								Amend to last commit: account for the existence of proxies.  
							
							
							
						 
						
							2012-04-27 09:59:46 -07:00  
				
					
						
							
							
								 
						
							
							
								2970a18e54 
								
							
								 
							
						 
						
							
							
								
								Merge branch 'master' of ssh://opensimulator.org/var/git/opensim  
							
							
							
						 
						
							2012-04-27 09:26:14 -07:00  
				
					
						
							
							
								 
						
							
							
								e4e754ee93 
								
							
								 
							
						 
						
							
							
								
								MapImageService: added an additional security check for OSGrid and other grids like it.  
							
							
							
						 
						
							2012-04-27 09:23:56 -07:00  
				
					
						
							
							
								 
						
							
							
								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  
				
					
						
							
							
								 
						
							
							
								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  
				
					
						
							
							
								 
						
							
							
								fc9f244a7d 
								
							
								 
							
						 
						
							
							
								
								Merge branch 'master' into careminster  
							
							
							
						 
						
							2012-04-18 00:28:33 +01:00  
				
					
						
							
							
								 
						
							
							
								2d45ba47ac 
								
							
								 
							
						 
						
							
							
								
								add configuration for jsonstore module, disabled by default  
							
							
							
						 
						
							2012-04-17 13:55:00 -07:00  
				
					
						
							
							
								 
						
							
							
								fe65b51876 
								
							
								 
							
						 
						
							
							
								
								Merge branch 'master' into careminster  
							
							... 
							
							
							
							Conflicts:
	OpenSim/Region/Framework/Scenes/SceneObjectPartInventory.cs 
							
						 
						
							2012-04-13 03:00:48 +01:00  
				
					
						
							
							
								 
						
							
							
								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  
				
					
						
							
							
								 
						
							
							
								4a67e8b98f 
								
							
								 
							
						 
						
							
							
								
								Merge branch 'master' into careminster  
							
							... 
							
							
							
							Conflicts:
	OpenSim/Region/Framework/Interfaces/IEstateModule.cs 
							
						 
						
							2012-04-11 23:35:27 +01:00  
				
					
						
							
							
								 
						
							
							
								1f4d3d3582 
								
							
								 
							
						 
						
							
							
								
								HGFriendsModule: Added optional user level based restriction to send friendship invitations to foreign users.  
							
							
							
						 
						
							2012-04-11 18:52:07 +02:00  
				
					
						
							
							
								 
						
							
							
								fb44e7b636 
								
							
								 
							
						 
						
							
							
								
								minor: convert tabs to spaces in config example files from recent  7c534e5 
							
							
							
						 
						
							2012-04-10 17:46:34 +01:00  
				
					
						
							
							
								 
						
							
							
								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  
				
					
						
							
							
								 
						
							
							
								a25d12d166 
								
							
								 
							
						 
						
							
							
								
								Merge branch 'master' into careminster  
							
							
							
						 
						
							2012-04-08 02:25:48 +01:00  
				
					
						
							
							
								 
						
							
							
								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  
				
					
						
							
							
								 
						
							
							
								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  
				
					
						
							
							
								 
						
							
							
								7dad1ded2e 
								
							
								 
							
						 
						
							
							
								
								Merge branch 'master' into careminster  
							
							... 
							
							
							
							Conflicts:
	OpenSim/Region/CoreModules/Avatar/Friends/FriendsModule.cs 
							
						 
						
							2012-03-29 00:27:35 +01:00  
				
					
						
							
							
								 
						
							
							
								b18b1b1d70 
								
							
								 
							
						 
						
							
							
								
								Merge branch 'master' into careminster  
							
							... 
							
							
							
							Conflicts:
	OpenSim/Region/ScriptEngine/Shared/Api/Implementation/LSL_Api.cs 
							
						 
						
							2012-03-27 23:14:43 +01:00  
				
					
						
							
							
								 
						
							
							
								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  
				
					
						
							
							
								 
						
							
							
								6b5f3b49e7 
								
							
								 
							
						 
						
							
							
								
								Merge branch 'master' into careminster  
							
							
							
						 
						
							2012-03-27 18:11:05 +01:00  
				
					
						
							
							
								 
						
							
							
								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  
				
					
						
							
							
								 
						
							
							
								0bd0514e81 
								
							
								 
							
						 
						
							
							
								
								Merge branch 'master' into careminster  
							
							
							
						 
						
							2012-03-26 16:47:02 +01:00  
				
					
						
							
							
								 
						
							
							
								3691e39178 
								
							
								 
							
						 
						
							
							
								
								BulletSim: update BulletSim.dll and libBulletSim.so with latest versions  
							
							
							
						 
						
							2012-03-26 08:48:51 -07:00  
				
					
						
							
							
								 
						
							
							
								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  
				
					
						
							
							
								 
						
							
							
								142de1d02f 
								
							
								 
							
						 
						
							
							
								
								BulletSim: add a bunch of internal Bullet configuration parameters to OpenSimDefaults.ini and the code.  
							
							
							
						 
						
							2012-03-23 13:15:23 -07:00  
				
					
						
							
							
								 
						
							
							
								2f6e8564fe 
								
							
								 
							
						 
						
							
							
								
								BulletSim: add updated (but not working) BulletSim dlls  
							
							
							
						 
						
							2012-03-23 13:15:20 -07:00  
				
					
						
							
							
								 
						
							
							
								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  
				
					
						
							
							
								 
						
							
							
								b22d040169 
								
							
								 
							
						 
						
							
							
								
								BulletSim: add some new runtime setable parameters to match the dll.  
							
							
							
						 
						
							2012-03-23 13:15:14 -07:00  
				
					
						
							
							
								 
						
							
							
								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  
				
					
						
							
							
								 
						
							
							
								9a67baae21 
								
							
								 
							
						 
						
							
							
								
								Merge branch 'master' into careminster  
							
							... 
							
							
							
							Conflicts:
	OpenSim/Region/Framework/Scenes/Scene.cs 
							
						 
						
							2012-03-23 14:24:55 +00:00  
				
					
						
							
							
								 
						
							
							
								e5b182fb41 
								
							
								 
							
						 
						
							
							
								
								Add information about SendPeriodicAppearanceUpdates to OpenSimDefaults.ini for now.  
							
							... 
							
							
							
							Default remains false. 
							
						 
						
							2012-03-23 03:38:33 +00:00  
				
					
						
							
							
								 
						
							
							
								9edf99703a 
								
							
								 
							
						 
						
							
							
								
								Merge commit 'df624c13c98b06d57311c1d93ecbd4790553f3b3' into careminster  
							
							
							
						 
						
							2012-03-22 23:01:50 +00:00  
				
					
						
							
							
								 
						
							
							
								25e5b6a76c 
								
							
								 
							
						 
						
							
							
								
								Added new simple_build_permissions config to the .ini and .example files.  
							
							
							
						 
						
							2012-03-22 14:21:07 -07:00  
				
					
						
							
							
								 
						
							
							
								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  
				
					
						
							
							
								 
						
							
							
								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  
				
					
						
							
							
								 
						
							
							
								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  
				
					
						
							
							
								 
						
							
							
								06c81a2afe 
								
							
								 
							
						 
						
							
							
								
								Fix typo  
							
							... 
							
							
							
							Add enclosing " to urls 
							
						 
						
							2012-03-21 20:33:45 -04:00  
				
					
						
							
							
								 
						
							
							
								91cc09b7bf 
								
							
								 
							
						 
						
							
							
								
								HG Friends config for Robust.HG.ini.example  
							
							
							
						 
						
							2012-03-20 21:36:24 -07:00  
				
					
						
							
							
								 
						
							
							
								ee9210f656 
								
							
								 
							
						 
						
							
							
								
								Merge branch 'master' into careminster  
							
							... 
							
							
							
							Conflicts:
	OpenSim/Region/CoreModules/Avatar/Friends/FriendsModule.cs 
							
						 
						
							2012-03-21 00:26:02 +00:00  
				
					
						
							
							
								 
						
							
							
								3fa51f66ec 
								
							
								 
							
						 
						
							
							
								
								Merge branch 'master' of ssh://opensimulator.org/var/git/opensim  
							
							... 
							
							
							
							Conflicts:
	OpenSim/Framework/Util.cs 
							
						 
						
							2012-03-20 17:19:14 -07:00  
				
					
						
							
							
								 
						
							
							
								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  
				
					
						
							
							
								 
						
							
							
								5768a151ff 
								
							
								 
							
						 
						
							
							
								
								Merge branch 'master' into careminster  
							
							... 
							
							
							
							Conflicts:
	OpenSim/Data/MySQL/MySQLXAssetData.cs 
							
						 
						
							2012-03-20 02:48:11 +00:00  
				
					
						
							
							
								 
						
							
							
								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  
				
					
						
							
							
								 
						
							
							
								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 
							
						 
						
							2012-03-19 00:18:04 +00:00  
				
					
						
							
							
								 
						
							
							
								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  
				
					
						
							
							
								 
						
							
							
								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  
				
					
						
							
							
								 
						
							
							
								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  
				
					
						
							
							
								 
						
							
							
								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  
				
					
						
							
							
								 
						
							
							
								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  
				
					
						
							
							
								 
						
							
							
								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  
				
					
						
							
							
								 
						
							
							
								b19be657b6 
								
							
								 
							
						 
						
							
							
								
								Remove unnecessary "backup" command in shutdown_commands.txt  
							
							... 
							
							
							
							The simulator is already doing this internally. 
							
						 
						
							2012-03-16 02:10:59 +00:00  
				
					
						
							
							
								 
						
							
							
								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  
				
					
						
							
							
								 
						
							
							
								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  
				
					
						
							
							
								 
						
							
							
								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  
				
					
						
							
							
								 
						
							
							
								f292e19689 
								
							
								 
							
						 
						
							
							
								
								Merge branch 'master' into careminster  
							
							... 
							
							
							
							Conflicts:
	OpenSim/Region/Application/OpenSimBase.cs 
							
						 
						
							2012-03-11 02:29:43 +00:00  
				
					
						
							
							
								 
						
							
							
								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  
				
					
						
							
							
								 
						
							
							
								c521f3b348 
								
							
								 
							
						 
						
							
							
								
								Fix UbitODE dll mappping by simply copying the one from ODE.Net  
							
							
							
						 
						
							2012-03-09 02:39:02 +01:00  
				
					
						
							
							
								 
						
							
							
								6338996f87 
								
							
								 
							
						 
						
							
							
								
								Merge branch 'master' into careminster  
							
							... 
							
							
							
							Conflicts:
	OpenSim/Services/AuthenticationService/PasswordAuthenticationService.cs 
							
						 
						
							2012-03-04 16:23:19 +00:00  
				
					
						
							
							
								 
						
							
							
								ac934e2dbb 
								
							
								 
							
						 
						
							
							
								
								Add WebProfiles config to other config example  
							
							
							
						 
						
							2012-03-04 11:11:01 -05:00  
				
					
						
							
							
								 
						
							
							
								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  
				
					
						
							
							
								 
						
							
							
								6fc350725d 
								
							
								 
							
						 
						
							
							
								
								Merge branch 'master' into v3_support  
							
							
							
						 
						
							2012-03-02 15:02:09 -05:00  
				
					
						
							
							
								 
						
							
							
								255afbf08a 
								
							
								 
							
						 
						
							
							
								
								Remove more now unused third party libraries.  
							
							
							
						 
						
							2012-03-01 02:11:15 +00:00  
				
					
						
							
							
								 
						
							
							
								4177571a78 
								
							
								 
							
						 
						
							
							
								
								Merge branch 'master' of ssh://opensimulator.org/var/git/opensim into v3_support  
							
							
							
						 
						
							2012-02-25 14:33:56 -05:00  
				
					
						
							
							
								 
						
							
							
								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  
				
					
						
							
							
								 
						
							
							
								4a5f9fe6a2 
								
							
								 
							
						 
						
							
							
								
								Move libopenjpeg native libraries into lib32 and lib64 as appropriate.  
							
							
							
						 
						
							2012-02-25 04:26:32 +00:00  
				
					
						
							
							
								 
						
							
							
								6159110258 
								
							
								 
							
						 
						
							
							
								
								Remove some more unused Bullet libraries.  
							
							
							
						 
						
							2012-02-25 04:22:59 +00:00  
				
					
						
							
							
								 
						
							
							
								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  
				
					
						
							
							
								 
						
							
							
								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  
				
					
						
							
							
								 
						
							
							
								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  
				
					
						
							
							
								 
						
							
							
								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  
				
					
						
							
							
								 
						
							
							
								67bea681e2 
								
							
								 
							
						 
						
							
							
								
								Add web profile url setting to ini  
							
							
							
						 
						
							2012-02-21 23:04:49 -05:00  
				
					
						
							
							
								 
						
							
							
								03e7bc1526 
								
							
								 
							
						 
						
							
							
								
								Merge branch 'master' into careminster  
							
							... 
							
							
							
							Conflicts: 
							
						 
						
							2012-02-21 10:20:56 +00:00  
				
					
						
							
							
								 
						
							
							
								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  
				
					
						
							
							
								 
						
							
							
								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  
				
					
						
							
							
								 
						
							
							
								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  
				
					
						
							
							
								 
						
							
							
								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  
				
					
						
							
							
								 
						
							
							
								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  
				
					
						
							
							
								 
						
							
							
								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  
				
					
						
							
							
								 
						
							
							
								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  
				
					
						
							
							
								 
						
							
							
								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  
				
					
						
							
							
								 
						
							
							
								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  
				
					
						
							
							
								 
						
							
							
								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  
				
					
						
							
							
								 
						
							
							
								04279e36d1 
								
							
								 
							
						 
						
							
							
								
								Merge branch 'master' of ssh://3dhosting.de/var/git/careminster into ubitwork  
							
							
							
						 
						
							2012-02-15 03:51:30 +00:00  
				
					
						
							
							
								 
						
							
							
								272ba5a741 
								
							
								 
							
						 
						
							
							
								
								Merge branch 'master' into careminster  
							
							
							
						 
						
							2012-02-15 01:11:17 +00:00  
				
					
						
							
							
								 
						
							
							
								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  
				
					
						
							
							
								 
						
							
							
								48b962c401 
								
							
								 
							
						 
						
							
							
								
								Update [XEngine] AppDomainLoading advice in OpenSim.ini.example  
							
							
							
						 
						
							2012-02-14 00:00:49 +00:00  
				
					
						
							
							
								 
						
							
							
								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  
				
					
						
							
							
								 
						
							
							
								754129b903 
								
							
								 
							
						 
						
							
							
								
								files need to run UbitODE in linux ( untested )  
							
							
							
						 
						
							2012-02-08 15:33:51 +00:00  
				
					
						
							
							
								 
						
							
							
								236e1c45f2 
								
							
								 
							
						 
						
							
							
								
								Merge branch 'master' into careminster  
							
							
							
						 
						
							2012-02-07 23:30:48 +00:00  
				
					
						
							
							
								 
						
							
							
								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  
				
					
						
							
							
								 
						
							
							
								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  
				
					
						
							
							
								 
						
							
							
								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  
				
					
						
							
							
								 
						
							
							
								54fc78013d 
								
							
								 
							
						 
						
							
							
								
								Merge branch 'master' into careminster  
							
							... 
							
							
							
							Conflicts:
	OpenSim/Region/Framework/Scenes/Scene.cs 
							
						 
						
							2012-02-05 20:58:04 +00:00  
				
					
						
							
							
								 
						
							
							
								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  
				
					
						
							
							
								 
						
							
							
								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  
				
					
						
							
							
								 
						
							
							
								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  
				
					
						
							
							
								 
						
							
							
								1b63b21a4d 
								
							
								 
							
						 
						
							
							
								
								Merge branch 'master' into careminster  
							
							... 
							
							
							
							Conflicts:
	OpenSim/Region/Application/OpenSimBase.cs 
							
						 
						
							2012-01-31 20:53:49 +00:00  
				
					
						
							
							
								 
						
							
							
								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  
				
					
						
							
							
								 
						
							
							
								9a86a713d3 
								
							
								 
							
						 
						
							
							
								
								Merge branch 'master' into careminster  
							
							
							
						 
						
							2012-01-29 22:50:59 +00:00  
				
					
						
							
							
								 
						
							
							
								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  
				
					
						
							
							
								 
						
							
							
								abffda269f 
								
							
								 
							
						 
						
							
							
								
								Merge branch 'master' into careminster  
							
							... 
							
							
							
							Conflicts:
	OpenSim/Region/Framework/Scenes/Scene.Inventory.cs 
							
						 
						
							2012-01-28 04:05:53 +00:00  
				
					
						
							
							
								 
						
							
							
								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  
				
					
						
							
							
								 
						
							
							
								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  
				
					
						
							
							
								 
						
							
							
								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  
				
					
						
							
							
								 
						
							
							
								ba3b0c69f1 
								
							
								 
							
						 
						
							
							
								
								Merge branch 'master' into careminster  
							
							
							
						 
						
							2012-01-21 19:52:33 +00:00  
				
					
						
							
							
								 
						
							
							
								a0fb1e1788 
								
							
								 
							
						 
						
							
							
								
								Revert "Change linux, windows and mac ODE libraries to use the GIMPACT collider rather than OPCODE."  
							
							... 
							
							
							
							This reverts commit 4eef6725f4 
							
						 
						
							2012-01-20 17:51:12 +00:00  
				
					
						
							
							
								 
						
							
							
								717656c453 
								
							
								 
							
						 
						
							
							
								
								Merge branch 'master' of /home/opensim/src/opensim  
							
							
							
						 
						
							2012-01-17 22:10:47 -05:00  
				
					
						
							
							
								 
						
							
							
								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  
				
					
						
							
							
								 
						
							
							
								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  
				
					
						
							
							
								 
						
							
							
								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  
				
					
						
							
							
								 
						
							
							
								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  
				
					
						
							
							
								 
						
							
							
								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  
				
					
						
							
							
								 
						
							
							
								4492bc1bcd 
								
							
								 
							
						 
						
							
							
								
								Merge branch 'master' into careminster  
							
							
							
						 
						
							2012-01-12 17:52:29 +00:00  
				
					
						
							
							
								 
						
							
							
								34137ed4ea 
								
							
								 
							
						 
						
							
							
								
								Correcting ini.example were permissionmodules uses komma instead of space as separator  
							
							
							
						 
						
							2012-01-12 12:27:41 -05:00  
				
					
						
							
							
								 
						
							
							
								a4c2e7f599 
								
							
								 
							
						 
						
							
							
								
								Merge branch 'master' into careminster  
							
							
							
						 
						
							2012-01-10 20:34:43 +00:00  
				
					
						
							
							
								 
						
							
							
								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  
				
					
						
							
							
								 
						
							
							
								1cc685e820 
								
							
								 
							
						 
						
							
							
								
								Merge branch 'master' into careminster  
							
							... 
							
							
							
							Conflicts:
	OpenSim/Region/Framework/Scenes/ScenePresence.cs 
							
						 
						
							2012-01-10 18:33:32 +00:00  
				
					
						
							
							
								 
						
							
							
								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  
				
					
						
							
							
								 
						
							
							
								9bab43b4d1 
								
							
								 
							
						 
						
							
							
								
								eliminate a few tabs from OpenSimDefaults.ini  
							
							
							
						 
						
							2012-01-06 21:36:30 +00:00  
				
					
						
							
							
								 
						
							
							
								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  
				
					
						
							
							
								 
						
							
							
								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  
				
					
						
							
							
								 
						
							
							
								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  
				
					
						
							
							
								 
						
							
							
								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  
				
					
						
							
							
								 
						
							
							
								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  
				
					
						
							
							
								 
						
							
							
								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  
				
					
						
							
							
								 
						
							
							
								bde004c08e 
								
							
								 
							
						 
						
							
							
								
								Merge branch 'master' into careminster  
							
							
							
						 
						
							2011-12-28 09:24:35 +00:00  
				
					
						
							
							
								 
						
							
							
								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  
				
					
						
							
							
								 
						
							
							
								eef6f92029 
								
							
								 
							
						 
						
							
							
								
								Merge branch 'master' into careminster  
							
							
							
						 
						
							2011-12-22 19:52:59 +00:00  
				
					
						
							
							
								 
						
							
							
								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  
				
					
						
							
							
								 
						
							
							
								759f1d2dbe 
								
							
								 
							
						 
						
							
							
								
								Merge branch 'master' into careminster  
							
							
							
						 
						
							2011-12-18 10:49:45 +00:00  
				
					
						
							
							
								 
						
							
							
								4f628849f3 
								
							
								 
							
						 
						
							
							
								
								Add more documentation to EstateConnectorString in StandaloneCommon.ini.example  
							
							
							
						 
						
							2011-12-17 00:14:48 +00:00  
				
					
						
							
							
								 
						
							
							
								898549d13e 
								
							
								 
							
						 
						
							
							
								
								Merge branch 'master' into careminster  
							
							
							
						 
						
							2011-12-14 08:57:55 +00:00  
				
					
						
							
							
								 
						
							
							
								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  
				
					
						
							
							
								 
						
							
							
								e9b59e7627 
								
							
								 
							
						 
						
							
							
								
								Remove long unused libdb_dotNET43.dll  
							
							
							
						 
						
							2011-12-12 19:31:12 +00:00  
				
					
						
							
							
								 
						
							
							
								f025387f10 
								
							
								 
							
						 
						
							
							
								
								Set adaptive throttles false by default because it doesn't play nice with AVN  
							
							... 
							
							
							
							code 
							
						 
						
							2011-12-09 19:56:03 +01:00  
				
					
						
							
							
								 
						
							
							
								d913303875 
								
							
								 
							
						 
						
							
							
								
								Merge branch 'master' into bigmerge  
							
							
							
						 
						
							2011-12-09 08:13:57 +00:00  
				
					
						
							
							
								 
						
							
							
								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  
				
					
						
							
							
								 
						
							
							
								50aa89dae6 
								
							
								 
							
						 
						
							
							
								
								Merge commit 'eda770e978c09c756d15ba62dbbf6ee34a61b2f5' into bigmerge  
							
							... 
							
							
							
							Conflicts:
	OpenSim/Region/Framework/Scenes/Scene.cs 
							
						 
						
							2011-12-08 03:24:25 +00:00  
				
					
						
							
							
								 
						
							
							
								fd023b317a 
								
							
								 
							
						 
						
							
							
								
								Update libomv to 0.9.1  
							
							
							
						 
						
							2011-12-07 09:56:15 -05:00  
				
					
						
							
							
								 
						
							
							
								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  
				
					
						
							
							
								 
						
							
							
								6541fc08d4 
								
							
								 
							
						 
						
							
							
								
								Merge branch 'master' of /home/opensim/var/repo/opensim  
							
							
							
						 
						
							2011-12-02 22:46:37 -05:00  
				
					
						
							
							
								 
						
							
							
								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  
				
					
						
							
							
								 
						
							
							
								e7930b1d0f 
								
							
								 
							
						 
						
							
							
								
								Make fix to Nini for null references in some cases.  
							
							
							
						 
						
							2011-11-29 22:25:03 -05:00  
				
					
						
							
							
								 
						
							
							
								dc612d0f08 
								
							
								 
							
						 
						
							
							
								
								Merge branch 'master' into bigmerge  
							
							... 
							
							
							
							Conflicts:
	OpenSim/Region/Framework/Scenes/SceneObjectPartInventory.cs 
							
						 
						
							2011-11-28 11:06:38 +00:00  
				
					
						
							
							
								 
						
							
							
								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  
				
					
						
							
							
								 
						
							
							
								b785f204ce 
								
							
								 
							
						 
						
							
							
								
								remove some mono compiler warnings  
							
							
							
						 
						
							2011-11-25 22:19:57 +00:00  
				
					
						
							
							
								 
						
							
							
								a8270cb48c 
								
							
								 
							
						 
						
							
							
								
								Merge branch 'master' into bigmerge  
							
							
							
						 
						
							2011-11-24 01:16:37 +00:00  
				
					
						
							
							
								 
						
							
							
								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  
				
					
						
							
							
								 
						
							
							
								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  
				
					
						
							
							
								 
						
							
							
								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  
				
					
						
							
							
								 
						
							
							
								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  
				
					
						
							
							
								 
						
							
							
								f72c4bdba5 
								
							
								 
							
						 
						
							
							
								
								Replace HttpServer_OpenSim.dll with Oren Hurvitz's patch applied.  
							
							... 
							
							
							
							This will hopefully address mantis 5471, 5694 and 5718.
This code is now in opensim-libs, along with Diva's slightly older patches (which were already applied to the DLLs in the opensim tree).
Thanks Oren! 
							
						 
						
							2011-11-18 22:52:59 +00:00  
				
					
						
							
							
								 
						
							
							
								9d458fdd7f 
								
							
								 
							
						 
						
							
							
								
								Turn the [RegionReady] module on by default and login_disable = true while scripts are loading.  
							
							... 
							
							
							
							From field experience, we know that simulators can be unstable if a user logs in before the scripts have finished loading.
This commit turns login_disable = true in [RegionReady] on by default which prevents this from happening.
If you want the old behaviour, please copy these section from OpenSimDefaults.ini into OpenSim.ini and set login_disable = false 
							
						 
						
							2011-11-18 21:31:23 +00:00  
				
					
						
							
							
								 
						
							
							
								169387b390 
								
							
								 
							
						 
						
							
							
								
								Turn SellEnabled in the [EconomyModule] on by default.  
							
							... 
							
							
							
							This only provides enough functionality to allow operations for no money (e.g. sell for $0). 
							
						 
						
							2011-11-17 23:53:25 +00:00  
				
					
						
							
							
								 
						
							
							
								2d4ac6288d 
								
							
								 
							
						 
						
							
							
								
								Alter commit  3758306 to allow region name to be substituted within a region console prompt  
							
							... 
							
							
							
							This is to allow broader subsitution in the future.  Currently, the only substitions are \R (for region name) and \\ (for a single backslash)
e.g. "Region (\R) " is the current and continuing default prompt
This renames custom_prompt in [Startup] to ConsolePrompt 
							
						 
						
							2011-11-10 22:56:13 +00:00  
				
					
						
							
							
								 
						
							
							
								4939d99b57 
								
							
								 
							
						 
						
							
							
								
								Merge branch 'master' into bigmerge  
							
							
							
						 
						
							2011-11-10 23:03:50 +00:00  
				
					
						
							
							
								 
						
							
							
								a1426739a2 
								
							
								 
							
						 
						
							
							
								
								Merge branch 'master' into bigmerge  
							
							
							
						 
						
							2011-11-10 17:35:35 +00:00  
				
					
						
							
							
								 
						
							
							
								37583063ee 
								
							
								 
							
						 
						
							
							
								
								Allow custom setting for the console prompt  
							
							... 
							
							
							
							Signed-off-by: BlueWall <jamesh@bluewallgroup.com> 
							
						 
						
							2011-11-10 06:56:32 -05:00  
				
					
						
							
							
								 
						
							
							
								facdc9c46e 
								
							
								 
							
						 
						
							
							
								
								Merge branch 'master' into bigmerge  
							
							... 
							
							
							
							Conflicts:
	OpenSim/Region/Framework/Scenes/Scene.cs
	OpenSim/Region/Framework/Scenes/ScenePresence.cs 
							
						 
						
							2011-11-05 22:56:08 +00:00  
				
					
						
							
							
								 
						
							
							
								4d3926694d 
								
							
								 
							
						 
						
							
							
								
								Remove enableprejump config option and associated code as this is now  
							
							... 
							
							
							
							fully functional and cannot be disabled because that would break timings. 
							
						 
						
							2011-11-05 22:43:45 +00:00  
				
					
						
							
							
								 
						
							
							
								24235006f4 
								
							
								 
							
						 
						
							
							
								
								Merge branch 'master' into bigmerge  
							
							... 
							
							
							
							Conflicts:
	OpenSim/Region/CoreModules/Avatar/Chat/ChatModule.cs
	OpenSim/Region/CoreModules/Avatar/Gods/GodsModule.cs
	OpenSim/Region/CoreModules/LightShare/LightShareModule.cs
	OpenSim/Region/CoreModules/World/Estate/EstateManagementModule.cs 
							
						 
						
							2011-11-04 01:18:37 +00:00  
				
					
						
							
							
								 
						
							
							
								59232a6ea8 
								
							
								 
							
						 
						
							
							
								
								Change default say distance to 20m from 30m, the same as on the big grid.  This is to improve the migration of scripts that expect a 20m say distance.  
							
							... 
							
							
							
							If you want to keep a 30m say distance then please set this as the say_distance parameter in the [Chat] section of OpenSim.ini. 
							
						 
						
							2011-11-02 20:05:31 +00:00  
				
					
						
							
							
								 
						
							
							
								b69f679122 
								
							
								 
							
						 
						
							
							
								
								Merge branch 'master' into bigmerge  
							
							... 
							
							
							
							Conflicts:
	OpenSim/Region/CoreModules/World/WorldMap/WorldMapModule.cs 
							
						 
						
							2011-11-01 23:54:09 +00:00  
				
					
						
							
							
								 
						
							
							
								4b58d4ff95 
								
							
								 
							
						 
						
							
							
								
								Removed see_into_this_sim_from_neighbor configuration option.  
							
							
							
						 
						
							2011-11-01 16:51:14 -07:00  
				
					
						
							
							
								 
						
							
							
								74cc834fec 
								
							
								 
							
						 
						
							
							
								
								Remove unused PumaCode.SvnDotNet library  
							
							
							
						 
						
							2011-10-31 21:37:35 +00:00  
				
					
						
							
							
								 
						
							
							
								083b28de8c 
								
							
								 
							
						 
						
							
							
								
								Merge branch 'master' into bigmerge  
							
							... 
							
							
							
							Conflicts:
	OpenSim/Region/Framework/Scenes/SceneObjectGroup.cs 
							
						 
						
							2011-10-30 10:16:25 +00:00  
				
					
						
							
							
								 
						
							
							
								9bdf118e0d 
								
							
								 
							
						 
						
							
							
								
								Add missing max_listens_per_region to [LL_Functions] config section in OpenSimDefaults.ini + explanation.  
							
							... 
							
							
							
							This setting controls the maximum number of listeners in a region 
							
						 
						
							2011-10-29 02:45:50 +01:00  
				
					
						
							
							
								 
						
							
							
								6a96c9546d 
								
							
								 
							
						 
						
							
							
								
								Merge branch 'master' into bigmerge  
							
							... 
							
							
							
							Conflicts:
	OpenSim/Region/ScriptEngine/Shared/Api/Implementation/LSL_Api.cs 
							
						 
						
							2011-10-26 17:48:51 +01:00  
				
					
						
							
							
								 
						
							
							
								41395d5443 
								
							
								 
							
						 
						
							
							
								
								Added optional owner classes to existing OSSL agent Permissions  
							
							... 
							
							
							
							PARCEL_GROUP, PARCEL_OWNER, ESTATE_MANAGER and REGION_OWNER can be combined with the existing agent uuid option to limit ossl functions to agents and owner classes.
Signed-off-by: BlueWall <jamesh@bluewallgroup.com> 
							
						 
						
							2011-10-26 10:35:50 -04:00  
				
					
						
							
							
								 
						
							
							
								740077a291 
								
							
								 
							
						 
						
							
							
								
								Merge commit 'e28e2d24c714c3fba1cba60097986a1c1c28c6c0' into bigmerge  
							
							
							
						 
						
							2011-10-25 03:26:20 +01:00  
				
					
						
							
							
								 
						
							
							
								4e9457ca0c 
								
							
								 
							
						 
						
							
							
								
								Merge commit '4c9400e6460a73baa2d687afe73a62c6efca9f37' into bigmerge  
							
							... 
							
							
							
							Conflicts:
	OpenSim/Services/AuthenticationService/AuthenticationServiceBase.cs 
							
						 
						
							2011-10-25 03:26:09 +01:00  
				
					
						
							
							
								 
						
							
							
								508f2ebb76 
								
							
								 
							
						 
						
							
							
								
								Merge commit '655aee44c4236d7023b9274645bf033b87b17131' into bigmerge  
							
							
							
						 
						
							2011-10-25 03:19:30 +01:00  
				
					
						
							
							
								 
						
							
							
								98b7bd01cb 
								
							
								 
							
						 
						
							
							
								
								Merge commit '229ca09b7956f51fc2618dc35dff87cf04bf0fc9' into bigmerge  
							
							
							
						 
						
							2011-10-25 03:19:16 +01:00  
				
					
						
							
							
								 
						
							
							
								a71c60ee6d 
								
							
								 
							
						 
						
							
							
								
								Merge commit 'd9184eceab5ff9087801b0f0d447dec2f5227a50' into bigmerge  
							
							
							
						 
						
							2011-10-25 02:56:56 +01:00  
				
					
						
							
							
								 
						
							
							
								cdca0fb387 
								
							
								 
							
						 
						
							
							
								
								Merge commit '9d59b285bbc84aa620200e7da69be0f347dd69f4' into bigmerge  
							
							
							
						 
						
							2011-10-25 02:56:03 +01:00  
				
					
						
							
							
								 
						
							
							
								f5e2bdebef 
								
							
								 
							
						 
						
							
							
								
								Merge commit 'c85a780583cb36bac95f69c5d704f60a758d56bb' into bigmerge  
							
							
							
						 
						
							2011-10-25 02:55:57 +01:00  
				
					
						
							
							
								 
						
							
							
								90f17785c3 
								
							
								 
							
						 
						
							
							
								
								Merge commit '352002fd0b74a87f62ea82c76969e4110ba2542f' into bigmerge  
							
							
							
						 
						
							2011-10-25 02:54:53 +01:00  
				
					
						
							
							
								 
						
							
							
								8841b77cd1 
								
							
								 
							
						 
						
							
							
								
								Merge commit '3843efe478ed682fd08bf12ea8bd7377c68a36fb' into bigmerge  
							
							
							
						 
						
							2011-10-25 01:53:53 +01:00  
				
					
						
							
							
								 
						
							
							
								3eb51e9a79 
								
							
								 
							
						 
						
							
							
								
								Merge commit 'bea65b06a445c267ecb77be08452146cb7fee1ce' into bigmerge  
							
							
							
						 
						
							2011-10-25 01:52:12 +01:00  
				
					
						
							
							
								 
						
							
							
								2d4ba1a871 
								
							
								 
							
						 
						
							
							
								
								Merge commit '03102864f0d9851b6937ca5472f48f10ec861a26' into bigmerge  
							
							
							
						 
						
							2011-10-25 01:52:00 +01:00  
				
					
						
							
							
								 
						
							
							
								b4395143e7 
								
							
								 
							
						 
						
							
							
								
								Merge commit '4e7d4330c2b2c61e64c9f82efa7b824b717b2e4d' into bigmerge  
							
							... 
							
							
							
							Conflicts:
	OpenSim/Region/Framework/Scenes/Scene.cs 
							
						 
						
							2011-10-25 01:50:07 +01:00  
				
					
						
							
							
								 
						
							
							
								e28e2d24c7 
								
							
								 
							
						 
						
							
							
								
								Add new EventQueueTests with basic test to check that adding a client registers an http poll  
							
							
							
						 
						
							2011-10-24 22:23:41 +01:00  
				
					
						
							
							
								 
						
							
							
								4c9400e646 
								
							
								 
							
						 
						
							
							
								
								Add optional getauthinfo and setauthinfo authentication service calls.  
							
							... 
							
							
							
							These are disabled by default, as before.  Please only turn these on in secure grids, since they allow the same facilities as the existing SetPassword call (also disabled by default)
These facilities can be helpful when integrating external systems, in addition to the existing option of adapting an IAuthenticationService or using WebLoginKey 
							
						 
						
							2011-10-24 21:40:36 +01:00  
				
					
						
							
							
								 
						
							
							
								655aee44c4 
								
							
								 
							
						 
						
							
							
								
								Rename some of the example commented out server names to mygridserver.com like all the others.  
							
							... 
							
							
							
							This is to make it easier to change all these names at once, where all grids services are running from the same location.
Also rearranges some lines in [Modules] so that StandaloneCommon.ini.example and GridCommon.ini.exmaple are consistent. 
							
						 
						
							2011-10-22 02:51:41 +01:00  
				
					
						
							
							
								 
						
							
							
								229ca09b79 
								
							
								 
							
						 
						
							
							
								
								Make config comments about choosing assetcache modules clearer.  
							
							... 
							
							
							
							OpenSim needs an asset cache.  Running without one will cause problems.
Thanks to Ai Austin for the suggestions in http://opensimulator.org/mantis/view.php?id=4850  
							
						 
						
							2011-10-22 02:47:53 +01:00  
				
					
						
							
							
								 
						
							
							
								d9184eceab 
								
							
								 
							
						 
						
							
							
								
								Add option to allow remote http calls to setpassword in the AuthenticationService.  
							
							... 
							
							
							
							This is switched on by setting AllowSetPassword = true in the [AuthenticationService] section of Robust.ini or Robust.HG.ini
Default is false as before. 
							
						 
						
							2011-10-19 19:03:17 +01:00  
				
					
						
							
							
								 
						
							
							
								9d59b285bb 
								
							
								 
							
						 
						
							
							
								
								Allow an http call to set account details if AllowSetAccount = true in [UserAccountService].  
							
							... 
							
							
							
							As before, default is false to not allow these calls. 
							
						 
						
							2011-10-19 00:06:40 +01:00  
				
					
						
							
							
								 
						
							
							
								c85a780583 
								
							
								 
							
						 
						
							
							
								
								Provide an option to allow remote calls to the CreateUser method on the UserAccountService  
							
							... 
							
							
							
							Default is false, as before.
Enabling AllowCreateUser in [UserAccountService] for ROBUST allows avatars to be created via an http call, with viewer 2 appropriate bits and pieces.
Only Ruths can be created at present.
Please don't rely on the config since at some point CreateUser will be moved to a separate co-ordinating service. 
							
						 
						
							2011-10-18 22:51:40 +01:00  
				
					
						
							
							
								 
						
							
							
								352002fd0b 
								
							
								 
							
						 
						
							
							
								
								Set enable_adaptive_throttles = true in OpenSimDefaults.ini  
							
							... 
							
							
							
							As discussed in http://lists.berlios.de/pipermail/opensim-dev/2011-October/010599.html  and the preceeding thread mails,
the aim of this setting is to avoid overloading the viewer UDP connection where the client is failing to ack packets.
Please mantis any anomalous viewer connection behaviour which wasn't there before. 
							
						 
						
							2011-10-17 22:11:56 +01:00  
				
					
						
							
							
								 
						
							
							
								3843efe478 
								
							
								 
							
						 
						
							
							
								
								Restore [Startup] physical_prim flag which can stop any prims being subject to physics  
							
							... 
							
							
							
							This had stopped working.  However, at the moment it still allows the physics flag to be set even though this has no effect.  This needs to be fixed.
Default for this flag is true as previously. 
							
						 
						
							2011-10-15 02:42:43 +01:00  
				
					
						
							
							
								 
						
							
							
								bea65b06a4 
								
							
								 
							
						 
						
							
							
								
								Add back the missing bin/addon-modules directory that I somehow managed to accidentally delete in  2fbc98f (Jul 7 2011)  
							
							
							
						 
						
							2011-10-14 23:32:15 +01:00  
				
					
						
							
							
								 
						
							
							
								03102864f0 
								
							
								 
							
						 
						
							
							
								
								change default ODE world_stepsize to 0.0178 from 0.02  
							
							... 
							
							
							
							This exactly fits five ODE steps in the default frame time (0.089).
This means that ODE execution time now matches the default minimum frame time.
This eliminates errors between distance travelled as calculated by ODE in clear air and simple extrapolation.
On the old values, ODE would actually do calculations over 0.1 seconds rather than 0.089.
This means that once the avatar is at top speed, no additional packets need to be sent for smooth movement, since no error develops between server and viewer.
This approach replaces the tweaks previously discussed on the opensim-dev mailing list 
							
						 
						
							2011-10-14 21:11:00 +01:00  
				
					
						
							
							
								 
						
							
							
								4e7d4330c2 
								
							
								 
							
						 
						
							
							
								
								Expose minimum frame time and update periods for experimentation.  
							
							... 
							
							
							
							Settings are at bottom of [Startup] in OpenSimDefaults.ini, override in OpenSim.ini to change
Defaults are the same as previously.
More information to come on opensim-dev shortly.
Feel free to tweak but if you do please don't expect any support unless feedback on certain tweaks is explicitly requested. 
							
						 
						
							2011-10-13 23:47:37 +01:00  
				
					
						
							
							
								 
						
							
							
								35def547f7 
								
							
								 
							
						 
						
							
							
								
								Merge branch 'master' into bigmerge  
							
							
							
						 
						
							2011-10-12 16:45:48 +01:00  
				
					
						
							
							
								 
						
							
							
								4b7b9e81f7 
								
							
								 
							
						 
						
							
							
								
								Make it possible to disable the HG linker. On non-HG systems it spits yellow  
							
							... 
							
							
							
							spam, so it should not load unless HG is desired. 
							
						 
						
							2011-10-12 15:41:59 +01:00  
				
					
						
							
							
								 
						
							
							
								0faa8db0ef 
								
							
								 
							
						 
						
							
							
								
								Update OpenSimDefaults.ini to make the prior state (Groups messaging enabled  
							
							... 
							
							
							
							by default) the config default. This way it will work for current cases while
allowing the use of other groups modules without config bloat. 
							
						 
						
							2011-10-12 09:23:57 +01:00  
				
					
						
							
							
								 
						
							
							
								c9fae6f8a2 
								
							
								 
							
						 
						
							
							
								
								Disable Flotsam groups messaging module in our config base  
							
							
							
						 
						
							2011-10-12 09:27:48 +02:00  
				
					
						
							
							
								 
						
							
							
								d2dc2316c2 
								
							
								 
							
						 
						
							
							
								
								Merge branch 'master' into bigmerge  
							
							
							
						 
						
							2011-10-12 09:26:35 +01:00  
				
					
						
							
							
								 
						
							
							
								ad46ad1ab2 
								
							
								 
							
						 
						
							
							
								
								Merge commit '8114f895c2973ac9e2e456ac2aaad8deb23f3852' into bigmerge  
							
							
							
						 
						
							2011-10-12 07:23:54 +01:00  
				
					
						
							
							
								 
						
							
							
								1c67c13d77 
								
							
								 
							
						 
						
							
							
								
								Merge commit '5551542c286c5db4fa47527c3167bcf539116ada' into bigmerge  
							
							
							
						 
						
							2011-10-12 07:09:10 +01:00  
				
					
						
							
							
								 
						
							
							
								2c23fc9e68 
								
							
								 
							
						 
						
							
							
								
								Merge commit '4073cd6ced525cb36e4335e79e3f94ad4872b263' into bigmerge  
							
							
							
						 
						
							2011-10-12 07:09:04 +01:00  
				
					
						
							
							
								 
						
							
							
								4a284110e6 
								
							
								 
							
						 
						
							
							
								
								Merge commit '5bc6503ae1295d00934a5f2ab92484ebcc8513a1' into bigmerge  
							
							
							
						 
						
							2011-10-12 07:07:12 +01:00  
				
					
						
							
							
								 
						
							
							
								e3f6344f54 
								
							
								 
							
						 
						
							
							
								
								Merge commit 'f1986d54bb3569e6b075b2125e860f31842a60cc' into bigmerge  
							
							
							
						 
						
							2011-10-12 01:29:31 +01:00  
				
					
						
							
							
								 
						
							
							
								ae8504f8d9 
								
							
								 
							
						 
						
							
							
								
								Merge commit '844b4f3a168a5fb1c19902e1f230f24d677c152f' into bigmerge  
							
							
							
						 
						
							2011-10-11 23:15:00 +01:00  
				
					
						
							
							
								 
						
							
							
								20a2b5d63c 
								
							
								 
							
						 
						
							
							
								
								Merge commit '6d0978594d1eca9ae56584afe38215f4262256e7' into bigmerge  
							
							
							
						 
						
							2011-10-11 23:14:54 +01:00  
				
					
						
							
							
								 
						
							
							
								d1e681f682 
								
							
								 
							
						 
						
							
							
								
								Merge commit 'e742cffe15d3e50841908d7babc2e4c4a7630635' into bigmerge  
							
							... 
							
							
							
							Conflicts:
	OpenSim/Region/CoreModules/Avatar/Attachments/AttachmentsModule.cs 
							
						 
						
							2011-10-11 23:14:23 +01:00  
				
					
						
							
							
								 
						
							
							
								5536cdf90c 
								
							
								 
							
						 
						
							
							
								
								Merge commit '39d7945efc8daa6e5cd0f4728b499e7a624526cd' into bigmerge  
							
							... 
							
							
							
							Conflicts:
	OpenSim/Framework/RegionLoader/Web/RegionLoaderWebServer.cs 
							
						 
						
							2011-10-11 23:01:52 +01:00  
				
					
						
							
							
								 
						
							
							
								d8b78ca498 
								
							
								 
							
						 
						
							
							
								
								Merge commit '53646070057c9355bba6df9e181253232d97d8e9' into bigmerge  
							
							
							
						 
						
							2011-10-11 22:53:38 +01:00  
				
					
						
							
							
								 
						
							
							
								1b2849319c 
								
							
								 
							
						 
						
							
							
								
								Merge commit 'ceb09cde4ddaff6b7e76ce18656f0c2049bcb8ec' into bigmerge  
							
							
							
						 
						
							2011-10-11 22:52:15 +01:00  
				
					
						
							
							
								 
						
							
							
								36ec9f0e94 
								
							
								 
							
						 
						
							
							
								
								Merge commit '27af016381f2f4aaa8cda99ce7f029980bf8ea76' into bigmerge  
							
							
							
						 
						
							2011-10-11 22:22:49 +01:00  
				
					
						
							
							
								 
						
							
							
								b9de3b7f5b 
								
							
								 
							
						 
						
							
							
								
								Merge commit 'f95033812402aaf31a9f2f66c946165d2d79669f' into bigmerge  
							
							... 
							
							
							
							Conflicts:
	OpenSim/Region/Physics/BulletDotNETPlugin/BulletDotNETCharacter.cs
	OpenSim/Region/Physics/BulletXPlugin/BulletXPlugin.cs
	prebuild.xml 
							
						 
						
							2011-10-11 22:22:34 +01:00  
				
					
						
							
							
								 
						
							
							
								071c3fe721 
								
							
								 
							
						 
						
							
							
								
								Merge commit '6f69ab3bcb932589f102c16b718e7f8964d2c8eb' into bigmerge  
							
							
							
						 
						
							2011-10-11 22:15:44 +01:00  
				
					
						
							
							
								 
						
							
							
								45ce8db5db 
								
							
								 
							
						 
						
							
							
								
								Merge commit '744602f6d170373882cb31155c8c899b43a5339e' into bigmerge  
							
							
							
						 
						
							2011-10-11 22:14:17 +01:00  
				
					
						
							
							
								 
						
							
							
								117d24be54 
								
							
								 
							
						 
						
							
							
								
								Merge commit 'c38b25a1d21540fd5be4ae438b38ab67ba88d166' into bigmerge  
							
							
							
						 
						
							2011-10-11 21:45:01 +01:00  
				
					
						
							
							
								 
						
							
							
								f1fa059b37 
								
							
								 
							
						 
						
							
							
								
								Merge commit 'a00327d0e5f512ccf56e18082c7e7c7366517379' into bigmerge  
							
							
							
						 
						
							2011-10-11 21:32:24 +01:00  
				
					
						
							
							
								 
						
							
							
								288f5bd727 
								
							
								 
							
						 
						
							
							
								
								Merge commit '37370a8102f066dab1fe3fd9b0b4a7d3541e8b47' into bigmerge  
							
							
							
						 
						
							2011-10-11 21:29:38 +01:00  
				
					
						
							
							
								 
						
							
							
								9d22110c23 
								
							
								 
							
						 
						
							
							
								
								Merge commit 'c4efb97d49dec736151dfa3fa102efe6a5f6fbab' into bigmerge  
							
							
							
						 
						
							2011-10-11 21:22:58 +01:00  
				
					
						
							
							
								 
						
							
							
								8114f895c2 
								
							
								 
							
						 
						
							
							
								
								Provide a way to turn the MonitorModule on and off  
							
							... 
							
							
							
							Default is currently on since this is the historical setting 
							
						 
						
							2011-10-10 22:17:29 +01:00  
				
					
						
							
							
								 
						
							
							
								5551542c28 
								
							
								 
							
						 
						
							
							
								
								Improve explanation of access_ip_addresses in [RemoteAdmin] to say that there are no restrictions if not set  
							
							
							
						 
						
							2011-10-08 01:39:27 +01:00  
				
					
						
							
							
								 
						
							
							
								4073cd6ced 
								
							
								 
							
						 
						
							
							
								
								Add option to allow only explicitly listed IPs to access RemoteAdmin facilities.  
							
							... 
							
							
							
							Also adds password check to some functions where this was missing and fixes some parameter checking.
This is a patch from http://opensimulator.org/mantis/view.php?id=5715  with a few small unrelated spacing tweaks from me.
Thanks Michelle Argus. 
							
						 
						
							2011-10-08 01:23:26 +01:00  
				
					
						
							
							
								 
						
							
							
								5bc6503ae1 
								
							
								 
							
						 
						
							
							
								
								Correct DeleteScriptsOnRestart to DeleteScriptsOnStartup in comments in OpenSim.ini.example  
							
							
							
						 
						
							2011-10-07 21:43:52 +01:00  
				
					
						
							
							
								 
						
							
							
								f1986d54bb 
								
							
								 
							
						 
						
							
							
								
								Clarify explanation of DeleteScriptsOnStartup switch in [XEngine].  
							
							
							
						 
						
							2011-10-04 22:48:28 +01:00  
				
					
						
							
							
								 
						
							
							
								844b4f3a16 
								
							
								 
							
						 
						
							
							
								
								copy config information on allow/disallow individual os functions into OpenSim.ini.example  
							
							... 
							
							
							
							I this is generally useful rather than a 'default' setting 
							
						 
						
							2011-09-30 23:55:02 +01:00  
				
					
						
							
							
								 
						
							
							
								6d0978594d 
								
							
								 
							
						 
						
							
							
								
								remove unused postgresql dll  
							
							
							
						 
						
							2011-09-30 18:58:26 +01:00  
				
					
						
							
							
								 
						
							
							
								e742cffe15 
								
							
								 
							
						 
						
							
							
								
								Add Enabled switch in new [Attachments] section in OpenSimDefaults.ini to allow attachments to be temporarily turned off.  
							
							... 
							
							
							
							This is for debugging purposes.  Defaults to Attachments Enabled 
							
						 
						
							2011-09-30 01:19:22 +01:00  
				
					
						
							
							
								 
						
							
							
								39d7945efc 
								
							
								 
							
						 
						
							
							
								
								Added a setting to [Startup] section of config that will allow the simulator to start up with no regions configured.  
							
							... 
							
							
							
							I added the boolean config setting "allow_regionless", defaulting to false. If set to true, opensim will start up ok if no region configurations are found in the specified region_info_source. It will not ask the user to create a region. 
							
						 
						
							2011-09-24 01:59:02 +01:00  
				
					
						
							
							
								 
						
							
							
								5364607005 
								
							
								 
							
						 
						
							
							
								
								Clarify explanation of the "DeleteScriptsOnStartup" config switch and add this to OpenSim.ini.example since it's very useful if you're not updating OpenSim from source.  
							
							... 
							
							
							
							On reflection, "DeleteScriptsOnStartup" isn't a great name since it suggests real script deletion rather than compiled versions. 
							
						 
						
							2011-09-24 00:22:23 +01:00  
				
					
						
							
							
								 
						
							
							
								ceb09cde4d 
								
							
								 
							
						 
						
							
							
								
								Correct asset id of library default iris texture.  
							
							... 
							
							
							
							For this change to show up you will need to clear viewer cache. 
							
						 
						
							2011-09-23 21:57:52 +01:00  
				
					
						
							
							
								 
						
							
							
								27af016381 
								
							
								 
							
						 
						
							
							
								
								Add BulletSim physics option details to OpenSim.ini.example.  Marked as in development and experimental.  
							
							
							
						 
						
							2011-09-17 01:13:07 +01:00  
				
					
						
							
							
								 
						
							
							
								f950338124 
								
							
								 
							
						 
						
							
							
								
								Remove old bullet DotNET and X libraries in preparation for BulletS  
							
							... 
							
							
							
							These weren't working properly anyway.
You will need to rerun prebuild.sh/.bat after this commit, and maybe "nant clean" as well. 
							
						 
						
							2011-09-17 01:09:25 +01:00  
				
					
						
							
							
								 
						
							
							
								6f69ab3bcb 
								
							
								 
							
						 
						
							
							
								
								Add back BulletSPlugin.dll.config that I somehow managed to delete today in  a00327d 
							
							
							
						 
						
							2011-09-17 00:49:26 +01:00  
				
					
						
							
							
								 
						
							
							
								744602f6d1 
								
							
								 
							
						 
						
							
							
								
								Revert "uncomment Standalone config in OpenSim.ini.example."  
							
							... 
							
							
							
							This reverts commit 44a491f36b 
							
						 
						
							2011-09-17 00:10:19 +01:00  
				
					
						
							
							
								 
						
							
							
								c38b25a1d2 
								
							
								 
							
						 
						
							
							
								
								Fix base_hair.dat to actually contain the base hair asset rather than base eyes by mistake.  
							
							... 
							
							
							
							I must have had it cached last night.
This now makes completely fresh avatar setups appear properly (remember to wipe viewer cache and server cache as well as database).
As a bonus, eyes now appear by default too! 
							
						 
						
							2011-09-16 21:43:58 +01:00  
				
					
						
							
							
								 
						
							
							
								a00327d0e5 
								
							
								 
							
						 
						
							
							
								
								Fix build errors on Windows by adding missing OpenSim.Services.Base reference  
							
							
							
						 
						
							2011-09-16 19:54:23 +01:00  
				
					
						
							
							
								 
						
							
							
								37370a8102 
								
							
								 
							
						 
						
							
							
								
								On standalone, by default create the necessary minimum body parts and clothes necessary to display a viewer 2 avatar, as implemented in  c4efb97d 
							
							... 
							
							
							
							This is controlled by the CreateDefaultAvatarEntries switch in the [UserAccountService] section of config-include/Stnadalone.ini
This is left as false in grid mode 
							
						 
						
							2011-09-16 00:30:37 +01:00  
				
					
						
							
							
								 
						
							
							
								c4efb97d49 
								
							
								 
							
						 
						
							
							
								
								Write code to create minimum necessary body parts/clothing and avatar entries to make a newly created user appear as a non-cloud on viewer 2  
							
							... 
							
							
							
							Viewer 2 no longer contains the default avatar assets (i.e. "Ruth") that would appear if the user had insufficient body part/clothing entries.
Instead, avatars always appear as a cloud, which is a very bad experience for out-of-the-box OpenSim.
Default is currently off.  My intention is to switch it on for standalone shortly.
This is not particularly flexible as "Ruth" is hardcoded, but this can change in the future, in co-ordination with the existing RemoteAdmin capabilities.
Need to fix creation of suitable entries for users created as estate owners on standalone.
Avatars still appear with spooky empty eyes, need to see if we can address this.
This commit adds a "Default Iris" to the library (thanks to Eirynne Sieyes from http://opensimulator.org/mantis/view.php?id=1461 ) which can be used. 
							
						 
						
							2011-09-15 22:59:29 +01:00  
				
					
						
							
							
								 
						
							
							
								5484c9b585 
								
							
								 
							
						 
						
							
							
								
								Bring us up to date.  
							
							
							
						 
						
							2011-09-14 19:11:32 -07:00  
				
					
						
							
							
								 
						
							
							
								44a491f36b 
								
							
								 
							
						 
						
							
							
								
								uncomment Standalone config in OpenSim.ini.example.  
							
							... 
							
							
							
							This is to make my life easier when creating releases.
I think that it also gives a better story for anybody newly compiling from source. 
							
						 
						
							2011-09-12 20:31:14 +01:00  
				
					
						
							
							
								 
						
							
							
								9f75eaf50e 
								
							
								 
							
						 
						
							
							
								
								Fixed BulletSim config files for Linux *.so libraries.  
							
							
							
						 
						
							2011-09-04 21:42:33 +02:00  
				
					
						
							
							
								 
						
							
							
								66dec3b874 
								
							
								 
							
						 
						
							
							
								
								Resolve merge commits, stage 1  
							
							
							
						 
						
							2011-09-04 07:06:36 -07:00  
				
					
						
							
							
								 
						
							
							
								91f59f246f 
								
							
								 
							
						 
						
							
							
								
								also get "nant clean" to remove old .mdb from .exe and .dll  
							
							
							
						 
						
							2011-08-30 23:20:54 +01:00  
				
					
						
							
							
								 
						
							
							
								9e4153f16b 
								
							
								 
							
						 
						
							
							
								
								Hack our copy of Prebuild to just delete the dlls and mdbs in Physics, so as to leave the new config file  
							
							
							
						 
						
							2011-08-30 23:17:02 +01:00  
				
					
						
							
							
								 
						
							
							
								b705ad477e 
								
							
								 
							
						 
						
							
							
								
								BulletSim: update values in OpenSimDefaults.ini to the same as defaults in the source.  
							
							
							
						 
						
							2011-08-30 13:49:50 -07:00  
				
					
						
							
							
								 
						
							
							
								b281163457 
								
							
								 
							
						 
						
							
							
								
								BulletSim: add .so for 64 bit Linux. Move .config file to where it will be read.  
							
							
							
						 
						
							2011-08-30 13:19:53 -07:00  
				
					
						
							
							
								 
						
							
							
								21708b832b 
								
							
								 
							
						 
						
							
							
								
								BulletSim: add mesh representation. Use meshes for static objects and switch to hulls for physical objects.  
							
							
							
						 
						
							2011-08-26 15:51:21 -07:00  
				
					
						
							
							
								 
						
							
							
								23f10f1d22 
								
							
								 
							
						 
						
							
							
								
								Merge branch 'master' into bulletsim  
							
							
							
						 
						
							2011-08-26 15:23:46 -07:00  
				
					
						
							
							
								 
						
							
							
								2307d9a2f9 
								
							
								 
							
						 
						
							
							
								
								minor: Add explanative text for the new currency parameter.  Convert some tabs to spaces  
							
							
							
						 
						
							2011-08-22 00:58:11 +01:00  
				
					
						
							
							
								 
						
							
							
								384cb79a1a 
								
							
								 
							
						 
						
							
							
								
								Merge branch 'master' into bulletsim  
							
							... 
							
							
							
							Conflicts:
	OpenSim/Region/Framework/Scenes/SceneManager.cs 
							
						 
						
							2011-08-19 14:49:16 -07:00