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/Data/MySQL/Resources/RegionStore.migrations
	OpenSim/Region/Framework/Scenes/Scene.Inventory.cs
This commit is contained in:
Melanie
2012-02-04 11:48:20 +00:00
parent 0dbfa70443 6034e5d112
commit ce5e900721
34 changed files with 560 additions and 253 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
OpenSim/ApplicationPlugins/RemoteController/RemoteAdminPlugin.cs
View File

@@ -1510,9 +1510,9 @@ namespace OpenSim.ApplicationPlugins.RemoteController
// options["version"] = (string)requestData["version"];
//}
if (requestData.Contains("profile"))
if (requestData.Contains("home"))
{
options["profile"] = (string)requestData["profile"];
options["home"] = (string)requestData["home"];
}
if ((string)requestData["noassets"] == "true")