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

Merge branch 'master' into careminster

Browse Source 
Conflicts:
	OpenSim/Region/Framework/Scenes/Scene.cs
This commit is contained in:
Melanie
2012-07-13 02:27:16 +01:00
parent d632fd7124 2954ceccae
commit 64393a7ca8
28 changed files with 177 additions and 212 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
OpenSim/Framework/IClientAPI.cs
View File

@@ -1369,7 +1369,6 @@ namespace OpenSim.Framework
void SendBlueBoxMessage(UUID FromAvatarID, String FromAvatarName, String Message);
void SendLogoutPacket();
EndPoint GetClientEP();
// WARNING WARNING WARNING
//