diff options
author | mingchen | 2007-06-28 16:17:20 +0000 |
---|---|---|
committer | mingchen | 2007-06-28 16:17:20 +0000 |
commit | 108d89f89436556c8f4662197903c374db943f7d (patch) | |
tree | 4a089c43c54bdef28c0883fd9aaef464c840c3ac /OpenSim/Region/Application/OpenSimMain.cs | |
parent | Applied ScenePresence movement patch from Darok. (diff) | |
download | opensim-SC-108d89f89436556c8f4662197903c374db943f7d.zip opensim-SC-108d89f89436556c8f4662197903c374db943f7d.tar.gz opensim-SC-108d89f89436556c8f4662197903c374db943f7d.tar.bz2 opensim-SC-108d89f89436556c8f4662197903c374db943f7d.tar.xz |
*Master User is now set up
*Added support for getting user profile information from remote grid server (untested)
*Updated prebuild.xml
Diffstat (limited to '')
-rw-r--r-- | OpenSim/Region/Application/OpenSimMain.cs | 11 |
1 files changed, 10 insertions, 1 deletions
diff --git a/OpenSim/Region/Application/OpenSimMain.cs b/OpenSim/Region/Application/OpenSimMain.cs index 7bf6b8d..6e600b8 100644 --- a/OpenSim/Region/Application/OpenSimMain.cs +++ b/OpenSim/Region/Application/OpenSimMain.cs | |||
@@ -42,6 +42,8 @@ using OpenSim.Region.Environment; | |||
42 | using OpenSim.Region.Environment.Scenes; | 42 | using OpenSim.Region.Environment.Scenes; |
43 | using OpenSim.Region.Terrain; | 43 | using OpenSim.Region.Terrain; |
44 | using OpenSim.Framework.Interfaces; | 44 | using OpenSim.Framework.Interfaces; |
45 | using OpenSim.Framework.Data; | ||
46 | |||
45 | using OpenSim.Framework.Types; | 47 | using OpenSim.Framework.Types; |
46 | using OpenSim.Framework; | 48 | using OpenSim.Framework; |
47 | using OpenSim.Assets; | 49 | using OpenSim.Assets; |
@@ -250,7 +252,14 @@ namespace OpenSim | |||
250 | LocalWorld.PhysScene = this.physManager.GetPhysicsScene(this.m_physicsEngine); | 252 | LocalWorld.PhysScene = this.physManager.GetPhysicsScene(this.m_physicsEngine); |
251 | LocalWorld.PhysScene.SetTerrain(LocalWorld.Terrain.getHeights1D()); | 253 | LocalWorld.PhysScene.SetTerrain(LocalWorld.Terrain.getHeights1D()); |
252 | LocalWorld.LoadPrimsFromStorage(); | 254 | LocalWorld.LoadPrimsFromStorage(); |
253 | LocalWorld.localStorage.LoadParcels((ILocalStorageParcelReceiver)LocalWorld.parcelManager); | 255 | |
256 | //Master Avatar Setup | ||
257 | UserProfileData masterAvatar = commsManager.UserServer.SetupMasterUser(LocalWorld.RegionInfo.MasterAvatarFirstName, LocalWorld.RegionInfo.MasterAvatarLastName, LocalWorld.RegionInfo.MasterAvatarSandboxPassword); | ||
258 | if (masterAvatar != null) | ||
259 | { | ||
260 | LocalWorld.RegionInfo.MasterAvatarAssignedUUID = masterAvatar.UUID; | ||
261 | LocalWorld.localStorage.LoadParcels((ILocalStorageParcelReceiver)LocalWorld.parcelManager); | ||
262 | } | ||
254 | 263 | ||
255 | 264 | ||
256 | LocalWorld.StartTimer(); | 265 | LocalWorld.StartTimer(); |