aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim/Framework
diff options
context:
space:
mode:
authorDiva Canto2010-05-23 12:23:16 -0700
committerDiva Canto2010-05-23 12:23:16 -0700
commit30e94cd0753809094b9b01b664e0ae643db28492 (patch)
tree4a76c17218f68ff6aeeb43524b3298b2107e74fc /OpenSim/Framework
parentThe 8th migration statement in AssetStore.migrations didn't look right. (diff)
parentRemove an unneeded conditional (diff)
downloadopensim-SC-30e94cd0753809094b9b01b664e0ae643db28492.zip
opensim-SC-30e94cd0753809094b9b01b664e0ae643db28492.tar.gz
opensim-SC-30e94cd0753809094b9b01b664e0ae643db28492.tar.bz2
opensim-SC-30e94cd0753809094b9b01b664e0ae643db28492.tar.xz
Merge branch 'master' of ssh://diva@opensimulator.org/var/git/opensim
Diffstat (limited to 'OpenSim/Framework')
-rw-r--r--OpenSim/Framework/IClientAPI.cs1
1 files changed, 1 insertions, 0 deletions
diff --git a/OpenSim/Framework/IClientAPI.cs b/OpenSim/Framework/IClientAPI.cs
index f51bf71..c1333fc 100644
--- a/OpenSim/Framework/IClientAPI.cs
+++ b/OpenSim/Framework/IClientAPI.cs
@@ -983,6 +983,7 @@ namespace OpenSim.Framework
983 983
984 void SendInstantMessage(GridInstantMessage im); 984 void SendInstantMessage(GridInstantMessage im);
985 985
986 void SendGenericMessage(string method, List<string> message);
986 void SendGenericMessage(string method, List<byte[]> message); 987 void SendGenericMessage(string method, List<byte[]> message);
987 988
988 void SendLayerData(float[] map); 989 void SendLayerData(float[] map);