Commit Graph

1103 Commits (ca8b1e488c167e5644567cb001c9c2a6504f15f7)

Author SHA1 Message Date
Justin Clark-Casey (justincc) 15d42d2111 Add instructions for using SQLiteNG to OpenSim.ini and config-include/StandaloneCommon.ini
Unfortunately, database settings need to be changed in two places.
2010-04-23 22:06:02 +01:00
Justin Clark-Casey (justincc) 847cc4fceb remove [DatabaseService] section from OpenSim.ini since this is always present in included configuration files 2010-04-23 21:31:08 +01:00
Justin Clark-Casey (justincc) 10e18f465e minor: eliminate configuration section handling deprecation of OpenSim.DataStore.MonoSqlite.dll, since this hasn't exist for a long, long time 2010-04-23 21:29:09 +01:00
Diva Canto c9da66728a Renamed OpenSim.Server.exe to Robust.exe and corresponding .ini's and config. 2010-04-22 07:25:32 -07:00
Melanie 98cb4f74b2 Merge branch 'master' into careminster-presence-refactor 2010-04-19 07:00:40 +01:00
Melanie f8d49e0a30 Merge branch '0.6.9-post-fixes' into careminster 2010-04-19 06:32:29 +01:00
Justin Clark-Casey (justincc) b7457a0a5d Update OpenMetaverse libraries to those used in master as of commit 9a781e7
This removes Mono.Security.dll which might help with Mono 2.6.3 compatability issues (notwithstanding the sqlite problem)
2010-04-18 19:16:41 +01:00
Diva Canto a7aab6af0c This version of the launcher exe works. 2010-04-14 19:39:27 -07:00
Diva Canto bdc03dbff9 * Added 32bitLauncher for Robust. Still need to test it on a 64 bit machine.
* PrimitiveBaseShape wants to be be committed too -- EOF.
2010-04-14 10:36:03 -07:00
Melanie fe034dc3e4 Merge branch 'master' into careminster-presence-refactor 2010-04-05 18:12:29 +01:00
unknown ee198eaa11 Updates to config files for groups
Signed-off-by: Melanie <melanie@t-data.com>
2010-04-04 21:56:57 +01:00
Melanie d315fce2ff Adding the configuration example 2010-03-31 04:22:51 +01:00
Melanie 7d917e7c5c Rename Meta7Windlight to LightShare 2010-03-30 23:29:03 +01:00
Melanie 5693870fe2 Merge branch 'master' into careminster-presence-refactor 2010-03-30 21:34:27 +01:00
Diva Canto f55dd3704d Hippos with bin/Newtonsoft.Json.XML 2010-03-26 13:14:13 -07:00
Justin Clark-Casey (justincc) 6ad85dc259 put out full exception stack if something reaches top of base http server OnRequest() on both mono and .net
replace Newtonsoft.Json.XML since the updated copy got accidentally reverted by another commit
2010-03-25 20:33:46 +00:00
John Hurliman 9a781e793a * Updated libomv libraries to fix JSON (LLSD) decoding errors on null values and remove the unused OpenMetaverse.Http.dll and Mono.Security.dll
* Fixed a password hash comparison error in SimianAuthenticationServiceConnector.Authenticate()
2010-03-20 19:21:58 -07:00
Melanie 4c2a51b1b5 Merge branch 'master' into careminster-presence-refactor 2010-03-18 20:09:04 +00:00
John Hurliman b51f40da8f Removed the unused use_async_when_possible config variable 2010-03-16 12:03:04 -07:00
John Hurliman 28e4302eb6 Fixed a bad module name in SimianGrid.ini 2010-03-15 22:07:28 -07:00
Melanie d3f33acc1a Merge branch 'master' into careminster-presence-refactor 2010-03-15 17:23:35 +00:00
John Hurliman 5beb08be31 Merge branch 'master' of ssh://opensimulator.org/var/git/opensim 2010-03-12 14:40:21 -08:00
John Hurliman 3036aba875 * Added a better check to the SimianGrid connectors to test if they are enabled or not. This method should work equally well with standalone or robust mode
* Applying #4602 from Misterblu to add collision detection to BulletDotNET
2010-03-12 14:28:31 -08:00
Justin Clark-Casey (justincc) 19b4770fe7 start laoding griduser local connector, though it isn't invoked by anything yet 2010-03-12 22:18:48 +00:00
Justin Clark-Casey (justincc) aad17e7513 Simplify database setup and remove migration problems by moving all sqlite config-include settings to a separate file for standalone
Update information in StandaloneCommon.ini.example to reflect this
Remove ISharedRegionModule interfaces from all SimianGrid connector classes temporarily since this stopped standalone from working (due to absence of AssetURI settings, etc.).
Solution here may be to create separate region module connectors as done by local/grid/hypergrid so that loading can be controlled via include files
Or otherwise work out how to stop these modules from being loaded for all OpenSim invocations
2010-03-12 20:29:17 +00:00
Justin Clark-Casey (justincc) 7d738156fa Merge branch 'master' of ssh://justincc@opensimulator.org/var/git/opensim 2010-03-12 20:06:40 +00:00
John Hurliman 8b1e33eb2d Fixed SimianGrid.ini to use GridCommon.ini(.example) 2010-03-12 10:31:43 -08:00
Justin Clark-Casey (justincc) e844524b41 Upgrade Newtonsoft.Json.dll from 1.3 to 3.5r6
Actually using the one built against Net 2.0 (labelled Newtonsoft.Json.Net20.dll) since the 3.5 build is not compatible with Mono 2.4 (though it is with Mono 2.6)
2010-03-11 21:04:56 +00:00
John Hurliman 2040649871 Adding the SimianGrid connectors 2010-03-11 11:19:02 -08:00
Melanie 40873504dc Merge branch 'master' into careminster-presence-refactor 2010-03-09 22:46:17 +00:00
Justin Clark-Casey (justincc) 4423630f1e remove milliseconds from console log again 2010-03-09 18:56:32 +00:00
Justin Clark-Casey (justincc) 5caae0293a Fix bug where approximately half the time, attachments would rez only their root prim until right clicked (or otherwise updated).
The root cause of this problem was that multiple ObjectUpdates were being sent on attachment which differed enough to confuse the client.
Sometimes these would eliminate each other and sometimes not, depending on whether the scheduler looked at the queued updates.
The solution here is to only schedule the ObjectUpdate once the attachment code has done all it needs to do.

Backport from head.
2010-03-09 18:53:04 +00:00
Melanie 2362da2ad0 Add config option for switching between CSJ2K and BuggyJPEG. 2010-03-08 20:29:26 +00:00
John Hurliman d71ed7081b Merge branch 'master' of ssh://opensimulator.org/var/git/opensim 2010-03-07 16:05:12 -08:00
John Hurliman 3ecccbb77d * Updated to libomv r3268 which fixes the mapping for OpenJPEG on 64-bit systems and adds protocol support for Viewer 2.0 (still needs work in OpenSim to get things fully functional) 2010-03-07 16:03:15 -08:00
Diva Canto 38b8c52762 Removed obsolete configs. 2010-03-07 10:01:23 -08:00
Melanie 8180c72cbc Merge branch 'master' into careminster-presence-refactor 2010-03-06 12:37:24 +00:00
Melanie 1f7a0cf892 Merge branch '0.6.9-post-fixes' into careminster 2010-03-06 12:24:09 +00:00
Justin Clark-Casey (justincc) b88259db7d revert accidental Standalone.ini change 2010-03-05 23:19:22 +00:00
Justin Clark-Casey (justincc) e906dd3d28 add initial UserGrid service classes as per diva's direction
this will initially store home location data instead of the presence service
compiles but not enough to actually test yet
2010-03-05 22:29:51 +00:00
Diva Canto f5a088c9cc Replaced BclExtras.dll with a newer version compiled for .NET 3.5. This solves the compilation errors that have been affecting build on Windows for the past day. Thanks lkalif for noticing the conflict. 2010-03-04 08:33:01 -08:00
Melanie 107a0a4905 Merge branch 'master' into careminster-presence-refactor 2010-03-04 11:02:01 +00:00
Justin Clark-Casey (justincc) e97ba57788 reset the accidental local configuration changes 2010-03-03 22:20:06 +00:00
Justin Clark-Casey (justincc) edb176447b Fix bug where approximately half the time, attachments would rez only their root prim until right clicked (or otherwise updated).
The root cause of this problem was that multiple ObjectUpdates were being sent on attachment which differed enough to confuse the client.
Sometimes these would eliminate each other and sometimes not, depending on whether the scheduler looked at the queued updates.
The solution here is to only schedule the ObjectUpdate once the attachment code has done all it needs to do.
2010-03-03 22:14:06 +00:00
Diva Canto 13f0e4a718 * Better debug message on login problems.
* Moved GridInfoService config to OpenSim.Server.ini
2010-03-02 20:17:25 -08:00
Melanie 7ec1a3fcad Merge branch 'master' into careminster-presence-refactor 2010-03-03 03:18:19 +00:00
Melanie 028a87fe37 Merge branch 'master' into careminster-presence-refactor
This brings careminster on the level of master. To be tested
2010-03-03 02:07:03 +00:00
Melanie 38ea1dd5c8 Merge branch 'master' into presence-refactor 2010-03-01 01:01:32 +00:00
Diva Canto 774958bbbf Added FriendsData to both Null storage and SQLite. Untested. 2010-02-28 16:09:06 -08:00
Diva Canto cc05bdf6ab * Friends out connector completed. Grid login retrieves friends correctly.
* Added friends configs to grid .inis
2010-02-26 08:46:30 -08:00
Diva Canto c745df007d Added server-side Friends in connector. Untested. 2010-02-25 17:42:51 -08:00
Diva Canto 679ad95750 List of friends now retrieved upon login. Configured and tested in standalone only. 2010-02-25 16:11:04 -08:00
Melanie 0b73ee3cd8 Add part of the needed config examples 2010-02-25 03:14:23 +00:00
Melanie c7b1e76eb5 Add the stream handler/listener and requisite methods to the friends module
for the friends interregion comms.
2010-02-25 01:46:34 +00:00
Diva Canto 0d85f4f861 Deleted duplicate [GridService] section. 2010-02-22 09:56:03 -08:00
Jeff Ames e6c869ddfc Minor formatting cleanup. 2010-02-22 13:18:11 +09:00
Diva Canto 552e9e8c78 * Added SQlite connector for AvatarData. Tested -- works.
* Small bug fix in debug message
* Set default standalone configs to use SQLite across the board
2010-02-21 09:09:35 -08:00
Diva Canto 0ab6aac052 Added UserAccountData and auth to the SQLite connector. Compiles, runs, but access to these tables doesn't work. 2010-02-20 17:52:38 -08:00
Diva Canto dc19785672 Added UserAccount, Avatar and Authentication to Data.Null, so that OpenSim can run out-of-the-box. #WaitingForSQLite 2010-02-14 16:57:02 -08:00
Melanie 9f5b39300a Add InventoryService to default standalone config 2010-02-08 20:26:47 +00:00
Melanie baaf660511 Merge branch 'master' into presence-refactor
This was a large, heavily conflicted merge and things MAY have got broken.
Please check!
2010-02-08 15:53:38 +00:00
Diva Canto b18e95b3a2 Added missing configs to Standalone.ini 2010-02-08 07:49:14 -08:00
Diva Canto df3ab04e0c Removed useless config. 2010-02-02 16:54:55 -08:00
Diva Canto 35a245b67a Assorted bug fixes related to hyperlinking 2010-01-31 22:35:23 -08:00
Diva Canto 0b89afd3e5 * Simplified the configuration by having [DatabaseService] in it
* Fixed configuration issue for HGInventoryServerInConnector
* Corrected typos in debug messages
2010-01-31 14:37:22 -08:00
Diva Canto a6b50c2436 In HG, add asset service handlers to 8002, to make it even easier. 2010-01-31 14:07:26 -08:00
Diva Canto af758ea164 * More config cleanup
* Added different ports (8002 and 8003) to the many services in OpenSim.Server.ini.example
* Added a separate OpenSim.Server.HG.ini.example to make it easier to run
2010-01-31 14:01:47 -08:00
Diva Canto 823b9607e2 Can't comment [Network] even if it's not used. 2010-01-31 13:19:03 -08:00
Diva Canto 67b0fcf806 * Added OpenSim.Server.HG.ini as an add-on to OpenSim.Server.ini
* Cleaned up standalone configs
2010-01-31 13:07:13 -08:00
Diva Canto 041594ed07 Cleaned up configuration. 'gridmode' and 'hypergrid' are gone, as well as lots of other obsolete configs. 2010-01-31 13:01:23 -08:00
Diva Canto 40d8e91008 * Added a few files that were missing in the repo.
* New HGInventoryService which allows restricted access to inventory while outside
2010-01-31 11:10:57 -08:00
Diva Canto a2096f58ce Updated gridhypergrid config. 2010-01-30 17:41:01 -08:00
Diva Canto 42f978a478 * HGScene is no more.
* Moved a few key inventory access methods from Scene.Inventory to an IInventoryAccessModule module
2010-01-30 09:23:07 -08:00
Diva Canto 5001f61c08 * HGGridConnector is no longer necessary.
* Handle logout properly. This needed an addition to IClientAPI, because of how the logout packet is currently being handled -- the agent is being removed from the scene before the different event handlers are executed, which is broken.
2010-01-29 18:59:41 -08:00
Diva Canto 0c81966c0a Works for grid login. 2010-01-29 09:12:22 -08:00
Diva Canto c9e64d578d Fixed broken dll name. 2010-01-28 19:36:42 -08:00
Diva Canto c99f40fc53 Config for grid login. Untested. 2010-01-28 19:32:23 -08:00
Diva Canto 00f7d622cb HG 1.5 is in place. Tested in standalone only. 2010-01-28 19:19:42 -08:00
Melanie 5b9ca6e35f Merge branch 'master' into careminster 2010-01-28 14:38:46 +00:00
Melanie ee12b00cfa Fixes inconsistencies in the permissions module. Adds a region_manager_is_god
configurable. Previously, estate managers could enter god mode, but would
not have any powers. Now estate managers can enter god mode only if this
option is true, and then will have real god powers.
2010-01-28 14:34:31 +00:00
Diva Canto 7c00469cd2 Added ExternalName config on Gatekeeper. 2010-01-27 08:00:29 -08:00
Diva Canto b1b9ac2e74 Added image for hyperlink map tiles. 2010-01-25 09:08:57 -08:00
Diva Canto 8ddf787cfd Hypergrid map search back on, this time with a config var in the grid service. 2010-01-24 16:00:28 -08:00
Diva Canto 48b03c2c61 Integrated the hyperlinking with the GridService. 2010-01-24 14:30:48 -08:00
Melanie 946e06eb58 Merge branch 'master' into careminster 2010-01-21 23:47:40 +00:00
Melanie 6c1dd2dfa7 Merge branch 'master' of melanie@opensimulator.org:/var/git/opensim 2010-01-20 00:16:54 +00:00
mbowman c211a120a5 Console output no longer requires loglevel to be set to info; you can run the simulator with log level WARN or ERROR and see the output of console commands
Signed-off-by: Melanie <melanie@t-data.com>
2010-01-20 00:16:08 +00:00
Justin Clark-Casey (justincc) c89a9912cc Add OpenSim.Server.ini.example documentation for the new AllowDuplicateNames grid service setting 2010-01-19 19:58:50 +00:00
Diva Canto 9fbcceb1db * Towards enabling hyperlinks at grid-level.
* Updated grid configs
2010-01-18 20:35:59 -08:00
Careminster Staff 24056dc98b Adds example to OpenSim.ini.example for Admin Default Parcel settings 2010-01-19 01:46:50 +00:00
Diva Canto 3d53694415 Go Home works. With security!! 2010-01-18 16:34:23 -08:00
Diva Canto b5fcb5e872 HG teleports through gatekeeper are working. 2010-01-17 20:10:42 -08:00
Diva Canto b2e6ec9e12 Agent gets there through the Gatekeeper, but still a few quirks to fix. 2010-01-17 18:04:55 -08:00
Diva Canto f276ba57bf HG agent transfers are starting to work. Gatekeeper handlers are missing. 2010-01-17 11:33:47 -08:00
Diva Canto a7309d90da * Added ServiceURLs to AgentCircuitData.
* Fixed a configuration buglet introduced yesterday in StandaloneHypergrid.ini.
2010-01-17 08:40:05 -08:00
Diva Canto 04e29c1bac Beginning of rewriting HG. Compiles, and runs, but HG functions not restored yet. 2010-01-16 21:42:44 -08:00
Diva Canto bd6d1a2444 Moved prim crossing to EntityTransferModule. Not complete yet. 2010-01-16 07:46:07 -08:00
Melanie 8c39392eaa Merge branch 'master' into careminster 2010-01-16 00:15:26 +00:00
Melanie 10f8c2ea9b Merge branch 'master' into presence-refactor
This merge was very conflicted. I think I got them all, but I can't be sure.
I had to merge to master or risk divergence to the point of unmergeability.
2010-01-16 00:05:08 +00:00
Diva Canto f1c30784ac * General cleanup of Teleports, Crossings and Child agents. They are now in the new AgentTransferModule, in line with what MW started implementing back in May -- ITeleportModule. This has been renamed IAgentTransferModule, to be more generic.
* HGSceneCommunicationService has been deleted
* SceneCommunicationService will likely be deleted soon too
2010-01-15 15:11:58 -08:00
Justin Clark-Casey (justincc) 046a195c2e Add "create user" instructions to README.txt
Add documentation to [Standalone] accounts_authenticate setting
2010-01-15 18:16:21 +00:00
Diva Canto f5fb14ff52 * Added the missing AvatarServices module. 2010-01-13 19:57:41 -08:00
Diva Canto daa9866a9a Omit AuthorizationService from the default configurations, because the service doesn't exist in the distribution. 2010-01-13 19:25:33 -08:00
Diva Canto 283ff593b1 Make use of Fallback regions when the desired start region is having problems. 2010-01-13 18:30:33 -08:00
Melanie f0152790cf Merge branch 'master' into careminster 2010-01-14 01:20:07 +00:00
Diva Canto 14ab9b04c4 LL Login now uses default regions if the desired start location is not found. 2010-01-13 15:28:46 -08:00
Diva Canto d939668d6a Bug fix in create user: create inventory was missing. 2010-01-13 10:15:14 -08:00
Diva Canto fa272e7521 Updated configs. 2010-01-13 09:44:20 -08:00
Justin Clark-Casey (justincc) 4f2d2c4efa minor: add a line of documentation to the new ForwardOfflineGroupMessages [Messaging] switch 2010-01-12 20:52:44 +00:00
Diva Canto 66920a9047 Fixed more appearance woes that showed up using remote connectors. Appearance is now being passed with AgentCircuitData, as it should be. 2010-01-12 09:22:58 -08:00
Diva Canto 77e43f4801 Fixed a couple of bugs with Appearance. Appearance is all good now. 2010-01-11 17:30:05 -08:00
Melanie 7467a471ca Add the option to reject duplicate region names 2010-01-11 22:52:05 +00:00
Justin Clark-Casey (justincc) fcaef85029 Add explanation about AllowModFunctions to OpenSim.ini.example
This switch allows scripts to pass messages to modules via the modSendCommand() function
Modules can then send messages back to scripts via the link_message LSL event through
invoking DispatchReply() on OpenSim.Region.Framework.Interfaces.IScriptModuleComms
2010-01-11 17:13:03 +00:00
Melanie 20e748205e Merge branch 'master' into careminster 2010-01-11 03:50:24 +00:00
Melanie 2b478a61d0 Add the console port setting to ROBUST, too 2010-01-11 03:49:05 +00:00
Melanie e966e51b89 Add a console_port setting to let the rest console use a different port
from the region server
2010-01-11 03:29:24 +00:00
Diva Canto 49618dc102 Moved GridInfo service from where it was to Handlers/Grid 2010-01-10 19:19:34 -08:00
Diva Canto eb6d49e02c Fixed small inconsistency in config var name. 2010-01-10 17:19:40 -08:00
Diva Canto b0bbe861cd Moved OpenId authentication from user server to Server.Handlers.Authentication. 2010-01-10 17:15:02 -08:00
Diva Canto c0642bf7e0 Merge branch 'presence-refactor' of ssh://diva@opensimulator.org/var/git/opensim into presence-refactor 2010-01-10 15:35:15 -08:00
Diva Canto 4dd523b45d * Changed IPresenceService Logout, so that it takes a position and a lookat
* CommsManager.AvatarService rerouted
2010-01-10 15:34:56 -08:00
Melanie 3c90d834ea Remove all references to master avatar, replacing with estate owner where
appropriate. This changes the behavior of the REST plugins and RemoteAdmin's
region creation process.
2010-01-10 22:41:42 +00:00
Diva Canto 6998668bbc * Last reference to CommsManager.UserProfileCacheService removed
* Grided-sims added the Library module
2010-01-10 14:12:03 -08:00
Melanie 1676e70dfe Merge branch 'master' into careminster 2010-01-10 04:16:06 +00:00
Melanie b0a7bcb2c8 Add "StartDisabled" to [Startup] to make all regions start up with
logins disabled until enabled from the console. Add the AccessModule (WIP)
2010-01-10 03:17:40 +00:00
Diva Canto 96ecdcf9c5 * Added SetPassword to IAuthenticationService.
* Added create user command to UserAccountService. Works.
* Deleted create user command from OpenSim.
2010-01-09 18:04:50 -08:00
Melanie d22bdb5095 Merge branch 'master' into careminster 2010-01-09 12:02:48 +00:00
dahlia b297913e2b Add some notes to OpenSim.ini.example suggesting to use MySQL with Mono installations 2010-01-08 22:58:01 -08:00
dahlia 1e899704c1 Adds config option "ForwardOfflineGroupMessages" to allow disabling of group messages forwarded while offline. Addresses Mantis #4457 2010-01-07 11:28:38 -08:00
Melanie 54e6c26def Merge branch 'master' into careminster 2010-01-04 22:29:43 +00:00
Melanie 39293758f1 Merge branch 'master' into presence-refactor 2010-01-04 22:28:27 +00:00
Melanie ab0dfbc163 Update SQlite to newest 2010-01-04 22:24:01 +00:00
Diva Canto 1ac36bb5d9 Forgot to add these to the grid configs, so that logins work. 2010-01-04 07:45:20 -08:00
Diva Canto add8d5df4c Config for non-HG grided sims. 2010-01-03 20:06:06 -08:00
Diva Canto 99efa99585 Successfully logged into a grid. 2010-01-03 11:44:57 -08:00
Diva Canto c268e342d1 * Changed ISimulation interface to take a GridRegion as input arg instead of a regionHandle.
* Added the RemoteSimulationConnectorModule, which is the replacement for RESTComms. Scenes is not using this yet, only (standalone) Login uses these region modules for now.
* Completed SimulationServiceConnector and corresponding handlers.
2010-01-03 09:35:12 -08:00
Diva Canto 8a9677a531 The Library Service is now working. UserProfileCacheService.LibraryRoot is obsolete. Didn't delete it yet to avoid merge conflicts later -- want to stay out of core as much as possible. 2010-01-01 21:12:46 -08:00
Diva Canto ec53301e63 Forgotten modules in prior commit. 2010-01-01 18:59:54 -08:00
Diva Canto 4240f2dec6 New LL login service is working! -- tested in standalone only. Things still missing from response, namely Library and Friends. Appearance service is also missing. 2010-01-01 16:54:24 -08:00
Diva Canto 1387919c20 Yes! First test of new login service done still in 2009! Bombs in auth, because the data migration is missing. Will fix it next year...
* HAPPY NEW YEAR!
2009-12-31 20:51:35 -08:00
Diva Canto b29ae72460 First pass at the new login service. Still incomplete, but doesn't disrupt the existing code. 2009-12-30 21:00:16 -08:00
Diva Canto be2f033626 More renames to make everything consistent. This is the UserAccountService. 2009-12-29 17:21:16 -08:00
Diva Canto 88d2df597e * Fixed names.
* Added configs for Standalone
* Changed UserSericeBase to use useraccounts instead of user
2009-12-29 16:34:02 -08:00
Diva Canto f43a648052 * Added the new modules to Resources, making them active.
* Added their configs to standalone for testing. This crashes, because the DB is still not ready.
2009-12-28 09:22:35 -08:00
Melanie e3f60ce06f Merge branch 'master' into careminster 2009-12-27 15:48:43 +00:00
Adam Frisby 763fa90be5 * Adding Google.ProtocolBuffers.dll dependency (BSD licensed)
* For some experimental work with a Sirikata clientstack.
2009-12-27 14:34:41 +11:00
Melanie 0054afd39b Merge branch 'master' into careminster 2009-12-24 16:45:27 +00:00
Diva Canto 1fa938aab0 Library Module: allows adding folders/items to the Library from IAR files placed under bin/Library. This works only for standalones. 2009-12-23 17:31:30 -08:00
Melanie 3d3e0ea4f3 Merge branch 'master' into careminster 2009-12-20 16:45:28 +00:00
Justin Clark-Casey (justincc) ba7552665c remove OpenSim.GridServer.ini.example that has been folded into ROBUST
please revert if I'm wrong
2009-12-15 18:21:10 +00:00