diff options
Diffstat (limited to '')
-rw-r--r-- | OpenSim/Framework/Communications/Cache/AssetCache.cs | 15 | ||||
-rw-r--r-- | OpenSim/Framework/Communications/Cache/LibraryRootFolder.cs | 49 |
2 files changed, 47 insertions, 17 deletions
diff --git a/OpenSim/Framework/Communications/Cache/AssetCache.cs b/OpenSim/Framework/Communications/Cache/AssetCache.cs index 32ba830..0c6d971 100644 --- a/OpenSim/Framework/Communications/Cache/AssetCache.cs +++ b/OpenSim/Framework/Communications/Cache/AssetCache.cs | |||
@@ -350,7 +350,6 @@ namespace OpenSim.Framework.Communications.Caches | |||
350 | Transfer.TransferInfo.TargetType = 0; | 350 | Transfer.TransferInfo.TargetType = 0; |
351 | if (req.AssetRequestSource == 2) | 351 | if (req.AssetRequestSource == 2) |
352 | { | 352 | { |
353 | //Transfer.TransferInfo.Params = req.Params; | ||
354 | Transfer.TransferInfo.Params = new byte[20]; | 353 | Transfer.TransferInfo.Params = new byte[20]; |
355 | Array.Copy(req.RequestAssetID.GetBytes(), 0, Transfer.TransferInfo.Params, 0, 16); | 354 | Array.Copy(req.RequestAssetID.GetBytes(), 0, Transfer.TransferInfo.Params, 0, 16); |
356 | int assType = (int)req.AssetInf.Type; | 355 | int assType = (int)req.AssetInf.Type; |
@@ -389,19 +388,19 @@ namespace OpenSim.Framework.Communications.Caches | |||
389 | { | 388 | { |
390 | chunk = new byte[req.AssetInf.Data.Length]; | 389 | chunk = new byte[req.AssetInf.Data.Length]; |
391 | Array.Copy(req.AssetInf.Data, chunk, req.AssetInf.Data.Length); | 390 | Array.Copy(req.AssetInf.Data, chunk, req.AssetInf.Data.Length); |
391 | TransferPacket.TransferData.Data = chunk; | ||
392 | TransferPacket.TransferData.Status = 1; | ||
393 | req.RequestUser.OutPacket(TransferPacket); | ||
392 | } | 394 | } |
393 | else | 395 | else |
394 | { | 396 | { |
395 | chunk = new byte[1000]; | 397 | chunk = new byte[1000]; |
396 | Array.Copy(req.AssetInf.Data, chunk, 1000); | 398 | Array.Copy(req.AssetInf.Data, chunk, 1000); |
397 | } | ||
398 | 399 | ||
399 | TransferPacket.TransferData.Data = chunk; | 400 | TransferPacket.TransferData.Data = chunk; |
400 | TransferPacket.TransferData.Status = 0; | 401 | TransferPacket.TransferData.Status = 0; |
401 | req.RequestUser.OutPacket(TransferPacket); | 402 | req.RequestUser.OutPacket(TransferPacket); |
402 | 403 | ||
403 | if (req.AssetInf.Data.Length > 1000) | ||
404 | { | ||
405 | TransferPacket = new TransferPacketPacket(); | 404 | TransferPacket = new TransferPacketPacket(); |
406 | TransferPacket.TransferData.Packet = 1; | 405 | TransferPacket.TransferData.Packet = 1; |
407 | TransferPacket.TransferData.ChannelType = 2; | 406 | TransferPacket.TransferData.ChannelType = 2; |
@@ -411,7 +410,7 @@ namespace OpenSim.Framework.Communications.Caches | |||
411 | TransferPacket.TransferData.Data = chunk1; | 410 | TransferPacket.TransferData.Data = chunk1; |
412 | TransferPacket.TransferData.Status = 1; | 411 | TransferPacket.TransferData.Status = 1; |
413 | req.RequestUser.OutPacket(TransferPacket); | 412 | req.RequestUser.OutPacket(TransferPacket); |
414 | } | 413 | } |
415 | } | 414 | } |
416 | 415 | ||
417 | } | 416 | } |
diff --git a/OpenSim/Framework/Communications/Cache/LibraryRootFolder.cs b/OpenSim/Framework/Communications/Cache/LibraryRootFolder.cs index f807b2b..7813adc 100644 --- a/OpenSim/Framework/Communications/Cache/LibraryRootFolder.cs +++ b/OpenSim/Framework/Communications/Cache/LibraryRootFolder.cs | |||
@@ -43,7 +43,7 @@ namespace OpenSim.Framework.Communications.Caches | |||
43 | item.assetID = new LLUUID("00000000-0000-0000-9999-000000000002"); | 43 | item.assetID = new LLUUID("00000000-0000-0000-9999-000000000002"); |
44 | item.inventoryDescription = "Plywood texture"; | 44 | item.inventoryDescription = "Plywood texture"; |
45 | item.inventoryName = "Plywood"; | 45 | item.inventoryName = "Plywood"; |
46 | item.type = 0; | 46 | item.assetType = 0; |
47 | item.parentFolderID = m_textureFolder.folderID; | 47 | item.parentFolderID = m_textureFolder.folderID; |
48 | item.inventoryBasePermissions = 0x7FFFFFFF; | 48 | item.inventoryBasePermissions = 0x7FFFFFFF; |
49 | item.inventoryEveryOnePermissions = 0x7FFFFFFF; | 49 | item.inventoryEveryOnePermissions = 0x7FFFFFFF; |
@@ -58,7 +58,7 @@ namespace OpenSim.Framework.Communications.Caches | |||
58 | item.assetID = new LLUUID("00000000-0000-0000-9999-000000000003"); | 58 | item.assetID = new LLUUID("00000000-0000-0000-9999-000000000003"); |
59 | item.inventoryDescription = "Rocks texture"; | 59 | item.inventoryDescription = "Rocks texture"; |
60 | item.inventoryName = "Rocks"; | 60 | item.inventoryName = "Rocks"; |
61 | item.type = 0; | 61 | item.assetType = 0; |
62 | item.parentFolderID = m_textureFolder.folderID; | 62 | item.parentFolderID = m_textureFolder.folderID; |
63 | item.inventoryBasePermissions = 0x7FFFFFFF; | 63 | item.inventoryBasePermissions = 0x7FFFFFFF; |
64 | item.inventoryEveryOnePermissions = 0x7FFFFFFF; | 64 | item.inventoryEveryOnePermissions = 0x7FFFFFFF; |
@@ -73,7 +73,7 @@ namespace OpenSim.Framework.Communications.Caches | |||
73 | item.assetID = new LLUUID("00000000-0000-0000-9999-000000000001"); | 73 | item.assetID = new LLUUID("00000000-0000-0000-9999-000000000001"); |
74 | item.inventoryDescription = "Bricks texture"; | 74 | item.inventoryDescription = "Bricks texture"; |
75 | item.inventoryName = "Bricks"; | 75 | item.inventoryName = "Bricks"; |
76 | item.type = 0; | 76 | item.assetType = 0; |
77 | item.parentFolderID = m_textureFolder.folderID; | 77 | item.parentFolderID = m_textureFolder.folderID; |
78 | item.inventoryBasePermissions = 0x7FFFFFFF; | 78 | item.inventoryBasePermissions = 0x7FFFFFFF; |
79 | item.inventoryEveryOnePermissions = 0x7FFFFFFF; | 79 | item.inventoryEveryOnePermissions = 0x7FFFFFFF; |
@@ -88,7 +88,7 @@ namespace OpenSim.Framework.Communications.Caches | |||
88 | item.assetID = new LLUUID("00000000-0000-0000-9999-000000000004"); | 88 | item.assetID = new LLUUID("00000000-0000-0000-9999-000000000004"); |
89 | item.inventoryDescription = "Granite texture"; | 89 | item.inventoryDescription = "Granite texture"; |
90 | item.inventoryName = "Granite"; | 90 | item.inventoryName = "Granite"; |
91 | item.type = 0; | 91 | item.assetType = 0; |
92 | item.parentFolderID = m_textureFolder.folderID; | 92 | item.parentFolderID = m_textureFolder.folderID; |
93 | item.inventoryBasePermissions = 0x7FFFFFFF; | 93 | item.inventoryBasePermissions = 0x7FFFFFFF; |
94 | item.inventoryEveryOnePermissions = 0x7FFFFFFF; | 94 | item.inventoryEveryOnePermissions = 0x7FFFFFFF; |
@@ -103,7 +103,7 @@ namespace OpenSim.Framework.Communications.Caches | |||
103 | item.assetID = new LLUUID("00000000-0000-0000-9999-000000000005"); | 103 | item.assetID = new LLUUID("00000000-0000-0000-9999-000000000005"); |
104 | item.inventoryDescription = "Hardwood texture"; | 104 | item.inventoryDescription = "Hardwood texture"; |
105 | item.inventoryName = "Hardwood"; | 105 | item.inventoryName = "Hardwood"; |
106 | item.type = 0; | 106 | item.assetType = 0; |
107 | item.parentFolderID = m_textureFolder.folderID; | 107 | item.parentFolderID = m_textureFolder.folderID; |
108 | item.inventoryBasePermissions = 0x7FFFFFFF; | 108 | item.inventoryBasePermissions = 0x7FFFFFFF; |
109 | item.inventoryEveryOnePermissions = 0x7FFFFFFF; | 109 | item.inventoryEveryOnePermissions = 0x7FFFFFFF; |
@@ -118,7 +118,8 @@ namespace OpenSim.Framework.Communications.Caches | |||
118 | item.assetID = new LLUUID("66c41e39-38f9-f75a-024e-585989bfab73"); | 118 | item.assetID = new LLUUID("66c41e39-38f9-f75a-024e-585989bfab73"); |
119 | item.inventoryDescription = "Default Shape"; | 119 | item.inventoryDescription = "Default Shape"; |
120 | item.inventoryName = "Default Shape"; | 120 | item.inventoryName = "Default Shape"; |
121 | item.type = 13; | 121 | item.assetType = 13; |
122 | item.invType = 18; | ||
122 | item.parentFolderID = this.folderID; | 123 | item.parentFolderID = this.folderID; |
123 | item.inventoryCurrentPermissions = 0; | 124 | item.inventoryCurrentPermissions = 0; |
124 | item.inventoryNextPermissions = 0; | 125 | item.inventoryNextPermissions = 0; |
@@ -131,12 +132,41 @@ namespace OpenSim.Framework.Communications.Caches | |||
131 | item.assetID = new LLUUID("77c41e39-38f9-f75a-024e-585989bbabbb"); | 132 | item.assetID = new LLUUID("77c41e39-38f9-f75a-024e-585989bbabbb"); |
132 | item.inventoryDescription = "Default Skin"; | 133 | item.inventoryDescription = "Default Skin"; |
133 | item.inventoryName = "Default Skin"; | 134 | item.inventoryName = "Default Skin"; |
134 | item.type = 13; | 135 | item.assetType = 13; |
136 | item.invType = 18; | ||
135 | item.parentFolderID = this.folderID; | 137 | item.parentFolderID = this.folderID; |
136 | item.inventoryCurrentPermissions = 0; | 138 | item.inventoryCurrentPermissions = 0; |
137 | item.inventoryNextPermissions = 0; | 139 | item.inventoryNextPermissions = 0; |
138 | this.Items.Add(item.inventoryID, item); | 140 | this.Items.Add(item.inventoryID, item); |
139 | 141 | ||
142 | item = new InventoryItemBase(); | ||
143 | item.avatarID = libOwner; | ||
144 | item.creatorsID = libOwner; | ||
145 | item.inventoryID = new LLUUID("77c41e39-38f9-f75a-0000-585989bf0000"); | ||
146 | item.assetID = new LLUUID("00000000-38f9-1111-024e-222222111110"); | ||
147 | item.inventoryDescription = "Default Shirt"; | ||
148 | item.inventoryName = "Default Shirt"; | ||
149 | item.assetType = 5; | ||
150 | item.invType = 18; | ||
151 | item.parentFolderID = this.folderID; | ||
152 | item.inventoryCurrentPermissions = 0; | ||
153 | item.inventoryNextPermissions = 0; | ||
154 | this.Items.Add(item.inventoryID, item); | ||
155 | |||
156 | item = new InventoryItemBase(); | ||
157 | item.avatarID = libOwner; | ||
158 | item.creatorsID = libOwner; | ||
159 | item.inventoryID = new LLUUID("77c41e39-38f9-f75a-0000-5859892f1111"); | ||
160 | item.assetID = new LLUUID("00000000-38f9-1111-024e-222222111120"); | ||
161 | item.inventoryDescription = "Default Pants"; | ||
162 | item.inventoryName = "Default Pants"; | ||
163 | item.assetType = 5; | ||
164 | item.invType = 18; | ||
165 | item.parentFolderID = this.folderID; | ||
166 | item.inventoryCurrentPermissions = 0; | ||
167 | item.inventoryNextPermissions = 0; | ||
168 | this.Items.Add(item.inventoryID, item); | ||
169 | |||
140 | item = new InventoryItemBase(); | 170 | item = new InventoryItemBase(); |
141 | item.avatarID = libOwner; | 171 | item.avatarID = libOwner; |
142 | item.creatorsID = libOwner; | 172 | item.creatorsID = libOwner; |
@@ -144,7 +174,8 @@ namespace OpenSim.Framework.Communications.Caches | |||
144 | item.assetID = new LLUUID("00000000-0000-2222-3333-000000000001"); | 174 | item.assetID = new LLUUID("00000000-0000-2222-3333-000000000001"); |
145 | item.inventoryDescription = "Welcome"; | 175 | item.inventoryDescription = "Welcome"; |
146 | item.inventoryName = "Welcome"; | 176 | item.inventoryName = "Welcome"; |
147 | item.type = 7; | 177 | item.assetType = 7; |
178 | item.invType = 7; | ||
148 | item.parentFolderID = this.folderID; | 179 | item.parentFolderID = this.folderID; |
149 | item.inventoryCurrentPermissions = (1 << 15); | 180 | item.inventoryCurrentPermissions = (1 << 15); |
150 | item.inventoryNextPermissions = (1 << 15); | 181 | item.inventoryNextPermissions = (1 << 15); |