diff options
| author | Melanie Thielker | 2017-01-11 23:05:39 +0000 |
|---|---|---|
| committer | Melanie Thielker | 2017-01-11 23:05:39 +0000 |
| commit | dafb362b60cedd954f748147a563386dc87a2c26 (patch) | |
| tree | eb349484ae1c3c94c553e647dbea31e389a5031f /OpenSim/Framework | |
| parent | Also add the ability to quit on SIGTERM for ROBUST (diff) | |
| parent | stop using a GetPermissionClass() in GenerateClientFlags since it is not good... (diff) | |
| download | opensim-SC_OLD-dafb362b60cedd954f748147a563386dc87a2c26.zip opensim-SC_OLD-dafb362b60cedd954f748147a563386dc87a2c26.tar.gz opensim-SC_OLD-dafb362b60cedd954f748147a563386dc87a2c26.tar.bz2 opensim-SC_OLD-dafb362b60cedd954f748147a563386dc87a2c26.tar.xz | |
Merge branch 'master' of opensimulator.org:/var/git/opensim
Diffstat (limited to 'OpenSim/Framework')
| -rw-r--r-- | OpenSim/Framework/IClientAPI.cs | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/OpenSim/Framework/IClientAPI.cs b/OpenSim/Framework/IClientAPI.cs index 1267993..eedba9d 100644 --- a/OpenSim/Framework/IClientAPI.cs +++ b/OpenSim/Framework/IClientAPI.cs | |||
| @@ -1112,7 +1112,7 @@ namespace OpenSim.Framework | |||
| 1112 | /// <param name="localID"></param> | 1112 | /// <param name="localID"></param> |
| 1113 | void SendKillObject(List<uint> localID); | 1113 | void SendKillObject(List<uint> localID); |
| 1114 | 1114 | ||
| 1115 | void SendPartFullUpdate(ISceneEntity ent, uint? parentID); | 1115 | // void SendPartFullUpdate(ISceneEntity ent, uint? parentID); |
| 1116 | 1116 | ||
| 1117 | void SendAnimations(UUID[] animID, int[] seqs, UUID sourceAgentId, UUID[] objectIDs); | 1117 | void SendAnimations(UUID[] animID, int[] seqs, UUID sourceAgentId, UUID[] objectIDs); |
| 1118 | void SendRegionHandshake(RegionInfo regionInfo, RegionHandshakeArgs args); | 1118 | void SendRegionHandshake(RegionInfo regionInfo, RegionHandshakeArgs args); |