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

Merge branch 'master' into careminster

Browse Source 
Conflicts:
	.gitignore
	OpenSim/Region/CoreModules/Scripting/HttpRequest/ScriptsHttpRequests.cs
	OpenSim/Region/CoreModules/World/Land/LandManagementModule.cs
	prebuild.xml
	runprebuild.bat
This commit is contained in:
Melanie
2013-11-23 19:13:22 +00:00
parent 91b70bf3fe 60e049ea39
commit 3589acdab1
76 changed files with 10917 additions and 9834 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
OpenSim/Services/HypergridService/HGInventoryService.cs
View File

@@ -298,7 +298,7 @@ namespace OpenSim.Services.HypergridService
UserAccount user = m_Cache.GetUser(it.CreatorId);
// Adjust the creator data
if (user != null && it != null && (it.CreatorData == null || it.CreatorData == string.Empty))
if (user != null && it != null && string.IsNullOrEmpty(it.CreatorData))
it.CreatorData = m_HomeURL + ";" + user.FirstName + " " + user.LastName;
}
return it;

19
OpenSim/Services/HypergridService/HGSuitcaseInventoryService.cs
View File

@@ -213,16 +213,23 @@ namespace OpenSim.Services.HypergridService
// In the DB we tag it as type 100, but we use -1 (Unknown) outside
suitcase = CreateFolder(principalID, root.folderID, 100, "My Suitcase");
if (suitcase == null)
{
m_log.ErrorFormat("[HG SUITCASE INVENTORY SERVICE]: Unable to create suitcase folder");
m_Database.StoreFolder(suitcase);
}
else
{
m_Database.StoreFolder(suitcase);
// Create System folders
CreateSystemFolders(principalID, suitcase.folderID);
// Create System folders
CreateSystemFolders(principalID, suitcase.folderID);
SetAsNormalFolder(suitcase);
return ConvertToOpenSim(suitcase);
}
}
SetAsNormalFolder(suitcase);
return ConvertToOpenSim(suitcase);
return null;
}
protected void CreateSystemFolders(UUID principalID, UUID rootID)

3
OpenSim/Services/UserAccountService/GridUserService.cs
View File

@@ -194,7 +194,8 @@ namespace OpenSim.Services.UserAccountService
public bool SetLastPosition(string userID, UUID sessionID, UUID regionID, Vector3 lastPosition, Vector3 lastLookAt)
{
m_log.DebugFormat("[GRID USER SERVICE]: SetLastPosition for {0}", userID);
// m_log.DebugFormat("[GRID USER SERVICE]: SetLastPosition for {0}", userID);
GridUserData d = m_Database.Get(userID);
if (d == null)
{