From 622b2ed6c84eaa9fa9c2f6cc749807aa79b0be21 Mon Sep 17 00:00:00 2001
From: Jim Radford <jradford@npl.com>
Date: Mon, 7 Apr 2008 16:46:04 +0000
Subject: [PATCH] AssetManager.AssetType.Primitive seems misnamed and causes SL
 client to ignore inventory objects Mantis #208 patch from DrScofield

git-svn-id: http://libopenmetaverse.googlecode.com/svn/trunk@1714 52acb1d6-8a22-11de-b505-999d5b087335
---
 libsecondlife/AssetManager.cs | 4 ++--
 libsecondlife/AssetTypes.cs   | 2 +-
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/libsecondlife/AssetManager.cs b/libsecondlife/AssetManager.cs
index 02d20dcb..841e09d3 100644
--- a/libsecondlife/AssetManager.cs
+++ b/libsecondlife/AssetManager.cs
@@ -32,7 +32,7 @@ namespace libsecondlife
         Clothing = 5,
         /// <summary>Primitive that can contain textures, sounds, 
         /// scripts and more</summary>
-        Primitive = 6,
+        Object = 6,
         /// <summary>Notecard asset</summary>
         Notecard = 7,
         /// <summary>Holds a collection of inventory items</summary>
@@ -702,7 +702,7 @@ namespace libsecondlife
                 case AssetType.Texture:
                     asset = new AssetTexture();
                     break;
-                case AssetType.Primitive:
+                case AssetType.Object:
                     asset = new AssetPrim();
                     break;
                 case AssetType.Clothing:
diff --git a/libsecondlife/AssetTypes.cs b/libsecondlife/AssetTypes.cs
index 66b58b42..a441fa91 100644
--- a/libsecondlife/AssetTypes.cs
+++ b/libsecondlife/AssetTypes.cs
@@ -176,7 +176,7 @@ namespace libsecondlife
 
     public class AssetPrim : Asset
     {
-        public override AssetType AssetType { get { return AssetType.Primitive; } }
+        public override AssetType AssetType { get { return AssetType.Object; } }
 
         public AssetPrim() { }