aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim/Region/CoreModules/World (follow)
Commit message (Collapse)AuthorAgeFilesLines
* Merge branch 'master' into careminsterMelanie2013-03-011-21/+33
|\
| * Moved permissions config vars out of [Startup] into [Permissions]. Backwards ↵Diva Canto2013-03-011-21/+33
| | | | | | | | compatible ([Startup] still being looked up), but please update your configs sometime soon.
* | Merge branch 'master' into careminsterMelanie2013-02-271-1/+1
|\ \ | |/ | | | | | | | | | | Conflicts: OpenSim/Framework/RegionLoader/Web/RegionLoaderWebServer.cs OpenSim/Region/CoreModules/Scripting/LSLHttp/UrlModule.cs OpenSim/Region/CoreModules/World/WorldMap/WorldMapModule.cs
| * Make sure we dispose of WebResponse, StreamReader and Stream in various ↵Justin Clark-Casey (justincc)2013-02-271-16/+14
| | | | | | | | places where we were not already.
* | Merge branch 'master' into careminsterMelanie2013-02-263-29/+24
|\ \ | |/
| * Move map related settings from [Startup] to a new [Map] section in OpenSim.iniJustin Clark-Casey (justincc)2013-02-253-29/+24
| | | | | | | | | | | | | | Existing map settings in [Startup] will continue to work, and if present will override anything in [Map] However, the proper place for such settings would now be [Map] This is to reduce the use of [Startup] as a bag for non-generic settings which should really go in sections, in common with other settings. This commit also extends Diva's previous work to allow a default setting to be given when looking at multiple sections for settings.
* | Merge branch 'master' into careminsterMelanie2013-02-221-5/+5
|\ \ | |/
| * Correct mistake in parsing 'show object pos' and similar pos commands where ↵Justin Clark-Casey (justincc)2013-02-201-5/+5
| | | | | | | | | | | | the 'to' text would be treat as the end vector rather than discarded. Before this, the commands still work but the help text is wrong - one has to leave out the 'to' in stating the vectors
* | Merge branch 'master' into careminsterMelanie2013-02-161-0/+2
|\ \ | |/
| * Add regression test TestSaveNonRootFolderToIarJustin Clark-Casey (justincc)2013-02-161-0/+2
| |
* | Merge branch 'master' into careminsterMelanie2013-02-051-0/+37
|\ \ | |/ | | | | | | | | | | | | Conflicts: OpenSim/Data/MySQL/MySQLSimulationData.cs OpenSim/Framework/Servers/VersionInfo.cs OpenSim/Region/ClientStack/Linden/Caps/BunchOfCaps/BunchOfCaps.cs OpenSim/Region/Framework/Scenes/SceneObjectPart.cs
| * Merge branch 'dynamic-attributes2'Justin Clark-Casey (justincc)2013-02-051-0/+37
| |\
| | * Added unit tests for Dynamic AttributesOren Hurvitz2013-01-251-0/+37
| | |
* | | Merge branch 'master' into careminsterMelanie2013-02-041-5/+12
|\ \ \ | |/ /
| * | Stop exceptions being thrown if GenerateMapTiles = false but no static map ↵Justin Clark-Casey (justincc)2013-02-021-5/+12
| | | | | | | | | | | | tile has been set. Do more informative warn instead.
* | | Merge branch 'master' into careminsterMelanie2013-01-311-18/+63
|\ \ \ | |/ / | | | | | | | | | Conflicts: OpenSim/Region/Framework/Scenes/Scene.cs
| * | Allow use of MaptileStaticUUID in Regions.ini to override the global setting ↵Jak Daniels2013-01-301-18/+63
| | | | | | | | | | | | | | | | | | in OpenSim.ini for each region. Signed-off-by: BlueWall <jamesh@bluewallgroup.com>
* | | Merge branch 'master' into careminsterMelanie2013-01-261-1/+1
|\ \ \ | |/ /
| * | Fix issue where the "set terrain texture" console command did not tell the ↵Justin Clark-Casey (justincc)2013-01-261-1/+1
| | | | | | | | | | | | | | | | | | viewers that textures had updated (hence they did not display the changes). Addresses http://opensimulator.org/mantis/view.php?id=6513
* | | Merge branch 'master' into careminsterMelanie2013-01-261-5/+5
|\ \ \ | |/ /
| * | minor: Fix full scene part console report to show proper Light* names rather ↵Justin Clark-Casey (justincc)2013-01-261-5/+5
| |/ | | | | | | than all wrongly FlexiDrag
* | Merge branch 'master' into careminsterMelanie2013-01-111-7/+12
|\ \ | |/ | | | | | | Conflicts: OpenSim/Region/Framework/Scenes/Scene.cs
| * Move scene debug commands into separate module. Command changes from "debug ↵Justin Clark-Casey (justincc)2013-01-101-7/+12
| | | | | | | | scene <key> <value>" to "debug scene set <key> <value>" to accomodate future settings
* | Merge branch 'avination' into careminsterMelanie2013-01-061-0/+13
|\ \
| * | check land permitions on sit target for unscripted sitsUbitUmarov2013-01-031-0/+13
| | |
* | | Merge branch 'master' into careminsterMelanie2013-01-049-85/+166
|\ \ \ | | |/ | |/| | | | | | | | | | Conflicts: OpenSim/Region/CoreModules/World/Land/LandManagementModule.cs OpenSim/Region/ScriptEngine/Shared/Api/Implementation/LSL_Api.cs
| * | minor: Change channel digger replacement message in TerrainModule to Info ↵Justin Clark-Casey (justincc)2013-01-031-1/+1
| | | | | | | | | | | | | | | | | | from Warn. This is to stop this unnecessarily triggering log analysis code which reports warn and error level statements.
| * | Fixed several problems with the Sun: some settings didn't work, or were ↵Oren Hurvitz2013-01-022-20/+27
| | | | | | | | | | | | inconsistently used. - The sun position is always calculated by combining the sun settings in the Region and Estate. This fixes the problem that 'UseEstateSun' didn't work. - To remove ambiguity, the EstateToolsSunUpdate event no longer accepts the sun's position as parameters. That's because the position is always calculated from the Region and Estate settings. - Use only the 'FixedSun' flag to determine whether the sun is fixed; not the 'UseGlobalTime' flag. - Don't change the region's 'SunPosition' field according to the sun's position: this field is used only to set the position when using a FixedSun. (The 'SunVector' field does get updated according to the sun's position in the sky)
| * | Fixed: the AvatarEnteringNewParcel event wasn't triggered in some casesOren Hurvitz2013-01-021-0/+6
| | | | | | | | | | | | If an avatar moved between regions: A -> B -> A, then when returning to region A the AvatarEnteringNewParcel wasn't triggered. This happened because the ScenePresence in region A still remembered its previous 'currentParcelUUID', so it appeared as if the avatar didn't change parcels. Now, however, when a ScenePresence becomes a child presence we clear its 'currentParcelUUID'.
| * | minor: minor code and log formatting fixes to recent changes in ↵Justin Clark-Casey (justincc)2013-01-021-5/+6
| | | | | | | | | | | | LandManagementModule
| * | Changed locks to prevent deadlocks (especially during multi-region Load OAR)Oren Hurvitz2013-01-023-39/+61
| | |
| * | If Save OAR/IAR times-out while waiting for assets then notify the caller ↵Oren Hurvitz2013-01-023-24/+29
| | | | | | | | | | | | that the operation failed
| * | Implemented Return Objects when it's invoked from the Top Colliders or Top ↵Oren Hurvitz2013-01-021-5/+55
| | | | | | | | | | | | Scripts dialogs
* | | Merge branch 'master' into careminsterMelanie2012-12-161-2/+2
|\ \ \ | |/ / | | | | | | | | | | | | Conflicts: OpenSim/Region/Framework/Scenes/SceneObjectPart.cs OpenSim/Region/ScriptEngine/Shared/Instance/ScriptInstance.cs
| * | Fix sounds so that they play from inventory after teleport rather than only ↵Justin Clark-Casey (justincc)2012-12-131-2/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | on initial login region. Regression from commit ed162a10 (Fri Oct 5 13:50:12 2012) We had started listening for the client login event for attaching the sound trigger event rather than OnNewClient Addresses http://opensimulator.org/mantis/view.php?id=6453 Many thanks to danbanner for identifying the exact commit where this went wrong, which made identifying the fix easy.
* | | Merge branch 'master' into careminsterMelanie2012-12-072-2/+6
|\ \ \ | |/ / | | | | | | | | | | | | Conflicts: OpenSim/Region/CoreModules/Avatar/InstantMessage/MessageTransferModule.cs OpenSim/Region/Framework/Scenes/Scene.cs
| * | minor: Fix more compiler warnings in CoreModules tests by properly ↵Justin Clark-Casey (justincc)2012-12-052-2/+6
| | | | | | | | | | | | overriding OpenSimTestCase.SetUp()
* | | Merge branch 'master' into careminsterMelanie2012-11-301-3/+57
|\ \ \ | |/ / | | | | | | | | | | | | Conflicts: OpenSim/Region/CoreModules/Avatar/InstantMessage/OfflineMessageModule.cs OpenSim/Region/Physics/Meshing/Meshmerizer.cs
| * | Show many more primitive properties on console command "show part name/id/pos"Justin Clark-Casey (justincc)2012-11-281-3/+57
| | |
* | | Merge branch 'master' into careminsterMelanie2012-11-2512-202/+288
|\ \ \ | |/ / | | / | |/ |/| | | Conflicts: OpenSim/Region/CoreModules/World/Estate/EstateManagementModule.cs OpenSim/Region/CoreModules/World/Land/LandManagementModule.cs
| * Consistenly make NUnit test cases inherit from OpenSimTestCase which ↵Justin Clark-Casey (justincc)2012-11-244-4/+5
| | | | | | | | automatically turns off any logging enabled between tests
| * In ArchiverTests, use the local instantiated SceneManager rather than ↵Justin Clark-Casey (justincc)2012-11-241-20/+7
| | | | | | | | potentially cross-contaminating tests by relying on the static SceneManager.Instance
| * Fix bug where loading an OAR with a deeded parcel would always set the ↵Justin Clark-Casey (justincc)2012-11-245-147/+224
| | | | | | | | | | | | | | | | | | parcel owner ID to the estate owner even if the group UUID was present. Aims to address http://opensimulator.org/mantis/view.php?id=6355 As part of this work, an incomplete IXGroupsData was added which currently only allows store/fetch/delete of group records (i.e. no membership data etc) This is subject to change and currently only an in-memory storage implementation exists for regression test purposes.
| * minor: Add some currently commented out debug log lines for investigating ↵Justin Clark-Casey (justincc)2012-11-231-0/+5
| | | | | | | | issues resolving group IDs for land parcels on OAR loading where groups do not exist
| * minor: remove some mono compiler warningsJustin Clark-Casey (justincc)2012-11-232-3/+3
| |
| * Add AllowRegionRestartFromClient setting to [EstateManagement] section of ↵Justin Clark-Casey (justincc)2012-11-231-40/+63
| | | | | | | | | | | | | | | | | | OpenSim.ini. Setting this to false will block all restart requests from the viewer even if they are otherwise legitimate. One use is to block region restarts if necessary whilst restart functionality remains buggy or triggers bugs in modules, though these should be fixed as soon as practicable. Default is true, as has been the case historically.
* | Merge branch 'master' into careminsterMelanie2012-11-232-9/+22
|\ \ | |/ | | | | | | | | Conflicts: OpenSim/Region/CoreModules/World/Estate/EstateManagementModule.cs OpenSim/Region/Framework/Scenes/SceneManager.cs
| * Remove the redundant BypassPermissions() checks in EstateManagmentModule.Justin Clark-Casey (justincc)2012-11-231-8/+13
| | | | | | | | This is repeated in the PermissionsModule and checking it earlier does not allow a force override of the bypass value
| * minor: Add some console feedback on region restart and log who requested a ↵Justin Clark-Casey (justincc)2012-11-232-1/+9
| | | | | | | | region restart if done from the viewer.
* | Merge branch 'master' into careminsterMelanie2012-11-151-12/+8
|\ \ | |/ | | | | | | Conflicts: OpenSim/Region/ClientStack/Linden/UDP/LLUDPServer.cs
generated by cgit v1.1 at 2024-09-19 18:50:03 +0000