aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim/Region/ClientStack
diff options
context:
space:
mode:
authorMW2007-08-10 13:59:19 +0000
committerMW2007-08-10 13:59:19 +0000
commit94c7e41ef1978a5be21e1a063c68ffc1c8a89b97 (patch)
treef40b2951bfbabe0bff2553355e3603450c737b0a /OpenSim/Region/ClientStack
parentCouldn't leave this one alone. Data is now flowing both ways in (diff)
downloadopensim-SC_OLD-94c7e41ef1978a5be21e1a063c68ffc1c8a89b97.zip
opensim-SC_OLD-94c7e41ef1978a5be21e1a063c68ffc1c8a89b97.tar.gz
opensim-SC_OLD-94c7e41ef1978a5be21e1a063c68ffc1c8a89b97.tar.bz2
opensim-SC_OLD-94c7e41ef1978a5be21e1a063c68ffc1c8a89b97.tar.xz
Made a few changes so that once we enable the sqlite data store (simple line change in OpenSimMain), then basic ( with a few limits at moment) prim database backup will work.
Diffstat (limited to 'OpenSim/Region/ClientStack')
-rw-r--r--OpenSim/Region/ClientStack/ClientView.API.cs2
-rw-r--r--OpenSim/Region/ClientStack/RegionApplicationBase.cs2
2 files changed, 2 insertions, 2 deletions
diff --git a/OpenSim/Region/ClientStack/ClientView.API.cs b/OpenSim/Region/ClientStack/ClientView.API.cs
index 8a2db98..81c20e8 100644
--- a/OpenSim/Region/ClientStack/ClientView.API.cs
+++ b/OpenSim/Region/ClientStack/ClientView.API.cs
@@ -844,7 +844,7 @@ namespace OpenSim.Region.ClientStack
844 844
845 byte[] rot = rotation.GetBytes(); 845 byte[] rot = rotation.GetBytes();
846 Array.Copy(rot, 0, outPacket.ObjectData[0].ObjectData, 36, rot.Length); 846 Array.Copy(rot, 0, outPacket.ObjectData[0].ObjectData, 36, rot.Length);
847 847
848 OutPacket(outPacket); 848 OutPacket(outPacket);
849 } 849 }
850 850
diff --git a/OpenSim/Region/ClientStack/RegionApplicationBase.cs b/OpenSim/Region/ClientStack/RegionApplicationBase.cs
index c67ae66..05c970a 100644
--- a/OpenSim/Region/ClientStack/RegionApplicationBase.cs
+++ b/OpenSim/Region/ClientStack/RegionApplicationBase.cs
@@ -115,7 +115,7 @@ namespace OpenSim.Region.ClientStack
115 115
116 scene.PhysScene = GetPhysicsScene( ); 116 scene.PhysScene = GetPhysicsScene( );
117 scene.PhysScene.SetTerrain(scene.Terrain.GetHeights1D()); 117 scene.PhysScene.SetTerrain(scene.Terrain.GetHeights1D());
118 scene.LoadPrimsFromStorage(); 118 scene.LoadPrimsFromStorage();
119 119
120 //Master Avatar Setup 120 //Master Avatar Setup
121 UserProfileData masterAvatar = m_commsManager.UserServer.SetupMasterUser(scene.RegionInfo.MasterAvatarFirstName, scene.RegionInfo.MasterAvatarLastName, scene.RegionInfo.MasterAvatarSandboxPassword); 121 UserProfileData masterAvatar = m_commsManager.UserServer.SetupMasterUser(scene.RegionInfo.MasterAvatarFirstName, scene.RegionInfo.MasterAvatarLastName, scene.RegionInfo.MasterAvatarSandboxPassword);