diff options
Diffstat (limited to 'OpenSim/Region/Environment/Scenes')
-rw-r--r-- | OpenSim/Region/Environment/Scenes/Scene.cs | 4 | ||||
-rw-r--r-- | OpenSim/Region/Environment/Scenes/ScenePresence.cs | 15 |
2 files changed, 4 insertions, 15 deletions
diff --git a/OpenSim/Region/Environment/Scenes/Scene.cs b/OpenSim/Region/Environment/Scenes/Scene.cs index cae57a2..d3c7f77 100644 --- a/OpenSim/Region/Environment/Scenes/Scene.cs +++ b/OpenSim/Region/Environment/Scenes/Scene.cs | |||
@@ -50,7 +50,7 @@ namespace OpenSim.Region.Environment.Scenes | |||
50 | 50 | ||
51 | public delegate void ForEachScenePresenceDelegate(ScenePresence presence); | 51 | public delegate void ForEachScenePresenceDelegate(ScenePresence presence); |
52 | 52 | ||
53 | public partial class Scene : SceneBase, ILocalStorageReceiver | 53 | public partial class Scene : SceneBase |
54 | { | 54 | { |
55 | protected Timer m_heartbeatTimer = new Timer(); | 55 | protected Timer m_heartbeatTimer = new Timer(); |
56 | protected Dictionary<LLUUID, ScenePresence> Avatars; | 56 | protected Dictionary<LLUUID, ScenePresence> Avatars; |
@@ -229,7 +229,7 @@ namespace OpenSim.Region.Environment.Scenes | |||
229 | 229 | ||
230 | //backup scene data | 230 | //backup scene data |
231 | storageCount++; | 231 | storageCount++; |
232 | if (storageCount > 1200) //set to how often you want to backup | 232 | if (storageCount > 600) //set to how often you want to backup |
233 | { | 233 | { |
234 | Backup(); | 234 | Backup(); |
235 | storageCount = 0; | 235 | storageCount = 0; |
diff --git a/OpenSim/Region/Environment/Scenes/ScenePresence.cs b/OpenSim/Region/Environment/Scenes/ScenePresence.cs index 114623a..1be1e7a 100644 --- a/OpenSim/Region/Environment/Scenes/ScenePresence.cs +++ b/OpenSim/Region/Environment/Scenes/ScenePresence.cs | |||
@@ -665,19 +665,8 @@ namespace OpenSim.Region.Environment.Scenes | |||
665 | } | 665 | } |
666 | } | 666 | } |
667 | 667 | ||
668 | public static void CreateDefaultTextureEntry(string name) | 668 | public static void CreateDefaultTextureEntry() |
669 | { | 669 | { |
670 | /* FileInfo fInfo = new FileInfo(name); | ||
671 | long numBytes = fInfo.Length; | ||
672 | FileStream fStream = new FileStream(name, FileMode.Open, FileAccess.Read); | ||
673 | BinaryReader br = new BinaryReader(fStream); | ||
674 | byte[] data1 = br.ReadBytes((int)numBytes); | ||
675 | br.Close(); | ||
676 | fStream.Close(); | ||
677 | DefaultTexture = data1; | ||
678 | LLObject.TextureEntry textu = new LLObject.TextureEntry(data1, 0, data1.Length); | ||
679 | Console.WriteLine("default texture entry: " + textu.ToString());*/ | ||
680 | |||
681 | LLObject.TextureEntry textu = new LLObject.TextureEntry(new LLUUID("C228D1CF-4B5D-4BA8-84F4-899A0796AA97")); | 670 | LLObject.TextureEntry textu = new LLObject.TextureEntry(new LLUUID("C228D1CF-4B5D-4BA8-84F4-899A0796AA97")); |
682 | textu.CreateFace(0).TextureID = new LLUUID("00000000-0000-1111-9999-000000000012"); | 671 | textu.CreateFace(0).TextureID = new LLUUID("00000000-0000-1111-9999-000000000012"); |
683 | textu.CreateFace(1).TextureID = new LLUUID("5748decc-f629-461c-9a36-a35a221fe21f"); | 672 | textu.CreateFace(1).TextureID = new LLUUID("5748decc-f629-461c-9a36-a35a221fe21f"); |