ogb912/opensim
1
0
Fork 0
mirror of https://github.com/opensim/opensim.git synced 2026-08-08 02:05:34 +08:00
Code Issues Packages Projects Releases Wiki Activity

* This is the fabled LibOMV update with all of the libOMV types from JHurliman

Browse Source 
* 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:
Teravus Ovares
2008-09-06 07:52:41 +00:00
parent cbec2bf22b
commit 7d89e12293
388 changed files with 6811 additions and 7138 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
OpenSim/Region/Environment/Scenes/SceneManager.cs
View File

@@ -29,7 +29,7 @@ using System;
using System.Collections.Generic;
using System.Net;
using System.Reflection;
using libsecondlife;
using OpenMetaverse;
using log4net;
using OpenSim.Framework;
using OpenSim.Region.Environment.Interfaces;
@@ -190,7 +190,7 @@ namespace OpenSim.Region.Environment.Scenes
/// <param name="filename"></param>
/// <param name="generateNewIDs"></param>
/// <param name="loadOffset"></param>
public void LoadCurrentSceneFromXml(string filename, bool generateNewIDs, LLVector3 loadOffset)
public void LoadCurrentSceneFromXml(string filename, bool generateNewIDs, Vector3 loadOffset)
{
CurrentOrFirstScene.LoadPrimsFromXml(filename, generateNewIDs, loadOffset);
}
@@ -320,7 +320,7 @@ namespace OpenSim.Region.Environment.Scenes
}
}
public bool TrySetCurrentScene(LLUUID regionID)
public bool TrySetCurrentScene(UUID regionID)
{
Console.WriteLine("Searching for Region: '{0}'", regionID.ToString());
@@ -350,7 +350,7 @@ namespace OpenSim.Region.Environment.Scenes
return false;
}
public bool TryGetScene(LLUUID regionID, out Scene scene)
public bool TryGetScene(UUID regionID, out Scene scene)
{
foreach (Scene mscene in m_localScenes)
{
@@ -481,7 +481,7 @@ namespace OpenSim.Region.Environment.Scenes
ForEachCurrentScene(delegate(Scene scene) { scene.HandleEditCommand(cmdparams); });
}
public bool TryGetAvatar(LLUUID avatarId, out ScenePresence avatar)
public bool TryGetAvatar(UUID avatarId, out ScenePresence avatar)
{
foreach (Scene scene in m_localScenes)
{
@@ -495,7 +495,7 @@ namespace OpenSim.Region.Environment.Scenes
return false;
}
public bool TryGetAvatarsScene(LLUUID avatarId, out Scene scene)
public bool TryGetAvatarsScene(UUID avatarId, out Scene scene)
{
ScenePresence avatar = null;
foreach (Scene mScene in m_localScenes)