diff options
| author | Justin Clark-Casey (justincc) | 2013-07-15 23:28:02 +0100 |
|---|---|---|
| committer | Justin Clark-Casey (justincc) | 2013-07-15 23:28:02 +0100 |
| commit | eb14e5a1756726b1f296591bb1ac385e4b1372d7 (patch) | |
| tree | 6a7e5e7489785729a2487a0245e0c7e3a9ee99bd /OpenSim/Framework/ChildAgentDataUpdate.cs | |
| parent | Add request received/handling stats for caps which are served by http poll ha... (diff) | |
| parent | Revert "Puts RequestImage (UDP) back to asyn -- CPU spike hunt" (diff) | |
| download | opensim-SC_OLD-eb14e5a1756726b1f296591bb1ac385e4b1372d7.zip opensim-SC_OLD-eb14e5a1756726b1f296591bb1ac385e4b1372d7.tar.gz opensim-SC_OLD-eb14e5a1756726b1f296591bb1ac385e4b1372d7.tar.bz2 opensim-SC_OLD-eb14e5a1756726b1f296591bb1ac385e4b1372d7.tar.xz | |
Merge branch 'master' of ssh://opensimulator.org/var/git/opensim
Diffstat (limited to 'OpenSim/Framework/ChildAgentDataUpdate.cs')
| -rw-r--r-- | OpenSim/Framework/ChildAgentDataUpdate.cs | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/OpenSim/Framework/ChildAgentDataUpdate.cs b/OpenSim/Framework/ChildAgentDataUpdate.cs index dfe60aa..9fc048b 100644 --- a/OpenSim/Framework/ChildAgentDataUpdate.cs +++ b/OpenSim/Framework/ChildAgentDataUpdate.cs | |||
| @@ -171,9 +171,10 @@ namespace OpenSim.Framework | |||
| 171 | /// Soon to be decommissioned | 171 | /// Soon to be decommissioned |
| 172 | /// </summary> | 172 | /// </summary> |
| 173 | /// <param name="cAgent"></param> | 173 | /// <param name="cAgent"></param> |
| 174 | public void CopyFrom(ChildAgentDataUpdate cAgent) | 174 | public void CopyFrom(ChildAgentDataUpdate cAgent, UUID sid) |
| 175 | { | 175 | { |
| 176 | AgentID = new UUID(cAgent.AgentID); | 176 | AgentID = new UUID(cAgent.AgentID); |
| 177 | SessionID = sid; | ||
| 177 | 178 | ||
| 178 | // next: ??? | 179 | // next: ??? |
| 179 | Size = new Vector3(); | 180 | Size = new Vector3(); |