OpenSim
/
OpenSimMirror
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Update svn properties. Minor formatting cleanup.

0.6.0-stable
Jeff Ames 2008-06-26 20:04:06 +00:00
parent fa5f27acfa
commit 56802afff4
4 changed files with 51 additions and 59 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
OpenSim/Framework/IClientAPI.cs
View File

@ -37,11 +37,9 @@ namespace OpenSim.Framework
public interface IEventArgs public interface IEventArgs
{ {
IScene Scene { get; set; } IScene Scene { get; set; }
IClientAPI Sender { get; set; } IClientAPI Sender { get; set; }
} }
public delegate void ViewerEffectEventHandler(IClientAPI sender, List<ViewerEffectEventHandlerArg> args); public delegate void ViewerEffectEventHandler(IClientAPI sender, List<ViewerEffectEventHandlerArg> args);
public delegate void ChatFromViewer(Object sender, ChatFromViewerArgs e); public delegate void ChatFromViewer(Object sender, ChatFromViewerArgs e);
@ -281,6 +279,7 @@ namespace OpenSim.Framework
public LLVector3 UserLocation; public LLVector3 UserLocation;
public LLVector3 UserLookAt; public LLVector3 UserLookAt;
} }
public class RegionHandshakeArgs : EventArgs public class RegionHandshakeArgs : EventArgs
{ {
public bool isEstateManager; public bool isEstateManager;
@ -358,6 +357,7 @@ namespace OpenSim.Framework
public int SourceType; public int SourceType;
public LLUUID TransferID; public LLUUID TransferID;
} }
public class AgentUpdateArgs : EventArgs public class AgentUpdateArgs : EventArgs
{ {
public LLUUID AgentID; public LLUUID AgentID;
@ -644,7 +644,6 @@ namespace OpenSim.Framework
public delegate void EstateTeleportOneUserHomeRequest(IClientAPI remoteClient, LLUUID invoice, LLUUID senderID, LLUUID prey); public delegate void EstateTeleportOneUserHomeRequest(IClientAPI remoteClient, LLUUID invoice, LLUUID senderID, LLUUID prey);
public delegate void ScriptReset(IClientAPI remoteClient, LLUUID objectID, LLUUID itemID); public delegate void ScriptReset(IClientAPI remoteClient, LLUUID objectID, LLUUID itemID);
public interface IClientAPI public interface IClientAPI
{ {
LLVector3 StartPos { get; set; } LLVector3 StartPos { get; set; }
@ -681,8 +680,6 @@ namespace OpenSim.Framework
set; set;
} }
[Obsolete("LLClientView Specific - Circuits are unique to LLClientView")] [Obsolete("LLClientView Specific - Circuits are unique to LLClientView")]
uint CircuitCode { get; } uint CircuitCode { get; }
[Obsolete("LLClientView Specific - Replace with more bare-bones arguments.")] [Obsolete("LLClientView Specific - Replace with more bare-bones arguments.")]

6
OpenSim/Framework/UndoStack.cs
View File

@ -50,7 +50,6 @@ namespace OpenSim.Framework
get { return m_new == m_old; } get { return m_new == m_old; }
} }
public int Capacity public int Capacity
{ {
get { return m_Undos.Length - 1; } get { return m_Undos.Length - 1; }
@ -67,7 +66,6 @@ namespace OpenSim.Framework
} }
} }
public void Push(T item) public void Push(T item)
{ {
if (IsFull) if (IsFull)
@ -95,13 +93,11 @@ namespace OpenSim.Framework
throw new InvalidOperationException("Cannot pop from emtpy stack"); throw new InvalidOperationException("Cannot pop from emtpy stack");
} }
public T Peek() public T Peek()
{ {
return m_Undos[m_new]; return m_Undos[m_new];
} }
public void Clear() public void Clear()
{ {
if (Count > 0) if (Count > 0)
@ -115,4 +111,4 @@ namespace OpenSim.Framework
} }
} }
} }
} }

3
OpenSim/Region/Environment/Scenes/ScenePresence.cs
View File

@ -164,7 +164,6 @@ namespace OpenSim.Region.Environment.Scenes
//neighbouring regions we have enabled a child agent in //neighbouring regions we have enabled a child agent in
private readonly List<ulong> m_knownChildRegions = new List<ulong>(); private readonly List<ulong> m_knownChildRegions = new List<ulong>();
/// <summary> /// <summary>
/// Implemented Control Flags /// Implemented Control Flags
/// </summary> /// </summary>
@ -214,12 +213,12 @@ namespace OpenSim.Region.Environment.Scenes
return false; return false;
} }
public bool Updated public bool Updated
{ {
set { m_updateflag = value; } set { m_updateflag = value; }
get { return m_updateflag; } get { return m_updateflag; }
} }
public bool Invulnerable public bool Invulnerable
{ {
set { m_invulnerable = value; } set { m_invulnerable = value; }

94
bin/OpenSim.Example.xml
View File

@ -1,48 +1,48 @@
<Nini> <Nini>
<Section Name="Startup"> <Section Name="Startup">
<Key Name="gridmode" Value="False" /> <Key Name="gridmode" Value="False" />
<Key Name="physics" Value="basicphysics" /> <Key Name="physics" Value="basicphysics" />
<Key Name="physical_prim" Value="True" /> <Key Name="physical_prim" Value="True" />
<Key Name="see_into_this_sim_from_neighbor" Value="True" /> <Key Name="see_into_this_sim_from_neighbor" Value="True" />
<Key Name="serverside_object_permissions" Value="False" /> <Key Name="serverside_object_permissions" Value="False" />
<Key Name="storage_plugin" Value="OpenSim.Data.SQLite.dll" /> <Key Name="storage_plugin" Value="OpenSim.Data.SQLite.dll" />
<Key Name="storage_connection_string" Value="URI=file:OpenSim.db,version=3" /> <Key Name="storage_connection_string" Value="URI=file:OpenSim.db,version=3" />
<Key Name="storage_prim_inventories" Value="True" /> <Key Name="storage_prim_inventories" Value="True" />
<Key Name="startup_console_commands_file" Value="" /> <Key Name="startup_console_commands_file" Value="" />
<Key Name="shutdown_console_commands_file" Value="" /> <Key Name="shutdown_console_commands_file" Value="" />
<Key Name="script_engine" Value="OpenSim.Region.ScriptEngine.DotNetEngine.dll" /> <Key Name="script_engine" Value="OpenSim.Region.ScriptEngine.DotNetEngine.dll" />
<Key Name="asset_database" Value="sqlite" /> <Key Name="asset_database" Value="sqlite" />
<Key Name="clientstack_plugin" Value="OpenSim.Region.ClientStack.LindenUDP.dll" /> <Key Name="clientstack_plugin" Value="OpenSim.Region.ClientStack.LindenUDP.dll" />
</Section> </Section>
<Section Name="StandAlone"> <Section Name="StandAlone">
<Key Name="accounts_authenticate" Value="False" /> <Key Name="accounts_authenticate" Value="False" />
<Key Name="welcome_message" Value="Welcome to OpenSimulator" /> <Key Name="welcome_message" Value="Welcome to OpenSimulator" />
<Key Name="inventory_plugin" Value="OpenSim.Data.SQLite.dll" /> <Key Name="inventory_plugin" Value="OpenSim.Data.SQLite.dll" />
<Key Name="inventory_source" Value="" /> <Key Name="inventory_source" Value="" />
<Key Name="userDatabase_plugin" Value="OpenSim.Data.SQLite.dll" /> <Key Name="userDatabase_plugin" Value="OpenSim.Data.SQLite.dll" />
<Key Name="user_source" Value="" /> <Key Name="user_source" Value="" />
<Key Name="asset_plugin" Value="OpenSim.Data.SQLite.dll" /> <Key Name="asset_plugin" Value="OpenSim.Data.SQLite.dll" />
<Key Name="asset_source" Value="" /> <Key Name="asset_source" Value="" />
<Key Name="dump_assets_to_file" Value="False" /> <Key Name="dump_assets_to_file" Value="False" />
</Section> </Section>
<Section Name="Network"> <Section Name="Network">
<Key Name="default_location_x" Value="1000" /> <Key Name="default_location_x" Value="1000" />
<Key Name="default_location_y" Value="1000" /> <Key Name="default_location_y" Value="1000" />
<Key Name="http_listener_port" Value="9000" /> <Key Name="http_listener_port" Value="9000" />
<Key Name="remoting_listener_port" Value="8895" /> <Key Name="remoting_listener_port" Value="8895" />
<Key Name="grid_server_url" Value="http://127.0.0.1:8001" /> <Key Name="grid_server_url" Value="http://127.0.0.1:8001" />
<Key Name="grid_send_key" Value="null" /> <Key Name="grid_send_key" Value="null" />
<Key Name="grid_recv_key" Value="null" /> <Key Name="grid_recv_key" Value="null" />
<Key Name="user_server_url" Value="http://127.0.0.1:8002" /> <Key Name="user_server_url" Value="http://127.0.0.1:8002" />
<Key Name="user_send_key" Value="null" /> <Key Name="user_send_key" Value="null" />
<Key Name="user_recv_key" Value="null" /> <Key Name="user_recv_key" Value="null" />
<Key Name="asset_server_url" Value="http://127.0.0.1:8003" /> <Key Name="asset_server_url" Value="http://127.0.0.1:8003" />
<Key Name="inventory_server_url" Value="http://127.0.0.1:8004" /> <Key Name="inventory_server_url" Value="http://127.0.0.1:8004" />
</Section> </Section>
<Section Name="RemoteAdmin"> <Section Name="RemoteAdmin">
<Key Name="enabled" Value="false" /> <Key Name="enabled" Value="false" />
</Section> </Section>
<Section Name="Voice"> <Section Name="Voice">
<Key Name="enabled" Value="false" /> <Key Name="enabled" Value="false" />
</Section> </Section>
</Nini> </Nini>