mirror of
https://github.com/opensim/opensim.git
synced 2026-08-09 18:55:58 +08:00
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.
This commit is contained in:
@@ -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;
|
||||
|
||||
@@ -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;
|
||||
|
||||
@@ -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;
|
||||
|
||||
@@ -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;
|
||||
|
||||
Reference in New Issue
Block a user