Merge branch 'master' into careminster-presence-refactor

This commit is contained in:
Melanie
2010-12-21 23:00:01 +00:00

View File

@@ -47,7 +47,7 @@ namespace OpenSim.Region.Framework.Scenes
private string m_inventoryFileName = String.Empty;
private byte[] m_inventoryFileData = new byte[0];
private int m_inventoryFileNameSerial = 0;
private uint m_inventoryFileNameSerial = 0;
private Dictionary<UUID, ArrayList> m_scriptErrors = new Dictionary<UUID, ArrayList>();