aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim/Region
diff options
context:
space:
mode:
authorUbitUmarov2015-12-04 18:29:31 +0000
committerUbitUmarov2015-12-04 18:29:31 +0000
commita7079c9227b6fc53bf554a9aa2c73d199d6d9e67 (patch)
treebc74fb9034cc002dbd96cd69cfd4471d9b662526 /OpenSim/Region
parentadd other Eyes asset id to xferupload defaults (diff)
downloadopensim-SC_OLD-a7079c9227b6fc53bf554a9aa2c73d199d6d9e67.zip
opensim-SC_OLD-a7079c9227b6fc53bf554a9aa2c73d199d6d9e67.tar.gz
opensim-SC_OLD-a7079c9227b6fc53bf554a9aa2c73d199d6d9e67.tar.bz2
opensim-SC_OLD-a7079c9227b6fc53bf554a9aa2c73d199d6d9e67.tar.xz
add default eyes to default wearables, and revert previus bad commit
Diffstat (limited to 'OpenSim/Region')
-rw-r--r--OpenSim/Region/CoreModules/Agent/AssetTransaction/AssetXferUploader.cs3
1 files changed, 1 insertions, 2 deletions
diff --git a/OpenSim/Region/CoreModules/Agent/AssetTransaction/AssetXferUploader.cs b/OpenSim/Region/CoreModules/Agent/AssetTransaction/AssetXferUploader.cs
index d2794f9..64bcfa2 100644
--- a/OpenSim/Region/CoreModules/Agent/AssetTransaction/AssetXferUploader.cs
+++ b/OpenSim/Region/CoreModules/Agent/AssetTransaction/AssetXferUploader.cs
@@ -56,9 +56,8 @@ namespace OpenSim.Region.CoreModules.Agent.AssetTransaction
56 // other transparency defined in assets 56 // other transparency defined in assets
57 new UUID("3a367d1c-bef1-6d43-7595-e88c1e3aadb3"), 57 new UUID("3a367d1c-bef1-6d43-7595-e88c1e3aadb3"),
58 new UUID("1578a2b1-5179-4b53-b618-fe00ca5a5594"), 58 new UUID("1578a2b1-5179-4b53-b618-fe00ca5a5594"),
59
60 new UUID("4bb6fa4d-1cd2-498a-a84c-95c1a0e745a7") // other eyes
61 }; 59 };
60
62 private static readonly ILog m_log = LogManager.GetLogger(MethodBase.GetCurrentMethod().DeclaringType); 61 private static readonly ILog m_log = LogManager.GetLogger(MethodBase.GetCurrentMethod().DeclaringType);
63 62
64 /// <summary> 63 /// <summary>