aboutsummaryrefslogtreecommitdiffstatshomepage
diff options
context:
space:
mode:
Diffstat (limited to '')
-rw-r--r--OpenSim/Framework/Servers/GetAssetStreamHandler.cs44
-rw-r--r--OpenSim/Region/ClientStack/LindenUDP/LLClientView.cs14
-rw-r--r--OpenSim/Region/Communications/Hypergrid/HGUserServices.cs2
-rw-r--r--OpenSim/Region/OptionalModules/Scripting/XmlRpcRouterModule/XmlRpcRouterModule.cs2
-rw-r--r--OpenSim/Region/ScriptEngine/XEngine/XEngine.cs4
5 files changed, 33 insertions, 33 deletions
diff --git a/OpenSim/Framework/Servers/GetAssetStreamHandler.cs b/OpenSim/Framework/Servers/GetAssetStreamHandler.cs
index ffd7ef4..d7fb72b 100644
--- a/OpenSim/Framework/Servers/GetAssetStreamHandler.cs
+++ b/OpenSim/Framework/Servers/GetAssetStreamHandler.cs
@@ -86,10 +86,10 @@ namespace OpenSim.Framework.Servers
86 AssetBase asset = m_assetProvider.FetchAsset(assetID); 86 AssetBase asset = m_assetProvider.FetchAsset(assetID);
87 if (asset != null) 87 if (asset != null)
88 { 88 {
89 if (asset.ContainsReferences && false) 89// if (asset.ContainsReferences)
90 { 90// {
91 asset.Data = ProcessOutgoingAssetData(asset.Data); 91// asset.Data = ProcessOutgoingAssetData(asset.Data);
92 } 92// }
93 93
94 XmlSerializer xs = new XmlSerializer(typeof(AssetBase)); 94 XmlSerializer xs = new XmlSerializer(typeof(AssetBase));
95 MemoryStream ms = new MemoryStream(); 95 MemoryStream ms = new MemoryStream();
@@ -136,24 +136,24 @@ namespace OpenSim.Framework.Servers
136 { 136 {
137 string result = String.Empty; 137 string result = String.Empty;
138 138
139 string key = m.Groups[1].Captures[0].Value; 139// string key = m.Groups[1].Captures[0].Value;
140 140//
141 string value = m.Groups[2].Captures[0].Value; 141// string value = m.Groups[2].Captures[0].Value;
142 142//
143 Guid userUri; 143// Guid userUri;
144 144//
145 switch (key) 145// switch (key)
146 { 146// {
147 case "creator_id": 147// case "creator_id":
148 userUri = new Guid(value); 148// userUri = new Guid(value);
149 // result = "creator_url " + userService(userService, userUri); 149// // result = "creator_url " + userService(userService, userUri);
150 break; 150// break;
151 151//
152 case "owner_id": 152// case "owner_id":
153 userUri = new Guid(value); 153// userUri = new Guid(value);
154 // result = "owner_url " + ResolveUserUri(userService, userUri); 154// // result = "owner_url " + ResolveUserUri(userService, userUri);
155 break; 155// break;
156 } 156// }
157 157
158 return result; 158 return result;
159 }); 159 });
diff --git a/OpenSim/Region/ClientStack/LindenUDP/LLClientView.cs b/OpenSim/Region/ClientStack/LindenUDP/LLClientView.cs
index 7ddbfbf..7340628 100644
--- a/OpenSim/Region/ClientStack/LindenUDP/LLClientView.cs
+++ b/OpenSim/Region/ClientStack/LindenUDP/LLClientView.cs
@@ -309,7 +309,7 @@ namespace OpenSim.Region.ClientStack.LindenUDP
309 309
310 private MuteListRequest handlerMuteListRequest; 310 private MuteListRequest handlerMuteListRequest;
311 311
312 private AvatarInterestUpdate handlerAvatarInterestUpdate; 312 //private AvatarInterestUpdate handlerAvatarInterestUpdate;
313 313
314 private readonly IGroupsModule m_GroupsModule; 314 private readonly IGroupsModule m_GroupsModule;
315 315
@@ -1107,7 +1107,7 @@ namespace OpenSim.Region.ClientStack.LindenUDP
1107 1107
1108 public event MuteListRequest OnMuteListRequest; 1108 public event MuteListRequest OnMuteListRequest;
1109 1109
1110 public event AvatarInterestUpdate OnAvatarInterestUpdate; 1110 //public event AvatarInterestUpdate OnAvatarInterestUpdate;
1111 1111
1112 public void ActivateGesture(UUID assetId, UUID gestureId) 1112 public void ActivateGesture(UUID assetId, UUID gestureId)
1113 { 1113 {
@@ -9111,11 +9111,11 @@ namespace OpenSim.Region.ClientStack.LindenUDP
9111 Utils.BytesToString(avatarNotesUpdate.Data.Notes)); 9111 Utils.BytesToString(avatarNotesUpdate.Data.Notes));
9112 break; 9112 break;
9113 9113
9114 case PacketType.AvatarInterestsUpdate: 9114// case PacketType.AvatarInterestsUpdate:
9115 AvatarInterestsUpdatePacket avatarInterestUpdate = 9115// AvatarInterestsUpdatePacket avatarInterestUpdate =
9116 (AvatarInterestsUpdatePacket)Pack; 9116// (AvatarInterestsUpdatePacket)Pack;
9117 9117//
9118 break; 9118// break;
9119 9119
9120 default: 9120 default:
9121 m_log.Warn("[CLIENT]: unhandled packet " + Pack); 9121 m_log.Warn("[CLIENT]: unhandled packet " + Pack);
diff --git a/OpenSim/Region/Communications/Hypergrid/HGUserServices.cs b/OpenSim/Region/Communications/Hypergrid/HGUserServices.cs
index 05ae5a9..20c7dc1 100644
--- a/OpenSim/Region/Communications/Hypergrid/HGUserServices.cs
+++ b/OpenSim/Region/Communications/Hypergrid/HGUserServices.cs
@@ -154,7 +154,7 @@ namespace OpenSim.Region.Communications.Hypergrid
154 /// <returns>null if the request fails</returns> 154 /// <returns>null if the request fails</returns>
155 public override UserProfileData GetUserProfile(UUID avatarID) 155 public override UserProfileData GetUserProfile(UUID avatarID)
156 { 156 {
157 string url = string.Empty; 157 //string url = string.Empty;
158 // Unfortunately we can't query for foreigners here, 158 // Unfortunately we can't query for foreigners here,
159 // because we'll end up in an infinite loop... 159 // because we'll end up in an infinite loop...
160 //if ((m_localUserServices != null) && (!IsForeignUser(avatarID, out url))) 160 //if ((m_localUserServices != null) && (!IsForeignUser(avatarID, out url)))
diff --git a/OpenSim/Region/OptionalModules/Scripting/XmlRpcRouterModule/XmlRpcRouterModule.cs b/OpenSim/Region/OptionalModules/Scripting/XmlRpcRouterModule/XmlRpcRouterModule.cs
index cdde893..0fb6ebe 100644
--- a/OpenSim/Region/OptionalModules/Scripting/XmlRpcRouterModule/XmlRpcRouterModule.cs
+++ b/OpenSim/Region/OptionalModules/Scripting/XmlRpcRouterModule/XmlRpcRouterModule.cs
@@ -41,7 +41,7 @@ namespace OpenSim.Region.OptionalModules.Scripting.XmlRpcRouterModule
41{ 41{
42 public class XmlRpcRouter : IRegionModule, IXmlRpcRouter 42 public class XmlRpcRouter : IRegionModule, IXmlRpcRouter
43 { 43 {
44 private static readonly ILog m_log = LogManager.GetLogger(MethodBase.GetCurrentMethod().DeclaringType); 44 //private static readonly ILog m_log = LogManager.GetLogger(MethodBase.GetCurrentMethod().DeclaringType);
45 45
46 public void Initialise(Scene scene, IConfigSource config) 46 public void Initialise(Scene scene, IConfigSource config)
47 { 47 {
diff --git a/OpenSim/Region/ScriptEngine/XEngine/XEngine.cs b/OpenSim/Region/ScriptEngine/XEngine/XEngine.cs
index 4b9affc..20bfc2f 100644
--- a/OpenSim/Region/ScriptEngine/XEngine/XEngine.cs
+++ b/OpenSim/Region/ScriptEngine/XEngine/XEngine.cs
@@ -770,7 +770,7 @@ namespace OpenSim.Region.ScriptEngine.XEngine
770 if (part != null) 770 if (part != null)
771 part.RemoveScriptEvents(itemID); 771 part.RemoveScriptEvents(itemID);
772 772
773 bool objectRemoved = false; 773// bool objectRemoved = false;
774 774
775 lock (m_PrimObjects) 775 lock (m_PrimObjects)
776 { 776 {
@@ -785,7 +785,7 @@ namespace OpenSim.Region.ScriptEngine.XEngine
785 if (m_PrimObjects[localID].Count == 0) 785 if (m_PrimObjects[localID].Count == 0)
786 { 786 {
787 m_PrimObjects.Remove(localID); 787 m_PrimObjects.Remove(localID);
788 objectRemoved = true; 788// objectRemoved = true;
789 } 789 }
790 } 790 }
791 } 791 }