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' into careminster

Browse Source 
Conflicts:
	OpenSim/Region/ClientStack/Linden/Caps/GetTextureModule.cs
	OpenSim/Region/ClientStack/Linden/Caps/NewFileAgentInventoryVariablePriceModule.cs
This commit is contained in:
Melanie
2012-11-13 02:10:09 +00:00
parent 3398999149 335ff4359c
commit 9a5679876e
43 changed files with 42 additions and 45 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
OpenSim/Region/ClientStack/Linden/Caps/MeshUploadFlagModule.cs
View File

@@ -45,7 +45,7 @@ namespace OpenSim.Region.ClientStack.Linden
/// <summary>
/// MeshUploadFlag capability. This is required for uploading Mesh.
/// </summary>
[Extension(Path = "/OpenSim/RegionModules", NodeName = "RegionModule")]
[Extension(Path = "/OpenSim/RegionModules", NodeName = "RegionModule", Id = "MeshUploadFlagModule")]
public class MeshUploadFlagModule : INonSharedRegionModule
{
// private static readonly ILog m_log =