Dan Lake
32ddcefaca
Merge branch 'master' into dev
...
Conflicts:
OpenSim/Region/Framework/Scenes/EventManager.cs
OpenSim/Region/Framework/Scenes/Scene.Inventory.cs
OpenSim/Region/Framework/Scenes/Scene.cs
OpenSim/Region/Framework/Scenes/SceneGraph.cs
OpenSim/Region/Framework/Scenes/Serialization/SceneObjectSerializer.cs
OpenSim/Region/OptionalModules/ContentManagementSystem/CMModel.cs
2011-06-14 23:15:34 -07:00
Oren Hurvitz
61f1c2b2c5
Write estate errors on startup to the log
2011-06-07 20:20:04 -07:00
Huaiyu (Kitty) Liu
cd70c3ff56
Merge branch 'dev_perPropertyTS' into dev
...
Conflicts:
OpenSim/Region/CoreModules/Framework/InventoryAccess/InventoryAccessModule.cs
2011-05-03 16:55:23 -07:00
Huaiyu (Kitty) Liu
1c1d3893fc
DelinkFromGroup now calls AddNewSceneObjectByDelink, to avoid calling SyncNewObject later.
...
Also, replace all "SYMMETRIC SYNC" with "DSG SYNC" in comments.
2011-04-20 14:59:06 -07:00
Dan Lake
da6044b6be
Merge branch 'master' into dev
...
Conflicts:
OpenSim/Data/SQLiteLegacy/SQLiteSimulationData.cs
OpenSim/Region/ClientStack/LindenUDP/LLClientView.cs
OpenSim/Region/CoreModules/Framework/InventoryAccess/InventoryAccessModule.cs
OpenSim/Region/Framework/Scenes/Scene.Inventory.cs
OpenSim/Region/Framework/Scenes/SceneObjectGroup.cs
2011-04-19 11:52:25 -07:00
Justin Clark-Casey (justincc)
8f4bf43534
When asked to join region to existing estate, make first estate name the default instead of None
2011-04-01 00:55:05 +01:00
Justin Clark-Casey (justincc)
e1ceb461c0
Make default answer for 'do you wish to join region to an existing estate' yes instead of no.
2011-04-01 00:51:10 +01:00
Dan Lake
0445e6e251
Merge branch 'master' of git://opensimulator.org/git/opensim into dev
2011-03-29 13:42:01 -07:00
Justin Clark-Casey (justincc)
7acade00b9
On initial setup, include estate and regions names in questions to make it clearer what they relate to.
2011-03-21 23:26:35 +00:00
Justin Clark-Casey (justincc)
3382de4d8b
In initial setup, stop a user being able to create a new estate with the same name as an existing estate.
2011-03-21 23:16:57 +00:00
Justin Clark-Casey (justincc)
060a53b896
On initial opensim setup, don't ask the user whether they want to join an existing opensim estate when there aren't any. Proceed directly to estate setup instead.
2011-03-21 22:57:20 +00:00
Justin Clark-Casey (justincc)
ee7cfc2854
refactor: use EstateDataService property directly instead of loading it into a local variable
2011-03-21 22:47:02 +00:00
Justin Clark-Casey (justincc)
d3a20a1e92
On initial region registration, if the user chooses the option to make the region part of an existing estate, then list the existing region names.
2011-03-21 21:37:06 +00:00
Dan Lake
1837778cf9
Merge branch 'master' into dev
...
Conflicts:
OpenSim/Region/ClientStack/LindenUDP/LLUDPServer.cs
OpenSim/Services/Connectors/Simulation/SimulationServiceConnector.cs
2011-02-14 13:39:27 -08:00
Justin Clark-Casey (justincc)
03d82a5a85
Fix bug where "My estate" name was always used even if the user entered a different name on initial setup.
...
Turns out we had stopped saving estate settings immediately after the name change. The scene constructor then reloade the settings and oblitereted the different name.
This code could be more efficient since there's no reason for scene to reload the settings when they are already known to be valid.
Thanks to Thoneve for the spot on this.
2011-02-12 01:08:56 +00:00
Huaiyu (Kitty) Liu
d63e3db533
Added event OnPostSceneCreation to OpenSim/Region/Framework/Scenes/EventManager.cs, and TriggerOnPostSceneCreation. Reason: to emulate what PostInitialise() used to do for IRegionsModules, which is no longer included in INonSharedRegionModule.
...
Added OnPostSceneCreation() in RegionSynModule.cs, to gain ActorType information from the
loaded Scene.ActorSyncModule. OpenSim, when configured as ScenePersistence, can start normally now.
2010-12-23 14:07:05 -08:00
Jonathan Freedman
45cd2e3ef9
Merge branch 'master-core' into mantis5110
2010-12-05 11:49:15 -08:00
Justin Clark-Casey (justincc)
2486d96d06
minor: correction to logging category
2010-12-04 00:56:53 +00:00
Justin Clark-Casey (justincc)
b69c5d6633
minor: change OpenSimBase log messages associated with newer module loader to make the association clear
2010-12-03 23:50:09 +00:00
Justin Clark-Casey (justincc)
fe8d3d5a2b
Revert "Merge remote branch 'otakup0pe/mantis5110'"
...
This reverts commit 21187f459e
, reversing
changes made to 8f34e46d74
.
2010-10-22 23:52:07 +01:00
Jonathan Freedman
69acf9c79b
* additional serveruri cleanup
2010-10-03 18:03:53 -04:00
Jonathan Freedman
32ccc7a9d9
* refactor refactor refactor ServerURI 4 lyfe
2010-10-02 19:17:02 -04:00
John Hurliman
0db1ed0b5a
* Added ISimulationDataService and IEstateDataService
...
* Removed StorageManager
* CONFIG CHANGE: There are no more database settings in OpenSim.ini. Check the config-include configuration files for region store and estate store database settings
2010-09-12 14:20:26 -07:00
Justin Clark-Casey (justincc)
b8c58e5f9f
reinsert functionality to debug log more levels of incoming and outgoing client protocol packets
...
These levels correspond to packets that one isn't usually interested in when debugging (e.g. regular outgoing SimStats packets)
This is equivalent to what we had a year ago before it was removed. It's extremely crude since it doesn't allow one to pick individual clients or packets. However, it can still be useful when debugging packet race conditions.
2010-08-31 18:27:10 +01:00
Justin Clark-Casey (justincc)
3cd7761d65
Report exception message as well as stack trace if a region fails to register with the grid service in grid mode
2010-08-30 21:23:19 +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
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
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
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
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
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
77e43f4801
Fixed a couple of bugs with Appearance. Appearance is all good now.
2010-01-11 17:30:05 -08:00
Diva Canto
4e7c449c5a
This fixes the problem that region modules (new style) weren't being recognized.
2010-01-11 14:39:15 -08:00
Diva Canto
c5ea783526
OpenSim/Framework/Communications/Cache deleted. LibraryRootFolder deleted.
2010-01-11 07:51:33 -08:00
Diva Canto
001d369568
CommunicationsManager deleted.
2010-01-11 07:45:47 -08:00
Diva Canto
dc4bbf6065
All Framework.Communications.Clients and Framework.Communications.Services deleted, including old LoginService.
2010-01-10 20:29:09 -08:00
Diva Canto
49618dc102
Moved GridInfo service from where it was to Handlers/Grid
2010-01-10 19:19:34 -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
Melanie
81d5a4b6d8
Remove "login disable", "login enable" and "login status" commands.
2010-01-10 03:03:18 +00:00
Justin Clark-Casey (justincc)
88ead9ee63
pass all command parameters to load/save oar, not just the filename
...
unfortunately, these commands cannot yet be properly relocated to the region modules due to deficiencies in the region module infrastructure
2009-11-24 17:28:38 +00:00
John Hurliman
a41cd1d069
* Unregister Mono.Addins event handlers in PluginLoader.Dispose() and always handle PluginLoader with the using pattern. This freed up 121,634,796 bytes on my system
...
* Avoid allocating an Action<IClientAPI> object every round of the OutgoingPacketHandler
* Removed unnecessary semi-colon endings from OpenSim.ini.example [InterestManagement] section
2009-10-23 13:14:29 -07:00
Justin Clark-Casey (justincc)
b6678faf34
* Apply http://opensimulator.org/mantis/view.php?id=3933
...
* Remove client servers when regions are closed or removed
* Thanks randomhuman!
2009-10-09 17:28:16 +01:00
John Hurliman
429a84f390
Beginning work on the new LLUDP implementation
2009-10-05 17:38:14 -07:00
Melanie
6878b26b0d
Merge branch 'diva-textures-osgrid'
2009-10-04 05:49:16 +01:00
John Hurliman
387e9f7a7f
* Creates Util.UTF8 and switches some references of Encoding.UTF8 to Util.UTF8 (not all references were switched since not all OpenSim libraries reference OpenSim.Framework)
...
* Shrinks the largest in-memory object, the LLRAW.HeightmapLookupValue struct (only used for exporting to LLRAW terrain files), to the minimum possible size. This seems to have the odd side effect of cutting the size of the two double[256,256] terrain objects in half. Possibly an alignment optimization?
2009-10-02 18:31:08 -07:00
Jeff Ames
ee205e7e81
Formatting cleanup.
2009-10-01 01:17:47 +09:00
Diva Canto
5757afe766
First pass at the heart surgery for grid services. Compiles and runs minimally. A few bugs to catch now.
2009-09-26 07:48:21 -07:00
Diva Canto
902279f0fd
Moved the property RegionLoginsEnabled from GridComms to the Scene -- not the scene itself but SceneCommunicationService, for now. Beginning to clear the code from using Region.Communications. grid stuff.
2009-09-25 08:39:09 -07:00
Justin Clark-Casey (justincc)
0d7bcee560
no-op to poke panda
2009-08-17 20:25:14 +01:00