diff options
author | Teravus Ovares (Dan Olivares) | 2010-10-14 10:11:51 -0400 |
---|---|---|
committer | Teravus Ovares (Dan Olivares) | 2010-10-14 10:12:57 -0400 |
commit | 3cb716d291e1f13bba3d95903fa253e5a844fe55 (patch) | |
tree | 0b6fc0be9ada87ba5d07be90cc7d82ed92a03b09 /OpenSim/Region/CoreModules/Avatar | |
parent | Updated to libomv-opensim r3449 (diff) | |
parent | * A few additional cleanup elements (diff) | |
download | opensim-SC_OLD-3cb716d291e1f13bba3d95903fa253e5a844fe55.zip opensim-SC_OLD-3cb716d291e1f13bba3d95903fa253e5a844fe55.tar.gz opensim-SC_OLD-3cb716d291e1f13bba3d95903fa253e5a844fe55.tar.bz2 opensim-SC_OLD-3cb716d291e1f13bba3d95903fa253e5a844fe55.tar.xz |
Merge branch 'master' of ssh://MyConnection/var/git/opensim
Signed-off-by: Teravus Ovares (Dan Olivares) <teravus@gmail.com>
Diffstat (limited to 'OpenSim/Region/CoreModules/Avatar')
-rw-r--r-- | OpenSim/Region/CoreModules/Avatar/Assets/GetMeshModule.cs | 1 | ||||
-rw-r--r-- | OpenSim/Region/CoreModules/Avatar/Assets/NewFileAgentInventoryVariablePriceModule.cs | 5 |
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") |