| Commit message (Collapse) | Author | Age | Files | Lines | |
|---|---|---|---|---|---|
| * | 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 |
| |\ \ | |||||
| | * | | * more url / hg cleanup | Jonathan Freedman | 2010-10-20 | 1 | -3/+28 |
| | | | | |||||
| | * | | * refactor refactor refactor ServerURI 4 lyfe | Jonathan Freedman | 2010-10-20 | 1 | -1/+7 |
| | |/ | |||||
| * | | Merge branch 'master' into careminster-presence-refactor | Melanie | 2010-09-13 | 1 | -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 Ames | 2010-09-12 | 1 | -14/+14 |
| | | | |||||
| * | | Merge branch 'master' into careminster-presence-refactor | Melanie | 2010-09-05 | 1 | -5/+10 |
| |\ \ | |/ | |||||
| | * | In RemoveAdminPlugin, use a .ini file template in XmlRpcCreateRegionMethod ↵ | Justin Clark-Casey (justincc) | 2010-09-03 | 1 | -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-refactor | Melanie | 2010-08-21 | 1 | -1/+1 |
| |\ \ | |/ | |||||
| | * | Some code cleanup for console command "create region". | Marck | 2010-08-20 | 1 | -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 serializable | Tom Grimshaw | 2010-06-26 | 1 | -0/+1 |
| |/ | |||||
| * | minor: Move log information about SYSTEMIP to the place where it's resolved | Justin Clark-Casey (justincc) | 2010-06-25 | 1 | -7/+13 |
| | | |||||
| * | First attempt at fixing mantis #4641. It's better but there are now some ↵ | Diva Canto | 2010-03-31 | 1 | -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. | Melanie | 2010-03-31 | 1 | -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 warnings | Justin Clark-Casey (justincc) | 2010-03-03 | 1 | -14/+4 |
| | | |||||
| * | Merge branch 'master' into presence-refactor | Melanie | 2010-02-22 | 1 | -1/+0 |
| |\ | | | | | | | This brings presence-refactor up to master again | ||||
| | * | Change handling of the SYSTEMIP constant to be more sane. | Melanie | 2010-02-18 | 1 | -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 ↵ | Melanie | 2010-02-18 | 1 | -4/+4 |
| | | | | | | | | | | | | | command prompt" after speaking to Dahlia This reverts commit c62a6adb2b234fcbe99e352f4bd2af0cbf683a99. | ||||
| | * | change "SYSTEMIP" to "localhost" in the create region console command prompt | dahlia | 2010-02-17 | 1 | -4/+4 |
| | | | |||||
| * | | Remove all references to master avatar, replacing with estate owner where | Melanie | 2010-01-10 | 1 | -96/+0 |
| |/ | | | | | appropriate. This changes the behavior of the REST plugins and RemoteAdmin's region creation process. | ||||
| * | Getting rid of SimpleRegionInfo and SerializableRegionInfo per Mel | Kunnis | 2009-12-12 | 1 | -263/+147 |
| | | | | | Signed-off-by: Melanie <melanie@t-data.com> | ||||
| * | Merged master into prioritization | John Hurliman | 2009-10-21 | 1 | -2/+3 |
| |\ | |||||
| | * | Fix web map retrieval for regions configured via .ini | Melanie | 2009-10-21 | 1 | -2/+3 |
| | | | |||||
| * | | Added a description for RegionType | John Hurliman | 2009-10-17 | 1 | -1/+1 |
| |/ | |||||
| * | Re-rename ProductName back to it's original RegionType | Melanie | 2009-10-17 | 1 | -16/+16 |
| | | |||||
| * | Add ProductName to RegionInfo (for search) | Melanie | 2009-10-17 | 1 | -1/+23 |
| | | |||||
| * | Formatting cleanup. | Jeff Ames | 2009-10-01 | 1 | -1/+1 |
| | | |||||
| * | Added hg console commands to the module. | Diva Canto | 2009-09-22 | 1 | -0/+1 |
| | | | | | | Added the IN connector module for link-region and corresponding handler to be used in the regions only. No service as such is needed. This will replace the current link-region machinery. Compiles but not tested. | ||||
| * | Moved RegionName from RegionInfo to SimpleRegionInfo. | Diva Canto | 2009-09-22 | 1 | -1/+7 |
| | | |||||
| * | Added grid handler and grid remote connector. | Diva Canto | 2009-09-21 | 1 | -0/+62 |
| | | |||||
| * | Added some help instructions to the new RegionInfo region setup process; ↵ | Adam Frisby | 2009-08-10 | 1 | -0/+6 |
| | | | | | mainly to point out 'yes you can input information here.' since it seems to elude some users. | ||||
 |
index : opensim-SC | |
| My fork of OpenSim for IG and DG, called SledjChisl. |
| aboutsummaryrefslogtreecommitdiffstatshomepage |