diff options
author | Melanie Thielker | 2009-06-22 12:18:04 +0000 |
---|---|---|
committer | Melanie Thielker | 2009-06-22 12:18:04 +0000 |
commit | 044446821b7d1d4550e43b0351c2611026874755 (patch) | |
tree | 2043005ce27cd5519b104c0d49e53ba78632b2bb /OpenSim/Framework | |
parent | Formatting cleanup, ignore some generated files. (diff) | |
download | opensim-SC_OLD-044446821b7d1d4550e43b0351c2611026874755.zip opensim-SC_OLD-044446821b7d1d4550e43b0351c2611026874755.tar.gz opensim-SC_OLD-044446821b7d1d4550e43b0351c2611026874755.tar.bz2 opensim-SC_OLD-044446821b7d1d4550e43b0351c2611026874755.tar.xz |
Committing the meat of the user server interface and the bones of the service implementation
Diffstat (limited to 'OpenSim/Framework')
-rw-r--r-- | OpenSim/Framework/RegionInfo.cs | 10 |
1 files changed, 10 insertions, 0 deletions
diff --git a/OpenSim/Framework/RegionInfo.cs b/OpenSim/Framework/RegionInfo.cs index 7b65504..db23af9 100644 --- a/OpenSim/Framework/RegionInfo.cs +++ b/OpenSim/Framework/RegionInfo.cs | |||
@@ -71,6 +71,7 @@ namespace OpenSim.Framework | |||
71 | protected uint m_remotingPort; | 71 | protected uint m_remotingPort; |
72 | public UUID RegionID = UUID.Zero; | 72 | public UUID RegionID = UUID.Zero; |
73 | public string RemotingAddress; | 73 | public string RemotingAddress; |
74 | public UUID ScopeID = UUID.Zero; | ||
74 | 75 | ||
75 | public SimpleRegionInfo() | 76 | public SimpleRegionInfo() |
76 | { | 77 | { |
@@ -470,6 +471,9 @@ namespace OpenSim.Framework | |||
470 | 471 | ||
471 | configMember.addConfigurationOption("object_capacity", ConfigurationOption.ConfigurationTypes.TYPE_INT32, | 472 | configMember.addConfigurationOption("object_capacity", ConfigurationOption.ConfigurationTypes.TYPE_INT32, |
472 | "Max objects this sim will hold", m_objectCapacity.ToString(), true); | 473 | "Max objects this sim will hold", m_objectCapacity.ToString(), true); |
474 | |||
475 | configMember.addConfigurationOption("scope_id", ConfigurationOption.ConfigurationTypes.TYPE_UUID, | ||
476 | "Scope ID for this region", ScopeID.ToString(), true); | ||
473 | } | 477 | } |
474 | 478 | ||
475 | public void loadConfigurationOptions() | 479 | public void loadConfigurationOptions() |
@@ -530,6 +534,9 @@ namespace OpenSim.Framework | |||
530 | 534 | ||
531 | configMember.addConfigurationOption("object_capacity", ConfigurationOption.ConfigurationTypes.TYPE_INT32, | 535 | configMember.addConfigurationOption("object_capacity", ConfigurationOption.ConfigurationTypes.TYPE_INT32, |
532 | "Max objects this sim will hold", "0", true); | 536 | "Max objects this sim will hold", "0", true); |
537 | |||
538 | configMember.addConfigurationOption("scope_id", ConfigurationOption.ConfigurationTypes.TYPE_UUID, | ||
539 | "Scope ID for this region", UUID.Zero.ToString(), true); | ||
533 | } | 540 | } |
534 | 541 | ||
535 | public bool shouldMasterAvatarDetailsBeAsked(string configuration_key) | 542 | public bool shouldMasterAvatarDetailsBeAsked(string configuration_key) |
@@ -607,6 +614,9 @@ namespace OpenSim.Framework | |||
607 | case "object_capacity": | 614 | case "object_capacity": |
608 | m_objectCapacity = (int)configuration_result; | 615 | m_objectCapacity = (int)configuration_result; |
609 | break; | 616 | break; |
617 | case "scope_id": | ||
618 | ScopeID = (UUID)configuration_result; | ||
619 | break; | ||
610 | } | 620 | } |
611 | 621 | ||
612 | return true; | 622 | return true; |