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

Merge branch 'master' into varregion

Browse Source
This commit is contained in:
Robert Adams
2014-01-19 07:38:53 -08:00
parent 54a4b9eab4 4fb3d314b8
commit f127e4b4ee
22 changed files with 320 additions and 356 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
OpenSim/Data/IOfflineIMData.cs
View File

@@ -1,4 +1,4 @@
/*
/*
* Copyright (c) Contributors, http://opensimulator.org/
* See CONTRIBUTORS.TXT for a full list of copyright holders.
*
@@ -34,6 +34,7 @@ namespace OpenSim.Data
public class OfflineIMData
{
public UUID PrincipalID;
public UUID FromID;
public Dictionary<string, string> Data;
}

12
OpenSim/Data/MySQL/Resources/IM_Store.migrations
View File

@@ -21,4 +21,14 @@ INSERT INTO `im_offline` SELECT * from `diva_im_offline`;
DROP TABLE `diva_im_offline`;
DELETE FROM `migrations` WHERE name='diva_im_Store';
COMMIT;
COMMIT;
:VERSION 3 # --------------------------
BEGIN;
ALTER TABLE `im_offline`
ADD `FromID` char(36) NOT NULL default '' AFTER `PrincipalID`,
ADD KEY `FromID` (`FromID`);
COMMIT;