aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim
diff options
context:
space:
mode:
authorTeravus Ovares (Dan Olivares)2010-10-14 09:57:42 -0400
committerTeravus Ovares (Dan Olivares)2010-10-14 09:57:42 -0400
commit05c4e27a30e9bfa4657aac911ddbb69cafe3c9a0 (patch)
tree006f3416ec63ae5760d71a796101081739a466b7 /OpenSim
parent* Whoops, That was supposed to use the HTTP VERB 'GET' not 'POST' (diff)
downloadopensim-SC_OLD-05c4e27a30e9bfa4657aac911ddbb69cafe3c9a0.zip
opensim-SC_OLD-05c4e27a30e9bfa4657aac911ddbb69cafe3c9a0.tar.gz
opensim-SC_OLD-05c4e27a30e9bfa4657aac911ddbb69cafe3c9a0.tar.bz2
opensim-SC_OLD-05c4e27a30e9bfa4657aac911ddbb69cafe3c9a0.tar.xz
* A few additional cleanup elements
* At this point, I want to make sure to thank the fabulous developers of the LibOpenMetaverse library for tirelessly keeping things updated and hammering away at the protocols and providing excellent tools to figure out where things go wrong. * Special thanks to John Hurliman and Latif Khalifa for their valuable insight.
Diffstat (limited to 'OpenSim')
-rw-r--r--OpenSim/Region/CoreModules/Avatar/Assets/GetMeshModule.cs1
-rw-r--r--OpenSim/Region/CoreModules/Avatar/Assets/NewFileAgentInventoryVariablePriceModule.cs5
2 files changed, 6 insertions, 0 deletions
diff --git a/OpenSim/Region/CoreModules/Avatar/Assets/GetMeshModule.cs b/OpenSim/Region/CoreModules/Avatar/Assets/GetMeshModule.cs
index a090c0c..b8aed0b 100644
--- a/OpenSim/Region/CoreModules/Avatar/Assets/GetMeshModule.cs
+++ b/OpenSim/Region/CoreModules/Avatar/Assets/GetMeshModule.cs
@@ -113,6 +113,7 @@ namespace OpenSim.Region.CoreModules.Avatar.Assets
113 } 113 }
114 114
115 #endregion 115 #endregion
116
116 public Hashtable ProcessGetMesh(Hashtable request, UUID AgentId, Caps cap) 117 public Hashtable ProcessGetMesh(Hashtable request, UUID AgentId, Caps cap)
117 { 118 {
118 119
diff --git a/OpenSim/Region/CoreModules/Avatar/Assets/NewFileAgentInventoryVariablePriceModule.cs b/OpenSim/Region/CoreModules/Avatar/Assets/NewFileAgentInventoryVariablePriceModule.cs
index 9029f58..35f054f 100644
--- a/OpenSim/Region/CoreModules/Avatar/Assets/NewFileAgentInventoryVariablePriceModule.cs
+++ b/OpenSim/Region/CoreModules/Avatar/Assets/NewFileAgentInventoryVariablePriceModule.cs
@@ -120,6 +120,11 @@ namespace OpenSim.Region.CoreModules.Avatar.Assets
120 120
121 public LLSDNewFileAngentInventoryVariablePriceReplyResponse NewAgentInventoryRequest(LLSDAssetUploadRequest llsdRequest, UUID agentID) 121 public LLSDNewFileAngentInventoryVariablePriceReplyResponse NewAgentInventoryRequest(LLSDAssetUploadRequest llsdRequest, UUID agentID)
122 { 122 {
123
124 //TODO: The Mesh uploader uploads many types of content. If you're going to implement a Money based limit
125 // You need to be aware of this and
126
127
123 //if (llsdRequest.asset_type == "texture" || 128 //if (llsdRequest.asset_type == "texture" ||
124 // llsdRequest.asset_type == "animation" || 129 // llsdRequest.asset_type == "animation" ||
125 // llsdRequest.asset_type == "sound") 130 // llsdRequest.asset_type == "sound")