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

* Updating the version of the ODE library. (big update). The Mac library needs to be updated still.

Browse Source 
* Adding some XMPP stuff that's incomplete.
This commit is contained in:
Teravus Ovares
2008-04-02 01:03:31 +00:00
parent 7ec3bb71e6
commit b790a16e98
9 changed files with 209 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
OpenSim/Region/Environment/Modules/FriendsModule.cs
View File

@@ -24,7 +24,7 @@
* (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
* SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
*/
using System;
using System.Collections.Generic;
using libsecondlife;
using Nini.Config;
@@ -107,6 +107,12 @@ namespace OpenSim.Region.Environment.Modules
{
m_rootAgents[avatar.UUID] = avatar.RegionHandle;
m_log.Info("[FRIEND]: Claiming " + avatar.Firstname + " " + avatar.Lastname + " in region:" + avatar.RegionHandle + ".");
if (avatar.JID.Length > 0)
{
JId avatarID = new JId(avatar.JID);
// REST Post XMPP Stanzas!
}
// Claim User! my user! Mine mine mine!
}
}

2
OpenSim/Region/Environment/Scenes/ScenePresence.cs
View File

@@ -77,6 +77,8 @@ namespace OpenSim.Region.Environment.Scenes
public bool IsRestrictedToRegion = false;
public string JID = string.Empty;
// Agent moves with a PID controller causing a force to be exerted.
private bool m_newForce = false;
private bool m_newCoarseLocations = true;

4
OpenSim/Region/Physics/OdePlugin/OdePlugin.cs
View File

@@ -290,8 +290,8 @@ namespace OpenSim.Region.Physics.OdePlugin
internal void waitForSpaceUnlock(IntPtr space)
{
if (space != (IntPtr)0)
while (d.SpaceLockQuery(space)){ } // Wait and do nothing
//if (space != (IntPtr)0)
//while (d.SpaceLockQuery(space)){ } // Wait and do nothing
}
/// <summary>