diff options
author | Teravus Ovares | 2008-04-02 01:03:31 +0000 |
---|---|---|
committer | Teravus Ovares | 2008-04-02 01:03:31 +0000 |
commit | b790a16e986a0296b3a006f0db2b1011e5377ce9 (patch) | |
tree | 544aa40283c709476038bc3fe53b6611d919bec9 /OpenSim/Region/Environment | |
parent | * Remove the quit command from the inventory console which was actually addin... (diff) | |
download | opensim-SC_OLD-b790a16e986a0296b3a006f0db2b1011e5377ce9.zip opensim-SC_OLD-b790a16e986a0296b3a006f0db2b1011e5377ce9.tar.gz opensim-SC_OLD-b790a16e986a0296b3a006f0db2b1011e5377ce9.tar.bz2 opensim-SC_OLD-b790a16e986a0296b3a006f0db2b1011e5377ce9.tar.xz |
* Updating the version of the ODE library. (big update). The Mac library needs to be updated still.
* Adding some XMPP stuff that's incomplete.
Diffstat (limited to 'OpenSim/Region/Environment')
-rw-r--r-- | OpenSim/Region/Environment/Modules/FriendsModule.cs | 8 | ||||
-rw-r--r-- | OpenSim/Region/Environment/Scenes/ScenePresence.cs | 2 |
2 files changed, 9 insertions, 1 deletions
diff --git a/OpenSim/Region/Environment/Modules/FriendsModule.cs b/OpenSim/Region/Environment/Modules/FriendsModule.cs index a572eb5..7560c90 100644 --- a/OpenSim/Region/Environment/Modules/FriendsModule.cs +++ b/OpenSim/Region/Environment/Modules/FriendsModule.cs | |||
@@ -24,7 +24,7 @@ | |||
24 | * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS | 24 | * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS |
25 | * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. | 25 | * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. |
26 | */ | 26 | */ |
27 | 27 | using System; | |
28 | using System.Collections.Generic; | 28 | using System.Collections.Generic; |
29 | using libsecondlife; | 29 | using libsecondlife; |
30 | using Nini.Config; | 30 | using Nini.Config; |
@@ -107,6 +107,12 @@ namespace OpenSim.Region.Environment.Modules | |||
107 | { | 107 | { |
108 | m_rootAgents[avatar.UUID] = avatar.RegionHandle; | 108 | m_rootAgents[avatar.UUID] = avatar.RegionHandle; |
109 | m_log.Info("[FRIEND]: Claiming " + avatar.Firstname + " " + avatar.Lastname + " in region:" + avatar.RegionHandle + "."); | 109 | m_log.Info("[FRIEND]: Claiming " + avatar.Firstname + " " + avatar.Lastname + " in region:" + avatar.RegionHandle + "."); |
110 | if (avatar.JID.Length > 0) | ||
111 | { | ||
112 | JId avatarID = new JId(avatar.JID); | ||
113 | // REST Post XMPP Stanzas! | ||
114 | |||
115 | } | ||
110 | // Claim User! my user! Mine mine mine! | 116 | // Claim User! my user! Mine mine mine! |
111 | } | 117 | } |
112 | } | 118 | } |
diff --git a/OpenSim/Region/Environment/Scenes/ScenePresence.cs b/OpenSim/Region/Environment/Scenes/ScenePresence.cs index 774e3b4..365c884 100644 --- a/OpenSim/Region/Environment/Scenes/ScenePresence.cs +++ b/OpenSim/Region/Environment/Scenes/ScenePresence.cs | |||
@@ -77,6 +77,8 @@ namespace OpenSim.Region.Environment.Scenes | |||
77 | 77 | ||
78 | public bool IsRestrictedToRegion = false; | 78 | public bool IsRestrictedToRegion = false; |
79 | 79 | ||
80 | public string JID = string.Empty; | ||
81 | |||
80 | // Agent moves with a PID controller causing a force to be exerted. | 82 | // Agent moves with a PID controller causing a force to be exerted. |
81 | private bool m_newForce = false; | 83 | private bool m_newForce = false; |
82 | private bool m_newCoarseLocations = true; | 84 | private bool m_newCoarseLocations = true; |