OpenSim
/
OpenSimMirror
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Merge branch 'master' of /home/opensim/var/repo/opensim

integration
BlueWall 2012-05-24 23:27:52 -04:00
parent c1467e7fe1 67ebe80dd9
commit 36d8e6208a
9 changed files with 33 additions and 26 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
OpenSim/Region/CoreModules/Avatar/Attachments/AttachmentsModule.cs
View File

@ -48,7 +48,6 @@ namespace OpenSim.Region.CoreModules.Avatar.Attachments
private static readonly ILog m_log = LogManager.GetLogger(MethodBase.GetCurrentMethod().DeclaringType); private static readonly ILog m_log = LogManager.GetLogger(MethodBase.GetCurrentMethod().DeclaringType);
private Scene m_scene; private Scene m_scene;
private IDialogModule m_dialogModule;
private IInventoryAccessModule m_invAccessModule; private IInventoryAccessModule m_invAccessModule;
/// <summary> /// <summary>
@ -89,7 +88,6 @@ namespace OpenSim.Region.CoreModules.Avatar.Attachments
public void RegionLoaded(Scene scene) public void RegionLoaded(Scene scene)
{ {
m_dialogModule = m_scene.RequestModuleInterface<IDialogModule>();
m_invAccessModule = m_scene.RequestModuleInterface<IInventoryAccessModule>(); m_invAccessModule = m_scene.RequestModuleInterface<IInventoryAccessModule>();
} }

13
OpenSim/Region/CoreModules/Avatar/Friends/HGFriendsModule.cs
View File

@ -415,12 +415,13 @@ namespace OpenSim.Region.CoreModules.Avatar.Friends
protected override void StoreBackwards(UUID friendID, UUID agentID) protected override void StoreBackwards(UUID friendID, UUID agentID)
{ {
Boolean agentIsLocal = true; bool agentIsLocal = true;
Boolean friendIsLocal = true; // bool friendIsLocal = true;
if (UserManagementModule != null) if (UserManagementModule != null)
{ {
agentIsLocal = UserManagementModule.IsLocalGridUser(agentID); agentIsLocal = UserManagementModule.IsLocalGridUser(agentID);
friendIsLocal = UserManagementModule.IsLocalGridUser(friendID); // friendIsLocal = UserManagementModule.IsLocalGridUser(friendID);
} }
// Is the requester a local user? // Is the requester a local user?
@ -507,7 +508,11 @@ namespace OpenSim.Region.CoreModules.Avatar.Friends
{ {
friendUUI = finfo.Friend; friendUUI = finfo.Friend;
theFriendUUID = friendUUI; theFriendUUID = friendUUI;
UUID utmp = UUID.Zero; String url = String.Empty; String first = String.Empty, last = String.Empty, tmp = String.Empty; UUID utmp = UUID.Zero;
string url = String.Empty;
string first = String.Empty;
string last = String.Empty;
// If it's confirming the friendship, we already have the full UUI with the secret // If it's confirming the friendship, we already have the full UUI with the secret
if (Util.ParseUniversalUserIdentifier(theFriendUUID, out utmp, out url, out first, out last, out secret)) if (Util.ParseUniversalUserIdentifier(theFriendUUID, out utmp, out url, out first, out last, out secret))
{ {

2
OpenSim/Region/CoreModules/Framework/EntityTransfer/EntityTransferModule.cs
View File

@ -1240,7 +1240,7 @@ namespace OpenSim.Region.CoreModules.Framework.EntityTransfer
return agent; return agent;
} }
private void CrossAgentToNewRegionCompleted(IAsyncResult iar) private void CrossAgentToNewRegionCompleted(IAsyncResult iar)
{ {
CrossAgentToNewRegionDelegate icon = (CrossAgentToNewRegionDelegate)iar.AsyncState; CrossAgentToNewRegionDelegate icon = (CrossAgentToNewRegionDelegate)iar.AsyncState;

2
OpenSim/Region/CoreModules/Framework/EntityTransfer/HGEntityTransferModule.cs
View File

@ -336,7 +336,7 @@ namespace OpenSim.Region.CoreModules.Framework.EntityTransfer
// Let's find out if this is a foreign user or a local user // Let's find out if this is a foreign user or a local user
IUserManagement uMan = m_scene.RequestModuleInterface<IUserManagement>(); IUserManagement uMan = m_scene.RequestModuleInterface<IUserManagement>();
UserAccount account = m_scene.UserAccountService.GetUserAccount(m_scene.RegionInfo.ScopeID, obj.AgentId); // UserAccount account = m_scene.UserAccountService.GetUserAccount(m_scene.RegionInfo.ScopeID, obj.AgentId);
if (uMan != null && uMan.IsLocalGridUser(obj.AgentId)) if (uMan != null && uMan.IsLocalGridUser(obj.AgentId))
{ {
// local grid user // local grid user

5
OpenSim/Region/CoreModules/Framework/InventoryAccess/HGInventoryAccessModule.cs
View File

@ -364,8 +364,7 @@ namespace OpenSim.Region.CoreModules.Framework.InventoryAccess
{ {
m_log.DebugFormat("[HG INVENTORY ACCESS MODULE]: Changing root inventory for user {0}", client.Name); m_log.DebugFormat("[HG INVENTORY ACCESS MODULE]: Changing root inventory for user {0}", client.Name);
InventoryCollection content = m_Scene.InventoryService.GetFolderContent(client.AgentId, root.ID); InventoryCollection content = m_Scene.InventoryService.GetFolderContent(client.AgentId, root.ID);
List<UUID> fids = new List<UUID>();
List<UUID> iids = new List<UUID>();
List<InventoryFolderBase> keep = new List<InventoryFolderBase>(); List<InventoryFolderBase> keep = new List<InventoryFolderBase>();
foreach (InventoryFolderBase f in content.Folders) foreach (InventoryFolderBase f in content.Folders)
@ -395,4 +394,4 @@ namespace OpenSim.Region.CoreModules.Framework.InventoryAccess
#endregion #endregion
} }
} }

3
OpenSim/Region/CoreModules/ServiceConnectorsIn/Hypergrid/HypergridServiceInConnectorModule.cs
View File

@ -122,7 +122,8 @@ namespace OpenSim.Region.CoreModules.ServiceConnectorsIn.Hypergrid
ISimulationService simService = scene.RequestModuleInterface<ISimulationService>(); ISimulationService simService = scene.RequestModuleInterface<ISimulationService>();
IFriendsSimConnector friendsConn = scene.RequestModuleInterface<IFriendsSimConnector>(); IFriendsSimConnector friendsConn = scene.RequestModuleInterface<IFriendsSimConnector>();
Object[] args = new Object[] { m_Config }; Object[] args = new Object[] { m_Config };
IFriendsService friendsService = ServerUtils.LoadPlugin<IFriendsService>(m_LocalServiceDll, args); // IFriendsService friendsService = ServerUtils.LoadPlugin<IFriendsService>(m_LocalServiceDll, args)
ServerUtils.LoadPlugin<IFriendsService>(m_LocalServiceDll, args);
m_HypergridHandler = new GatekeeperServiceInConnector(m_Config, MainServer.Instance, simService); m_HypergridHandler = new GatekeeperServiceInConnector(m_Config, MainServer.Instance, simService);

2
OpenSim/Region/CoreModules/ServiceConnectorsOut/Asset/HGAssetBroker.cs
View File

@ -149,7 +149,7 @@ namespace OpenSim.Region.CoreModules.ServiceConnectorsOut.Asset
m_aScene = scene; m_aScene = scene;
scene.RegisterModuleInterface<IAssetService>(this); m_aScene.RegisterModuleInterface<IAssetService>(this);
} }
public void RemoveRegion(Scene scene) public void RemoveRegion(Scene scene)

2
OpenSim/Region/CoreModules/World/Terrain/FileLoaders/TIFF.cs
View File

@ -59,7 +59,7 @@ namespace OpenSim.Region.CoreModules.World.Terrain.FileLoaders
} }
//Returns true if this extension is supported for terrain save-tile //Returns true if this extension is supported for terrain save-tile
public bool SupportsTileSave() public override bool SupportsTileSave()
{ {
return false; return false;
} }

28
OpenSim/Region/CoreModules/World/Terrain/FileLoaders/Terragen.cs
View File

@ -65,7 +65,7 @@ namespace OpenSim.Region.CoreModules.World.Terrain.FileLoaders
bool eof = false; bool eof = false;
int fileXPoints = 0; int fileXPoints = 0;
int fileYPoints = 0; // int fileYPoints = 0;
// Terragen file // Terragen file
while (eof == false) while (eof == false)
@ -75,7 +75,7 @@ namespace OpenSim.Region.CoreModules.World.Terrain.FileLoaders
{ {
case "SIZE": case "SIZE":
fileXPoints = bs.ReadInt16() + 1; fileXPoints = bs.ReadInt16() + 1;
fileYPoints = fileXPoints; // fileYPoints = fileXPoints;
bs.ReadInt16(); bs.ReadInt16();
break; break;
case "XPTS": case "XPTS":
@ -83,7 +83,8 @@ namespace OpenSim.Region.CoreModules.World.Terrain.FileLoaders
bs.ReadInt16(); bs.ReadInt16();
break; break;
case "YPTS": case "YPTS":
fileYPoints = bs.ReadInt16(); // fileYPoints = bs.ReadInt16();
bs.ReadInt16();
bs.ReadInt16(); bs.ReadInt16();
break; break;
case "ALTW": case "ALTW":
@ -164,10 +165,8 @@ namespace OpenSim.Region.CoreModules.World.Terrain.FileLoaders
bool eof = false; bool eof = false;
if (Encoding.ASCII.GetString(bs.ReadBytes(16)) == "TERRAGENTERRAIN ") if (Encoding.ASCII.GetString(bs.ReadBytes(16)) == "TERRAGENTERRAIN ")
{ {
// int fileWidth = w;
int fileWidth = w; // int fileHeight = h;
int fileHeight = h;
// Terragen file // Terragen file
while (eof == false) while (eof == false)
@ -176,17 +175,22 @@ namespace OpenSim.Region.CoreModules.World.Terrain.FileLoaders
switch (tmp) switch (tmp)
{ {
case "SIZE": case "SIZE":
int sztmp = bs.ReadInt16() + 1; // int sztmp = bs.ReadInt16() + 1;
fileWidth = sztmp; // fileWidth = sztmp;
fileHeight = sztmp; // fileHeight = sztmp;
bs.ReadInt16();
bs.ReadInt16();
bs.ReadInt16();
bs.ReadInt16(); bs.ReadInt16();
break; break;
case "XPTS": case "XPTS":
fileWidth = bs.ReadInt16(); // fileWidth = bs.ReadInt16();
bs.ReadInt16();
bs.ReadInt16(); bs.ReadInt16();
break; break;
case "YPTS": case "YPTS":
fileHeight = bs.ReadInt16(); // fileHeight = bs.ReadInt16();
bs.ReadInt16();
bs.ReadInt16(); bs.ReadInt16();
break; break;
case "ALTW": case "ALTW":