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

* Removed more compiler warnings, dead code, etc.

0.6.0-stable
Adam Frisby 2008-03-05 21:47:19 +00:00
parent 4ea52b2105
commit 14b37533aa
8 changed files with 6 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
OpenSim/Framework/PacketPool.cs
View File

@ -158,6 +158,7 @@ namespace OpenSim.Framework
public void ReturnPacket(Packet packet) { public void ReturnPacket(Packet packet) {
return; // packet pool disabled return; // packet pool disabled
/* // Commented out to remove a compiler warning. :)
lock(pool) lock(pool)
{ {
PacketType type=packet.Type; PacketType type=packet.Type;
@ -171,6 +172,7 @@ namespace OpenSim.Framework
((Stack)pool[type]).Push(packet); ((Stack)pool[type]).Push(packet);
} }
} }
*/
} }
} }
} }

1
OpenSim/Region/ClientStack/ClientView.cs
View File

@ -1163,7 +1163,6 @@ namespace OpenSim.Region.ClientStack
int MAX_ITEMS_PER_PACKET = 6; int MAX_ITEMS_PER_PACKET = 6;
Encoding enc = Encoding.ASCII; Encoding enc = Encoding.ASCII;
uint FULL_MASK_PERMISSIONS = (uint)PermissionMask.All;
InventoryDescendentsPacket descend; InventoryDescendentsPacket descend;
int i; int i;
int count; int count;

1
OpenSim/Region/ClientStack/UDPServer.cs
View File

@ -385,7 +385,6 @@ namespace OpenSim.Region.ClientStack
// We are looking for alternate ports! // We are looking for alternate ports!
//m_log.Info("[SERVER]: UDP socket on " + listenIP.ToString() + " " + listenPort.ToString() + " is not available, trying next."); //m_log.Info("[SERVER]: UDP socket on " + listenIP.ToString() + " " + listenPort.ToString() + " is not available, trying next.");
} }
System.Threading.Thread.Sleep(100); // Wait before we retry socket
} }
m_log.Info("[SERVER]: UDP socket bound, getting ready to listen"); m_log.Info("[SERVER]: UDP socket bound, getting ready to listen");

2
OpenSim/Region/Environment/Modules/AssetDownloadModule.cs
View File

@ -52,8 +52,6 @@ namespace OpenSim.Region.Environment.Modules
/// </summary> /// </summary>
private List<AssetRequest> AssetRequests; private List<AssetRequest> AssetRequests;
private Thread m_thread;
public AssetDownloadModule() public AssetDownloadModule()
{ {
RequestedAssets = new Dictionary<LLUUID, Dictionary<LLUUID, AssetRequest>>(); RequestedAssets = new Dictionary<LLUUID, Dictionary<LLUUID, AssetRequest>>();

1
OpenSim/Region/Environment/Modules/XMLRPCModule.cs
View File

@ -77,7 +77,6 @@ namespace OpenSim.Region.Environment.Modules
{ {
private static readonly log4net.ILog m_log = log4net.LogManager.GetLogger(System.Reflection.MethodBase.GetCurrentMethod().DeclaringType); private static readonly log4net.ILog m_log = log4net.LogManager.GetLogger(System.Reflection.MethodBase.GetCurrentMethod().DeclaringType);
private Scene m_scene;
private object XMLRPCListLock = new object(); private object XMLRPCListLock = new object();
private string m_name = "XMLRPCModule"; private string m_name = "XMLRPCModule";
private int RemoteReplyScriptWait = 300; private int RemoteReplyScriptWait = 300;

7
OpenSim/Region/Environment/PermissionManager.cs
View File

@ -37,11 +37,12 @@ namespace OpenSim.Region.Environment
protected Scene m_scene; protected Scene m_scene;
// These are here for testing. They will be taken out // These are here for testing. They will be taken out
private uint PERM_ALL = (uint)2147483647;
//private uint PERM_ALL = (uint)2147483647;
private uint PERM_COPY = (uint)32768; private uint PERM_COPY = (uint)32768;
private uint PERM_MODIFY = (uint)16384; //private uint PERM_MODIFY = (uint)16384;
private uint PERM_MOVE = (uint)524288; private uint PERM_MOVE = (uint)524288;
private uint PERM_TRANS = (uint)8192; //private uint PERM_TRANS = (uint)8192;
private uint PERM_LOCKED = (uint)540672; private uint PERM_LOCKED = (uint)540672;
// Bypasses the permissions engine (always returns OK) // Bypasses the permissions engine (always returns OK)
// disable in any production environment // disable in any production environment

4
OpenSim/Region/Environment/Scenes/Scene.cs
View File

@ -129,7 +129,6 @@ namespace OpenSim.Region.Environment.Scenes
private int m_update_backup = 200; private int m_update_backup = 200;
private int m_update_terrain = 50; private int m_update_terrain = 50;
private int m_update_land = 1; private int m_update_land = 1;
private int m_update_avatars = 1;
private int frameMS = 0; private int frameMS = 0;
private int physicsMS2 = 0; private int physicsMS2 = 0;
@ -137,7 +136,6 @@ namespace OpenSim.Region.Environment.Scenes
private int otherMS = 0; private int otherMS = 0;
private bool m_physics_enabled = true; private bool m_physics_enabled = true;
private bool m_physics_collisions_enabled = true;
private bool m_scripts_enabled = true; private bool m_scripts_enabled = true;
@ -669,7 +667,6 @@ namespace OpenSim.Region.Environment.Scenes
{ {
if (m_update_entities == 1) if (m_update_entities == 1)
{ {
m_update_avatars = 5;
m_update_entities = 5; m_update_entities = 5;
m_statsReporter.SetUpdateMS(6000); m_statsReporter.SetUpdateMS(6000);
} }
@ -678,7 +675,6 @@ namespace OpenSim.Region.Environment.Scenes
{ {
if (m_update_entities == 5) if (m_update_entities == 5)
{ {
m_update_avatars = 1;
m_update_entities = 1; m_update_entities = 1;
m_statsReporter.SetUpdateMS(3000); m_statsReporter.SetUpdateMS(3000);
} }

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

@ -82,8 +82,6 @@ namespace OpenSim.Region.Environment.Scenes
private bool m_newCoarseLocations = true; private bool m_newCoarseLocations = true;
private bool m_gotAllObjectsInScene = false; private bool m_gotAllObjectsInScene = false;
private bool m_lastPhysicsStoppedStatus = false;
private LLVector3 m_lastVelocity = LLVector3.Zero; private LLVector3 m_lastVelocity = LLVector3.Zero;
// Default AV Height // Default AV Height