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

move along, nothing to see here. just a couple of lazy variables.

0.6.0-stable
Dr Scofield 2008-06-27 19:57:06 +00:00
parent 333b741e30
commit 3d26e6ede0
8 changed files with 31 additions and 25 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
OpenSim/Region/Environment/Modules/Scripting/LoadImageURL/LoadImageURLModule.cs
View File

@ -122,7 +122,8 @@ namespace OpenSim.Region.Environment.Modules.Scripting.LoadImageURL
{ {
WebRequest request = HttpWebRequest.Create(url); WebRequest request = HttpWebRequest.Create(url);
RequestState state = new RequestState((HttpWebRequest) request, requestID); RequestState state = new RequestState((HttpWebRequest) request, requestID);
IAsyncResult result = request.BeginGetResponse(new AsyncCallback(HttpRequestReturn), state); // IAsyncResult result = request.BeginGetResponse(new AsyncCallback(HttpRequestReturn), state);
request.BeginGetResponse(new AsyncCallback(HttpRequestReturn), state);
TimeSpan t = (DateTime.UtcNow - new DateTime(1970, 1, 1)); TimeSpan t = (DateTime.UtcNow - new DateTime(1970, 1, 1));
state.TimeOfRequest = (int) t.TotalSeconds; state.TimeOfRequest = (int) t.TotalSeconds;

3
OpenSim/Region/Environment/Modules/World/Estate/EstateManagementModule.cs
View File

@ -500,7 +500,8 @@ namespace OpenSim.Region.Environment.Modules.World.Estate
for (int i = 0; i < uuidarr.Length; i++) for (int i = 0; i < uuidarr.Length; i++)
{ {
string lookupname = m_scene.CommsManager.UUIDNameRequestString(uuidarr[i]); // string lookupname = m_scene.CommsManager.UUIDNameRequestString(uuidarr[i]);
m_scene.CommsManager.UUIDNameRequestString(uuidarr[i]);
// we drop it. It gets cached though... so we're ready for the next request. // we drop it. It gets cached though... so we're ready for the next request.
} }
} }

10
OpenSim/Region/Environment/Modules/World/Permissions/PermissionsModule.cs
View File

@ -310,7 +310,7 @@ namespace OpenSim.Region.Environment.Modules.World.Permissions
objectOwnerMask |= (uint)LLObject.ObjectFlags.ObjectYouOwner | (uint)LLObject.ObjectFlags.ObjectOwnerModify; objectOwnerMask |= (uint)LLObject.ObjectFlags.ObjectYouOwner | (uint)LLObject.ObjectFlags.ObjectOwnerModify;
// Customize the GroupMask // Customize the GroupMask
uint objectGroupMask = ApplyObjectModifyMasks(task.GroupMask, objflags); // uint objectGroupMask = ApplyObjectModifyMasks(task.GroupMask, objflags);
// Customize the EveryoneMask // Customize the EveryoneMask
uint objectEveryoneMask = ApplyObjectModifyMasks(task.EveryoneMask, objflags); uint objectEveryoneMask = ApplyObjectModifyMasks(task.EveryoneMask, objflags);
@ -655,10 +655,10 @@ namespace OpenSim.Region.Environment.Modules.World.Permissions
SceneObjectGroup task = (SceneObjectGroup)m_scene.Entities[objectID]; SceneObjectGroup task = (SceneObjectGroup)m_scene.Entities[objectID];
LLUUID taskOwner = null; // LLUUID taskOwner = null;
// Added this because at this point in time it wouldn't be wise for // Added this because at this point in time it wouldn't be wise for
// the administrator object permissions to take effect. // the administrator object permissions to take effect.
LLUUID objectOwner = task.OwnerID; // LLUUID objectOwner = task.OwnerID;
// Anyone can move // Anyone can move
if ((task.RootPart.EveryoneMask & PERM_MOVE) != 0) if ((task.RootPart.EveryoneMask & PERM_MOVE) != 0)
@ -842,10 +842,10 @@ namespace OpenSim.Region.Environment.Modules.World.Permissions
} }
SceneObjectGroup task = (SceneObjectGroup)m_scene.Entities[objectID]; SceneObjectGroup task = (SceneObjectGroup)m_scene.Entities[objectID];
LLUUID taskOwner = null; // LLUUID taskOwner = null;
// Added this because at this point in time it wouldn't be wise for // Added this because at this point in time it wouldn't be wise for
// the administrator object permissions to take effect. // the administrator object permissions to take effect.
LLUUID objectOwner = task.OwnerID; // LLUUID objectOwner = task.OwnerID;
if ((task.RootPart.EveryoneMask & PERM_COPY) != 0) if ((task.RootPart.EveryoneMask & PERM_COPY) != 0)

6
OpenSim/Region/Environment/Modules/World/Serialiser/SerialiserModule.cs
View File

@ -177,7 +177,8 @@ namespace OpenSim.Region.Environment.Modules.World.Serialiser
{ {
if (region.RegionInfo.RegionName == (string) args[0]) if (region.RegionInfo.RegionName == (string) args[0])
{ {
List<string> results = SerialiseRegion(region, m_savedir + region.RegionInfo.RegionID.ToString() + "/"); // List<string> results = SerialiseRegion(region, m_savedir + region.RegionInfo.RegionID.ToString() + "/");
SerialiseRegion(region, m_savedir + region.RegionInfo.RegionID.ToString() + "/");
} }
} }
} }
@ -186,7 +187,8 @@ namespace OpenSim.Region.Environment.Modules.World.Serialiser
{ {
foreach (Scene region in m_regions) foreach (Scene region in m_regions)
{ {
List<string> results = SerialiseRegion(region, m_savedir + region.RegionInfo.RegionID.ToString() + "/"); // List<string> results = SerialiseRegion(region, m_savedir + region.RegionInfo.RegionID.ToString() + "/");
SerialiseRegion(region, m_savedir + region.RegionInfo.RegionID.ToString() + "/");
} }
} }

7
OpenSim/Region/Environment/Scenes/InnerScene.cs
View File

@ -1096,7 +1096,7 @@ namespace OpenSim.Region.Environment.Scenes
SceneObjectGroup group = GetGroupByPrim(localID); SceneObjectGroup group = GetGroupByPrim(localID);
if (group != null) if (group != null)
{ {
LLVector3 oldPos = group.AbsolutePosition; // LLVector3 oldPos = group.AbsolutePosition;
if (!m_parentScene.ExternalChecks.ExternalChecksCanObjectEntry(group.UUID,pos) && !group.RootPart.m_IsAttachment) if (!m_parentScene.ExternalChecks.ExternalChecksCanObjectEntry(group.UUID,pos) && !group.RootPart.m_IsAttachment)
{ {
group.SendGroupTerseUpdate(); group.SendGroupTerseUpdate();
@ -1122,7 +1122,7 @@ namespace OpenSim.Region.Environment.Scenes
if (group != null) if (group != null)
{ {
LLVector3 oldPos = group.AbsolutePosition; // LLVector3 oldPos = group.AbsolutePosition;
if (group.RootPart.m_IsAttachment) if (group.RootPart.m_IsAttachment)
{ {
group.UpdateGroupPosition(pos); group.UpdateGroupPosition(pos);
@ -1467,7 +1467,8 @@ namespace OpenSim.Region.Environment.Scenes
{ {
//m_log.DebugFormat("[SCENE]: Duplication of object {0} at offset {1} requested by agent {2}", originalPrim, offset, AgentID); //m_log.DebugFormat("[SCENE]: Duplication of object {0} at offset {1} requested by agent {2}", originalPrim, offset, AgentID);
SceneObjectGroup dupe = DuplicateObject(originalPrim, offset, flags, AgentID, GroupID, Quaternion.Zero); // SceneObjectGroup dupe = DuplicateObject(originalPrim, offset, flags, AgentID, GroupID, Quaternion.Zero);
DuplicateObject(originalPrim, offset, flags, AgentID, GroupID, Quaternion.Zero);
} }
/// <summary> /// <summary>
/// Duplicate the given object. /// Duplicate the given object.

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

@ -2098,7 +2098,8 @@ namespace OpenSim.Region.Environment.Scenes
{ {
LLQuaternion worldRot = target2.GetWorldRotation(); LLQuaternion worldRot = target2.GetWorldRotation();
SceneObjectGroup obj = m_innerScene.DuplicateObject(localID, pos, target.GetEffectiveObjectFlags(), AgentID, GroupID, new Quaternion(worldRot.W,worldRot.X,worldRot.Y,worldRot.Z)); // SceneObjectGroup obj = m_innerScene.DuplicateObject(localID, pos, target.GetEffectiveObjectFlags(), AgentID, GroupID, new Quaternion(worldRot.W,worldRot.X,worldRot.Y,worldRot.Z));
m_innerScene.DuplicateObject(localID, pos, target.GetEffectiveObjectFlags(), AgentID, GroupID, new Quaternion(worldRot.W,worldRot.X,worldRot.Y,worldRot.Z));
//obj.Rotation = new Quaternion(worldRot.W, worldRot.X, worldRot.Y, worldRot.Z); //obj.Rotation = new Quaternion(worldRot.W, worldRot.X, worldRot.Y, worldRot.Z);
//obj.UpdateGroupRotation(worldRot); //obj.UpdateGroupRotation(worldRot);
} }

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

@ -266,8 +266,8 @@ namespace OpenSim.Region.Environment.Scenes
public void RequestNeighbors(RegionInfo region) public void RequestNeighbors(RegionInfo region)
{ {
List<SimpleRegionInfo> neighbours = // List<SimpleRegionInfo> neighbours =
m_commsProvider.GridService.RequestNeighbours(m_regionInfo.RegionLocX, m_regionInfo.RegionLocY); m_commsProvider.GridService.RequestNeighbours(m_regionInfo.RegionLocX, m_regionInfo.RegionLocY);
//IPEndPoint blah = new IPEndPoint(); //IPEndPoint blah = new IPEndPoint();
//blah.Address = region.RemotingAddress; //blah.Address = region.RemotingAddress;

20
OpenSim/Region/Environment/Scenes/SceneObjectPart.cs
View File

@ -823,7 +823,7 @@ namespace OpenSim.Region.Environment.Scenes
public void AddFlag(LLObject.ObjectFlags flag) public void AddFlag(LLObject.ObjectFlags flag)
{ {
LLObject.ObjectFlags prevflag = Flags; // LLObject.ObjectFlags prevflag = Flags;
//uint objflags = Flags; //uint objflags = Flags;
if ((ObjectFlags & (uint) flag) == 0) if ((ObjectFlags & (uint) flag) == 0)
{ {
@ -1678,7 +1678,7 @@ namespace OpenSim.Region.Environment.Scenes
public void PreloadSound(string sound) public void PreloadSound(string sound)
{ {
LLUUID ownerID = OwnerID; // LLUUID ownerID = OwnerID;
LLUUID objectID = UUID; LLUUID objectID = UUID;
LLUUID soundID = LLUUID.Zero; LLUUID soundID = LLUUID.Zero;
@ -1708,7 +1708,7 @@ namespace OpenSim.Region.Environment.Scenes
public void RemFlag(LLObject.ObjectFlags flag) public void RemFlag(LLObject.ObjectFlags flag)
{ {
LLObject.ObjectFlags prevflag = Flags; // LLObject.ObjectFlags prevflag = Flags;
if ((ObjectFlags & (uint) flag) != 0) if ((ObjectFlags & (uint) flag) != 0)
{ {
//Console.WriteLine("Removing flag: " + ((LLObject.ObjectFlags)flag).ToString()); //Console.WriteLine("Removing flag: " + ((LLObject.ObjectFlags)flag).ToString());
@ -2153,12 +2153,12 @@ namespace OpenSim.Region.Environment.Scenes
public void SetScriptEvents(LLUUID scriptid, int events) public void SetScriptEvents(LLUUID scriptid, int events)
{ {
scriptEvents oldparts; // scriptEvents oldparts;
lock (m_scriptEvents) lock (m_scriptEvents)
{ {
if (m_scriptEvents.ContainsKey(scriptid)) if (m_scriptEvents.ContainsKey(scriptid))
{ {
oldparts = m_scriptEvents[scriptid]; // oldparts = m_scriptEvents[scriptid];
// remove values from aggregated script events // remove values from aggregated script events
m_scriptEvents[scriptid] = (scriptEvents) events; m_scriptEvents[scriptid] = (scriptEvents) events;
@ -2259,8 +2259,8 @@ namespace OpenSim.Region.Environment.Scenes
Vector3 vAbsolutePosition = new Vector3(AbsolutePosition.X, AbsolutePosition.Y, AbsolutePosition.Z); Vector3 vAbsolutePosition = new Vector3(AbsolutePosition.X, AbsolutePosition.Y, AbsolutePosition.Z);
Vector3 vScale = new Vector3(Scale.X, Scale.Y, Scale.Z); Vector3 vScale = new Vector3(Scale.X, Scale.Y, Scale.Z);
Quaternion qRotation = // Quaternion qRotation =
new Quaternion(RotationOffset.W, RotationOffset.X, RotationOffset.Y, RotationOffset.Z); // new Quaternion(RotationOffset.W, RotationOffset.X, RotationOffset.Y, RotationOffset.Z);
//Quaternion worldRotation = (qRotation*parentrot); //Quaternion worldRotation = (qRotation*parentrot);
@ -2366,7 +2366,7 @@ namespace OpenSim.Region.Environment.Scenes
// TODO: Change to take shape into account // TODO: Change to take shape into account
Vector3[] vertexes = new Vector3[8]; Vector3[] vertexes = new Vector3[8];
float[] distance = new float[6]; // float[] distance = new float[6];
Vector3[] FaceA = new Vector3[6]; // vertex A for Facei Vector3[] FaceA = new Vector3[6]; // vertex A for Facei
Vector3[] FaceB = new Vector3[6]; // vertex B for Facei Vector3[] FaceB = new Vector3[6]; // vertex B for Facei
Vector3[] FaceC = new Vector3[6]; // vertex C for Facei Vector3[] FaceC = new Vector3[6]; // vertex C for Facei
@ -2830,7 +2830,7 @@ namespace OpenSim.Region.Environment.Scenes
bool usePhysics = false; bool usePhysics = false;
bool IsTemporary = false; bool IsTemporary = false;
bool IsPhantom = false; bool IsPhantom = false;
bool castsShadows = false; // bool castsShadows = false;
bool wasUsingPhysics = ((ObjectFlags & (uint) LLObject.ObjectFlags.Physics) != 0); bool wasUsingPhysics = ((ObjectFlags & (uint) LLObject.ObjectFlags.Physics) != 0);
//bool IsLocked = false; //bool IsLocked = false;
int i = 0; int i = 0;
@ -2843,7 +2843,7 @@ namespace OpenSim.Region.Environment.Scenes
//System.Console.WriteLine("U" + packet.ToBytes().Length.ToString()); //System.Console.WriteLine("U" + packet.ToBytes().Length.ToString());
IsTemporary = (data[i++] != 0) ? true : false; IsTemporary = (data[i++] != 0) ? true : false;
IsPhantom = (data[i++] != 0) ? true : false; IsPhantom = (data[i++] != 0) ? true : false;
castsShadows = (data[i++] != 0) ? true : false; // castsShadows = (data[i++] != 0) ? true : false;
} }
catch (Exception) catch (Exception)
{ {