diff options
author | Teravus Ovares | 2008-09-06 07:52:41 +0000 |
---|---|---|
committer | Teravus Ovares | 2008-09-06 07:52:41 +0000 |
commit | 7d89e122930be39e84a6d174548fa2d12ac0484a (patch) | |
tree | e5aa5752f988a9aba2a969f49e5e208985eda80c /OpenSim/Region/ClientStack/RegionApplicationBase.cs | |
parent | * minor: speculatively try a change to bamboo.build to see if this generates ... (diff) | |
download | opensim-SC_OLD-7d89e122930be39e84a6d174548fa2d12ac0484a.zip opensim-SC_OLD-7d89e122930be39e84a6d174548fa2d12ac0484a.tar.gz opensim-SC_OLD-7d89e122930be39e84a6d174548fa2d12ac0484a.tar.bz2 opensim-SC_OLD-7d89e122930be39e84a6d174548fa2d12ac0484a.tar.xz |
* This is the fabled LibOMV update with all of the libOMV types from JHurliman
* This is a HUGE OMG update and will definitely have unknown side effects.. so this is really only for the strong hearted at this point. Regular people should let the dust settle.
* This has been tested to work with most basic functions. However.. make sure you back up 'everything' before using this. It's that big!
* Essentially we're back at square 1 in the testing phase.. so lets identify things that broke.
Diffstat (limited to 'OpenSim/Region/ClientStack/RegionApplicationBase.cs')
-rw-r--r-- | OpenSim/Region/ClientStack/RegionApplicationBase.cs | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/OpenSim/Region/ClientStack/RegionApplicationBase.cs b/OpenSim/Region/ClientStack/RegionApplicationBase.cs index 91f7472..d1572fd 100644 --- a/OpenSim/Region/ClientStack/RegionApplicationBase.cs +++ b/OpenSim/Region/ClientStack/RegionApplicationBase.cs | |||
@@ -28,7 +28,7 @@ | |||
28 | using System.Collections.Generic; | 28 | using System.Collections.Generic; |
29 | using System.Net; | 29 | using System.Net; |
30 | using System.Reflection; | 30 | using System.Reflection; |
31 | using libsecondlife; | 31 | using OpenMetaverse; |
32 | using log4net; | 32 | using log4net; |
33 | using Nini.Config; | 33 | using Nini.Config; |
34 | using OpenSim.Framework; | 34 | using OpenSim.Framework; |
@@ -138,7 +138,7 @@ namespace OpenSim.Region.ClientStack | |||
138 | // TODO: Remove this cruft once MasterAvatar is fully deprecated | 138 | // TODO: Remove this cruft once MasterAvatar is fully deprecated |
139 | //Master Avatar Setup | 139 | //Master Avatar Setup |
140 | UserProfileData masterAvatar; | 140 | UserProfileData masterAvatar; |
141 | if (scene.RegionInfo.MasterAvatarAssignedUUID != LLUUID.Zero) | 141 | if (scene.RegionInfo.MasterAvatarAssignedUUID != UUID.Zero) |
142 | { | 142 | { |
143 | masterAvatar = m_commsManager.UserService.SetupMasterUser(scene.RegionInfo.MasterAvatarAssignedUUID); | 143 | masterAvatar = m_commsManager.UserService.SetupMasterUser(scene.RegionInfo.MasterAvatarAssignedUUID); |
144 | scene.RegionInfo.MasterAvatarFirstName = masterAvatar.FirstName; | 144 | scene.RegionInfo.MasterAvatarFirstName = masterAvatar.FirstName; |
@@ -160,7 +160,7 @@ namespace OpenSim.Region.ClientStack | |||
160 | else | 160 | else |
161 | { | 161 | { |
162 | m_log.Info("[PARCEL]: No master avatar found, using null."); | 162 | m_log.Info("[PARCEL]: No master avatar found, using null."); |
163 | scene.RegionInfo.MasterAvatarAssignedUUID = LLUUID.Zero; | 163 | scene.RegionInfo.MasterAvatarAssignedUUID = UUID.Zero; |
164 | } | 164 | } |
165 | 165 | ||
166 | scene.LoadPrimsFromStorage(regionInfo.originRegionID); | 166 | scene.LoadPrimsFromStorage(regionInfo.originRegionID); |