let LLSDAssetUploadRequest include asset_resources information plus let
NewAgentInventoryRequest know about mesh (does nothing with it still)avinationmerge
parent
4ff7891506
commit
245763b1b0
|
@ -30,6 +30,15 @@ using OpenMetaverse;
|
|||
|
||||
namespace OpenSim.Framework.Capabilities
|
||||
{
|
||||
[OSDMap]
|
||||
public class LLSDAssetResource
|
||||
{
|
||||
public OSDArray instance_list = new OSDArray();
|
||||
public OSDArray texture_list = new OSDArray();
|
||||
public OSDArray mesh_list = new OSDArray();
|
||||
public string metric = String.Empty;
|
||||
}
|
||||
|
||||
[OSDMap]
|
||||
public class LLSDAssetUploadRequest
|
||||
{
|
||||
|
@ -38,7 +47,7 @@ namespace OpenSim.Framework.Capabilities
|
|||
public UUID folder_id = UUID.Zero;
|
||||
public string inventory_type = String.Empty;
|
||||
public string name = String.Empty;
|
||||
|
||||
public LLSDAssetResource asset_resources = new LLSDAssetResource();
|
||||
public LLSDAssetUploadRequest()
|
||||
{
|
||||
}
|
||||
|
|
|
@ -431,6 +431,7 @@ namespace OpenSim.Region.ClientStack.Linden
|
|||
|
||||
if (llsdRequest.asset_type == "texture" ||
|
||||
llsdRequest.asset_type == "animation" ||
|
||||
llsdRequest.asset_type == "mesh" ||
|
||||
llsdRequest.asset_type == "sound")
|
||||
{
|
||||
ScenePresence avatar = null;
|
||||
|
|
Loading…
Reference in New Issue