aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim/Framework (follow)
Commit message (Collapse)AuthorAgeFilesLines
* Merge branch 'master' into careminsterMelanie2012-02-051-2/+2
|\ | | | | | | | | Conflicts: OpenSim/Region/Framework/Scenes/Scene.cs
| * Set PhysPrimMax default to 0 so ini files won't be overriddenBlueWall2012-02-041-1/+1
| |
| * Make NonphysicalPrimMax setting work properlyBlueWall2012-02-041-1/+1
| | | | | | | | RegionInfo setting will override only if it is > 0
* | Merge branch 'master' into careminsterMelanie2012-02-049-111/+370
|\ \ | |/ | | | | | | | | Conflicts: OpenSim/Data/MySQL/Resources/RegionStore.migrations OpenSim/Region/Framework/Scenes/Scene.Inventory.cs
| * Add TestRegionSettingsDeserializeJustin Clark-Casey (justincc)2012-02-042-1/+135
| |
| * Merge branch 'master' of ssh://opensimulator.org/var/git/opensimJustin Clark-Casey (justincc)2012-02-033-4/+12
| |\
| | * Merge branch 'master' of ssh://snoopy@opensimulator.org/var/git/opensimSnoopy Pfeffer2012-02-048-109/+215
| | |\
| | | * Merge branch 'master' of /home/opensim/src/opensimBlueWall2012-02-032-2/+10
| | | |\
| | | | * Fix: Covenant changed time not set ↵PixelTomsen2012-02-032-2/+10
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | http://opensimulator.org/mantis/view.php?id=5869 Signed-off-by: BlueWall <jamesh@bluewallgroup.com>
| | * | | Changed save oar and save iar parameter -p|--profile to -h|--home, including ↵Snoopy Pfeffer2012-02-031-2/+2
| | | |/ | | |/| | | | | | | | | corresponding RemoteAdmin parameter
| * | | Change SceneObjectSerializer to use common ↵Justin Clark-Casey (justincc)2012-02-031-9/+28
| | |/ | |/| | | | | | | | | | | | | ExternalRepresentationUtils.ExecuteReadProcessors() methods. Adds ability to submit a customized exception message to match logging.
| * | Refactor common deserialization processor code to generic method ↵Justin Clark-Casey (justincc)2012-02-033-98/+62
| | | | | | | | | | | | ExternalRepresentationUtils.ExecuteReadProcessors()
| * | Change LandDataSerializer deserialization so that in the future it won't ↵Justin Clark-Casey (justincc)2012-02-035-75/+209
| |/ | | | | | | | | | | care about extra elements or element order. This brings it into line with other deserializations such as object and will improve future backward compatibility.
* | Merge branch 'master' into careminsterMelanie2012-02-031-18/+23
|\ \ | |/
| * Merge branch 'master' of ssh://opensimulator.org/var/git/opensimDan Lake2012-02-026-21/+42
| |\
| * | fix line endingsDan Lake2012-02-021-7/+7
| | |
| * | Merge branch 'master' of ssh://opensimulator.org/var/git/opensimDan Lake2012-02-019-167/+251
| |\ \
| * | | Fixed bugs in earlier commit on custom user parameters in Regions.iniDan Lake2012-01-191-20/+25
| | | |
* | | | Merge branch 'master' into careminsterMelanie2012-02-031-0/+1
|\ \ \ \ | | |_|/ | |/| |
| * | | Fix test failureMelanie2012-02-031-0/+1
| | | |
| * | | Replace ParcelAccessEntry with a new struct, LandAccessEntry, which moreMelanie2012-02-025-21/+30
| | | | | | | | | | | | | | | | | | | | | | | | accurately reflects the data sent by the viewer. Add times bans and the expiration of timed bans. Warning: Contains a Migration (and nuts)
* | | | Make ban, eject, freeze and the scripted versions of those work.Melanie2012-02-025-21/+30
| | | |
* | | | Merge branch 'master' into careminsterMelanie2012-02-021-3/+3
|\ \ \ \ | |/ / / | | | | | | | | | | | | | | | | Conflicts: OpenSim/Framework/TaskInventoryItem.cs OpenSim/Region/Framework/Scenes/SceneObjectPartInventory.cs
| * | | Improve reliability of script state saving by covering various savingMelanie2012-02-021-0/+11
| | |/ | |/| | | | | | | and loading scenarios which resulted in loss of continuity on item ids
* | | Improve reliability of script state saving by covering various savingMelanie2012-02-021-2/+12
| | | | | | | | | | | | and loading scenarios which resulted in loss of continuity on item ids
* | | Merge branch 'master' into careminsterMelanie2012-01-311-1/+1
|\ \ \ | |/ /
| * | Use Environment.TickCount & Int32.MaxValue; instead of ↵Justin Clark-Casey (justincc)2012-01-311-1/+1
| | | | | | | | | | | | | | | | | | | | | Util.EnvironmentTickCount(); when producing the threads report to reduce wraparound. This matches the tickcount masking in the thread watchdog. For some reason, Util.EnvironmentTickCount() masks ticks by 0x3fffffff instead of 0xffffffff
* | | 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.
* | | Merge branch 'master' into careminsterMelanie2012-01-281-2/+2
|\ \ \ | |/ /
| * | Remove IClientAPI from the money module. It was only used to pass in theMelanie2012-01-281-2/+2
| | | | | | | | | | | | agent id anyway
* | | Merge branch 'master' into careminsterMelanie2012-01-261-0/+6
|\ \ \ | |/ / | | | | | | | | | Conflicts: OpenSim/Framework/EstateSettings.cs
| * | llManageEstateAccess implementation ↵PixelTomsen2012-01-261-0/+6
| | | | | | | | | | | | | | | | | | http://wiki.secondlife.com/wiki/LlManageEstateAccess Signed-off-by: BlueWall <jamesh@bluewallgroup.com>
* | | Merge branch 'master' into careminsterMelanie2012-01-261-0/+6
|\ \ \ | |/ / | | | | | | | | | | | | Conflicts: OpenSim/Region/Framework/Scenes/Scene.Inventory.cs OpenSim/Region/ScriptEngine/Shared/Api/Implementation/LSL_Api.cs
| * | llGetParcelMusicURL implementation ↵Pixel Tomsen2012-01-251-0/+6
| | | | | | | | | | | | | | | | | | http://wiki.secondlife.com/wiki/LlGetParcelMusicURL Signed-off-by: BlueWall <jamesh@bluewallgroup.com>
* | | Merge branch 'master' into careminsterMelanie2012-01-251-123/+125
|\ \ \ | |/ / | | | | | | | | | Conflicts: OpenSim/Region/Framework/Scenes/SceneGraph.cs
| * | Comment out asset statistics section from periodic stats as these have not ↵Justin Clark-Casey (justincc)2012-01-241-108/+109
| | | | | | | | | | | | | | | | | | | | | been recorded for a very long time. Some might make a comeback in the future but others are of dubious usefuless for health check purposes, or the complexity of collection outweighs their usefulness. Some data is available via other means (e.g. "fcache status").
| * | Comment out inventory statistics section from periodic stats, since this ↵Justin Clark-Casey (justincc)2012-01-241-14/+15
| | | | | | | | | | | | only contained the now uncollected and irrelevant inventory cache number.
| * | 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-222-150/+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.
generated by cgit v1.1 at 2024-12-22 22:44:23 +0000