aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim/Framework/RegionSettings.cs (follow)
Commit message (Collapse)AuthorAgeFilesLines
* Merge branch 'master' into careminsterMelanie2014-01-281-15/+8
|\ | | | | | | | | | | | | | | Conflicts: OpenSim/Framework/RegionSettings.cs OpenSim/Region/CoreModules/World/WorldMap/WorldMapModule.cs OpenSim/Region/Framework/Interfaces/IInterregionComms.cs OpenSim/Region/OptionalModules/World/NPC/Tests/NPCModuleTests.cs
| * Stop exceptions being generated on agent connection if a telehub object has ↵Justin Clark-Casey (justincc)2014-01-201-14/+7
| | | | | | | | been deleted or has no spawn points.
* | Merge branch 'master' into careminsterMelanie2013-10-041-1/+1
|\ \ | |/ | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: OpenSim/Data/MySQL/MySQLSimulationData.cs OpenSim/Data/MySQL/Resources/RegionStore.migrations OpenSim/Region/ClientStack/Linden/Caps/WebFetchInvDescModule.cs OpenSim/Region/CoreModules/Avatar/Attachments/AttachmentsModule.cs OpenSim/Region/CoreModules/Avatar/Inventory/Transfer/InventoryTransferModule.cs OpenSim/Region/CoreModules/World/LightShare/LightShareModule.cs OpenSim/Region/Framework/Scenes/Scene.cs OpenSim/Region/Framework/Scenes/ScenePresence.cs OpenSim/Region/Framework/Scenes/Tests/ScenePresenceCapabilityTests.cs OpenSim/Region/OptionalModules/World/NPC/NPCModule.cs OpenSim/Region/ScriptEngine/Shared/Api/Implementation/LSL_Api.cs
| * Make new regions PG by default instead of Mature.Justin Clark-Casey (justincc)2013-09-201-1/+1
| | | | | | | | | | This makes scripted object sounds and a few other things play by default instead of having to switch the viewer to adult This reduces the support burden
* | Merge branch 'master' into careminsterMelanie2012-05-141-1/+28
|\ \ | |/ | | | | | | | | Conflicts: OpenSim/Region/Framework/Scenes/Scene.cs OpenSim/Region/ScriptEngine/Shared/Api/Implementation/LSL_Api.cs
| * Save the Telehub and its Spawn Points in the OAROren Hurvitz2012-05-141-1/+28
| |
| * Revert "Save the Telehub and its Spawn Points in the OAR"Justin Clark-Casey (justincc)2012-05-121-28/+1
| | | | | | | | | | | | | | | | | | This reverts commit b0b7b45b943dd94546bcfcf5d3bb871cfe35b507. Sorry BlueWall, I wanted to discuss an aspect of the data storage but I couldn't assign bugs in 'patch included' state to myself until I changed mantis just now and I forgot to mention it on irc. I wouldn't normally revert but thinks get tricky when it comes to data formats. Essentially, I would like to see the Yaw, Pitch and Distance values as separate XML entities (as used in other aspects such as vectors, quaternions) rather than as a . delimited string We can discuss this more with Oren in opensimulator.org/mantis/view.php?id=6008
| * Save the Telehub and its Spawn Points in the OAROren Hurvitz2012-05-101-1/+28
| | | | | | | | Signed-off-by: BlueWall <jamesh@bluewallgroup.com>
* | Merge branch 'master' into careminsterMelanie2012-02-041-1/+9
|\ \ | |/ | | | | | | | | Conflicts: OpenSim/Data/MySQL/Resources/RegionStore.migrations OpenSim/Region/Framework/Scenes/Scene.Inventory.cs
| * Fix: Covenant changed time not set ↵PixelTomsen2012-02-031-1/+9
| | | | | | | | | | | | http://opensimulator.org/mantis/view.php?id=5869 Signed-off-by: BlueWall <jamesh@bluewallgroup.com>
* | Merge branch 'master' into careminsterMelanie2012-01-301-0/+8
|\ \ | |/ | | | | | | Conflicts: OpenSim/Data/MySQL/MySQLSimulationData.cs
| * Add ParcelImageID to RegionSettings so we can have that overlay.Melanie2012-01-301-0/+8
| | | | | | | | | | Warning: Contains a Migration. Warning: May contain nuts.
| * Simplify and streamline telehub editing code. Verify rotations and fixMelanie2012-01-241-1/+1
| | | | | | | | spwan point positioning on rotated telehubs.
| * Reverse the spawn point distance vectorMelanie2012-01-241-3/+3
| |
| * Correct a coordinate to make the viewer like itMelanie2012-01-241-2/+2
| |
* | Simplify and streamline telehub editing code. Verify rotations and fixMelanie2012-01-241-1/+1
| | | | | | | | spwan point positioning on rotated telehubs.
* | Reverse the spawn point distance vectorMelanie2012-01-241-3/+3
| |
* | Correct a coordinate to make the viewer like itMelanie2012-01-241-2/+2
| |
* | Merge branch 'master' into careminsterMelanie2012-01-241-63/+45
|\ \ | |/ | | | | | | | | Conflicts: OpenSim/Data/MySQL/MySQLSimulationData.cs OpenSim/Framework/RegionSettings.cs
| * Change Telehubs to store only the data that is really needed and notMelanie2012-01-241-71/+45
| | | | | | | | additional redundant information.
* | Merge branch 'master' into careminsterMelanie2012-01-231-44/+6
|\ \ | |/ | | | | | | Conflicts: OpenSim/Data/MySQL/MySQLSimulationData.cs
| * Finish connecting Telehub to databaseBlueWall2012-01-221-44/+6
| |
* | Merge branch 'master' into careminsterMelanie2012-01-221-0/+151
|\ \ | |/ | | | | | | Conflicts: OpenSim/Framework/RegionSettings.cs
| * Move Telehub tables and data from EstateSettings to RegionSettings.Melanie2012-01-221-0/+150
| | | | | | | | | | | | | | | | | | | | This is damage control es EstateSettings is not the place this can be put. EstateSettings is nt unique to a region and therefore would introduce a hard limit of one telehub per estate, completely shutting off the option of having SL style telehubs, e.g. one per region. Whole estate teleport routing can still be implemented id desiresd, this way all options are open while the other way most options get closed off.
* | Add some flags to control content in search betterMelanie2011-06-201-0/+13
|/
* Finally putting estate_settings.xml to rest. There will be no more attemptsMelanie2010-08-211-198/+0
| | | | to read or write this file.
* From: Chris Yeoh <yeohc@au1.ibm.com>Sean Dague2009-06-291-7/+18
| | | | | | | | Attached is a patch that changes the oar file saving of creation date/time to an integer instead of a string. I did this after justincc emailed me saying there is a problem with internationalisation doing it the old way and I said I'd fix it. Its been tested with MySQL and I've made the changes for MSSQL but that hasn't been well tested.
* From: Chris Yeoh <yeohc@au1.ibm.com>Dr Scofield2009-06-031-0/+24
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This patch adds oar file date and time (UTC) meta data to an oar file when it is created. It also adds a unique ID, though this id does not in anyway identify the machine that the oar file was created on. When an oar file with this meta data is loaded this extra information is saved with the region settings and available via LSL through: - osLoadedCreationDate() - osLoadedCreationTime() - osLoadedCreationID() If there is no meta data these fields will be blank. Subsequent oar file loads will erase the information for the previous oar file load. Persistence has only been implemented for MySQL, the other backends need updating. Overall this allows us to much more easily identify the specific version of software that clients are using. Its very straightforward to edit the oar file to change the ID string to be something more human friendly. Included in the patch is a new file OpenSim/Data/MySQL/Resources/030_RegionStore.sql required for the MySQL DB migration. btw I had a chat with justincc about this a few weeks ago since he wrote the oar file import/export and he sounded happy to accept something that included date/time information but didn't want anything that would silently leak private information like machine names.
* Minor: Change OpenSim to OpenSimulator in older copyright headers and ↵Jeff Ames2009-06-011-1/+1
| | | | LICENSE.txt.
* * Implement saving of region settings in OAR filesJustin Clarke Casey2008-12-301-8/+16
| | | | | | | | * This means that you can now save terrain textures, water height, etc. * Estate settings are not supported * Older OAR files without these settings can still be loaded
* * Added IClientIM to IClientCore interfacesAdam Frisby2008-11-081-2/+0
| | | | | | * Changed SendInstantMessage, dropped fromAgentSession and imSessionID as security precaution, see http://opensimulator.org/wiki/OpenSim_0.6_IClientAPI#Porting_Guide for details on porting. * Removed unused usings from Framework.*
* * Apply a modified version of the part of ↵Justin Clarke Casey2008-10-131-1/+1
| | | | | | | | | | | | | | http://opensimulator.org/mantis/view.php?id=2361 that allows region registration to be enabled/disabled on the grid server * Region registration is enabled by default in the configuration unless the user chooses otherwise * On the console * show status - shows grid status * enable-reg - enables region registration to the grid * disable-reg - disables region registration * Enabling or disabling region registration will not affect any other grid functions or regions already on the grid
* Make a missing or read-only estate_settings.xml non-fatalMelanie Thielker2008-10-111-2/+8
|
* * Patch from JHurlimanTeravus Ovares2008-09-261-12/+12
| | | | | | | | | * Updates to libomv r2243, * Remove lots of unnecessary typecasts * Improves SendWindData() Thanks jhurliman. * Will update OpenSim-libs in 10 minutes..
* Mantis #2133Melanie Thielker2008-09-061-1/+1
| | | | | | | Thank you, Xugu Madison and ChrisDown, for a patch that fixes linux filename extensions from .Xml back to .xml
* * This is the fabled LibOMV update with all of the libOMV types from JHurlimanTeravus Ovares2008-09-061-34/+34
| | | | | | | * This is a HUGE OMG update and will definitely have unknown side effects.. so this is really only for the strong hearted at this point. Regular people should let the dust settle. * This has been tested to work with most basic functions. However.. make sure you back up 'everything' before using this. It's that big! * Essentially we're back at square 1 in the testing phase.. so lets identify things that broke.
* Add the default region texture UUIDS back in that were lost inMelanie Thielker2008-08-191-8/+32
| | | | | | | the shuffle. Translate LLUUID.Zero to the default textures on set. This should fix the default button in the viewer.
* Formatting cleanup.Jeff Ames2008-08-181-34/+34
|
* Update svn properties. Formatting cleanup. Remove a compiler warning.Jeff Ames2008-07-231-1/+1
|
* Patch #9151Melanie Thielker2008-07-181-1/+12
| | | | | | Makes the estate dialog fully functional. Implements all client facing functionality. Moves estate data from estate_settings.xml, which is used to provide defaults, to the region data store. Creates one estate for each region, and places the region in it. Converts all region bans to estate bans.
* Patch #9150Melanie Thielker2008-07-141-0/+16
| | | | | | Patch 7 of the region patches. Finish off the region parts of the estate dialog. Full user functionality. Terrain textures, heights, water, avatar counts, prim bonus, debug settings and region toggles can now be set from the dialog on a per-region basis. Estate stuff defaults to sane values where there are no defaults, to estate_settings.xml otherwise. Sun still b0rked :(
* Patch #9148Melanie Thielker2008-07-141-11/+11
| | | | | | | | Patch 5 in the region settings series. Adds a migration to ensure corrupted data is purged and re-read from defaults. Some changes. Still no full functionality
* Patch #9147Melanie Thielker2008-07-141-1/+1
| | | | | | | Patch #4 of the region settings series. Partial functionality of the new storage system. More patches to follow.
* Copyright notices and formatting cleanup.Jeff Ames2008-07-061-200/+200
|
* Changed default terrain lower limit to -100 instead of 100Dahlia Trimble2008-07-051-1/+1
|
* Mantis#1639. Thank you, Melanie for a patch that:Charles Krinke2008-07-011-0/+201
| | | | | | Reads estate_settings.xml and populates the database from it. If there is no record, just passes the defaults to the application.
* Mantis#1637. Thank you kindly, Melanie for a patch that:Charles Krinke2008-06-301-33/+33
| | | | | | Make each region load it's settings from the database on startup. No user functionality yet.
* patch and files from mantis #1630, Thanks MelanieMW2008-06-291-0/+300