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

Merge branch 'avination' into careminster

Browse Source 
Conflicts:
	OpenSim/Region/ScriptEngine/Shared/Api/Implementation/LSL_Api.cs
This commit is contained in:
Melanie
2012-07-29 16:11:20 +01:00
parent 277491d871 88d68e68c1
commit e012c81d7c
5 changed files with 62 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
OpenSim/Region/CoreModules/Avatar/Inventory/Archiver/InventoryArchiverModule.cs
View File

@@ -492,6 +492,8 @@ namespace OpenSim.Region.CoreModules.Avatar.Inventory.Archiver
return null;
}
return account;
/*
try
{
string encpass = Util.Md5Hash(pass);
@@ -512,6 +514,7 @@ namespace OpenSim.Region.CoreModules.Avatar.Inventory.Archiver
m_log.ErrorFormat("[INVENTORY ARCHIVER]: Could not authenticate password, {0}", e.Message);
return null;
}
*/
}
/// <summary>

2
OpenSim/Region/CoreModules/Scripting/LSLHttp/UrlModule.cs
View File

@@ -80,7 +80,7 @@ namespace OpenSim.Region.CoreModules.Scripting.LSLHttp
/// <summary>
/// Maximum number of external urls that can be set up by this module.
/// </summary>
private int m_TotalUrls = 5000;
private int m_TotalUrls = 15000;
private uint https_port = 0;
private IHttpServer m_HttpServer = null;