Commit Graph

763 Commits

Author SHA1 Message Date
Melanie
f8ff98577e Merge branch 'master' into careminster-presence-refactor 2010-08-21 00:32:26 +01:00
Marck
7aad5af498 Some code cleanup for console command "create region".
Make region name an optional command parameter.
Avoid question for region name if it has already been specified.
Extend help text.
2010-08-20 19:35:52 +01:00
Melanie
ae554a48d0 Add some maptile options, change maptile generation from OpenSimBase to Scene
to make it more configurable.
2010-08-20 08:36:23 +01:00
Melanie Thielker
47838e5fb3 Add some maptile options, change maptile generation from OpenSimBase to Scene
to make it more configurable.
2010-08-20 08:46:46 +02:00
Melanie
e74809ff4c Merge branch 'master' into careminster-presence-refactor 2010-08-18 00:59:20 +01:00
Marck
ae43a07f3b Configuration files can read include files from relative paths. 2010-08-13 23:59:30 +01:00
randomhuman
8eeb3f2fd2 Updated the create_region command in the RemoteAdmin plugin to properly support estates without seeking further input on the console. 2010-08-13 23:29:01 +01:00
Justin Clark-Casey (justincc)
5f5c65e4ba refactor: move more map tile generation code from scene to IWorldMapModule 2010-08-13 20:34:46 +01:00
Marck
251be8a1be Prettify console output for long avatar names. 2010-08-11 20:22:01 -07:00
Melanie Thielker
09ab32c21e Remove StandAlone from default hardcoded config 2010-08-04 03:10:10 +01:00
Melanie Thielker
0020dbee23 Remove StandAlone from default hardcoded config 2010-08-04 03:23:19 +02:00
Tom
b860c8021e First, change DefaultPermissionsModule so it returns the correct name...
... Then, make sure we also check the old-style module stack before we throw a tantrum
2010-08-01 10:23:48 -07:00
Tom
d5f497478a Add config option securePermissionsLoading which will stop the region from loading if the specified permissions modules fail to load. 2010-08-01 10:21:56 -07:00
Melanie
dc9e9931eb Merge branch 'master' into careminster-presence-refactor 2010-06-25 20:26:48 +01:00
Justin Clark-Casey (justincc)
2c4df19805 minor: Move log information about SYSTEMIP to the place where it's resolved 2010-06-25 18:29:02 +01:00
Melanie
5a071dc798 Move loading of parcels to before script start. Scripts using parcel functions
can fail if no land is loaded
2010-06-24 03:24:38 +01:00
Melanie Thielker
9d03271265 And another 2010-06-24 03:43:50 +02:00
Melanie
e93853623b Merge branch 'master' into careminster-presence-refactor 2010-06-24 03:30:11 +01:00
Tom Grimshaw
dda7185b43 Change the admin kick message to something more generic, "OpenSim Manager" is not really accurate 2010-06-03 17:55:50 -07:00
Melanie
542e6b8af4 Merge branch 'master' into careminster-presence-refactor 2010-05-28 21:56:42 +01:00
Justin Clark-Casey (justincc)
b1298fca0a tidy up help information on load oar and save oar 2010-05-28 19:36:30 +01:00
Melanie
b94cace547 Merge branch 'master' into careminster-presence-refactor 2010-05-16 15:01:56 +01:00
Teravus Ovares (Dan Olivares)
d4192dcb2e * Revert last commit for now at Melanie_T's request.
* Additional ways of configuring opensim break with this
2010-05-16 01:47:53 -04:00
Teravus Ovares (Dan Olivares)
dc1a3e9787 * Add User Friendly Configuration File Exists check. If OpenSim.ini and either StandaloneCommon.ini or GridCommon.ini don't exist in various casings then offer to copy the files for the user while warning them that they're missing out if they don't read the files. 2010-05-15 23:21:36 -04:00
Melanie
fada4cb6c4 Merge branch 'master' into careminster-presence-refactor 2010-05-10 04:05:04 +01:00
Diva Canto
b233a4b2ca * Fixed spamming the assets table with map tiles. The tile image ID is now stored in regionsettings. Upon generation of a new tile image, the old one is deleted. Tested for SQLite and MySql standalone.
* Fixed small bug with map search where the local sim regions weren't found.
2010-05-09 13:39:56 -07:00
Melanie
8a32ee7dd2 Merge branch 'careminster' into careminster-presence-refactor 2010-04-27 03:58:43 +01:00
Melanie
bbffe16f13 Merge branch 'master' into careminster-presence-refactor 2010-04-27 00:27:05 +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
sacha
85646b157c Adding some more SNMP events and some refactoring
Signed : The Masqued Foxi
2010-04-23 12:40:27 -04:00
sacha
7eda9364fd Adding LinkUp/LinkDown when a region is started or stoped.
Those two events could be used to compute the region availibility
2010-04-23 10:51:27 -04:00
Melanie
98cb4f74b2 Merge branch 'master' into careminster-presence-refactor 2010-04-19 07:00:40 +01:00
Justin Clark-Casey (justincc)
bf3956aeb0 Add --skip-assets option to load oar.
This allows you to load an oar without loading its assets.  This is useful if you know that the required assets are already in the asset service, since loading without assets is quicker.
This option will become more useful when the ability to save oars without assets is added, which should happen fairly soon.  At this point there will also be better documentation.
2010-04-16 22:29:11 +01:00
Melanie Thielker
ccc56e6dd4 Merge branch 'master' into careminster-presence-refactor 2010-04-16 05:20:25 +02:00
Melanie
1636f535ba Committing sacha's partial work (from orpheus). The GridBrat needs to learn
a bit of git
2010-04-14 10:42:14 +01:00
John Hurliman
b51f40da8f Removed the unused use_async_when_possible config variable 2010-03-16 12:03:04 -07:00
Justin Clark-Casey (justincc)
e39fc95659 Fix LocalPresenceServiceConnector test now that the hardcoded test data has been removed from Data.Null.NullPresenceData
Unfortunately, this meant publicly exposing the underlying service for the connector.
The other solution would be to create alternative initializers for services and connectors where objects could be given directly rather than loaded indirectly through config.
Unfortunately, this would require a lot of work in this case but might be the better way forward.
2010-03-05 00:54:46 +00:00
Justin Clark-Casey (justincc)
e07548d703 move linden notecard parsing from LSL_Api.cs to SLUtil so that region modules can use it 2010-03-04 20:08:25 +00:00
Melanie
1f45e6c649 Merge branch 'master' into presence-refactor
This brings presence-refactor up to master again
2010-02-22 03:00:59 +00:00
Melanie
842b68eeff Change handling of the SYSTEMIP constant to be more sane.
This will now choose the first network interface IP address, or the loopback
interface if no external interfaces are found. It will log the IP address
used as [NETWORK]: Using x.x.x.x for SYSTEMIP.
2010-02-18 04:19:33 +00:00
Jeff Ames
af265e001d Formatting cleanup. 2010-02-15 19:21:56 +09:00
Melanie
c033223c63 Merge branch 'master' into presence-refactor 2010-02-15 00:20:48 +00:00
Justin Clark-Casey (justincc)
00800c59d3 Apply last two patches from http://opensimulator.org/mantis/view.php?id=3522
These patch should allow people using systems that do not have their locale set to En_US or similar to use OpenSim without suffering effects such as being a million miles up in the air on login.
The problem was caused by parsing strings without forcing that parse to be En_US (hence different decimal and digit group symbols were causing problems).
Thanks very much to VikingErik for doing the legwork on this fix and phacelia for spotting it in the first place.
2010-02-12 23:13:35 +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
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
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
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
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
Diva Canto
77e43f4801 Fixed a couple of bugs with Appearance. Appearance is all good now. 2010-01-11 17:30:05 -08:00