diff options
Diffstat (limited to '')
-rw-r--r-- | OpenSim/Framework/General/Types/AgentCiruitData.cs (renamed from Common/OpenSim.Framework/Types/AgentCiruitData.cs) | 0 | ||||
-rw-r--r-- | OpenSim/Framework/General/Types/AgentWearable.cs (renamed from Common/OpenSim.Framework/Types/AgentWearable.cs) | 0 | ||||
-rw-r--r-- | OpenSim/Framework/General/Types/AssetBase.cs (renamed from Common/OpenSim.Framework/Types/AssetBase.cs) | 0 | ||||
-rw-r--r-- | OpenSim/Framework/General/Types/AssetLandmark.cs (renamed from Common/OpenSim.Framework/Types/AssetLandmark.cs) | 0 | ||||
-rw-r--r-- | OpenSim/Framework/General/Types/AssetStorage.cs (renamed from Common/OpenSim.Framework/Types/AssetStorage.cs) | 0 | ||||
-rw-r--r-- | OpenSim/Framework/General/Types/EstateSettings.cs (renamed from Common/OpenSim.Framework/Types/EstateSettings.cs) | 0 | ||||
-rw-r--r-- | OpenSim/Framework/General/Types/Login.cs (renamed from Common/OpenSim.Framework/Types/Login.cs) | 0 | ||||
-rw-r--r-- | OpenSim/Framework/General/Types/MapBlockData.cs (renamed from Common/OpenSim.Framework/Types/MapBlockData.cs) | 0 | ||||
-rw-r--r-- | OpenSim/Framework/General/Types/NeighbourInfo.cs (renamed from Common/OpenSim.Framework/Types/NeighbourInfo.cs) | 0 | ||||
-rw-r--r-- | OpenSim/Framework/General/Types/NetworkServersInfo.cs (renamed from Common/OpenSim.Framework/Types/NetworkServersInfo.cs) | 39 | ||||
-rw-r--r-- | OpenSim/Framework/General/Types/ParcelData.cs (renamed from Common/OpenSim.Framework/Types/ParcelData.cs) | 0 | ||||
-rw-r--r-- | OpenSim/Framework/General/Types/PrimData.cs (renamed from Common/OpenSim.Framework/Types/PrimData.cs) | 0 | ||||
-rw-r--r-- | OpenSim/Framework/General/Types/RegionHandle.cs (renamed from Common/OpenSim.Framework/Types/RegionHandle.cs) | 0 | ||||
-rw-r--r-- | OpenSim/Framework/General/Types/RegionInfo.cs (renamed from Common/OpenSim.Framework/Types/RegionInfo.cs) | 4 |
14 files changed, 41 insertions, 2 deletions
diff --git a/Common/OpenSim.Framework/Types/AgentCiruitData.cs b/OpenSim/Framework/General/Types/AgentCiruitData.cs index a650343..a650343 100644 --- a/Common/OpenSim.Framework/Types/AgentCiruitData.cs +++ b/OpenSim/Framework/General/Types/AgentCiruitData.cs | |||
diff --git a/Common/OpenSim.Framework/Types/AgentWearable.cs b/OpenSim/Framework/General/Types/AgentWearable.cs index 4c93da7..4c93da7 100644 --- a/Common/OpenSim.Framework/Types/AgentWearable.cs +++ b/OpenSim/Framework/General/Types/AgentWearable.cs | |||
diff --git a/Common/OpenSim.Framework/Types/AssetBase.cs b/OpenSim/Framework/General/Types/AssetBase.cs index 86586a6..86586a6 100644 --- a/Common/OpenSim.Framework/Types/AssetBase.cs +++ b/OpenSim/Framework/General/Types/AssetBase.cs | |||
diff --git a/Common/OpenSim.Framework/Types/AssetLandmark.cs b/OpenSim/Framework/General/Types/AssetLandmark.cs index 8a10b70..8a10b70 100644 --- a/Common/OpenSim.Framework/Types/AssetLandmark.cs +++ b/OpenSim/Framework/General/Types/AssetLandmark.cs | |||
diff --git a/Common/OpenSim.Framework/Types/AssetStorage.cs b/OpenSim/Framework/General/Types/AssetStorage.cs index 8cac23a..8cac23a 100644 --- a/Common/OpenSim.Framework/Types/AssetStorage.cs +++ b/OpenSim/Framework/General/Types/AssetStorage.cs | |||
diff --git a/Common/OpenSim.Framework/Types/EstateSettings.cs b/OpenSim/Framework/General/Types/EstateSettings.cs index 778c893..778c893 100644 --- a/Common/OpenSim.Framework/Types/EstateSettings.cs +++ b/OpenSim/Framework/General/Types/EstateSettings.cs | |||
diff --git a/Common/OpenSim.Framework/Types/Login.cs b/OpenSim/Framework/General/Types/Login.cs index 3180a16..3180a16 100644 --- a/Common/OpenSim.Framework/Types/Login.cs +++ b/OpenSim/Framework/General/Types/Login.cs | |||
diff --git a/Common/OpenSim.Framework/Types/MapBlockData.cs b/OpenSim/Framework/General/Types/MapBlockData.cs index 2e6f56e..2e6f56e 100644 --- a/Common/OpenSim.Framework/Types/MapBlockData.cs +++ b/OpenSim/Framework/General/Types/MapBlockData.cs | |||
diff --git a/Common/OpenSim.Framework/Types/NeighbourInfo.cs b/OpenSim/Framework/General/Types/NeighbourInfo.cs index 310fd1c..310fd1c 100644 --- a/Common/OpenSim.Framework/Types/NeighbourInfo.cs +++ b/OpenSim/Framework/General/Types/NeighbourInfo.cs | |||
diff --git a/Common/OpenSim.Framework/Types/NetworkServersInfo.cs b/OpenSim/Framework/General/Types/NetworkServersInfo.cs index 73d7811..c6b81a7 100644 --- a/Common/OpenSim.Framework/Types/NetworkServersInfo.cs +++ b/OpenSim/Framework/General/Types/NetworkServersInfo.cs | |||
@@ -156,6 +156,45 @@ namespace OpenSim.Framework.Types | |||
156 | this.GridRecvKey = attri; | 156 | this.GridRecvKey = attri; |
157 | } | 157 | } |
158 | 158 | ||
159 | //Grid Server | ||
160 | attri = ""; | ||
161 | attri = configData.GetAttribute("UserServerURL"); | ||
162 | if (attri == "") | ||
163 | { | ||
164 | this.UserURL= OpenSim.Framework.Console.MainLog.Instance.CmdPrompt("User server URL", "http://127.0.0.1:8002/"); | ||
165 | configData.SetAttribute("UserServerURL", this.UserURL); | ||
166 | } | ||
167 | else | ||
168 | { | ||
169 | this.UserURL = attri; | ||
170 | } | ||
171 | |||
172 | //Grid Send Key | ||
173 | attri = ""; | ||
174 | attri = configData.GetAttribute("UserSendKey"); | ||
175 | if (attri == "") | ||
176 | { | ||
177 | this.UserSendKey = OpenSim.Framework.Console.MainLog.Instance.CmdPrompt("Key to send to user server", "null"); | ||
178 | configData.SetAttribute("UserSendKey", this.UserSendKey); | ||
179 | } | ||
180 | else | ||
181 | { | ||
182 | this.UserSendKey = attri; | ||
183 | } | ||
184 | |||
185 | //Grid Receive Key | ||
186 | attri = ""; | ||
187 | attri = configData.GetAttribute("UserRecvKey"); | ||
188 | if (attri == "") | ||
189 | { | ||
190 | this.UserRecvKey = OpenSim.Framework.Console.MainLog.Instance.CmdPrompt("Key to expect from user server", "null"); | ||
191 | configData.SetAttribute("GridRecvKey", this.UserRecvKey); | ||
192 | } | ||
193 | else | ||
194 | { | ||
195 | this.UserRecvKey = attri; | ||
196 | } | ||
197 | |||
159 | attri = ""; | 198 | attri = ""; |
160 | attri = configData.GetAttribute("AssetServerURL"); | 199 | attri = configData.GetAttribute("AssetServerURL"); |
161 | if (attri == "") | 200 | if (attri == "") |
diff --git a/Common/OpenSim.Framework/Types/ParcelData.cs b/OpenSim/Framework/General/Types/ParcelData.cs index 40f128a..40f128a 100644 --- a/Common/OpenSim.Framework/Types/ParcelData.cs +++ b/OpenSim/Framework/General/Types/ParcelData.cs | |||
diff --git a/Common/OpenSim.Framework/Types/PrimData.cs b/OpenSim/Framework/General/Types/PrimData.cs index f84ae3e..f84ae3e 100644 --- a/Common/OpenSim.Framework/Types/PrimData.cs +++ b/OpenSim/Framework/General/Types/PrimData.cs | |||
diff --git a/Common/OpenSim.Framework/Types/RegionHandle.cs b/OpenSim/Framework/General/Types/RegionHandle.cs index 1271d04..1271d04 100644 --- a/Common/OpenSim.Framework/Types/RegionHandle.cs +++ b/OpenSim/Framework/General/Types/RegionHandle.cs | |||
diff --git a/Common/OpenSim.Framework/Types/RegionInfo.cs b/OpenSim/Framework/General/Types/RegionInfo.cs index 48e6922..0fba6ca 100644 --- a/Common/OpenSim.Framework/Types/RegionInfo.cs +++ b/OpenSim/Framework/General/Types/RegionInfo.cs | |||
@@ -110,7 +110,7 @@ namespace OpenSim.Framework.Types | |||
110 | attri = configData.GetAttribute("SimLocationX"); | 110 | attri = configData.GetAttribute("SimLocationX"); |
111 | if (attri == "") | 111 | if (attri == "") |
112 | { | 112 | { |
113 | string location = OpenSim.Framework.Console.MainLog.Instance.CmdPrompt("Grid Location X", "997"); | 113 | string location = OpenSim.Framework.Console.MainLog.Instance.CmdPrompt("Grid Location X", "1000"); |
114 | configData.SetAttribute("SimLocationX", location); | 114 | configData.SetAttribute("SimLocationX", location); |
115 | this.RegionLocX = (uint)Convert.ToUInt32(location); | 115 | this.RegionLocX = (uint)Convert.ToUInt32(location); |
116 | } | 116 | } |
@@ -123,7 +123,7 @@ namespace OpenSim.Framework.Types | |||
123 | attri = configData.GetAttribute("SimLocationY"); | 123 | attri = configData.GetAttribute("SimLocationY"); |
124 | if (attri == "") | 124 | if (attri == "") |
125 | { | 125 | { |
126 | string location = OpenSim.Framework.Console.MainLog.Instance.CmdPrompt("Grid Location Y", "996"); | 126 | string location = OpenSim.Framework.Console.MainLog.Instance.CmdPrompt("Grid Location Y", "1000"); |
127 | configData.SetAttribute("SimLocationY", location); | 127 | configData.SetAttribute("SimLocationY", location); |
128 | this.RegionLocY = (uint)Convert.ToUInt32(location); | 128 | this.RegionLocY = (uint)Convert.ToUInt32(location); |
129 | } | 129 | } |