a9b7487fcb 
								
							
								 
							
						 
						
							
							
								
								improve and tidy up some config file comments  
							
							
							
						 
						
							2011-06-30 22:36:41 +01:00  
				
					
						
							
							
								 
						
							
							
								03feb50a72 
								
							
								 
							
						 
						
							
							
								
								minor: adjust some indentation and spacing in OpenSim.ini.example for consistency  
							
							
							
						 
						
							2011-06-30 20:26:17 +01:00  
				
					
						
							
							
								 
						
							
							
								5f927dc104 
								
							
								 
							
						 
						
							
							
								
								Merge branch 'master' into careminster-presence-refactor  
							
							
							
						 
						
							2011-06-30 00:26:03 +01:00  
				
					
						
							
							
								 
						
							
							
								e11c959400 
								
							
								 
							
						 
						
							
							
								
								[PATCH] Changed Wind parameters default value in OpenSim.ini.example  
							
							... 
							
							
							
							according to implementation
Signed-off-by: BlueWall <jamesh@bluewallgroup.com> 
							
						 
						
							2011-06-28 11:48:28 -04:00  
				
					
						
							
							
								 
						
							
							
								23bf773dea 
								
							
								 
							
						 
						
							
							
								
								For an initial test, add 64 bit shared object bullet libraries built under Linux.  These are not yet hooked up.  
							
							... 
							
							
							
							I'm not sure which one you actually need, Robert, so please prune as appropriate.  I haven't tested or hooked these up in any way yet. 
							
						 
						
							2011-06-27 00:29:01 +01:00  
				
					
						
							
							
								 
						
							
							
								698cd0b3c2 
								
							
								 
							
						 
						
							
							
								
								Remove the now unused [cms] section from OpenSimDefaults.ini  
							
							
							
						 
						
							2011-06-25 01:33:09 +01:00  
				
					
						
							
							
								 
						
							
							
								0dd3281caf 
								
							
								 
							
						 
						
							
							
								
								Optionally, don't delete previously compiled scripts on startup  
							
							
							
						 
						
							2011-06-24 22:07:20 +01:00  
				
					
						
							
							
								 
						
							
							
								de20f0603f 
								
							
								 
							
						 
						
							
							
								
								Tell hypergridders when their teleports fail because of the 4096 limit rather than just saying "destination not found"  
							
							... 
							
							
							
							Instead of performing the 4096 check when the region is linked (and subsequently removing the link), leave the link in place and perform the check in the entity transfer module
This allows us to explicitly tell the hypergridder why the teleport failed (region out of range).
It also allows people on regions that are within range (on a large source grid) to teleport.
The Check4096 config parameter in the [GridService] section is replaced by a max_distance paramter in a new [EntityTransfer] section in OpenSimDefaults.ini
Since the parameter is in OpenSimDefaults.ini no action needs to be taken unless you want to increase this limit.  It could also be decreased.
The check is being made in the base entity transfer module, since I believe the viewer problem occurs both on extremely large grids and while hypergridding. 
							
						 
						
							2011-06-24 19:49:05 +01:00  
				
					
						
							
							
								 
						
							
							
								7974349262 
								
							
								 
							
						 
						
							
							
								
								Initial BulletSim.dll commit  
							
							
							
						 
						
							2011-06-20 17:28:53 -07:00  
				
					
						
							
							
								 
						
							
							
								6ae73aea49 
								
							
								 
							
						 
						
							
							
								
								Merge branch 'master' into careminster-presence-refactor  
							
							
							
						 
						
							2011-06-20 03:11:34 +01:00  
				
					
						
							
							
								 
						
							
							
								bbe489e64a 
								
							
								 
							
						 
						
							
							
								
								Added missing config var for map image service.  
							
							
							
						 
						
							2011-06-15 11:11:14 -07:00  
				
					
						
							
							
								 
						
							
							
								822b9e085f 
								
							
								 
							
						 
						
							
							
								
								Added SimulatorFeatures capability. Thanks Aurora devs for the bootstrap on the contents of the response.  
							
							... 
							
							
							
							Changed the experimental capability introduced a couple of commits ago: now sending that extra information as part of the response in the SimulatorFeatures cap. 
							
						 
						
							2011-06-13 10:21:29 -07:00  
				
					
						
							
							
								 
						
							
							
								ecb28ae130 
								
							
								 
							
						 
						
							
							
								
								V2 map now working in grids too. WARNING: A few visible configuration variables added in order for this to work. See .ini.example changes  
							
							
							
						 
						
							2011-06-13 09:13:44 -07:00  
				
					
						
							
							
								 
						
							
							
								0e4db3ca39 
								
							
								 
							
						 
						
							
							
								
								Added experimental new capability URL called MapImageService meant to work with Kokua viewer if devs are willing to do it.  
							
							
							
						 
						
							2011-06-13 07:56:52 -07:00  
				
					
						
							
							
								 
						
							
							
								9b1d3f0c38 
								
							
								 
							
						 
						
							
							
								
								Merge branch 'master' into careminster-presence-refactor  
							
							
							
						 
						
							2011-06-13 12:38:17 +01:00  
				
					
						
							
							
								 
						
							
							
								07d7c1cd2d 
								
							
								 
							
						 
						
							
							
								
								Trailing / in MapTileURL must be there!  
							
							
							
						 
						
							2011-06-12 18:29:44 -07:00  
				
					
						
							
							
								 
						
							
							
								fd57c91b4a 
								
							
								 
							
						 
						
							
							
								
								First pass at making the V2 map work. Standalones only for now. There are some issues with the zoom level -- TBD.  
							
							
							
						 
						
							2011-06-12 15:37:42 -07:00  
				
					
						
							
							
								 
						
							
							
								a1c16a4200 
								
							
								 
							
						 
						
							
							
								
								Merge branch 'master' into careminster-presence-refactor  
							
							
							
						 
						
							2011-06-11 12:08:02 +01:00  
				
					
						
							
							
								 
						
							
							
								39e878eb8f 
								
							
								 
							
						 
						
							
							
								
								Align CenomeCache.ini.example values with CenomeCache defaults.  
							
							
							
						 
						
							2011-06-11 00:35:31 +01:00  
				
					
						
							
							
								 
						
							
							
								c7cef650db 
								
							
								 
							
						 
						
							
							
								
								Make it clear that WaitOnInprogressTimeout is currently a dead setting in FlotsamCache.ini.example  
							
							
							
						 
						
							2011-06-11 00:10:40 +01:00  
				
					
						
							
							
								 
						
							
							
								b13b54c526 
								
							
								 
							
						 
						
							
							
								
								Make the internal flotsam asset cache defaults match config-include/FlotsamCache.ini.example.  Enable the flotsam console commands even if FlotsamCache.ini isn't present.  
							
							... 
							
							
							
							For the most part, defaults are made to match those already in FlotsamCache.ini.example.
The one exception is that the 48 hour file timeout from the code is used instead of the 0 hours that was in the example file.  This can be tweaked if necessary.
Most importantly, the default cache directory is now ./assetcache (as in FlotsamCache.ini.example) rather than ./FlotsamAssetCache (as was the internal code default).
Therefore, if you were using flotasm without using the config file, then please rename your cache directory or start using the ini file and change the default there if you want to keep using your existing cache. 
							
						 
						
							2011-06-11 00:04:21 +01:00  
				
					
						
							
							
								 
						
							
							
								c7bdb66a1f 
								
							
								 
							
						 
						
							
							
								
								Added missing "Old Guids=true" to ConnectionString  
							
							
							
						 
						
							2011-06-10 21:10:37 +01:00  
				
					
						
							
							
								 
						
							
							
								326c46ba70 
								
							
								 
							
						 
						
							
							
								
								Merge branch 'master' into careminster-presence-refactor  
							
							
							
						 
						
							2011-06-09 02:05:04 +01:00  
				
					
						
							
							
								 
						
							
							
								f5d82350bb 
								
							
								 
							
						 
						
							
							
								
								This fixes the crash reported in  http://opensimulator.org/mantis/view.php?id=5529  related to sending IMs to foreign friends who are offline. Hopefully.  
							
							
							
						 
						
							2011-06-07 10:51:12 -07:00  
				
					
						
							
							
								 
						
							
							
								e77ca65e57 
								
							
								 
							
						 
						
							
							
								
								This should make offline IMs work again. It should work for incoming foreign IMs where the local recipient is offline. I can't test any of this, because I don't run an offline IM server.  
							
							
							
						 
						
							2011-06-06 17:46:34 -07:00  
				
					
						
							
							
								 
						
							
							
								4ea89f39f2 
								
							
								 
							
						 
						
							
							
								
								Merge branch 'master' of ssh://opensimulator.org/var/git/opensim  
							
							
							
						 
						
							2011-06-03 10:32:21 -07:00  
				
					
						
							
							
								 
						
							
							
								7772640ae8 
								
							
								 
							
						 
						
							
							
								
								.ini.example's updated for HG Landmarks  
							
							
							
						 
						
							2011-06-03 10:29:59 -07:00  
				
					
						
							
							
								 
						
							
							
								dfa4442319 
								
							
								 
							
						 
						
							
							
								
								Move the "!!!Standalone Only!!!" [FreeswitchService] section from OpenSim.ini.example to config/StandaloneCommon.ini.example where it belongs.  
							
							
							
						 
						
							2011-06-02 22:43:44 +01:00  
				
					
						
							
							
								 
						
							
							
								b8e2ee6978 
								
							
								 
							
						 
						
							
							
								
								Merge branch 'master' of ssh://opensimulator.org/var/git/opensim  
							
							
							
						 
						
							2011-06-02 21:48:50 +01:00  
				
					
						
							
							
								 
						
							
							
								b000d4f67f 
								
							
								 
							
						 
						
							
							
								
								minor: add ini.example doc to hint that the server address in [FreeswitchService] must be reachable by viewers  
							
							
							
						 
						
							2011-06-02 21:37:17 +01:00  
				
					
						
							
							
								 
						
							
							
								46cdd442a8 
								
							
								 
							
						 
						
							
							
								
								[Profiles] --> [Profile]  
							
							
							
						 
						
							2011-06-01 18:18:31 -07:00  
				
					
						
							
							
								 
						
							
							
								c4b265aeae 
								
							
								 
							
						 
						
							
							
								
								update libomv libraries to 0.9.0  
							
							... 
							
							
							
							this is a prerequisite to fixing llDialog issues for the latest Linden viewers, since they are now making use of a new OwnerData field in the ScriptDialog message 
							
						 
						
							2011-05-31 18:47:13 +01:00  
				
					
						
							
							
								 
						
							
							
								7ea6dfecd9 
								
							
								 
							
						 
						
							
							
								
								Adding MSSQL connectionString example  
							
							
							
						 
						
							2011-05-30 23:22:52 +01:00  
				
					
						
							
							
								 
						
							
							
								d671dbb7c7 
								
							
								 
							
						 
						
							
							
								
								Removing mssql_connection.ini.example - mssql_connection.ini is no longer used  
							
							
							
						 
						
							2011-05-30 23:22:49 +01:00  
				
					
						
							
							
								 
						
							
							
								16fae059bb 
								
							
								 
							
						 
						
							
							
								
								Comment the alert_uri so it remains disabled until set  
							
							
							
						 
						
							2011-05-28 16:40:05 -04:00  
				
					
						
							
							
								 
						
							
							
								3326e417b4 
								
							
								 
							
						 
						
							
							
								
								Merge branch 'master' of /home/opensim/src/opensim  
							
							
							
						 
						
							2011-05-28 16:21:30 -04:00  
				
					
						
							
							
								 
						
							
							
								c7e18f9017 
								
							
								 
							
						 
						
							
							
								
								Adding an event to signal that logins are enabled  
							
							... 
							
							
							
							Added an event to signal the eabling of logins and added an alert to send to a configured service. 
							
						 
						
							2011-05-28 16:20:10 -04:00  
				
					
						
							
							
								 
						
							
							
								d2c2a4301b 
								
							
								 
							
						 
						
							
							
								
								Merge branch 'master' of /home/opensim/src/opensim  
							
							
							
						 
						
							2011-05-28 00:39:21 -04:00  
				
					
						
							
							
								 
						
							
							
								99f42c0a6e 
								
							
								 
							
						 
						
							
							
								
								Add option to disable logins  
							
							... 
							
							
							
							This just covers script loading for now. More to come. 
							
						 
						
							2011-05-28 00:35:06 -04:00  
				
					
						
							
							
								 
						
							
							
								44d5821c4e 
								
							
								 
							
						 
						
							
							
								
								Fixed one comment in a config file.  
							
							
							
						 
						
							2011-05-27 13:35:22 -07:00  
				
					
						
							
							
								 
						
							
							
								76525be7b2 
								
							
								 
							
						 
						
							
							
								
								HG lures working! Friends can offer friends HG teleports via the profile. WARNING: additional configuration for HG inis -- see *Common.ini.example  
							
							
							
						 
						
							2011-05-27 13:07:18 -07:00  
				
					
						
							
							
								 
						
							
							
								36f9d55c36 
								
							
								 
							
						 
						
							
							
								
								Added a BasicProfilemodule so that the profile-based actions (like give inventory, etc) work. This is just a mock profile, the same for all users, and with no DB backend behind it -- meaning that nothing will be saved. For serious profiles, use 3rd party implementations.  
							
							
							
						 
						
							2011-05-27 07:00:36 -07:00  
				
					
						
							
							
								 
						
							
							
								31d07859f9 
								
							
								 
							
						 
						
							
							
								
								Added missing config vars to StandaloneCommon.ini.example and fixed the ones in Robust.HG.ini.example  
							
							
							
						 
						
							2011-05-26 19:43:24 -07:00  
				
					
						
							
							
								 
						
							
							
								abae859e7a 
								
							
								 
							
						 
						
							
							
								
								Added missing configuration variables to Robust.HG.ini.example  
							
							
							
						 
						
							2011-05-26 19:20:29 -07:00  
				
					
						
							
							
								 
						
							
							
								07acb4d321 
								
							
								 
							
						 
						
							
							
								
								Last commit before pushing. WARNING: (a) DB migration on the friends table; and (b) several config additions related to HG. See Robust.HG.ini.example, GridCommon.ini.example and/or StandaloneCommon.ini.example.  
							
							
							
						 
						
							2011-05-26 19:15:39 -07:00  
				
					
						
							
							
								 
						
							
							
								0c58a9e680 
								
							
								 
							
						 
						
							
							
								
								HG IM in grid mode working fairly well. Unknown target user references looked back in source user's User Agent service.  
							
							
							
						 
						
							2011-05-26 10:04:48 -07:00  
				
					
						
							
							
								 
						
							
							
								5c2168cae7 
								
							
								 
							
						 
						
							
							
								
								HG: Instant Message working. Tested on HG standalones only. Needs a lot more testing.  
							
							
							
						 
						
							2011-05-25 12:32:21 -07:00  
				
					
						
							
							
								 
						
							
							
								e19031849e 
								
							
								 
							
						 
						
							
							
								
								Added necessary code to drop inventory on hg friends using the profile window, but can't test because this mechanism doesn't seem to work without a profile service.  
							
							
							
						 
						
							2011-05-24 09:38:03 -07:00  
				
					
						
							
							
								 
						
							
							
								24f28d3534 
								
							
								 
							
						 
						
							
							
								
								HG friends: Status notifications working. Also initial logins get the online friends in other grids.  
							
							
							
						 
						
							2011-05-23 19:45:39 -07:00  
				
					
						
							
							
								 
						
							
							
								336665e035 
								
							
								 
							
						 
						
							
							
								
								More on HG Friends. Added Delete(string, string) across the board. Added security to friendship identifiers so that they can safely be deleted across worlds. Had to change Get(string) to use LIKE because the secret in the identifier is not always known -- affects only HG visitors. BOTTOM LINE SO FAR: HG friendships established and deleted safely across grids, local rights working but not (yet?) being transmitted back.  
							
							
							
						 
						
							2011-05-22 16:51:03 -07:00  
				
					
						
							
							
								 
						
							
							
								d21e9c755f 
								
							
								 
							
						 
						
							
							
								
								HG Friends working to some extent: friendships offered and accepted correctly handled. Friends list showing correct foreign names. TODO: GrantRights.  
							
							
							
						 
						
							2011-05-19 16:54:46 -07:00  
				
					
						
							
							
								 
						
							
							
								f9203ca7e0 
								
							
								 
							
						 
						
							
							
								
								Add a message packing library to binary-pack AgentCircuitData for faster  
							
							... 
							
							
							
							teleporting 
							
						 
						
							2011-05-17 22:38:45 +02:00  
				
					
						
							
							
								 
						
							
							
								75d4956ee5 
								
							
								 
							
						 
						
							
							
								
								Merge branch 'master' into careminster-presence-refactor  
							
							
							
						 
						
							2011-05-13 12:05:46 +01:00  
				
					
						
							
							
								 
						
							
							
								5f9edd195c 
								
							
								 
							
						 
						
							
							
								
								Fix broken inventory links on viewer 2.  
							
							... 
							
							
							
							It appears that if the viewer requests a folder containing links, we must also send the folders that contain the link targets first.
This was tested with Kokua 0.1.0 WIP though I predict it will also work with other viewer 2s 
							
						 
						
							2011-05-13 03:24:19 +01:00  
				
					
						
							
							
								 
						
							
							
								279ed08de1 
								
							
								 
							
						 
						
							
							
								
								Incremental patch to add config options to enable/disable the prim limits module to OpenSim.ini. EnforcePrimLimits is set to false by default to emulate the current behavior.  
							
							
							
						 
						
							2011-05-09 03:14:48 +01:00  
				
					
						
							
							
								 
						
							
							
								939026d874 
								
							
								 
							
						 
						
							
							
								
								Incremental patch to add config options to enable/disable the prim limits module to OpenSim.ini. EnforcePrimLimits is set to false by default to emulate the current behavior.  
							
							
							
						 
						
							2011-05-09 02:35:32 +02:00  
				
					
						
							
							
								 
						
							
							
								b451cc1ebb 
								
							
								 
							
						 
						
							
							
								
								Merge branch 'master' into careminster-presence-refactor  
							
							
							
						 
						
							2011-05-08 20:23:06 +01:00  
				
					
						
							
							
								 
						
							
							
								d40e4562f2 
								
							
								 
							
						 
						
							
							
								
								Add missing configs for ssl in Robust.HG.ini  
							
							
							
						 
						
							2011-05-07 18:54:21 -04:00  
				
					
						
							
							
								 
						
							
							
								7c3e8a106b 
								
							
								 
							
						 
						
							
							
								
								Merge branch 'master' of  https://github.com/allquixotic/opensim-autobackup  
							
							
							
						 
						
							2011-05-06 20:51:55 +01:00  
				
					
						
							
							
								 
						
							
							
								8ca7938753 
								
							
								 
							
						 
						
							
							
								
								Adding ssl support  
							
							... 
							
							
							
							Adding ssl support for "Out of Band" applications such as the remote
	admin module or Robust services 
							
						 
						
							2011-05-05 19:56:54 -04:00  
				
					
						
							
							
								 
						
							
							
								4beb0c9b9b 
								
							
								 
							
						 
						
							
							
								
								Merge branch 'master' into careminster-presence-refactor  
							
							
							
						 
						
							2011-05-05 09:49:10 +01:00  
				
					
						
							
							
								 
						
							
							
								98b84802e4 
								
							
								 
							
						 
						
							
							
								
								Changed the defaults, so that it behaves exactly is it has been behaving (no WebFetch cap by default).  
							
							
							
						 
						
							2011-05-02 20:19:36 -07:00  
				
					
						
							
							
								 
						
							
							
								fffd42f5cb 
								
							
								 
							
						 
						
							
							
								
								Merge git://opensimulator.org/git/opensim  
							
							
							
						 
						
							2011-05-02 02:23:18 -04:00  
				
					
						
							
							
								 
						
							
							
								f10666c7ba 
								
							
								 
							
						 
						
							
							
								
								How this might look like from a configuration perspective. Changes OpenSimDefaults.ini.  
							
							
							
						 
						
							2011-05-01 10:07:54 -07:00  
				
					
						
							
							
								 
						
							
							
								d1cf1fe3d7 
								
							
								 
							
						 
						
							
							
								
								Merge branch 'master' into careminster-presence-refactor  
							
							
							
						 
						
							2011-04-30 14:37:37 +01:00  
				
					
						
							
							
								 
						
							
							
								5e3893ca5c 
								
							
								 
							
						 
						
							
							
								
								add the executable bit to all bundled DLLs so that these are preserved when using git or untarring releases under cygwin on windows  
							
							... 
							
							
							
							Mono doesn't care if the 
							
						 
						
							2011-04-27 23:57:26 +01:00  
				
					
						
							
							
								 
						
							
							
								e0576b56d3 
								
							
								 
							
						 
						
							
							
								
								Thank you Snoopy for a patch that adds some filtering to client versions allowed at login and HG-login times. NOTE: additional (optional) configuration variables in [LoginService] and [GatekeeperService]. See .examples.  
							
							
							
						 
						
							2011-04-27 07:02:37 -07:00  
				
					
						
							
							
								 
						
							
							
								1b43c05c3d 
								
							
								 
							
						 
						
							
							
								
								Change default ini.example port used by Freeswitch in grid settings to 8004.  
							
							... 
							
							
							
							This is to facilitate running Freeswitch in a separate ROBUST shell, as on grid setups there can be quite a lot of traffic flowing between FreeSWITCH and ROBUST.  However, running in a spearate shell is not mandatory. 
							
						 
						
							2011-04-27 02:05:16 +01:00  
				
					
						
							
							
								 
						
							
							
								d722f22102 
								
							
								 
							
						 
						
							
							
								
								adjust freeswitch grid connector to port 8003 to agree with the default 8003 used in OpenSim.ini.example  
							
							... 
							
							
							
							Adjusting to 8003 seems sensible since this service doesn't need to be exposed to viewers. 
							
						 
						
							2011-04-27 01:53:57 +01:00  
				
					
						
							
							
								 
						
							
							
								587aa91e36 
								
							
								 
							
						 
						
							
							
								
								Merge git://opensimulator.org/git/opensim  
							
							
							
						 
						
							2011-04-26 11:45:38 -04:00  
				
					
						
							
							
								 
						
							
							
								36fef21e52 
								
							
								 
							
						 
						
							
							
								
								Merge branch 'master' into queuetest  
							
							
							
						 
						
							2011-04-26 08:42:21 -07:00  
				
					
						
							
							
								 
						
							
							
								e579a990b4 
								
							
								 
							
						 
						
							
							
								
								Removed stale client components: MXP and VWoHTTP.  
							
							
							
						 
						
							2011-04-25 18:59:01 -07:00  
				
					
						
							
							
								 
						
							
							
								a6c53b1ba2 
								
							
								 
							
						 
						
							
							
								
								Merge branch 'queuetest' into careminster-presence-refactor  
							
							
							
						 
						
							2011-04-25 23:26:37 +01:00  
				
					
						
							
							
								 
						
							
							
								9bf5e94b70 
								
							
								 
							
						 
						
							
							
								
								Merge branch 'master' into careminster-presence-refactor  
							
							
							
						 
						
							2011-04-25 23:18:32 +01:00  
				
					
						
							
							
								 
						
							
							
								024c12abc3 
								
							
								 
							
						 
						
							
							
								
								Cleaned up various configuration options. Removed the category throttle  
							
							... 
							
							
							
							limits because the only ones used now are the defaults (which are overwritten
by the client throttles anyway). Updated the default rates to correspond to
about 350kbps.
Also added a configuration to disable adaptive throttle. The default
is the previous behavior (no adaptation). 
							
						 
						
							2011-04-25 10:44:41 -07:00  
				
					
						
							
							
								 
						
							
							
								0d5a80ad78 
								
							
								 
							
						 
						
							
							
								
								Removed unused libraries: RAILS.dll and dependencies.  
							
							
							
						 
						
							2011-04-24 19:14:39 -07:00  
				
					
						
							
							
								 
						
							
							
								35c09cae8c 
								
							
								 
							
						 
						
							
							
								
								Removed unused libraries Castle.*  
							
							
							
						 
						
							2011-04-24 19:06:48 -07:00  
				
					
						
							
							
								 
						
							
							
								d287e0ac68 
								
							
								 
							
						 
						
							
							
								
								Merge git://opensimulator.org/git/opensim  
							
							
							
						 
						
							2011-04-23 18:33:08 -04:00  
				
					
						
							
							
								 
						
							
							
								082fad6dd2 
								
							
								 
							
						 
						
							
							
								
								Fix most issues raised by justincc:  http://opensimulator.org/mantis/view.php?id=5440  
							
							
							
						 
						
							2011-04-23 18:29:13 -04:00  
				
					
						
							
							
								 
						
							
							
								44e43d9d24 
								
							
								 
							
						 
						
							
							
								
								Added MaxAgents configuration option to RegionConfig.ini allowing region hosters to setup regions maintaining more control over system resources.  
							
							
							
						 
						
							2011-04-23 00:40:08 +01:00  
				
					
						
							
							
								 
						
							
							
								c411ab54ee 
								
							
								 
							
						 
						
							
							
								
								Merge branch 'master' into careminster-presence-refactor  
							
							
							
						 
						
							2011-04-22 08:55:12 +01:00  
				
					
						
							
							
								 
						
							
							
								b8e282324e 
								
							
								 
							
						 
						
							
							
								
								fix merge conflicts with OpenSimDefaults.ini  
							
							
							
						 
						
							2011-04-21 19:06:54 -04:00  
				
					
						
							
							
								 
						
							
							
								e0002f6b64 
								
							
								 
							
						 
						
							
							
								
								some mesh config asthetics  
							
							
							
						 
						
							2011-04-21 19:04:41 -04:00  
				
					
						
							
							
								 
						
							
							
								0c68fbdb1a 
								
							
								 
							
						 
						
							
							
								
								Merge branch 'master' into careminster-presence-refactor  
							
							
							
						 
						
							2011-04-21 23:06:01 +01:00  
				
					
						
							
							
								 
						
							
							
								5e99d93651 
								
							
								 
							
						 
						
							
							
								
								Merge branch 'master' of ssh://opensimulator.org/var/git/opensim  
							
							
							
						 
						
							2011-04-21 15:16:12 -04:00  
				
					
						
							
							
								 
						
							
							
								d9055c8dc3 
								
							
								 
							
						 
						
							
							
								
								Group collada meshies settings under [Mesh] in OpensimDefaults.ini  
							
							
							
						 
						
							2011-04-21 15:15:24 -04:00  
				
					
						
							
							
								 
						
							
							
								223c90c751 
								
							
								 
							
						 
						
							
							
								
								Remove duplicated freeswitch settings.  
							
							
							
						 
						
							2011-04-21 19:31:37 +01:00  
				
					
						
							
							
								 
						
							
							
								09b6d717bf 
								
							
								 
							
						 
						
							
							
								
								Merge branch 'master' into careminster-presence-refactor  
							
							
							
						 
						
							2011-04-21 16:28:29 +01:00  
				
					
						
							
							
								 
						
							
							
								b786860bac 
								
							
								 
							
						 
						
							
							
								
								synchronize Robust.HG.ini.example FreeSWITCH config with other config files  
							
							
							
						 
						
							2011-04-19 22:38:43 +01:00  
				
					
						
							
							
								 
						
							
							
								575257f3fe 
								
							
								 
							
						 
						
							
							
								
								For consistency, uncomment ColladaMesh option in OpenSimDefaults.ini.  Thanks for the spot, Ai Austin.  
							
							
							
						 
						
							2011-04-19 21:58:55 +01:00  
				
					
						
							
							
								 
						
							
							
								2fa210243b 
								
							
								 
							
						 
						
							
							
								
								Clean up freeswitch config to what is currently required.  Add explanation to config parameters.  Clean up some log messages.  
							
							
							
						 
						
							2011-04-19 21:54:26 +01:00  
				
					
						
							
							
								 
						
							
							
								36c4e94ef7 
								
							
								 
							
						 
						
							
							
								
								Move mesh on/off swtich from [Startup] to [Mesh] in anticipation of future config parameters.  
							
							... 
							
							
							
							Default remains true.
OpenSimDefault.ini changed so if you haven't overriden this switch then you don't need to do anything. 
							
						 
						
							2011-04-18 23:22:04 +01:00  
				
					
						
							
							
								 
						
							
							
								ccf63a9c63 
								
							
								 
							
						 
						
							
							
								
								Merge branch 'master' into careminster-presence-refactor  
							
							
							
						 
						
							2011-04-18 21:04:09 +01:00  
				
					
						
							
							
								 
						
							
							
								419fc9427e 
								
							
								 
							
						 
						
							
							
								
								Provide a configuration setting to control whether multiple taken objects are coalesced to inventory  
							
							... 
							
							
							
							This is the CoalesceMultipleObjectsToInventory setting in [Inventory] in OpenSimDefaults.ini
Default is true. 
							
						 
						
							2011-04-18 20:03:53 +01:00  
				
					
						
							
							
								 
						
							
							
								474910c9d6 
								
							
								 
							
						 
						
							
							
								
								Merge branch 'master' into careminster-presence-refactor  
							
							
							
						 
						
							2011-04-17 18:48:53 +01:00  
				
					
						
							
							
								 
						
							
							
								40bf417da7 
								
							
								 
							
						 
						
							
							
								
								Add ColladaMesh switch  
							
							
							
						 
						
							2011-04-14 21:15:42 -04:00  
				
					
						
							
							
								 
						
							
							
								424995e138 
								
							
								 
							
						 
						
							
							
								
								Move example HttpProxy setting to OpenSim.ini.example and tidy  
							
							
							
						 
						
							2011-04-12 23:22:21 +01:00  
				
					
						
							
							
								 
						
							
							
								bed463666c 
								
							
								 
							
						 
						
							
							
								
								minor typo correction.  thanks Ai Austin.  
							
							
							
						 
						
							2011-04-12 23:16:43 +01:00  
				
					
						
							
							
								 
						
							
							
								42b96a8be0 
								
							
								 
							
						 
						
							
							
								
								Merge branch 'master' into careminster-presence-refactor  
							
							
							
						 
						
							2011-04-12 00:27:39 +01:00  
				
					
						
							
							
								 
						
							
							
								333a2913cf 
								
							
								 
							
						 
						
							
							
								
								slightly tweak OpenSim.ini.example text  
							
							
							
						 
						
							2011-04-11 22:02:12 +01:00