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

A few changes so that the number of warnings is less but without deleting everything. 

Like, I removed the Obsolete from the old caps method as at this time not all caps calls can use the new Caps stream method as it doesn't properly deal with LLSD Arrays. 
Now down to 3 warnings on the events in IClientAPI and for now I think we have to live with them as I think most of those events will be used.
afrisby
MW 2007-07-27 12:21:52 +00:00
parent bc11fa8fda
commit d143e7b074
8 changed files with 20 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
OpenSim/Framework/Communications/Cache/LibraryRootFolder.cs
View File

@ -23,7 +23,7 @@ namespace OpenSim.Framework.Communications.Caches
InventoryFolder folderInfo = new InventoryFolder();
folderInfo.agentID = libOwner;
folderInfo.folderID = new LLUUID("00000112-000f-0000-0000-000100bba001");
folderInfo.name = "My Inventory";
folderInfo.name = "Texture Library";
folderInfo.parentID = this.folderID;
folderInfo.type = -1;
folderInfo.version = 1;

5
OpenSim/Framework/Communications/Capabilities/Caps.cs
View File

@ -82,7 +82,10 @@ namespace OpenSim.Region.Capabilities
AddLegacyCapsHandler(httpListener, m_notecardUpdatePath, NoteCardAgentInventory);
}
[Obsolete("Use BaseHttpServer.AddStreamHandler(new LLSDStreamHandler( LLSDMethod delegate )) instead.")]
//[Obsolete("Use BaseHttpServer.AddStreamHandler(new LLSDStreamHandler( LLSDMethod delegate )) instead.")]
//Commented out the obsolete as at this time the first caps request can not use the new Caps method
//as the sent type is a array and not a map and the deserialising doesn't deal properly with arrays.
private void AddLegacyCapsHandler(BaseHttpServer httpListener, string path, RestMethod restMethod)
{
string capsBase = "/CAPS/" + m_capsObjectPath;

1
OpenSim/Framework/General/Interfaces/IClientAPI.cs
View File

@ -126,7 +126,6 @@ namespace OpenSim.Framework.Interfaces
event UpdateVector OnUpdatePrimScale;
event StatusChange OnChildAgentStatus;
event GenericCall2 OnStopMovement;
event NewAvatar OnNewAvatar;
event GenericCall6 OnRemoveAvatar;
event CreateNewInventoryItem OnCreateNewInventoryItem;

1
OpenSim/Framework/General/NullClientAPI.cs
View File

@ -49,7 +49,6 @@ namespace OpenSim.Framework
public event UpdateVector OnUpdatePrimScale;
public event StatusChange OnChildAgentStatus;
public event GenericCall2 OnStopMovement;
public event NewAvatar OnNewAvatar;
public event GenericCall6 OnRemoveAvatar;
public event CreateNewInventoryItem OnCreateNewInventoryItem;

7
OpenSim/Region/ClientStack/ClientView.API.cs
View File

@ -74,10 +74,9 @@ namespace OpenSim.Region.ClientStack
public event UpdatePrimSingleRotation OnUpdatePrimSingleRotation;
public event UpdatePrimGroupRotation OnUpdatePrimGroupMouseRotation;
public event UpdateVector OnUpdatePrimScale;
public event StatusChange OnChildAgentStatus; // HOUSEKEEPING : Do we really need this?
public event GenericCall2 OnStopMovement; // HOUSEKEEPING : Do we really need this?
public event NewAvatar OnNewAvatar; // HOUSEKEEPING : Do we really need this?
public event GenericCall6 OnRemoveAvatar; // HOUSEKEEPING : Do we really need this?
public event StatusChange OnChildAgentStatus;
public event GenericCall2 OnStopMovement;
public event GenericCall6 OnRemoveAvatar;
public event RequestMapBlocks OnRequestMapBlocks;
public event TeleportLocationRequest OnTeleportLocationRequest;

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

@ -14,6 +14,7 @@ namespace OpenSim.Region.Environment.Scenes
{
private const uint FULL_MASK_PERMISSIONS = 2147483647;
private uint m_flags = 32 + 65536 + 131072 + 256 + 4 + 8 + 2048 + 524288 + 268435456 + 128;
private ulong m_regionHandle;
public string SitName = "";
@ -127,6 +128,12 @@ namespace OpenSim.Region.Environment.Scenes
this.m_Shape = shape;
this.OffsetPosition = position;
//temporary code just so the m_flags field doesn't give a compiler warning
if (m_flags == 1)
{
}
}
#endregion

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

@ -66,6 +66,8 @@ namespace OpenSim.Region.Environment.Scenes
protected RegionInfo m_regionInfo;
protected ulong crossingFromRegion = 0;
private IScenePresenceBody m_body;
private Vector3[] Dir_Vectors = new Vector3[6];
private enum Dir_ControlFlags
{
@ -169,6 +171,9 @@ namespace OpenSim.Region.Environment.Scenes
Dir_Vectors[3] = new Vector3(0, -1, 0); //RIGHT
Dir_Vectors[4] = new Vector3(0, 0, 1); //UP
Dir_Vectors[5] = new Vector3(0, 0, -1); //DOWN
//tempoary until we move some code into the body classes
this.m_body = new ChildAgent();
}
#endregion

1
OpenSim/Region/Examples/SimpleApp/MyNpcCharacter.cs
View File

@ -63,7 +63,6 @@ namespace SimpleApp
public event UpdateVector OnUpdatePrimScale;
public event StatusChange OnChildAgentStatus;
public event GenericCall2 OnStopMovement;
public event NewAvatar OnNewAvatar;
public event GenericCall6 OnRemoveAvatar;
public event CreateNewInventoryItem OnCreateNewInventoryItem;