minor: Remove some mono compiler warnings. Uncomment code when it's actually being used.
parent
63936d442c
commit
9f6b8ec9b0
|
@ -86,10 +86,10 @@ namespace OpenSim.Framework.Servers
|
||||||
AssetBase asset = m_assetProvider.FetchAsset(assetID);
|
AssetBase asset = m_assetProvider.FetchAsset(assetID);
|
||||||
if (asset != null)
|
if (asset != null)
|
||||||
{
|
{
|
||||||
if (asset.ContainsReferences && false)
|
// if (asset.ContainsReferences)
|
||||||
{
|
// {
|
||||||
asset.Data = ProcessOutgoingAssetData(asset.Data);
|
// asset.Data = ProcessOutgoingAssetData(asset.Data);
|
||||||
}
|
// }
|
||||||
|
|
||||||
XmlSerializer xs = new XmlSerializer(typeof(AssetBase));
|
XmlSerializer xs = new XmlSerializer(typeof(AssetBase));
|
||||||
MemoryStream ms = new MemoryStream();
|
MemoryStream ms = new MemoryStream();
|
||||||
|
@ -136,24 +136,24 @@ namespace OpenSim.Framework.Servers
|
||||||
{
|
{
|
||||||
string result = String.Empty;
|
string result = String.Empty;
|
||||||
|
|
||||||
string key = m.Groups[1].Captures[0].Value;
|
// string key = m.Groups[1].Captures[0].Value;
|
||||||
|
//
|
||||||
string value = m.Groups[2].Captures[0].Value;
|
// string value = m.Groups[2].Captures[0].Value;
|
||||||
|
//
|
||||||
Guid userUri;
|
// Guid userUri;
|
||||||
|
//
|
||||||
switch (key)
|
// switch (key)
|
||||||
{
|
// {
|
||||||
case "creator_id":
|
// case "creator_id":
|
||||||
userUri = new Guid(value);
|
// userUri = new Guid(value);
|
||||||
// result = "creator_url " + userService(userService, userUri);
|
// // result = "creator_url " + userService(userService, userUri);
|
||||||
break;
|
// break;
|
||||||
|
//
|
||||||
case "owner_id":
|
// case "owner_id":
|
||||||
userUri = new Guid(value);
|
// userUri = new Guid(value);
|
||||||
// result = "owner_url " + ResolveUserUri(userService, userUri);
|
// // result = "owner_url " + ResolveUserUri(userService, userUri);
|
||||||
break;
|
// break;
|
||||||
}
|
// }
|
||||||
|
|
||||||
return result;
|
return result;
|
||||||
});
|
});
|
||||||
|
|
|
@ -309,7 +309,7 @@ namespace OpenSim.Region.ClientStack.LindenUDP
|
||||||
|
|
||||||
private MuteListRequest handlerMuteListRequest;
|
private MuteListRequest handlerMuteListRequest;
|
||||||
|
|
||||||
private AvatarInterestUpdate handlerAvatarInterestUpdate;
|
//private AvatarInterestUpdate handlerAvatarInterestUpdate;
|
||||||
|
|
||||||
private readonly IGroupsModule m_GroupsModule;
|
private readonly IGroupsModule m_GroupsModule;
|
||||||
|
|
||||||
|
@ -1107,7 +1107,7 @@ namespace OpenSim.Region.ClientStack.LindenUDP
|
||||||
|
|
||||||
public event MuteListRequest OnMuteListRequest;
|
public event MuteListRequest OnMuteListRequest;
|
||||||
|
|
||||||
public event AvatarInterestUpdate OnAvatarInterestUpdate;
|
//public event AvatarInterestUpdate OnAvatarInterestUpdate;
|
||||||
|
|
||||||
public void ActivateGesture(UUID assetId, UUID gestureId)
|
public void ActivateGesture(UUID assetId, UUID gestureId)
|
||||||
{
|
{
|
||||||
|
@ -9111,11 +9111,11 @@ namespace OpenSim.Region.ClientStack.LindenUDP
|
||||||
Utils.BytesToString(avatarNotesUpdate.Data.Notes));
|
Utils.BytesToString(avatarNotesUpdate.Data.Notes));
|
||||||
break;
|
break;
|
||||||
|
|
||||||
case PacketType.AvatarInterestsUpdate:
|
// case PacketType.AvatarInterestsUpdate:
|
||||||
AvatarInterestsUpdatePacket avatarInterestUpdate =
|
// AvatarInterestsUpdatePacket avatarInterestUpdate =
|
||||||
(AvatarInterestsUpdatePacket)Pack;
|
// (AvatarInterestsUpdatePacket)Pack;
|
||||||
|
//
|
||||||
break;
|
// break;
|
||||||
|
|
||||||
default:
|
default:
|
||||||
m_log.Warn("[CLIENT]: unhandled packet " + Pack);
|
m_log.Warn("[CLIENT]: unhandled packet " + Pack);
|
||||||
|
|
|
@ -154,7 +154,7 @@ namespace OpenSim.Region.Communications.Hypergrid
|
||||||
/// <returns>null if the request fails</returns>
|
/// <returns>null if the request fails</returns>
|
||||||
public override UserProfileData GetUserProfile(UUID avatarID)
|
public override UserProfileData GetUserProfile(UUID avatarID)
|
||||||
{
|
{
|
||||||
string url = string.Empty;
|
//string url = string.Empty;
|
||||||
// Unfortunately we can't query for foreigners here,
|
// Unfortunately we can't query for foreigners here,
|
||||||
// because we'll end up in an infinite loop...
|
// because we'll end up in an infinite loop...
|
||||||
//if ((m_localUserServices != null) && (!IsForeignUser(avatarID, out url)))
|
//if ((m_localUserServices != null) && (!IsForeignUser(avatarID, out url)))
|
||||||
|
|
|
@ -41,7 +41,7 @@ namespace OpenSim.Region.OptionalModules.Scripting.XmlRpcRouterModule
|
||||||
{
|
{
|
||||||
public class XmlRpcRouter : IRegionModule, IXmlRpcRouter
|
public class XmlRpcRouter : IRegionModule, IXmlRpcRouter
|
||||||
{
|
{
|
||||||
private static readonly ILog m_log = LogManager.GetLogger(MethodBase.GetCurrentMethod().DeclaringType);
|
//private static readonly ILog m_log = LogManager.GetLogger(MethodBase.GetCurrentMethod().DeclaringType);
|
||||||
|
|
||||||
public void Initialise(Scene scene, IConfigSource config)
|
public void Initialise(Scene scene, IConfigSource config)
|
||||||
{
|
{
|
||||||
|
|
|
@ -770,7 +770,7 @@ namespace OpenSim.Region.ScriptEngine.XEngine
|
||||||
if (part != null)
|
if (part != null)
|
||||||
part.RemoveScriptEvents(itemID);
|
part.RemoveScriptEvents(itemID);
|
||||||
|
|
||||||
bool objectRemoved = false;
|
// bool objectRemoved = false;
|
||||||
|
|
||||||
lock (m_PrimObjects)
|
lock (m_PrimObjects)
|
||||||
{
|
{
|
||||||
|
@ -785,7 +785,7 @@ namespace OpenSim.Region.ScriptEngine.XEngine
|
||||||
if (m_PrimObjects[localID].Count == 0)
|
if (m_PrimObjects[localID].Count == 0)
|
||||||
{
|
{
|
||||||
m_PrimObjects.Remove(localID);
|
m_PrimObjects.Remove(localID);
|
||||||
objectRemoved = true;
|
// objectRemoved = true;
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
Loading…
Reference in New Issue