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

Don't serve texture preview from other people's objects if you

Browse Source 
havenever seen that texture before.
This commit is contained in:
Melanie Thielker
2008-11-23 20:39:51 +00:00
parent bb982ab57f
commit fba9e3f513
3 changed files with 88 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files

52
OpenSim/Data/MySQL/MySQLRegionData.cs
View File

@@ -141,6 +141,14 @@ namespace OpenSim.Data.MySQL
Migration m = new Migration(m_connection, assem, "RegionStore");
m.Update();
PrepareConnection();
}
public void Dispose() {}
private void PrepareConnection()
{
GetWaitTimeout();
MySqlCommand primSelectCmd = new MySqlCommand(m_primSelect, m_connection);
m_primDataAdapter = new MySqlDataAdapter(primSelectCmd);
@@ -203,8 +211,6 @@ namespace OpenSim.Data.MySQL
}
}
public void Dispose() {}
/// <summary>
/// Get the wait_timeout value for our connection
/// </summary>
@@ -254,6 +260,8 @@ namespace OpenSim.Data.MySQL
m_connection.Close();
m_connection = new MySqlConnection(m_connectionString);
m_connection.Open();
PrepareConnection();
}
}
@@ -308,22 +316,40 @@ namespace OpenSim.Data.MySQL
/// <param name="regionUUID">The region UUID</param>
public void StoreObject(SceneObjectGroup obj, UUID regionUUID)
{
lock (m_dataSet)
int tries = 3;
while (tries > 0)
{
foreach (SceneObjectPart prim in obj.Children.Values)
tries--;
try
{
if ((prim.GetEffectiveObjectFlags() & (uint)PrimFlags.Temporary) == 0
&& (prim.GetEffectiveObjectFlags() & (uint)PrimFlags.TemporaryOnRez) == 0)
lock (m_dataSet)
{
//m_log.Info("[REGION DB]: Adding obj: " + obj.UUID + " to region: " + regionUUID);
addPrim(prim, obj.UUID, regionUUID);
}
else
{
// m_log.Info("[DATASTORE]: Ignoring Physical obj: " + obj.UUID + " in region: " + regionUUID);
foreach (SceneObjectPart prim in obj.Children.Values)
{
if ((prim.GetEffectiveObjectFlags() & (uint)PrimFlags.Temporary) == 0
&& (prim.GetEffectiveObjectFlags() & (uint)PrimFlags.TemporaryOnRez) == 0)
{
//m_log.Info("[REGION DB]: Adding obj: " + obj.UUID + " to region: " + regionUUID);
addPrim(prim, obj.UUID, regionUUID);
}
else
{
// m_log.Info("[DATASTORE]: Ignoring Physical obj: " + obj.UUID + " in region: " + regionUUID);
}
}
Commit();
return;
}
}
Commit();
catch(MySqlException)
{
m_connection.Close();
m_connection = new MySqlConnection(m_connectionString);
m_connection.Open();
PrepareConnection();
}
}
}