diff options
author | Diva Canto | 2013-09-05 07:44:49 -0700 |
---|---|---|
committer | Diva Canto | 2013-09-05 07:44:49 -0700 |
commit | 08874d6b9e4d99a3721c6cd0d194d147704464fb (patch) | |
tree | 1504138481e9ee9743c44773e6f4eb7dfbc81139 /bin | |
parent | Restore group membership check for HG users in QueryAccess. (diff) | |
parent | minor: add doc about DefaultHGRegion and some of the other GridService region... (diff) | |
download | opensim-SC-08874d6b9e4d99a3721c6cd0d194d147704464fb.zip opensim-SC-08874d6b9e4d99a3721c6cd0d194d147704464fb.tar.gz opensim-SC-08874d6b9e4d99a3721c6cd0d194d147704464fb.tar.bz2 opensim-SC-08874d6b9e4d99a3721c6cd0d194d147704464fb.tar.xz |
Merge branch 'master' of ssh://opensimulator.org/var/git/opensim
Diffstat (limited to 'bin')
-rw-r--r-- | bin/Robust.HG.ini.example | 17 | ||||
-rw-r--r-- | bin/Robust.ini.example | 20 | ||||
-rw-r--r-- | bin/config-include/StandaloneCommon.ini.example | 20 |
3 files changed, 52 insertions, 5 deletions
diff --git a/bin/Robust.HG.ini.example b/bin/Robust.HG.ini.example index 0fbdf4e..8fe6d0c 100644 --- a/bin/Robust.HG.ini.example +++ b/bin/Robust.HG.ini.example | |||
@@ -170,7 +170,22 @@ HGAssetServiceConnector = "HGAssetService@8002/OpenSim.Server.Handlers.dll:Asset | |||
170 | ;; The syntax is: Region_<RegionName> = "<flags>" | 170 | ;; The syntax is: Region_<RegionName> = "<flags>" |
171 | ;; or: Region_<RegionID> = "<flags>" | 171 | ;; or: Region_<RegionID> = "<flags>" |
172 | ;; where <flags> can be DefaultRegion, DefaultHGRegion, FallbackRegion, NoDirectLogin, Persistent, LockedOut, Reservation, NoMove, Authenticate | 172 | ;; where <flags> can be DefaultRegion, DefaultHGRegion, FallbackRegion, NoDirectLogin, Persistent, LockedOut, Reservation, NoMove, Authenticate |
173 | ;; For example: | 173 | ;; |
174 | ;; DefaultRegion If a local login cannot be placed in the required region (e.g. home region does not exist, avatar is not allowed entry, etc.) | ||
175 | ;; then this region becomes the destination. Only the first online default region will be used. If no DefaultHGRegion | ||
176 | ;; is specified then this will also be used as the region for hypergrid connections that require it (commonly because they have not specified | ||
177 | ;; an explicit region. | ||
178 | ;; | ||
179 | ;; DefaultHGRegion If an avatar connecting via the hypergrid does not specify a region, then they are placed here. Only the first online | ||
180 | ;; region will be used. | ||
181 | ;; | ||
182 | ;; FallbackRegion If the DefaultRegion is not available for a local login, then any FallbackRegions are tried instead. These are tried in the | ||
183 | ;; order specified. This only applies to local logins at this time, not Hypergrid connections. | ||
184 | ;; | ||
185 | ;; NoDirectLogin A hypergrid user cannot directly connect to this region. This does not apply to local logins. | ||
186 | ;; | ||
187 | ;; Persistent When the simulator is shutdown, the region is signalled as offline but left registered on the grid. | ||
188 | ;; | ||
174 | ; Region_Welcome_Area = "DefaultRegion, FallbackRegion" | 189 | ; Region_Welcome_Area = "DefaultRegion, FallbackRegion" |
175 | ; (replace spaces with underscore) | 190 | ; (replace spaces with underscore) |
176 | 191 | ||
diff --git a/bin/Robust.ini.example b/bin/Robust.ini.example index da1b43a..de6fc28 100644 --- a/bin/Robust.ini.example +++ b/bin/Robust.ini.example | |||
@@ -132,8 +132,24 @@ MapGetServiceConnector = "8002/OpenSim.Server.Handlers.dll:MapGetServiceConnecto | |||
132 | ;; Next, we can specify properties of regions, including default and fallback regions | 132 | ;; Next, we can specify properties of regions, including default and fallback regions |
133 | ;; The syntax is: Region_<RegionName> = "<flags>" | 133 | ;; The syntax is: Region_<RegionName> = "<flags>" |
134 | ;; or: Region_<RegionID> = "<flags>" | 134 | ;; or: Region_<RegionID> = "<flags>" |
135 | ;; where <flags> can be DefaultRegion, FallbackRegion, NoDirectLogin, Persistent, LockedOut,Reservation,NoMove,Authenticate | 135 | ;; where <flags> can be DefaultRegion, DefaultHGRegion, FallbackRegion, NoDirectLogin, Persistent, LockedOut, Reservation, NoMove, Authenticate |
136 | ;; For example: | 136 | ;; |
137 | ;; DefaultRegion If a local login cannot be placed in the required region (e.g. home region does not exist, avatar is not allowed entry, etc.) | ||
138 | ;; then this region becomes the destination. Only the first online default region will be used. If no DefaultHGRegion | ||
139 | ;; is specified then this will also be used as the region for hypergrid connections that require it (commonly because they have not specified | ||
140 | ;; an explicit region. | ||
141 | ;; | ||
142 | ;; DefaultHGRegion If an avatar connecting via the hypergrid does not specify a region, then they are placed here. Only the first online | ||
143 | ;; region will be used. | ||
144 | ;; | ||
145 | ;; FallbackRegion If the DefaultRegion is not available for a local login, then any FallbackRegions are tried instead. These are tried in the | ||
146 | ;; order specified. This only applies to local logins at this time, not Hypergrid connections. | ||
147 | ;; | ||
148 | ;; NoDirectLogin A hypergrid user cannot directly connect to this region. This does not apply to local logins. | ||
149 | ;; | ||
150 | ;; Persistent When the simulator is shutdown, the region is signalled as offline but left registered on the grid. | ||
151 | ;; | ||
152 | ;; Example specification: | ||
137 | ; Region_Welcome_Area = "DefaultRegion, FallbackRegion" | 153 | ; Region_Welcome_Area = "DefaultRegion, FallbackRegion" |
138 | ; (replace spaces with underscore) | 154 | ; (replace spaces with underscore) |
139 | 155 | ||
diff --git a/bin/config-include/StandaloneCommon.ini.example b/bin/config-include/StandaloneCommon.ini.example index 6b991a8..f7545d4 100644 --- a/bin/config-include/StandaloneCommon.ini.example +++ b/bin/config-include/StandaloneCommon.ini.example | |||
@@ -81,11 +81,27 @@ | |||
81 | ;; Next, we can specify properties of regions, including default and fallback regions | 81 | ;; Next, we can specify properties of regions, including default and fallback regions |
82 | ;; The syntax is: Region_<RegioName> = "<flags>" | 82 | ;; The syntax is: Region_<RegioName> = "<flags>" |
83 | ;; where <flags> can be DefaultRegion, FallbackRegion, NoDirectLogin, Persistent, LockedOut | 83 | ;; where <flags> can be DefaultRegion, FallbackRegion, NoDirectLogin, Persistent, LockedOut |
84 | ;; | ||
85 | ;; DefaultRegion If a local login cannot be placed in the required region (e.g. home region does not exist, avatar is not allowed entry, etc.) | ||
86 | ;; then this region becomes the destination. Only the first online default region will be used. If no DefaultHGRegion | ||
87 | ;; is specified then this will also be used as the region for hypergrid connections that require it (commonly because they have not specified | ||
88 | ;; an explicit region. | ||
89 | ;; | ||
90 | ;; DefaultHGRegion If an avatar connecting via the hypergrid does not specify a region, then they are placed here. Only the first online | ||
91 | ;; region will be used. | ||
92 | ;; | ||
93 | ;; FallbackRegion If the DefaultRegion is not available for a local login, then any FallbackRegions are tried instead. These are tried in the | ||
94 | ;; order specified. This only applies to local logins at this time, not Hypergrid connections. | ||
95 | ;; | ||
96 | ;; NoDirectLogin A hypergrid user cannot directly connect to this region. This does not apply to local logins. | ||
97 | ;; | ||
98 | ;; Persistent When the simulator is shutdown, the region is signalled as offline but left registered on the grid. | ||
99 | ;; | ||
84 | ;; For example: | 100 | ;; For example: |
85 | Region_Welcome_Area = "DefaultRegion, FallbackRegion" | 101 | Region_Welcome_Area = "DefaultRegion, FallbackRegion" |
86 | 102 | ||
87 | ; === HG ONLY === | 103 | ; === HG ONLY === |
88 | ;; If you have this set under [Hypergrid], no need to set it here, leave it commented | 104 | ;; If you have this set under [Hypergrid], no need to set it here, leave it commented |
89 | ; GatekeeperURI="http://127.0.0.1:9000" | 105 | ; GatekeeperURI="http://127.0.0.1:9000" |
90 | 106 | ||
91 | [LibraryModule] | 107 | [LibraryModule] |
@@ -94,7 +110,7 @@ | |||
94 | 110 | ||
95 | [LoginService] | 111 | [LoginService] |
96 | WelcomeMessage = "Welcome, Avatar!" | 112 | WelcomeMessage = "Welcome, Avatar!" |
97 | ;; If you have Gatekeeper set under [Hypergrid], no need to set it here, leave it commented | 113 | ;; If you have Gatekeeper set under [Hypergrid], no need to set it here, leave it commented |
98 | ; GatekeeperURI = "http://127.0.0.1:9000" | 114 | ; GatekeeperURI = "http://127.0.0.1:9000" |
99 | 115 | ||
100 | SRV_HomeURI = "http://127.0.0.1:9000" | 116 | SRV_HomeURI = "http://127.0.0.1:9000" |