ogb912/opensim
1
0
Fork 0
mirror of https://github.com/opensim/opensim.git synced 2026-07-23 00:17:17 +08:00
Code Issues Packages Projects Releases Wiki Activity
16,952 Commits 5 Branches 88 Tags
8fac7c065088d9861ba2ff772fde7f2e9c8d1003
Commit Graph

127 Commits

Author SHA1 Message Date
Melanie
705f70064e Fix merge artefact 2011-07-22 12:38:08 +01:00
Melanie
0e52010c0e Thank you, Michelle Argus, for a patch that adds reading the agent limit 
from XML properly.
 2011-07-22 12:36:49 +01:00
Melanie
b451cc1ebb Merge branch 'master' into careminster-presence-refactor 2011-05-08 20:23:06 +01:00
Diva Canto
737add1683 Removed SimpleRegionInfo, which was obsolete and not used anywhere. 2011-05-06 17:02:46 -07:00
Melanie
98fe37051a Set the attachment data on scripted rez to allow toasters to work. 2011-04-30 14:22:46 +02:00
Melanie
9bf5e94b70 Merge branch 'master' into careminster-presence-refactor 2011-04-25 23:18:32 +01:00
E. Allen Soard
44e43d9d24 Added MaxAgents configuration option to RegionConfig.ini allowing region hosters to setup regions maintaining more control over system resources. 2011-04-23 00:40:08 +01:00
Justin Clark-Casey (justincc)
88bd38690a Remove unused RegionInfo.getInternalEndPointPort() in favour of RegionInfo.InternalEndPoint.Port 2011-03-31 23:03:42 +01:00
Justin Clark-Casey (justincc)
8022400bd4 Remove unused Datastore parameter from RegionInfo (legacy from early 2008) 2011-03-31 22:16:09 +01:00
Melanie
45314c6622 Merge branch 'master' into careminster-presence-refactor 2010-12-06 02:54:51 +00:00
Jonathan Freedman
4f40374464 Merge git://github.com/opensim/opensim into mantis5110 2010-11-05 19:10:02 -07:00
Melanie
5f8ab9f018 Merge branch 'master' into careminster-presence-refactor 2010-11-03 02:34:36 +00:00
Melanie
4ab9d37a8e When LightShare is enabled, the standard day cycle is bypassed and replaced by 
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.
 2010-11-03 02:04:17 +00:00
Melanie
7f74dc1b14 Merge branch 'master' into careminster-presence-refactor 2010-10-23 00:21:42 +01:00
Justin Clark-Casey (justincc)
fe8d3d5a2b Revert "Merge remote branch 'otakup0pe/mantis5110'" 
This reverts commit 21187f459e, reversing
changes made to 8f34e46d74.
 2010-10-22 23:52:07 +01:00
Melanie
fc33d569cd Merge branch 'master' into careminster-presence-refactor 2010-10-21 07:33:01 +01:00
Jonathan Freedman
58f75fa19d * more url / hg cleanup 2010-10-20 22:21:45 -04:00
Jonathan Freedman
55974df14b * refactor refactor refactor ServerURI 4 lyfe 2010-10-20 22:21:23 -04:00
Jonathan Freedman
a2167b0f0d * more url / hg cleanup 2010-10-11 16:53:00 -04:00
Jonathan Freedman
32ccc7a9d9 * refactor refactor refactor ServerURI 4 lyfe 2010-10-02 19:17:02 -04:00
Melanie
6a1ce17cdb Merge branch 'master' into careminster-presence-refactor 
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.
 2010-09-13 16:17:38 +01:00
Jeff Ames
f1f0bc23f4 Formatting cleanup. 2010-09-12 13:43:49 -04:00
Melanie
e4c2b44e5c Merge branch 'master' into careminster-presence-refactor 2010-09-05 15:06:00 +01:00
Justin Clark-Casey (justincc)
b8da15c104 In RemoveAdminPlugin, use a .ini file template in XmlRpcCreateRegionMethod rather than an older XML one 
This is a patch from http://opensimulator.org/mantis/view.php?id=4973.  Thanks randomhuman
 2010-09-03 22:38:40 +01:00
Melanie
f8ff98577e Merge branch 'master' into careminster-presence-refactor 2010-08-21 00:32:26 +01:00
Marck
7aad5af498 Some code cleanup for console command "create region". 
Make region name an optional command parameter.
Avoid question for region name if it has already been specified.
Extend help text.
 2010-08-20 19:35:52 +01:00
Tom Grimshaw
49272657d7 Make RegionLightShareData serializable 2010-06-26 15:30:47 -07:00
Justin Clark-Casey (justincc)
2c4df19805 minor: Move log information about SYSTEMIP to the place where it's resolved 2010-06-25 18:29:02 +01:00
Diva Canto
08ba34da03 First attempt at fixing mantis #4641. It's better but there are now some issues with permissions. 
(looks like my commit is going to touch CM files, I'm going to let it do it - eof only)
 2010-03-31 21:30:44 -07:00
Melanie
ec637e2b8c Committing the LightShare code, which was developed by TomMeta of Meta7. 
This allows scripts to set WindLight parameters for clients connecting
to a region. Currently, this is only supported by the Meta7 viewer.
 2010-03-31 04:20:20 +01:00
Justin Clark-Casey (justincc)
60fde0c83a minor: remove a couple of compiler warnings 2010-03-03 23:03:41 +00:00
Melanie
1f45e6c649 Merge branch 'master' into presence-refactor 
This brings presence-refactor up to master again
 2010-02-22 03:00:59 +00:00
Melanie
842b68eeff Change handling of the SYSTEMIP constant to be more sane. 
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.
 2010-02-18 04:19:33 +00:00
Melanie
92f8f3e9d2 Revert "change "SYSTEMIP" to "localhost" in the create region console command prompt" after speaking to Dahlia 
This reverts commit c62a6adb2b.
 2010-02-18 03:31:06 +00:00
dahlia
c62a6adb2b change "SYSTEMIP" to "localhost" in the create region console command prompt 2010-02-17 19:56:30 -08:00
Melanie
3c90d834ea Remove all references to master avatar, replacing with estate owner where 
appropriate. This changes the behavior of the REST plugins and RemoteAdmin's
region creation process.
 2010-01-10 22:41:42 +00:00
Kunnis
d89f3e9811 Getting rid of SimpleRegionInfo and SerializableRegionInfo per Mel 
Signed-off-by: Melanie <melanie@t-data.com>
 2009-12-12 04:44:32 +00:00
John Hurliman
2b39ff0a39 Merged master into prioritization 2009-10-21 16:24:17 -07:00
Melanie
93b24b5207 Fix web map retrieval for regions configured via .ini 2009-10-21 03:44:40 +01:00
John Hurliman
3a63de8d02 Added a description for RegionType 2009-10-17 15:55:30 -07:00
Melanie
a95741cdd6 Re-rename ProductName back to it's original RegionType 2009-10-17 14:33:46 +01:00
Melanie
72b96bcd84 Add ProductName to RegionInfo (for search) 2009-10-17 13:36:45 +01:00
Jeff Ames
ee205e7e81 Formatting cleanup. 2009-10-01 01:17:47 +09:00
Diva Canto
882d2c9cc3 Added hg console commands to the module. 
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.
 2009-09-22 20:25:00 -07:00
Diva Canto
ffd30b8ac3 Moved RegionName from RegionInfo to SimpleRegionInfo. 2009-09-22 14:46:05 -07:00
Diva Canto
390137d540 Added grid handler and grid remote connector. 2009-09-21 11:05:01 -07:00
Adam Frisby
ad016ba87c Added some help instructions to the new RegionInfo region setup process; mainly to point out 'yes you can input information here.' since it seems to elude some users. 2009-08-10 19:06:09 +10:00
Melanie
dd03ad86c5 Change the default for internal IP address back to 0.0.0.0 2009-08-08 01:42:50 +01:00
Justin Clarke Casey
5815162d7e minor: remove some mono compiler warnings 2009-07-15 20:49:58 +00:00
Dr Scofield
840f5f9485 - adding a Persistent flag to RegionInfo 
- adding  EstateSettings.Save() to RemoteAdmin ACL code (invoked only when region is persistent)
 2009-07-03 15:36:47 +00:00