aboutsummaryrefslogtreecommitdiffstatshomepage
diff options
context:
space:
mode:
authorMelanie2010-07-14 16:13:21 +0100
committerMelanie2010-07-14 16:13:21 +0100
commit2291daa95a262a304e5bc448d172b80887dc6227 (patch)
tree5a6b2aba142bfece7d7635a5607eb080968669e7
parentFix a permissions issue (diff)
parentCleaned up a couple of things from OpenSim.ini.example: [Friends] section has... (diff)
downloadopensim-SC_OLD-2291daa95a262a304e5bc448d172b80887dc6227.zip
opensim-SC_OLD-2291daa95a262a304e5bc448d172b80887dc6227.tar.gz
opensim-SC_OLD-2291daa95a262a304e5bc448d172b80887dc6227.tar.bz2
opensim-SC_OLD-2291daa95a262a304e5bc448d172b80887dc6227.tar.xz
Merge branch 'master' of melanie@opensimulator.org:/var/git/opensim
-rw-r--r--bin/OpenSim.ini.example12
1 files changed, 0 insertions, 12 deletions
diff --git a/bin/OpenSim.ini.example b/bin/OpenSim.ini.example
index f4d9a18..5dcc601 100644
--- a/bin/OpenSim.ini.example
+++ b/bin/OpenSim.ini.example
@@ -288,9 +288,6 @@
288 ; if not defined - default machine name is being used 288 ; if not defined - default machine name is being used
289 ; (on Windows this mean NETBIOS name - useably only inside local network) 289 ; (on Windows this mean NETBIOS name - useably only inside local network)
290 ; ExternalHostNameForLSL=127.0.0.1 290 ; ExternalHostNameForLSL=127.0.0.1
291 ; Uncomment below to enable llRemoteData/remote channels
292 ; remoteDataPort = 20800
293
294 291
295 ; What is reported as the "X-Secondlife-Shard" 292 ; What is reported as the "X-Secondlife-Shard"
296 ; Defaults to the user server url if not set 293 ; Defaults to the user server url if not set
@@ -1303,12 +1300,3 @@
1303 ;XmlRpcRouterModule = "XmlRpcRouterModule" 1300 ;XmlRpcRouterModule = "XmlRpcRouterModule"
1304 ;XmlRpcPort = 20800 1301 ;XmlRpcPort = 20800
1305 1302
1306[Friends]
1307 ; The port the friendslist interregion comms will listen on
1308 ; Defaults to the simulator's TCP port
1309 ;Port = 0
1310
1311 ; Uncomment one of the lines below. Use FriendsService for local
1312 ; operation, Connectors for remote operation
1313 ;Connector = "OpenSim.Services.FriendsService.dll"
1314 Connector = "OpenSim.Services.Connectors.dll"