ogb912/opensim
1
0
Fork 0
mirror of https://github.com/opensim/opensim.git synced 2026-08-08 10:15:33 +08:00
Code Issues Packages Projects Releases Wiki Activity

Merge commit 'c8304b7f84b1a8d9fb978cae510f684e36419deb' into bigmerge

Browse Source 
Conflicts:
	OpenSim/Region/CoreModules/Agent/AssetTransaction/AgentAssetsTransactions.cs
This commit is contained in:
Melanie
2011-10-11 22:51:44 +01:00
parent 7c897ef2a1 c8304b7f84
commit b40157fc9b
8 changed files with 271 additions and 110 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
OpenSim/Framework/AssetBase.cs
View File

@@ -169,6 +169,7 @@ namespace OpenSim.Framework
get { return m_metadata.FullID; }
set { m_metadata.FullID = value; }
}
/// <summary>
/// Asset MetaData ID (transferring from UUID to string ID)
/// </summary>

2
OpenSim/Framework/AvatarAppearance.cs
View File

@@ -225,6 +225,8 @@ namespace OpenSim.Framework
/// </summary>
public virtual void ResetAppearance()
{
// m_log.WarnFormat("[AVATAR APPEARANCE]: Reset appearance");
m_serial = 0;
SetDefaultTexture();