diff options
author | Dan Lake | 2011-07-20 15:01:32 -0700 |
---|---|---|
committer | Dan Lake | 2011-07-20 15:01:32 -0700 |
commit | 2c11f7fc38ba14e041ed0e648088d574dadaaffe (patch) | |
tree | d593e3d1130e78ec74a11650d413f451a9a844da /bin | |
parent | Merge branch 'master' into bulletsim (diff) | |
parent | Removed unused AddPrimShape methods in PhysicsScene caused by merge conflicts (diff) | |
download | opensim-SC_OLD-2c11f7fc38ba14e041ed0e648088d574dadaaffe.zip opensim-SC_OLD-2c11f7fc38ba14e041ed0e648088d574dadaaffe.tar.gz opensim-SC_OLD-2c11f7fc38ba14e041ed0e648088d574dadaaffe.tar.bz2 opensim-SC_OLD-2c11f7fc38ba14e041ed0e648088d574dadaaffe.tar.xz |
Merge branch 'master' into bulletsim
Diffstat (limited to 'bin')
-rw-r--r-- | bin/config-include/GridCommon.ini.example | 36 |
1 files changed, 18 insertions, 18 deletions
diff --git a/bin/config-include/GridCommon.ini.example b/bin/config-include/GridCommon.ini.example index 4eb6fcf..4e34059 100644 --- a/bin/config-include/GridCommon.ini.example +++ b/bin/config-include/GridCommon.ini.example | |||
@@ -28,19 +28,19 @@ | |||
28 | AssetLoaderArgs = "assets/AssetSets.xml" | 28 | AssetLoaderArgs = "assets/AssetSets.xml" |
29 | 29 | ||
30 | ; | 30 | ; |
31 | ; change this to your grid-wide asset server | 31 | ; Change this to your grid-wide asset server. Do not add a slash to the end of any of these addresses. |
32 | ; | 32 | ; |
33 | AssetServerURI = "http://myassetserver.com:8003" | 33 | AssetServerURI = "http://myassetserver.com:8003" |
34 | 34 | ||
35 | [InventoryService] | 35 | [InventoryService] |
36 | ; | 36 | ; |
37 | ; change this to your grid-wide inventory server | 37 | ; Change this to your grid-wide inventory server |
38 | ; | 38 | ; |
39 | InventoryServerURI = "http://myinventoryserver.com:8003" | 39 | InventoryServerURI = "http://myinventoryserver.com:8003" |
40 | 40 | ||
41 | [GridService] | 41 | [GridService] |
42 | ; | 42 | ; |
43 | ; change this to your grid-wide grid server | 43 | ; Change this to your grid-wide grid server |
44 | ; | 44 | ; |
45 | GridServerURI = "http://mygridserver.com:8003" | 45 | GridServerURI = "http://mygridserver.com:8003" |
46 | ;AllowHypergridMapSearch = true | 46 | ;AllowHypergridMapSearch = true |
@@ -49,51 +49,51 @@ | |||
49 | ; MapTileDirectory = "./maptiles" | 49 | ; MapTileDirectory = "./maptiles" |
50 | 50 | ||
51 | ; === HG ONLY === | 51 | ; === HG ONLY === |
52 | ;; change this to the address of your Gatekeeper service | 52 | ;; Change this to the address of your Gatekeeper service |
53 | ;; (usually bundled with the rest of the services in one | 53 | ;; (usually bundled with the rest of the services in one |
54 | ;; Robust server in port 8002, but not always) | 54 | ;; Robust server in port 8002, but not always) |
55 | Gatekeeper="http://mygridserver.com:8002" | 55 | Gatekeeper="http://mygridserver.com:8002" |
56 | 56 | ||
57 | [Messaging] | 57 | [Messaging] |
58 | ; === HG ONLY === | 58 | ; === HG ONLY === |
59 | ;; change this to the address of your Gatekeeper service | 59 | ;; Change this to the address of your Gatekeeper service |
60 | ;; (usually bundled with the rest of the services in one | 60 | ;; (usually bundled with the rest of the services in one |
61 | ;; Robust server in port 8002, but not always) | 61 | ;; Robust server in port 8002, but not always) |
62 | Gatekeeper = "http://mygridserver.com:8002" | 62 | Gatekeeper = "http://mygridserver.com:8002" |
63 | 63 | ||
64 | [AvatarService] | 64 | [AvatarService] |
65 | ; | 65 | ; |
66 | ; change this to your grid-wide grid server | 66 | ; Change this to your grid-wide grid server |
67 | ; | 67 | ; |
68 | AvatarServerURI = "http://mygridserver.com:8003" | 68 | AvatarServerURI = "http://mygridserver.com:8003" |
69 | 69 | ||
70 | [PresenceService] | 70 | [PresenceService] |
71 | ; | 71 | ; |
72 | ; change this to your grid-wide presence server | 72 | ; Change this to your grid-wide presence server |
73 | ; | 73 | ; |
74 | PresenceServerURI = "http://mygridserver.com:8003" | 74 | PresenceServerURI = "http://mygridserver.com:8003" |
75 | 75 | ||
76 | [UserAccountService] | 76 | [UserAccountService] |
77 | ; | 77 | ; |
78 | ; change this to your grid-wide user accounts server | 78 | ; Change this to your grid-wide user accounts server |
79 | ; | 79 | ; |
80 | UserAccountServerURI = "http://mygridserver.com:8003" | 80 | UserAccountServerURI = "http://mygridserver.com:8003" |
81 | 81 | ||
82 | [GridUserService] | 82 | [GridUserService] |
83 | ; | 83 | ; |
84 | ; change this to your grid-wide user accounts server | 84 | ; Change this to your grid-wide user accounts server |
85 | ; | 85 | ; |
86 | GridUserServerURI = "http://mygridserver.com:8003" | 86 | GridUserServerURI = "http://mygridserver.com:8003" |
87 | 87 | ||
88 | [AuthenticationService] | 88 | [AuthenticationService] |
89 | ; | 89 | ; |
90 | ; change this to your grid-wide authentication server | 90 | ; Change this to your grid-wide authentication server |
91 | ; | 91 | ; |
92 | AuthenticationServerURI = "http://mygridserver.com:8003" | 92 | AuthenticationServerURI = "http://mygridserver.com:8003" |
93 | 93 | ||
94 | [FriendsService] | 94 | [FriendsService] |
95 | ; | 95 | ; |
96 | ; change this to your grid-wide friends server | 96 | ; Change this to your grid-wide friends server |
97 | ; | 97 | ; |
98 | FriendsServerURI = "http://mygridserver.com:8003" | 98 | FriendsServerURI = "http://mygridserver.com:8003" |
99 | 99 | ||
@@ -104,10 +104,10 @@ | |||
104 | ; accessible from other grids | 104 | ; accessible from other grids |
105 | ; | 105 | ; |
106 | ProfileServerURI = "http://mygridserver.com:8002/user" | 106 | ProfileServerURI = "http://mygridserver.com:8002/user" |
107 | Gatekeeper = "http://mygridserver.com:8002" | 107 | Gatekeeper = "http://mygridserver.com:8002" |
108 | ;; If you want to protect your assets from being copied by foreign visitors | 108 | ;; If you want to protect your assets from being copied by foreign visitors |
109 | ;; uncomment the next line. You may want to do this on sims that have licensed content. | 109 | ;; uncomment the next line. You may want to do this on sims that have licensed content. |
110 | ; OutboundPermission = False | 110 | ; OutboundPermission = False |
111 | 111 | ||
112 | [UserAgentService] | 112 | [UserAgentService] |
113 | ; | 113 | ; |