aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim/Framework/RegionInfo.cs (follow)
Commit message (Collapse)AuthorAgeFilesLines
* Merge branch 'master' into careminsterMelanie2012-02-101-1/+0
|\
| * minor: Remove warning from RegionInfo due to repeated config.GetString() ↵Justin Clark-Casey (justincc)2012-02-101-1/+0
| | | | | | | | call where the first was unused.
* | 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-031-18/+23
|\ \ | |/
| * fix line endingsDan Lake2012-02-021-7/+7
| |
| * Fixed bugs in earlier commit on custom user parameters in Regions.iniDan Lake2012-01-191-20/+25
| |
* | Merge branch 'master' into careminsterMelanie2011-12-121-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 Lake2011-12-121-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 bigmergeMelanie2011-10-261-1/+1
|\ \ | |/ | | | | | | Conflicts: OpenSim/Framework/Watchdog.cs
| * Make OpenSim.Framework.Servers.HttpServer rely on OpenSim.Framework instead ↵Justin Clark-Casey (justincc)2011-10-251-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 limitMelanie2011-07-221-1/+4
| | | | | | | | from XML properly.
* | Fix merge artefactMelanie2011-07-221-3/+0
| |
* | Thank you, Michelle Argus, for a patch that adds reading the agent limitMelanie2011-07-221-1/+4
| | | | | | | | from XML properly.
* | Merge branch 'master' into careminster-presence-refactorMelanie2011-05-081-245/+0
|\ \ | |/
| * Removed SimpleRegionInfo, which was obsolete and not used anywhere.Diva Canto2011-05-061-245/+0
| |
* | Set the attachment data on scripted rez to allow toasters to work.Melanie2011-04-301-0/+3
| |
* | Merge branch 'master' into careminster-presence-refactorMelanie2011-04-251-0/+17
|\ \ | |/
| * Added MaxAgents configuration option to RegionConfig.ini allowing region ↵E. Allen Soard2011-04-231-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-311-6/+1
| | | | | | | | RegionInfo.InternalEndPoint.Port
| * Remove unused Datastore parameter from RegionInfo (legacy from early 2008)Justin Clark-Casey (justincc)2011-03-311-11/+0
| |
* | Merge branch 'master' into careminster-presence-refactorMelanie2010-12-061-4/+35
|\ \ | |/
| * Merge git://github.com/opensim/opensim into mantis5110Jonathan Freedman2010-11-051-0/+1
| |\
* | \ Merge branch 'master' into careminster-presence-refactorMelanie2010-11-031-0/+1
|\ \ \ | | |/ | |/|
| * | When LightShare is enabled, the standard day cycle is bypassed and replaced byMelanie2010-11-031-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-refactorMelanie2010-10-231-35/+4
|\ \ \ | |/ /
| * | Revert "Merge remote branch 'otakup0pe/mantis5110'"Justin Clark-Casey (justincc)2010-10-221-35/+4
| |/ | | | | | | | | This reverts commit 21187f459ea2ae590dda4249fa15ebf116d04fe0, reversing changes made to 8f34e46d7449be1c29419a232a8f7f1e5918f03c.
| * * more url / hg cleanupJonathan Freedman2010-10-111-3/+28
| |
| * * refactor refactor refactor ServerURI 4 lyfeJonathan Freedman2010-10-021-1/+7
| |
* | Merge branch 'master' into careminster-presence-refactorMelanie2010-10-211-4/+35
|\ \
| * | * more url / hg cleanupJonathan Freedman2010-10-201-3/+28
| | |
| * | * refactor refactor refactor ServerURI 4 lyfeJonathan Freedman2010-10-201-1/+7
| |/
* | Merge branch 'master' into careminster-presence-refactorMelanie2010-09-131-14/+14
|\ \ | |/ | | | | | | The modules will need to be updated for this to compile and run again. Please don't use until I do the companion commit to modules later on.
| * Formatting cleanup.Jeff Ames2010-09-121-14/+14
| |
* | Merge branch 'master' into careminster-presence-refactorMelanie2010-09-051-5/+10
|\ \ | |/
| * In RemoveAdminPlugin, use a .ini file template in XmlRpcCreateRegionMethod ↵Justin Clark-Casey (justincc)2010-09-031-5/+10
| | | | | | | | | | | | rather than an older XML one This is a patch from http://opensimulator.org/mantis/view.php?id=4973. Thanks randomhuman
* | Merge branch 'master' into careminster-presence-refactorMelanie2010-08-211-1/+1
|\ \ | |/
| * Some code cleanup for console command "create region".Marck2010-08-201-1/+1
| | | | | | | | | | | | Make region name an optional command parameter. Avoid question for region name if it has already been specified. Extend help text.
* | Make RegionLightShareData serializableTom Grimshaw2010-06-261-0/+1
|/
* minor: Move log information about SYSTEMIP to the place where it's resolvedJustin Clark-Casey (justincc)2010-06-251-7/+13
|
* First attempt at fixing mantis #4641. It's better but there are now some ↵Diva Canto2010-03-311-6/+6
| | | | | | issues with permissions. (looks like my commit is going to touch CM files, I'm going to let it do it - eof only)
* Committing the LightShare code, which was developed by TomMeta of Meta7.Melanie2010-03-311-1/+304
| | | | | This allows scripts to set WindLight parameters for clients connecting to a region. Currently, this is only supported by the Meta7 viewer.
* minor: remove a couple of compiler warningsJustin Clark-Casey (justincc)2010-03-031-14/+4
|
* Merge branch 'master' into presence-refactorMelanie2010-02-221-1/+0
|\ | | | | | | This brings presence-refactor up to master again
| * Change handling of the SYSTEMIP constant to be more sane.Melanie2010-02-181-1/+0
| | | | | | | | | | | | This will now choose the first network interface IP address, or the loopback interface if no external interfaces are found. It will log the IP address used as [NETWORK]: Using x.x.x.x for SYSTEMIP.
| * Revert "change "SYSTEMIP" to "localhost" in the create region console ↵Melanie2010-02-181-4/+4
| | | | | | | | | | | | command prompt" after speaking to Dahlia This reverts commit c62a6adb2b234fcbe99e352f4bd2af0cbf683a99.
| * change "SYSTEMIP" to "localhost" in the create region console command promptdahlia2010-02-171-4/+4
| |
* | Remove all references to master avatar, replacing with estate owner whereMelanie2010-01-101-96/+0
|/ | | | | appropriate. This changes the behavior of the REST plugins and RemoteAdmin's region creation process.
* Getting rid of SimpleRegionInfo and SerializableRegionInfo per MelKunnis2009-12-121-263/+147
| | | | Signed-off-by: Melanie <melanie@t-data.com>
generated by cgit v1.1 at 2024-12-18 12:56:23 +0000