diff options
| author | Melanie | 2010-12-21 23:00:01 +0000 |
|---|---|---|
| committer | Melanie | 2010-12-21 23:00:01 +0000 |
| commit | 303c02133fe2bb7ff4fe499dc855bb358ca4fcb6 (patch) | |
| tree | 75fef05c6b22bbce3c6364cdf5b8c8a8ed193448 /OpenSim | |
| parent | Merge branch 'master' into careminster-presence-refactor (diff) | |
| parent | What is the point of using different types to express the same damn thing? (diff) | |
| download | opensim-SC_OLD-303c02133fe2bb7ff4fe499dc855bb358ca4fcb6.zip opensim-SC_OLD-303c02133fe2bb7ff4fe499dc855bb358ca4fcb6.tar.gz opensim-SC_OLD-303c02133fe2bb7ff4fe499dc855bb358ca4fcb6.tar.bz2 opensim-SC_OLD-303c02133fe2bb7ff4fe499dc855bb358ca4fcb6.tar.xz | |
Merge branch 'master' into careminster-presence-refactor
Diffstat (limited to 'OpenSim')
| -rw-r--r-- | OpenSim/Region/Framework/Scenes/SceneObjectPartInventory.cs | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/OpenSim/Region/Framework/Scenes/SceneObjectPartInventory.cs b/OpenSim/Region/Framework/Scenes/SceneObjectPartInventory.cs index f7896cf..da1b983 100644 --- a/OpenSim/Region/Framework/Scenes/SceneObjectPartInventory.cs +++ b/OpenSim/Region/Framework/Scenes/SceneObjectPartInventory.cs | |||
| @@ -47,7 +47,7 @@ namespace OpenSim.Region.Framework.Scenes | |||
| 47 | 47 | ||
| 48 | private string m_inventoryFileName = String.Empty; | 48 | private string m_inventoryFileName = String.Empty; |
| 49 | private byte[] m_inventoryFileData = new byte[0]; | 49 | private byte[] m_inventoryFileData = new byte[0]; |
| 50 | private int m_inventoryFileNameSerial = 0; | 50 | private uint m_inventoryFileNameSerial = 0; |
| 51 | 51 | ||
| 52 | private Dictionary<UUID, ArrayList> m_scriptErrors = new Dictionary<UUID, ArrayList>(); | 52 | private Dictionary<UUID, ArrayList> m_scriptErrors = new Dictionary<UUID, ArrayList>(); |
| 53 | 53 | ||