aboutsummaryrefslogtreecommitdiffstatshomepage
diff options
context:
space:
mode:
authorJeff Ames2008-06-26 20:04:06 +0000
committerJeff Ames2008-06-26 20:04:06 +0000
commit56802afff4ce1585dba96ba49be02bc34a5c29e0 (patch)
tree7509e9e487d2add8d5b1ba75120e9492ca9d46d0
parent* Put extensions on all assets in an archive (diff)
downloadopensim-SC_OLD-56802afff4ce1585dba96ba49be02bc34a5c29e0.zip
opensim-SC_OLD-56802afff4ce1585dba96ba49be02bc34a5c29e0.tar.gz
opensim-SC_OLD-56802afff4ce1585dba96ba49be02bc34a5c29e0.tar.bz2
opensim-SC_OLD-56802afff4ce1585dba96ba49be02bc34a5c29e0.tar.xz
Update svn properties. Minor formatting cleanup.
Diffstat
-rw-r--r--OpenSim/Framework/IClientAPI.cs7
-rw-r--r--OpenSim/Framework/UndoStack.cs6
-rw-r--r--OpenSim/Region/Environment/Scenes/ScenePresence.cs3
-rw-r--r--bin/OpenSim.Example.xml94
4 files changed, 51 insertions, 59 deletions
diff --git a/OpenSim/Framework/IClientAPI.cs b/OpenSim/Framework/IClientAPI.cs
index 8eb82b2..5b0726b 100644
--- a/OpenSim/Framework/IClientAPI.cs
+++ b/OpenSim/Framework/IClientAPI.cs
@@ -37,11 +37,9 @@ namespace OpenSim.Framework
37 public interface IEventArgs 37 public interface IEventArgs
38 { 38 {
39 IScene Scene { get; set; } 39 IScene Scene { get; set; }
40
41 IClientAPI Sender { get; set; } 40 IClientAPI Sender { get; set; }
42 } 41 }
43 42
44
45 public delegate void ViewerEffectEventHandler(IClientAPI sender, List<ViewerEffectEventHandlerArg> args); 43 public delegate void ViewerEffectEventHandler(IClientAPI sender, List<ViewerEffectEventHandlerArg> args);
46 44
47 public delegate void ChatFromViewer(Object sender, ChatFromViewerArgs e); 45 public delegate void ChatFromViewer(Object sender, ChatFromViewerArgs e);
@@ -281,6 +279,7 @@ namespace OpenSim.Framework
281 public LLVector3 UserLocation; 279 public LLVector3 UserLocation;
282 public LLVector3 UserLookAt; 280 public LLVector3 UserLookAt;
283 } 281 }
282
284 public class RegionHandshakeArgs : EventArgs 283 public class RegionHandshakeArgs : EventArgs
285 { 284 {
286 public bool isEstateManager; 285 public bool isEstateManager;
@@ -358,6 +357,7 @@ namespace OpenSim.Framework
358 public int SourceType; 357 public int SourceType;
359 public LLUUID TransferID; 358 public LLUUID TransferID;
360 } 359 }
360
361 public class AgentUpdateArgs : EventArgs 361 public class AgentUpdateArgs : EventArgs
362 { 362 {
363 public LLUUID AgentID; 363 public LLUUID AgentID;
@@ -644,7 +644,6 @@ namespace OpenSim.Framework
644 public delegate void EstateTeleportOneUserHomeRequest(IClientAPI remoteClient, LLUUID invoice, LLUUID senderID, LLUUID prey); 644 public delegate void EstateTeleportOneUserHomeRequest(IClientAPI remoteClient, LLUUID invoice, LLUUID senderID, LLUUID prey);
645 public delegate void ScriptReset(IClientAPI remoteClient, LLUUID objectID, LLUUID itemID); 645 public delegate void ScriptReset(IClientAPI remoteClient, LLUUID objectID, LLUUID itemID);
646 646
647
648 public interface IClientAPI 647 public interface IClientAPI
649 { 648 {
650 LLVector3 StartPos { get; set; } 649 LLVector3 StartPos { get; set; }
@@ -681,8 +680,6 @@ namespace OpenSim.Framework
681 set; 680 set;
682 } 681 }
683 682
684
685
686 [Obsolete("LLClientView Specific - Circuits are unique to LLClientView")] 683 [Obsolete("LLClientView Specific - Circuits are unique to LLClientView")]
687 uint CircuitCode { get; } 684 uint CircuitCode { get; }
688 [Obsolete("LLClientView Specific - Replace with more bare-bones arguments.")] 685 [Obsolete("LLClientView Specific - Replace with more bare-bones arguments.")]
diff --git a/OpenSim/Framework/UndoStack.cs b/OpenSim/Framework/UndoStack.cs
index a49a0cc..1fbe083 100644
--- a/OpenSim/Framework/UndoStack.cs
+++ b/OpenSim/Framework/UndoStack.cs
@@ -50,7 +50,6 @@ namespace OpenSim.Framework
50 get { return m_new == m_old; } 50 get { return m_new == m_old; }
51 } 51 }
52 52
53
54 public int Capacity 53 public int Capacity
55 { 54 {
56 get { return m_Undos.Length - 1; } 55 get { return m_Undos.Length - 1; }
@@ -67,7 +66,6 @@ namespace OpenSim.Framework
67 } 66 }
68 } 67 }
69 68
70
71 public void Push(T item) 69 public void Push(T item)
72 { 70 {
73 if (IsFull) 71 if (IsFull)
@@ -95,13 +93,11 @@ namespace OpenSim.Framework
95 throw new InvalidOperationException("Cannot pop from emtpy stack"); 93 throw new InvalidOperationException("Cannot pop from emtpy stack");
96 } 94 }
97 95
98
99 public T Peek() 96 public T Peek()
100 { 97 {
101 return m_Undos[m_new]; 98 return m_Undos[m_new];
102 } 99 }
103 100
104
105 public void Clear() 101 public void Clear()
106 { 102 {
107 if (Count > 0) 103 if (Count > 0)
@@ -115,4 +111,4 @@ namespace OpenSim.Framework
115 } 111 }
116 } 112 }
117 } 113 }
118} \ No newline at end of file 114}
diff --git a/OpenSim/Region/Environment/Scenes/ScenePresence.cs b/OpenSim/Region/Environment/Scenes/ScenePresence.cs
index b6c59e3..7ba096b 100644
--- a/OpenSim/Region/Environment/Scenes/ScenePresence.cs
+++ b/OpenSim/Region/Environment/Scenes/ScenePresence.cs
@@ -164,7 +164,6 @@ namespace OpenSim.Region.Environment.Scenes
164 //neighbouring regions we have enabled a child agent in 164 //neighbouring regions we have enabled a child agent in
165 private readonly List<ulong> m_knownChildRegions = new List<ulong>(); 165 private readonly List<ulong> m_knownChildRegions = new List<ulong>();
166 166
167
168 /// <summary> 167 /// <summary>
169 /// Implemented Control Flags 168 /// Implemented Control Flags
170 /// </summary> 169 /// </summary>
@@ -214,12 +213,12 @@ namespace OpenSim.Region.Environment.Scenes
214 return false; 213 return false;
215 } 214 }
216 215
217
218 public bool Updated 216 public bool Updated
219 { 217 {
220 set { m_updateflag = value; } 218 set { m_updateflag = value; }
221 get { return m_updateflag; } 219 get { return m_updateflag; }
222 } 220 }
221
223 public bool Invulnerable 222 public bool Invulnerable
224 { 223 {
225 set { m_invulnerable = value; } 224 set { m_invulnerable = value; }
diff --git a/bin/OpenSim.Example.xml b/bin/OpenSim.Example.xml
index 97abde9..12133e6 100644
--- a/bin/OpenSim.Example.xml
+++ b/bin/OpenSim.Example.xml
@@ -1,48 +1,48 @@
1<Nini> 1<Nini>
2 <Section Name="Startup"> 2 <Section Name="Startup">
3 <Key Name="gridmode" Value="False" /> 3 <Key Name="gridmode" Value="False" />
4 <Key Name="physics" Value="basicphysics" /> 4 <Key Name="physics" Value="basicphysics" />
5 <Key Name="physical_prim" Value="True" /> 5 <Key Name="physical_prim" Value="True" />
6 <Key Name="see_into_this_sim_from_neighbor" Value="True" /> 6 <Key Name="see_into_this_sim_from_neighbor" Value="True" />
7 <Key Name="serverside_object_permissions" Value="False" /> 7 <Key Name="serverside_object_permissions" Value="False" />
8 <Key Name="storage_plugin" Value="OpenSim.Data.SQLite.dll" /> 8 <Key Name="storage_plugin" Value="OpenSim.Data.SQLite.dll" />
9 <Key Name="storage_connection_string" Value="URI=file:OpenSim.db,version=3" /> 9 <Key Name="storage_connection_string" Value="URI=file:OpenSim.db,version=3" />
10 <Key Name="storage_prim_inventories" Value="True" /> 10 <Key Name="storage_prim_inventories" Value="True" />
11 <Key Name="startup_console_commands_file" Value="" /> 11 <Key Name="startup_console_commands_file" Value="" />
12 <Key Name="shutdown_console_commands_file" Value="" /> 12 <Key Name="shutdown_console_commands_file" Value="" />
13 <Key Name="script_engine" Value="OpenSim.Region.ScriptEngine.DotNetEngine.dll" /> 13 <Key Name="script_engine" Value="OpenSim.Region.ScriptEngine.DotNetEngine.dll" />
14 <Key Name="asset_database" Value="sqlite" /> 14 <Key Name="asset_database" Value="sqlite" />
15 <Key Name="clientstack_plugin" Value="OpenSim.Region.ClientStack.LindenUDP.dll" /> 15 <Key Name="clientstack_plugin" Value="OpenSim.Region.ClientStack.LindenUDP.dll" />
16 </Section> 16 </Section>
17 <Section Name="StandAlone"> 17 <Section Name="StandAlone">
18 <Key Name="accounts_authenticate" Value="False" /> 18 <Key Name="accounts_authenticate" Value="False" />
19 <Key Name="welcome_message" Value="Welcome to OpenSimulator" /> 19 <Key Name="welcome_message" Value="Welcome to OpenSimulator" />
20 <Key Name="inventory_plugin" Value="OpenSim.Data.SQLite.dll" /> 20 <Key Name="inventory_plugin" Value="OpenSim.Data.SQLite.dll" />
21 <Key Name="inventory_source" Value="" /> 21 <Key Name="inventory_source" Value="" />
22 <Key Name="userDatabase_plugin" Value="OpenSim.Data.SQLite.dll" /> 22 <Key Name="userDatabase_plugin" Value="OpenSim.Data.SQLite.dll" />
23 <Key Name="user_source" Value="" /> 23 <Key Name="user_source" Value="" />
24 <Key Name="asset_plugin" Value="OpenSim.Data.SQLite.dll" /> 24 <Key Name="asset_plugin" Value="OpenSim.Data.SQLite.dll" />
25 <Key Name="asset_source" Value="" /> 25 <Key Name="asset_source" Value="" />
26 <Key Name="dump_assets_to_file" Value="False" /> 26 <Key Name="dump_assets_to_file" Value="False" />
27 </Section> 27 </Section>
28 <Section Name="Network"> 28 <Section Name="Network">
29 <Key Name="default_location_x" Value="1000" /> 29 <Key Name="default_location_x" Value="1000" />
30 <Key Name="default_location_y" Value="1000" /> 30 <Key Name="default_location_y" Value="1000" />
31 <Key Name="http_listener_port" Value="9000" /> 31 <Key Name="http_listener_port" Value="9000" />
32 <Key Name="remoting_listener_port" Value="8895" /> 32 <Key Name="remoting_listener_port" Value="8895" />
33 <Key Name="grid_server_url" Value="http://127.0.0.1:8001" /> 33 <Key Name="grid_server_url" Value="http://127.0.0.1:8001" />
34 <Key Name="grid_send_key" Value="null" /> 34 <Key Name="grid_send_key" Value="null" />
35 <Key Name="grid_recv_key" Value="null" /> 35 <Key Name="grid_recv_key" Value="null" />
36 <Key Name="user_server_url" Value="http://127.0.0.1:8002" /> 36 <Key Name="user_server_url" Value="http://127.0.0.1:8002" />
37 <Key Name="user_send_key" Value="null" /> 37 <Key Name="user_send_key" Value="null" />
38 <Key Name="user_recv_key" Value="null" /> 38 <Key Name="user_recv_key" Value="null" />
39 <Key Name="asset_server_url" Value="http://127.0.0.1:8003" /> 39 <Key Name="asset_server_url" Value="http://127.0.0.1:8003" />
40 <Key Name="inventory_server_url" Value="http://127.0.0.1:8004" /> 40 <Key Name="inventory_server_url" Value="http://127.0.0.1:8004" />
41 </Section> 41 </Section>
42 <Section Name="RemoteAdmin"> 42 <Section Name="RemoteAdmin">
43 <Key Name="enabled" Value="false" /> 43 <Key Name="enabled" Value="false" />
44 </Section> 44 </Section>
45 <Section Name="Voice"> 45 <Section Name="Voice">
46 <Key Name="enabled" Value="false" /> 46 <Key Name="enabled" Value="false" />
47 </Section> 47 </Section>
48</Nini> \ No newline at end of file 48</Nini> \ No newline at end of file
generated by cgit v1.1 at 2024-11-17 06:15:00 +0000