ogb912/opensim
1
0
Fork 0
mirror of https://github.com/opensim/opensim.git synced 2026-08-05 17:05:55 +08:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'master' of ssh://MyConnection/var/git/opensim

Browse Source 
Signed-off-by: Teravus Ovares (Dan Olivares) <teravus@gmail.com>
This commit is contained in:
Teravus Ovares (Dan Olivares)
2010-10-14 10:11:51 -04:00
parent 69dbfe2a69 05c4e27a30
commit 3cb716d291
2 changed files with 6 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
OpenSim/Region/CoreModules/Avatar/Assets/GetMeshModule.cs
View File

@@ -113,6 +113,7 @@ namespace OpenSim.Region.CoreModules.Avatar.Assets
}
#endregion
public Hashtable ProcessGetMesh(Hashtable request, UUID AgentId, Caps cap)
{

5
OpenSim/Region/CoreModules/Avatar/Assets/NewFileAgentInventoryVariablePriceModule.cs
View File

@@ -120,6 +120,11 @@ namespace OpenSim.Region.CoreModules.Avatar.Assets
public LLSDNewFileAngentInventoryVariablePriceReplyResponse NewAgentInventoryRequest(LLSDAssetUploadRequest llsdRequest, UUID agentID)
{
//TODO: The Mesh uploader uploads many types of content. If you're going to implement a Money based limit
// You need to be aware of this and
//if (llsdRequest.asset_type == "texture" ||
// llsdRequest.asset_type == "animation" ||
// llsdRequest.asset_type == "sound")