diff options
author | mingchen | 2007-06-29 01:58:16 +0000 |
---|---|---|
committer | mingchen | 2007-06-29 01:58:16 +0000 |
commit | 90b01ba80ccaa69bf7cf76be6ce0a6ca05717d6c (patch) | |
tree | 7428eccc93a3f64f46e08d7269bc337f3d26d8a8 /OpenSim/Framework/General | |
parent | * Removed J# language support because it has issues with Mono. (diff) | |
download | opensim-SC-90b01ba80ccaa69bf7cf76be6ce0a6ca05717d6c.zip opensim-SC-90b01ba80ccaa69bf7cf76be6ce0a6ca05717d6c.tar.gz opensim-SC-90b01ba80ccaa69bf7cf76be6ce0a6ca05717d6c.tar.bz2 opensim-SC-90b01ba80ccaa69bf7cf76be6ce0a6ca05717d6c.tar.xz |
*Hopefully fixed the empty dialog box error on client when logging in on sandbox mode
Diffstat (limited to 'OpenSim/Framework/General')
-rw-r--r-- | OpenSim/Framework/General/RegionCommsListener.cs | 1 | ||||
-rw-r--r-- | OpenSim/Framework/General/Types/RegionInfo.cs | 4 | ||||
-rw-r--r-- | OpenSim/Framework/General/UserProfile.cs | 2 |
3 files changed, 4 insertions, 3 deletions
diff --git a/OpenSim/Framework/General/RegionCommsListener.cs b/OpenSim/Framework/General/RegionCommsListener.cs index bba928f..5fa2f58 100644 --- a/OpenSim/Framework/General/RegionCommsListener.cs +++ b/OpenSim/Framework/General/RegionCommsListener.cs | |||
@@ -49,6 +49,7 @@ namespace OpenSim.Framework | |||
49 | { | 49 | { |
50 | if(OnExpectUser != null) | 50 | if(OnExpectUser != null) |
51 | { | 51 | { |
52 | |||
52 | OnExpectUser(regionHandle, agent); | 53 | OnExpectUser(regionHandle, agent); |
53 | return true; | 54 | return true; |
54 | } | 55 | } |
diff --git a/OpenSim/Framework/General/Types/RegionInfo.cs b/OpenSim/Framework/General/Types/RegionInfo.cs index 48e6922..0fba6ca 100644 --- a/OpenSim/Framework/General/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 | } |
diff --git a/OpenSim/Framework/General/UserProfile.cs b/OpenSim/Framework/General/UserProfile.cs index 04ff20b..263dba2 100644 --- a/OpenSim/Framework/General/UserProfile.cs +++ b/OpenSim/Framework/General/UserProfile.cs | |||
@@ -59,7 +59,7 @@ namespace OpenSim.Framework.User | |||
59 | { | 59 | { |
60 | Circuits = new Dictionary<LLUUID, uint>(); | 60 | Circuits = new Dictionary<LLUUID, uint>(); |
61 | Inventory = new AgentInventory(); | 61 | Inventory = new AgentInventory(); |
62 | homeregionhandle = Helpers.UIntsToLong((997 * 256), (996 * 256)); | 62 | homeregionhandle = Helpers.UIntsToLong((1000 * 256), (1000 * 256)); |
63 | homepos = new LLVector3(); | 63 | homepos = new LLVector3(); |
64 | homelookat = new LLVector3(); | 64 | homelookat = new LLVector3(); |
65 | } | 65 | } |