| Commit message (Collapse) | Author | Age | Files | Lines | |
|---|---|---|---|---|---|
| * | Merge branch 'master' of ssh://3dhosting.de/var/git/careminster | Melanie Thielker | 2014-06-21 | 1 | -19/+153 |
| |\ | | | | | | | | | Conflicts: OpenSim/Region/Framework/Scenes/SceneObjectGroup.cs | ||||
| | * | Intermediate commit. Sill errors. | Melanie | 2014-01-05 | 1 | -19/+153 |
| | |\ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Merge branch 'master' into careminster Conflicts: OpenSim/Data/SQLite/SQLiteUserProfilesData.cs OpenSim/Framework/RegionInfo.cs OpenSim/Region/ClientStack/Linden/Caps/EventQueue/EventQueueHelper.cs OpenSim/Region/Framework/Scenes/SceneObjectGroup.cs OpenSim/Services/UserProfilesService/UserProfilesService.cs | ||||
| | | * | varregion: Add region size to teleport event messages (EnableSimulator, | Robert Adams | 2014-01-04 | 1 | -0/+2 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | CorssRegion, TeleportFinishEvent). Have Simian grid service return the region size. Many teleport related debug log messages. Can be removed when teleport works (like that's ever going to happen). Conflicts: OpenSim/Framework/RegionInfo.cs | ||||
| | | * | Add serialization/deserialization of region size to RegionInfo, GridRegion, ↵ | Robert Adams | 2013-12-28 | 1 | -37/+152 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | and RegionData. This does not modify interfaces or handling of variable sized regions. This only enables the loading and storing of the region size and the reporting of the region size in grid service responses. The database tables already have the code to load and store the region size. | ||||
| * | | | Convert region loading to new format | Melanie Thielker | 2014-04-26 | 1 | -4/+6 |
| |/ / | |||||
| * | | Merge branch 'master' into careminster | Melanie | 2013-01-31 | 1 | -1/+26 |
| |\ \ | |/ | | | | | | | Conflicts: OpenSim/Region/Framework/Scenes/Scene.cs | ||||
| | * | Allow use of MaptileStaticUUID in Regions.ini to override the global setting ↵ | Jak Daniels | 2013-01-30 | 1 | -1/+26 |
| | | | | | | | | | | | | | in OpenSim.ini for each region. Signed-off-by: BlueWall <jamesh@bluewallgroup.com> | ||||
| * | | Merge branch 'master' into careminster | Melanie | 2012-09-24 | 1 | -4/+4 |
| |\ \ | |/ | | | | | | | Conflicts: OpenSim/Region/Framework/Scenes/Scene.cs | ||||
| | * | Fix some inconsistencies in configurartion: NonPhys prims | BlueWall | 2012-09-18 | 1 | -4/+4 |
| | | | | | | | | | | | | | Fix inconsistencies between configuration parameter names and their description names. Changing the configuration parameters for non physical prim size min-max from Nonphys* to NonPhys*. Please update your OpenSim.ini and Regions.ini to reflect these changes. | ||||
| * | | Merge branch 'master' into careminster | Melanie | 2012-09-16 | 1 | -7/+7 |
| |\ \ | |/ | | | | | | | | | Conflicts: OpenSim/Region/CoreModules/Framework/EntityTransfer/HGEntityTransferModule.cs OpenSim/Region/Framework/Scenes/EventManager.cs | ||||
| | * | mathematically & hypothetically speaking we want to avoid negative values ↵ | SignpostMarv | 2012-09-12 | 1 | -7/+7 |
| | | | | | | | | | being written | ||||
| * | | Merge branch 'master' into careminster | Melanie | 2012-09-09 | 1 | -0/+18 |
| |\ \ | |/ | | | | | | | Conflicts: OpenSim/Region/Framework/Scenes/Scene.cs | ||||
| | * | implementing per-region configuration of limits on the number of prims one ↵ | SignpostMarv | 2012-09-09 | 1 | -1/+19 |
| | | | | | | | | | | | | | | | | | can have in a linkset Applied with changes - patch was based on a repo different from core Signed-off-by: Melanie <melanie@t-data.com> | ||||
| * | | Merge branch 'master' into careminster | Melanie | 2012-08-18 | 1 | -2/+40 |
| |\ \ | |/ | | | | | | | | | | | | | Conflicts: OpenSim/Region/Framework/Scenes/Scene.cs OpenSim/Region/Framework/Scenes/SceneObjectGroup.cs OpenSim/Region/ScriptEngine/Shared/Api/Implementation/LSL_Api.cs OpenSim/Region/ScriptEngine/XEngine/XEngine.cs | ||||
| | * | enables configurable minimum sizes for physical & non-physical prims | SignpostMarv | 2012-08-15 | 1 | -2/+40 |
| | | | |||||
| * | | Merge branch 'master' into careminster | Melanie | 2012-07-28 | 1 | -7/+19 |
| |\ \ | |/ | | | | | | | | | | | | | | | | | | | | | | | Conflicts: OpenSim/Framework/Monitoring/BaseStatsCollector.cs OpenSim/Region/Application/OpenSim.cs OpenSim/Region/Application/OpenSimBase.cs OpenSim/Region/Framework/Scenes/SceneManager.cs bin/OpenMetaverse.Rendering.Meshmerizer.dll bin/OpenMetaverse.StructuredData.dll bin/OpenMetaverse.dll bin/OpenMetaverseTypes.dll prebuild.xml | ||||
| | * | making first run more resilient to bad input (loop until good input, rather ↵ | SignpostMarv | 2012-07-27 | 1 | -7/+19 |
| | | | | | | | | | than crash) | ||||
| * | | Merge branch 'master' into careminster | Melanie | 2012-03-25 | 1 | -0/+6 |
| |\ \ | |/ | |||||
| | * | Give feedback when "terrain save-tile" is not successfully invoked. | Justin Clark-Casey (justincc) | 2012-03-24 | 1 | -0/+6 |
| | | | |||||
| * | | Merge branch 'master' into careminster | Melanie | 2012-02-10 | 1 | -1/+0 |
| |\ \ | |/ | |||||
| | * | minor: Remove warning from RegionInfo due to repeated config.GetString() ↵ | Justin Clark-Casey (justincc) | 2012-02-10 | 1 | -1/+0 |
| | | | | | | | | | call where the first was unused. | ||||
| * | | Merge branch 'master' into careminster | Melanie | 2012-02-05 | 1 | -2/+2 |
| |\ \ | |/ | | | | | | | Conflicts: OpenSim/Region/Framework/Scenes/Scene.cs | ||||
| | * | Set PhysPrimMax default to 0 so ini files won't be overridden | BlueWall | 2012-02-04 | 1 | -1/+1 |
| | | | |||||
| | * | Make NonphysicalPrimMax setting work properly | BlueWall | 2012-02-04 | 1 | -1/+1 |
| | | | | | | | | | RegionInfo setting will override only if it is > 0 | ||||
| * | | Merge branch 'master' into careminster | Melanie | 2012-02-03 | 1 | -18/+23 |
| |\ \ | |/ | |||||
| | * | fix line endings | Dan Lake | 2012-02-02 | 1 | -7/+7 |
| | | | |||||
| | * | Fixed bugs in earlier commit on custom user parameters in Regions.ini | Dan Lake | 2012-01-19 | 1 | -20/+25 |
| | | | |||||
| * | | Merge branch 'master' into careminster | Melanie | 2011-12-12 | 1 | -24/+55 |
| |\ \ | |/ | | | | | | | | | Conflicts: OpenSim/Framework/RegionInfo.cs OpenSim/Region/Framework/Scenes/ScenePresence.cs | ||||
| | * | Added an option for extra settings within region ini file. Any non-hardcoded ↵ | Dan Lake | 2011-12-12 | 1 | -20/+55 |
| | | | | | | | | | key-value string pair can be added per-region and referenced by any part of OpenSim with access to the RegionInfo | ||||
| * | | Merge branch 'master' into bigmerge | Melanie | 2011-10-26 | 1 | -1/+1 |
| |\ \ | |/ | | | | | | | Conflicts: OpenSim/Framework/Watchdog.cs | ||||
| | * | Make OpenSim.Framework.Servers.HttpServer rely on OpenSim.Framework instead ↵ | Justin Clark-Casey (justincc) | 2011-10-25 | 1 | -1/+1 |
| | | | | | | | | | | | | | | | | | | | of the other way around. This is necessary so that code in HttpServer can use framework facilities such as the thread watchdog for monitoring purposes. Doing this shuffle meant that MainServer was moved into OpenSim/Framework/Servers Also had to make OpenSim.Framework.Console rely on OpenSim.Framework rather than the other way around since it in turn relies on HttpServer MainConsole and some new interfaces had to be moved into OpenSim/Framework to allow this. This can be reverted if parts of OpenSim.Framework stop relying on console presence (cheifly RegionInfo) | ||||
| | * | Thank you, Michelle Argus, for a patch that adds reading the agent limit | Melanie | 2011-07-22 | 1 | -1/+4 |
| | | | | | | | | | from XML properly. | ||||
| * | | Fix merge artefact | Melanie | 2011-07-22 | 1 | -3/+0 |
| | | | |||||
| * | | Thank you, Michelle Argus, for a patch that adds reading the agent limit | Melanie | 2011-07-22 | 1 | -1/+4 |
| | | | | | | | | | from XML properly. | ||||
| * | | Merge branch 'master' into careminster-presence-refactor | Melanie | 2011-05-08 | 1 | -245/+0 |
| |\ \ | |/ | |||||
| | * | Removed SimpleRegionInfo, which was obsolete and not used anywhere. | Diva Canto | 2011-05-06 | 1 | -245/+0 |
| | | | |||||
| * | | Set the attachment data on scripted rez to allow toasters to work. | Melanie | 2011-04-30 | 1 | -0/+3 |
| | | | |||||
| * | | Merge branch 'master' into careminster-presence-refactor | Melanie | 2011-04-25 | 1 | -0/+17 |
| |\ \ | |/ | |||||
| | * | Added MaxAgents configuration option to RegionConfig.ini allowing region ↵ | E. Allen Soard | 2011-04-23 | 1 | -0/+17 |
| | | | | | | | | | hosters to setup regions maintaining more control over system resources. | ||||
| | * | Remove unused RegionInfo.getInternalEndPointPort() in favour of ↵ | Justin Clark-Casey (justincc) | 2011-03-31 | 1 | -6/+1 |
| | | | | | | | | | RegionInfo.InternalEndPoint.Port | ||||
| | * | Remove unused Datastore parameter from RegionInfo (legacy from early 2008) | Justin Clark-Casey (justincc) | 2011-03-31 | 1 | -11/+0 |
| | | | |||||
| * | | Merge branch 'master' into careminster-presence-refactor | Melanie | 2010-12-06 | 1 | -4/+35 |
| |\ \ | |/ | |||||
| | * | Merge git://github.com/opensim/opensim into mantis5110 | Jonathan Freedman | 2010-11-05 | 1 | -0/+1 |
| | |\ | |||||
| * | \ | Merge branch 'master' into careminster-presence-refactor | Melanie | 2010-11-03 | 1 | -0/+1 |
| |\ \ \ | | |/ | |/| | |||||
| | * | | When LightShare is enabled, the standard day cycle is bypassed and replaced by | Melanie | 2010-11-03 | 1 | -0/+1 |
| | | | | | | | | | | | | | | | | | | | midday defaults when no specific LightShare profile is set. This prevents LightShare info being send out when the region has no LightShare profile, allowing normal day/night cycles to happen. | ||||
| * | | | Merge branch 'master' into careminster-presence-refactor | Melanie | 2010-10-23 | 1 | -35/+4 |
| |\ \ \ | |/ / | |||||
| | * | | Revert "Merge remote branch 'otakup0pe/mantis5110'" | Justin Clark-Casey (justincc) | 2010-10-22 | 1 | -35/+4 |
| | |/ | | | | | | | | | This reverts commit 21187f459ea2ae590dda4249fa15ebf116d04fe0, reversing changes made to 8f34e46d7449be1c29419a232a8f7f1e5918f03c. | ||||
| | * | * more url / hg cleanup | Jonathan Freedman | 2010-10-11 | 1 | -3/+28 |
| | | | |||||
| | * | * refactor refactor refactor ServerURI 4 lyfe | Jonathan Freedman | 2010-10-02 | 1 | -1/+7 |
| | | | |||||
| * | | Merge branch 'master' into careminster-presence-refactor | Melanie | 2010-10-21 | 1 | -4/+35 |
| |\ \ | |||||
 |
index : opensim-SC_OLD | |
| My fork of OpenSim for IG and MG, called SledjChisl. |
| aboutsummaryrefslogtreecommitdiffstatshomepage |