ogb912/opensim
1
0
Fork 0
mirror of https://github.com/opensim/opensim.git synced 2026-08-07 09:45:47 +08:00
Code Issues Packages Projects Releases Wiki Activity

bad merge?

Browse Source
This commit is contained in:
UbitUmarov
2015-09-01 14:54:35 +01:00
parent f811fdfb70 31a50a73cb
commit 371c9dd2af
406 changed files with 62562 additions and 8067 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
OpenSim/Data/PGSQL/PGSQLAssetData.cs
View File

@@ -149,7 +149,7 @@ namespace OpenSim.Data.PGSQL
/// Create asset in m_database
/// </summary>
/// <param name="asset">the asset</param>
override public void StoreAsset(AssetBase asset)
override public bool StoreAsset(AssetBase asset)
{
string sql =
@@ -208,6 +208,7 @@ namespace OpenSim.Data.PGSQL
m_log.Error("[ASSET DB]: Error storing item :" + e.Message + " sql "+sql);
}
}
return true;
}

5
OpenSim/Data/PGSQL/PGSQLUserAccountData.cs
View File

@@ -325,5 +325,10 @@ namespace OpenSim.Data.PGSQL
return DoQuery(cmd);
}
}
public UserAccountData[] GetUsersWhere(UUID scopeID, string where)
{
return null;
}
}
}

5
OpenSim/Data/PGSQL/Resources/UserProfiles.migrations
View File

@@ -81,6 +81,7 @@ CREATE TABLE userdata (
commit;
<<<<<<< HEAD
:VERSION 3 # -------------------------------
begin;
CREATE TABLE usersettings (
@@ -152,4 +153,6 @@ BEGIN;
ALTER TABLE usersettings ALTER COLUMN imviaemail SET DATA TYPE boolean USING CASE WHEN false THEN false ELSE true END;
COMMIT;
COMMIT;
=======
>>>>>>> avn/ubitvar