mirror of
https://github.com/opensim/opensim.git
synced 2026-08-01 06:06:06 +08:00
* 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.
This commit is contained in:
@@ -28,7 +28,7 @@
|
||||
using System.Collections.Generic;
|
||||
using System.Net;
|
||||
using System.Reflection;
|
||||
using libsecondlife;
|
||||
using OpenMetaverse;
|
||||
using log4net;
|
||||
using Nini.Config;
|
||||
using OpenSim.Framework;
|
||||
@@ -138,7 +138,7 @@ namespace OpenSim.Region.ClientStack
|
||||
// TODO: Remove this cruft once MasterAvatar is fully deprecated
|
||||
//Master Avatar Setup
|
||||
UserProfileData masterAvatar;
|
||||
if (scene.RegionInfo.MasterAvatarAssignedUUID != LLUUID.Zero)
|
||||
if (scene.RegionInfo.MasterAvatarAssignedUUID != UUID.Zero)
|
||||
{
|
||||
masterAvatar = m_commsManager.UserService.SetupMasterUser(scene.RegionInfo.MasterAvatarAssignedUUID);
|
||||
scene.RegionInfo.MasterAvatarFirstName = masterAvatar.FirstName;
|
||||
@@ -160,7 +160,7 @@ namespace OpenSim.Region.ClientStack
|
||||
else
|
||||
{
|
||||
m_log.Info("[PARCEL]: No master avatar found, using null.");
|
||||
scene.RegionInfo.MasterAvatarAssignedUUID = LLUUID.Zero;
|
||||
scene.RegionInfo.MasterAvatarAssignedUUID = UUID.Zero;
|
||||
}
|
||||
|
||||
scene.LoadPrimsFromStorage(regionInfo.originRegionID);
|
||||
|
||||
Reference in New Issue
Block a user