aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/Common/OpenSim.Framework
diff options
context:
space:
mode:
Diffstat (limited to 'Common/OpenSim.Framework')
-rw-r--r--Common/OpenSim.Framework/LLSDHelpers.cs51
-rw-r--r--Common/OpenSim.Framework/OpenSim.Framework.csproj10
-rw-r--r--Common/OpenSim.Framework/Types/NetworkServersInfo.cs14
3 files changed, 65 insertions, 10 deletions
diff --git a/Common/OpenSim.Framework/LLSDHelpers.cs b/Common/OpenSim.Framework/LLSDHelpers.cs
index 3b044a3..051520c 100644
--- a/Common/OpenSim.Framework/LLSDHelpers.cs
+++ b/Common/OpenSim.Framework/LLSDHelpers.cs
@@ -89,7 +89,23 @@ namespace OpenSim.Framework
89 System.Reflection.FieldInfo field = myType.GetField((string)enumerator.Key); 89 System.Reflection.FieldInfo field = myType.GetField((string)enumerator.Key);
90 if (field != null) 90 if (field != null)
91 { 91 {
92 field.SetValue(obj, enumerator.Value); 92 if (enumerator.Value is Hashtable)
93 {
94 object fieldValue = field.GetValue(obj);
95 DeserialiseLLSDMap((Hashtable) enumerator.Value, fieldValue);
96 }
97 else if (enumerator.Value is ArrayList)
98 {
99 object fieldValue = field.GetValue(obj);
100 fieldValue.GetType().GetField("Array").SetValue(fieldValue, enumerator.Value);
101 //TODO
102 // the LLSD map/array types in the array need to be deserialised
103 // but first we need to know the right class to deserialise them into.
104 }
105 else
106 {
107 field.SetValue(obj, enumerator.Value);
108 }
93 } 109 }
94 } 110 }
95 break; 111 break;
@@ -161,6 +177,39 @@ namespace OpenSim.Framework
161 } 177 }
162 } 178 }
163 179
180 [LLSDType("MAP")]
181 public class LLSDUploadReply
182 {
183 public string new_asset = "";
184 public LLUUID new_inventory_item = LLUUID.Zero;
185 public string state = "";
186
187 public LLSDUploadReply()
188 {
189
190 }
191 }
192
193 [LLSDType("MAP")]
194 public class LLSDCapEvent
195 {
196 public int id = 0;
197 public LLSDArray events = new LLSDArray();
198
199 public LLSDCapEvent()
200 {
201
202 }
203 }
204
205 [LLSDType("MAP")]
206 public class LLSDEmpty
207 {
208 public LLSDEmpty()
209 {
210
211 }
212 }
164 213
165 [LLSDType("MAP")] 214 [LLSDType("MAP")]
166 public class LLSDTest 215 public class LLSDTest
diff --git a/Common/OpenSim.Framework/OpenSim.Framework.csproj b/Common/OpenSim.Framework/OpenSim.Framework.csproj
index f12ffcb..ac0b195 100644
--- a/Common/OpenSim.Framework/OpenSim.Framework.csproj
+++ b/Common/OpenSim.Framework/OpenSim.Framework.csproj
@@ -126,15 +126,7 @@
126 <Compile Include="SimProfile.cs"> 126 <Compile Include="SimProfile.cs">
127 <SubType>Code</SubType> 127 <SubType>Code</SubType>
128 </Compile> 128 </Compile>
129 <Compile Include="UserProfile.cs"> 129 <Compile Include="UserProfile.cs" />
130 <SubType>Code</SubType>
131 </Compile>
132 <Compile Include="UserProfileManager.cs">
133 <SubType>Code</SubType>
134 </Compile>
135 <Compile Include="UserProfileManagerBase.cs">
136 <SubType>Code</SubType>
137 </Compile>
138 <Compile Include="Util.cs"> 130 <Compile Include="Util.cs">
139 <SubType>Code</SubType> 131 <SubType>Code</SubType>
140 </Compile> 132 </Compile>
diff --git a/Common/OpenSim.Framework/Types/NetworkServersInfo.cs b/Common/OpenSim.Framework/Types/NetworkServersInfo.cs
index 9c2e7a6..73d7811 100644
--- a/Common/OpenSim.Framework/Types/NetworkServersInfo.cs
+++ b/Common/OpenSim.Framework/Types/NetworkServersInfo.cs
@@ -49,6 +49,7 @@ namespace OpenSim.Framework.Types
49 public uint DefaultHomeLocY = 0; 49 public uint DefaultHomeLocY = 0;
50 50
51 public int HttpListenerPort = 9000; 51 public int HttpListenerPort = 9000;
52 public int RemotingListenerPort = 8895;
52 53
53 public void InitConfig(bool sandboxMode, IGenericConfig configData) 54 public void InitConfig(bool sandboxMode, IGenericConfig configData)
54 { 55 {
@@ -71,6 +72,19 @@ namespace OpenSim.Framework.Types
71 this.HttpListenerPort = Convert.ToInt32(attri); 72 this.HttpListenerPort = Convert.ToInt32(attri);
72 } 73 }
73 74
75 attri = "";
76 attri = configData.GetAttribute("RemotingListenerPort");
77 if (attri == "")
78 {
79 string location = OpenSim.Framework.Console.MainLog.Instance.CmdPrompt("Remoting Listener Port", "8895");
80 configData.SetAttribute("RemotingListenerPort", location);
81 this.RemotingListenerPort = Convert.ToInt32(location);
82 }
83 else
84 {
85 this.RemotingListenerPort = Convert.ToInt32(attri);
86 }
87
74 if (sandboxMode) 88 if (sandboxMode)
75 { 89 {
76 // default home location X 90 // default home location X