aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim/Region/CoreModules
diff options
context:
space:
mode:
authorDiva Canto2010-12-23 10:05:45 -0800
committerDiva Canto2010-12-23 10:05:45 -0800
commitbc67bc0d949e5b71dbd924b8119b0232b149cfb6 (patch)
tree3ca3ac8bda0d4b64ba3cacdefca920f5c2105ea8 /OpenSim/Region/CoreModules
parentRemoved unused code -- this was the previous version of UDP texture sending, ... (diff)
parentPut back a commented section of code. With some viewers, object inventory (diff)
downloadopensim-SC_OLD-bc67bc0d949e5b71dbd924b8119b0232b149cfb6.zip
opensim-SC_OLD-bc67bc0d949e5b71dbd924b8119b0232b149cfb6.tar.gz
opensim-SC_OLD-bc67bc0d949e5b71dbd924b8119b0232b149cfb6.tar.bz2
opensim-SC_OLD-bc67bc0d949e5b71dbd924b8119b0232b149cfb6.tar.xz
Merge branch 'master' of ssh://opensimulator.org/var/git/opensim
Diffstat (limited to 'OpenSim/Region/CoreModules')
-rw-r--r--OpenSim/Region/CoreModules/Agent/Xfer/XferModule.cs11
1 files changed, 5 insertions, 6 deletions
diff --git a/OpenSim/Region/CoreModules/Agent/Xfer/XferModule.cs b/OpenSim/Region/CoreModules/Agent/Xfer/XferModule.cs
index c5a6e62..4f9e32b 100644
--- a/OpenSim/Region/CoreModules/Agent/Xfer/XferModule.cs
+++ b/OpenSim/Region/CoreModules/Agent/Xfer/XferModule.cs
@@ -105,12 +105,11 @@ namespace OpenSim.Region.CoreModules.Agent.Xfer
105 } 105 }
106 } 106 }
107 107
108 // This should not be here 108 if (Requests.ContainsKey(fileName))
109 //if (Requests.ContainsKey(fileName)) 109 {
110 //{ 110 RequestXfer(Requests[fileName].remoteClient, Requests[fileName].xferID, fileName);
111 // RequestXfer(Requests[fileName].remoteClient, Requests[fileName].xferID, fileName); 111 Requests.Remove(fileName);
112 // Requests.Remove(fileName); 112 }
113 //}
114 113
115 return true; 114 return true;
116 } 115 }