aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim/Framework/General
diff options
context:
space:
mode:
authorMW2007-07-19 20:21:02 +0000
committerMW2007-07-19 20:21:02 +0000
commitb2c6f316e16e9bb33f81997319a4130fa683bc48 (patch)
tree632f901a43267c2f3a7c0de8feff2e4ddc845275 /OpenSim/Framework/General
parent*Handler Functions can now refuse an object as invalid by returning false, th... (diff)
downloadopensim-SC_OLD-b2c6f316e16e9bb33f81997319a4130fa683bc48.zip
opensim-SC_OLD-b2c6f316e16e9bb33f81997319a4130fa683bc48.tar.gz
opensim-SC_OLD-b2c6f316e16e9bb33f81997319a4130fa683bc48.tar.bz2
opensim-SC_OLD-b2c6f316e16e9bb33f81997319a4130fa683bc48.tar.xz
Some work on Inventory (not yet finished or enabled)
Diffstat (limited to 'OpenSim/Framework/General')
-rw-r--r--OpenSim/Framework/General/AgentInventory.cs10
-rw-r--r--OpenSim/Framework/General/Interfaces/IClientAPI.cs13
-rw-r--r--OpenSim/Framework/General/NullClientAPI.cs8
3 files changed, 21 insertions, 10 deletions
diff --git a/OpenSim/Framework/General/AgentInventory.cs b/OpenSim/Framework/General/AgentInventory.cs
index 0aeb0b3..4c80791 100644
--- a/OpenSim/Framework/General/AgentInventory.cs
+++ b/OpenSim/Framework/General/AgentInventory.cs
@@ -52,12 +52,11 @@ namespace OpenSim.Framework.Inventory
52 52
53 public virtual void Initialise() 53 public virtual void Initialise()
54 { 54 {
55 Wearables = new AvatarWearable[13]; //should be 12 of these 55 Wearables = new AvatarWearable[13];
56 for (int i = 0; i < 13; i++) 56 for (int i = 0; i < 13; i++)
57 { 57 {
58 Wearables[i] = new AvatarWearable(); 58 Wearables[i] = new AvatarWearable();
59 } 59 }
60
61 } 60 }
62 61
63 public bool CreateNewFolder(LLUUID folderID, ushort type) 62 public bool CreateNewFolder(LLUUID folderID, ushort type)
@@ -96,11 +95,10 @@ namespace OpenSim.Framework.Inventory
96 Folder.DefaultType = type; 95 Folder.DefaultType = type;
97 Folder.FolderName = folderName; 96 Folder.FolderName = folderName;
98 this.InventoryFolders.Add(Folder.FolderID, Folder); 97 this.InventoryFolders.Add(Folder.FolderID, Folder);
99
100 return (true); 98 return (true);
101 } 99 }
102 100
103 public bool CreateNewFolder(LLUUID folderID, ushort type, string folderName, LLUUID parent) 101 public bool CreateNewFolder(LLUUID folderID, ushort type, string folderName, LLUUID parentID)
104 { 102 {
105 if (!this.InventoryFolders.ContainsKey(folderID)) 103 if (!this.InventoryFolders.ContainsKey(folderID))
106 { 104 {
@@ -110,10 +108,9 @@ namespace OpenSim.Framework.Inventory
110 Folder.OwnerID = this.AgentID; 108 Folder.OwnerID = this.AgentID;
111 Folder.DefaultType = type; 109 Folder.DefaultType = type;
112 Folder.FolderName = folderName; 110 Folder.FolderName = folderName;
113 Folder.ParentID = parent; 111 Folder.ParentID = parentID;
114 this.InventoryFolders.Add(Folder.FolderID, Folder); 112 this.InventoryFolders.Add(Folder.FolderID, Folder);
115 } 113 }
116
117 return (true); 114 return (true);
118 } 115 }
119 116
@@ -135,7 +132,6 @@ namespace OpenSim.Framework.Inventory
135 return inv.FolderID; 132 return inv.FolderID;
136 } 133 }
137 } 134 }
138
139 return LLUUID.Zero; 135 return LLUUID.Zero;
140 } 136 }
141 137
diff --git a/OpenSim/Framework/General/Interfaces/IClientAPI.cs b/OpenSim/Framework/General/Interfaces/IClientAPI.cs
index 808a857..df65027 100644
--- a/OpenSim/Framework/General/Interfaces/IClientAPI.cs
+++ b/OpenSim/Framework/General/Interfaces/IClientAPI.cs
@@ -80,7 +80,10 @@ namespace OpenSim.Framework.Interfaces
80 80
81 public delegate void AddNewPrim(LLUUID ownerID, LLVector3 pos, PrimitiveBaseShape shape); 81 public delegate void AddNewPrim(LLUUID ownerID, LLVector3 pos, PrimitiveBaseShape shape);
82 82
83 83 public delegate void CreateInventoryFolder(IClientAPI remoteClient, LLUUID folderID, ushort folderType, string folderName, LLUUID parentID);
84 public delegate void FetchInventoryDescendents(IClientAPI remoteClient, LLUUID folderID, LLUUID ownerID, bool fetchFolders, bool fetchItems, int sortOrder);
85
86 public delegate void RequestTaskInventory(IClientAPI remoteClient, uint localID);
84 87
85 public interface IClientAPI 88 public interface IClientAPI
86 { 89 {
@@ -125,6 +128,10 @@ namespace OpenSim.Framework.Interfaces
125 event NewAvatar OnNewAvatar; 128 event NewAvatar OnNewAvatar;
126 event GenericCall6 OnRemoveAvatar; 129 event GenericCall6 OnRemoveAvatar;
127 130
131 event CreateInventoryFolder OnCreateNewInventoryFolder;
132 event FetchInventoryDescendents OnFetchInventoryDescendents;
133 event RequestTaskInventory OnRequestTaskInventory;
134
128 event UUIDNameRequest OnNameFromUUIDRequest; 135 event UUIDNameRequest OnNameFromUUIDRequest;
129 136
130 event ParcelPropertiesRequest OnParcelPropertiesRequest; 137 event ParcelPropertiesRequest OnParcelPropertiesRequest;
@@ -188,8 +195,10 @@ namespace OpenSim.Framework.Interfaces
188 195
189 void SendInventoryFolderDetails(LLUUID ownerID, LLUUID folderID, List<InventoryItemBase> items); 196 void SendInventoryFolderDetails(LLUUID ownerID, LLUUID folderID, List<InventoryItemBase> items);
190 void SendInventoryItemDetails(LLUUID ownerID, LLUUID folderID, InventoryItemBase item); 197 void SendInventoryItemDetails(LLUUID ownerID, LLUUID folderID, InventoryItemBase item);
191 void SendNameReply(LLUUID profileId, string firstname, string lastname); 198 void SendInventoryItemUpdate(InventoryItemBase Item);
199 void SendTaskInventory(LLUUID taskID, short serial, byte[] fileName);
192 200
201 void SendNameReply(LLUUID profileId, string firstname, string lastname);
193 void SendAlertMessage(string message); 202 void SendAlertMessage(string message);
194 void SendAgentAlertMessage(string message, bool modal); 203 void SendAgentAlertMessage(string message, bool modal);
195 } 204 }
diff --git a/OpenSim/Framework/General/NullClientAPI.cs b/OpenSim/Framework/General/NullClientAPI.cs
index cfba228..18ac527 100644
--- a/OpenSim/Framework/General/NullClientAPI.cs
+++ b/OpenSim/Framework/General/NullClientAPI.cs
@@ -52,6 +52,10 @@ namespace OpenSim.Framework
52 public event NewAvatar OnNewAvatar; 52 public event NewAvatar OnNewAvatar;
53 public event GenericCall6 OnRemoveAvatar; 53 public event GenericCall6 OnRemoveAvatar;
54 54
55 public event CreateInventoryFolder OnCreateNewInventoryFolder;
56 public event FetchInventoryDescendents OnFetchInventoryDescendents;
57 public event RequestTaskInventory OnRequestTaskInventory;
58
55 public event UUIDNameRequest OnNameFromUUIDRequest; 59 public event UUIDNameRequest OnNameFromUUIDRequest;
56 60
57 public event ParcelPropertiesRequest OnParcelPropertiesRequest; 61 public event ParcelPropertiesRequest OnParcelPropertiesRequest;
@@ -124,8 +128,10 @@ namespace OpenSim.Framework
124 128
125 public virtual void SendInventoryFolderDetails(LLUUID ownerID, LLUUID folderID, List<InventoryItemBase> items){} 129 public virtual void SendInventoryFolderDetails(LLUUID ownerID, LLUUID folderID, List<InventoryItemBase> items){}
126 public virtual void SendInventoryItemDetails(LLUUID ownerID, LLUUID folderID, InventoryItemBase item){} 130 public virtual void SendInventoryItemDetails(LLUUID ownerID, LLUUID folderID, InventoryItemBase item){}
127 public virtual void SendNameReply(LLUUID profileId, string firstname, string lastname){} 131 public virtual void SendInventoryItemUpdate(InventoryItemBase Item) { }
132 public virtual void SendTaskInventory(LLUUID taskID, short serial, byte[] fileName) { }
128 133
134 public virtual void SendNameReply(LLUUID profileId, string firstname, string lastname){}
129 public void SendAlertMessage(string message) { } 135 public void SendAlertMessage(string message) { }
130 public void SendAgentAlertMessage(string message, bool modal) { } 136 public void SendAgentAlertMessage(string message, bool modal) { }
131 } 137 }