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

save/load environments to/from oars

Browse Source
This commit is contained in:
UbitUmarov
2020-06-22 15:46:39 +01:00
parent 7b77609537
commit 8fe2cd6c46
13 changed files with 146 additions and 36 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
OpenSim/Data/MySQL/MySQLSimulationData.cs
View File

@@ -29,17 +29,13 @@ using System;
using System.Collections.Generic;
using System.Data;
using System.Drawing;
using System.IO;
using System.Reflection;
using System.Threading;
using log4net;
using MySql.Data.MySqlClient;
using OpenMetaverse;
using OpenMetaverse.StructuredData;
using OpenSim.Framework;
using OpenSim.Region.Framework.Interfaces;
using OpenSim.Region.Framework.Scenes;
using OpenSim.Data;
namespace OpenSim.Data.MySQL
{
@@ -1510,9 +1506,7 @@ namespace OpenSim.Data.MySQL
{
try
{
OSD oenv = OSDParser.Deserialize(env);
ViewerEnvironment VEnv = new ViewerEnvironment();
VEnv.FromOSD(oenv);
ViewerEnvironment VEnv = ViewerEnvironment.FromOSDString(env);
newData.Environment = VEnv;
newData.EnvironmentVersion = VEnv.version;
}
@@ -1875,9 +1869,7 @@ namespace OpenSim.Data.MySQL
{
try
{
OSD oenv = land.Environment.ToOSD();
string env = OSDParser.SerializeLLSDNotationFull(oenv);
cmd.Parameters.AddWithValue("environment", env);
cmd.Parameters.AddWithValue("environment", ViewerEnvironment.ToOSDString(land.Environment));
}
catch
{