aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim/Region/CoreModules (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-282-3/+6
|\ \ | |/ | | | | | | Conflicts: OpenSim/Region/Framework/Scenes/SceneManager.cs
| * Switched to using the other Util function with a default value.Diva Canto2013-02-272-3/+6
| |
| * Merge branch 'master' of ssh://opensimulator.org/var/git/opensimDiva Canto2013-02-273-47/+61
| |\
| * | Moved the HG default variables out of [Startup] and into their own section ↵Diva Canto2013-02-272-3/+3
| | | | | | | | | | | | [Hypergrid] in *Common.ini.example. Backwards compatible for now.
* | | Merge branch 'master' into careminsterMelanie2013-02-271-9/+17
|\ \ \ | | |/ | |/| | | | | | | Conflicts: OpenSim/Region/CoreModules/Scripting/LSLHttp/UrlModule.cs
| * | Add regression test for llReleaseUrl() (and for llRequestUrl)Justin Clark-Casey (justincc)2013-02-271-9/+16
| | | | | | | | | | | | Forgot to add file for llRequestUrl() test in commit b8a7c8b
* | | Merge branch 'master' into careminsterMelanie2013-02-273-24/+32
|\ \ \ | |/ / | | | | | | | | | | | | | | | 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-272-22/+24
| | | | | | | | | | | | places where we were not already.
| * | Add regression test for llRequestUrl()Justin Clark-Casey (justincc)2013-02-261-16/+21
| |/
* | Merge branch 'master' into careminsterMelanie2013-02-265-32/+73
|\ \ | |/
| * Move map related settings from [Startup] to a new [Map] section in OpenSim.iniJustin Clark-Casey (justincc)2013-02-254-31/+26
| | | | | | | | | | | | | | 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.
| * Add StatsManager registration for region specific stats as collectedRobert Adams2013-02-241-1/+47
| | | | | | | | | | by MonitorModule. Left existing functionality (command line and HTTP fetch) and just added StatsManager registration.
* | Make sure state machine is reset if crossing is abortedMelanie2013-02-231-0/+6
| |
* | Merge branch 'master' into careminsterMelanie2013-02-233-49/+74
|\ \ | |/ | | | | | | Conflicts: OpenSim/Region/CoreModules/Framework/EntityTransfer/EntityTransferModule.cs
| * Merge branch 'master' of ssh://opensimulator.org/var/git/opensimDiva Canto2013-02-221-42/+81
| |\
| | * Make reset of EntityTransferStateMachine for an avatar transfer always ↵Justin Clark-Casey (justincc)2013-02-221-42/+81
| | | | | | | | | | | | | | | | | | | | | happen despite unexpected exceptions. This means that if such an exception does occur, the region does not need to be reset before that user can teleport from it again. This is all Oren's code from his patch in http://opensimulator.org/mantis/view.php?id=6374 but I've chosen to split it in two.
| * | Added new Util function for reading config vars that's more generic than the ↵Diva Canto2013-02-222-4/+5
| |/ | | | | | | one I added yesterday -- this is for helping move config vars out of [Startup]
* | Merge branch 'master' into careminsterMelanie2013-02-226-14/+26
|\ \ | |/
| * Merge branch 'master' of ssh://opensimulator.org/var/git/opensimDiva Canto2013-02-211-1/+1
| |\
| | * minor: Change summary in "show appearance" console command to "incomplete" ↵Justin Clark-Casey (justincc)2013-02-211-1/+1
| | | | | | | | | | | | | | | | | | | | | rather than "corrupt" Corrupt is misleading - it implies textures were uploaded but are not j2k valid. The actual situation is that at least one required baked texture is not present.
| * | Simplification of HG configs: HomeURI and GatekeeperURI now are defined as ↵Diva Canto2013-02-212-6/+7
| |/ | | | | | | default under [Startup]. They can then be overwritten in the other sections (but probably shouldn't). I kept the existing code for backwards compatibility, so this should not cause any breaks from people's current configurations. But people should move to have these 2 vars under [Startup] -- see OpenSim.ini.example and Robust.HG.ini.example. And yes, both names now end with "URI" for consistency.
| * Add flush after write feature to LogWriterRobert Adams2013-02-201-1/+12
| |
| * Merge branch 'master' of ssh://opensimulator.org/var/git/opensimJustin Clark-Casey (justincc)2013-02-201-1/+1
| |\
| | * Deleted all AssemblyFileVersion directivesDiva Canto2013-02-191-1/+1
| | |
| * | 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-168-273/+439
|\ \ | |/
| * Separate IAR tests into separate files for load/save/loadpath testsJustin Clark-Casey (justincc)2013-02-163-245/+198
| |
| * Make it so that "load iar / ..." does not save the 'root' "My Inventory" folder.Justin Clark-Casey (justincc)2013-02-162-1/+60
| | | | | | | | | | | | | | | | Really "My Inventory" is just the name of the root, it isn't a folder in its own right. This also makes it more intuitive for users to save whole inventory iars for backup/later restoration, as they don't need to remember to use /* /* will still work and this is a special case just for the root If you want to save only the contents of other folders (rather than the folder itself), you still need to specify something like a/b/* Added a regression test for this case.
| * Add regression test TestSaveNonRootFolderToIarJustin Clark-Casey (justincc)2013-02-167-29/+183
| |
* | Merge branch 'master' into careminsterMelanie2013-02-154-9/+11
|\ \ | |/ | | | | | | Conflicts: OpenSim/Region/Framework/Scenes/SceneObjectPart.cs
| * * Handle null check on configs in module startup so that the the code can be ↵teravus2013-02-142-7/+9
| | | | | | | | run on 'stop on handled and unhandled null reference exceptions' mode without pausing during startup a bunch of times. I don't think exceptions were really meant for replacing a single if statement...
| * minor: remove some mono compiler warningsJustin Clark-Casey (justincc)2013-02-142-2/+2
| |
* | Merge branch 'master' into careminsterMelanie2013-02-082-31/+74
|\ \ | |/ | | | | | | Conflicts: OpenSim/Region/CoreModules/Asset/FlotsamAssetCache.cs
| * Don't allow exceptions to propogate from FlotsamAssetCache which may occur ↵Justin Clark-Casey (justincc)2013-02-081-32/+57
| | | | | | | | | | | | when deleting expired files or stamping the region status file. Changes various error level log lines to warn since these are not fatal to the operation of OpenSimulator
| * On IAR loading, if loading of a coaleseced item entirely fails, then ↵Justin Clark-Casey (justincc)2013-02-081-0/+18
| | | | | | | | continue with the IAR load rather than failing completely.
* | Merge branch 'avination' into careminsterMelanie2013-02-071-12/+23
|\ \
| * | * This Checks the asset of each wearable asynchronously and repairs if it's ↵teravus2013-01-291-12/+23
| | | | | | | | | | | | required.
* | | Merge branch 'master' into careminsterMelanie2013-02-053-1/+145
|\ \ \ | | |/ | |/| | | | | | | | | | | | | | | | 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-052-0/+144
| |\ \
| | * | Added unit tests for Dynamic AttributesOren Hurvitz2013-01-251-0/+37
| | | |
| | * | Disabled DAExampleModuleOren Hurvitz2013-01-251-5/+13
| | | |
| | * | Changed DAMap to be the container of "data stores", which are OSDMaps. Store ↵Oren Hurvitz2013-01-251-12/+13
| | | | | | | | | | | | | | | | names must have at least 4 characters.
| | * | Encapsulate an OSDMap in DAMap (was DynAttrsOSDMap) rather than inheriting ↵Justin Clark-Casey (justincc)2013-01-251-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | from it This is the easier way to give us control over locking, rather than asking that OSDMap IDictionary methods be virtual
| | * | Add DAExampleModule to demonstrate dynamic attributesJustin Clark-Casey (justincc)2013-01-251-0/+98
| | | | | | | | | | | | | | | | | | | | | | | | This module demonstrates that we can add an arbitrary persisted value to SOP without any changes to core code. Every time the object is moved, the move record is updated and the users in the scene alerted The number of moves is persisted over server restarts in sqlite
| * | | Bump version and assembly version numbers from 0.7.5 to 0.7.6Justin Clark-Casey (justincc)2013-02-051-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This is mostly Bluewall's work but I am also bumping the general version number OpenSimulator 0.7.5 remains in the release candidate stage. I'm doing this because master is significantly adding things that will not be in 0.7.5 This update should not cause issues with existing external binary DLLs because our DLLs do not have strong names and so the exact version match requirement is not in force.
* | | | Merge branch 'master' into careminsterMelanie2013-02-043-22/+44
|\ \ \ \ | |/ / /
| * | | Log missing assets on "fcache assets" found. This ignores references found ↵Justin Clark-Casey (justincc)2013-02-021-15/+26
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | by scanning LSL/notecard files since these are the source of false positives. This also changes UuidGatherer to reutn an AssetType.Unknown for embedded script/lsl references instead of Texture, since these are often not textures. This is added to help people in determining when they have missing assets such as textures, etc. In this case, one wants to run "fcache clear" first.
| * | | Stop exceptions being thrown if GenerateMapTiles = false but no static map ↵Justin Clark-Casey (justincc)2013-02-022-7/+18
| | | | | | | | | | | | | | | | tile has been set. Do more informative warn instead.
generated by cgit v1.1 at 2025-01-13 14:42:29 +0000