diff options
| author | opensim mirror account | 2010-10-29 19:50:06 -0700 |
|---|---|---|
| committer | opensim mirror account | 2010-10-29 19:50:06 -0700 |
| commit | e6a7b66b080070f398967ec29565d04d7d64e887 (patch) | |
| tree | 314fd7355f8c8d833eaa667f4cc7d79e3adf9dad | |
| parent | Merge branch 'master' of /var/git/opensim/ (diff) | |
| parent | Logins work now, but avatars are green ugly gnomes. (diff) | |
| download | opensim-SC_OLD-e6a7b66b080070f398967ec29565d04d7d64e887.zip opensim-SC_OLD-e6a7b66b080070f398967ec29565d04d7d64e887.tar.gz opensim-SC_OLD-e6a7b66b080070f398967ec29565d04d7d64e887.tar.bz2 opensim-SC_OLD-e6a7b66b080070f398967ec29565d04d7d64e887.tar.xz | |
Merge branch 'master' of /var/git/opensim/
| -rw-r--r-- | OpenSim/Framework/AgentCircuitData.cs | 2 |
1 files changed, 0 insertions, 2 deletions
diff --git a/OpenSim/Framework/AgentCircuitData.cs b/OpenSim/Framework/AgentCircuitData.cs index cd30c3d..7b14ac7 100644 --- a/OpenSim/Framework/AgentCircuitData.cs +++ b/OpenSim/Framework/AgentCircuitData.cs | |||
| @@ -212,8 +212,6 @@ namespace OpenSim.Framework | |||
| 212 | args["mac"] = OSD.FromString(Mac); | 212 | args["mac"] = OSD.FromString(Mac); |
| 213 | args["id0"] = OSD.FromString(Id0); | 213 | args["id0"] = OSD.FromString(Id0); |
| 214 | 214 | ||
| 215 | // Eventually this code should be deprecated, use full appearance | ||
| 216 | // packing in packed_appearance | ||
| 217 | if (Appearance != null) | 215 | if (Appearance != null) |
| 218 | { | 216 | { |
| 219 | args["appearance_serial"] = OSD.FromInteger(Appearance.Serial); | 217 | args["appearance_serial"] = OSD.FromInteger(Appearance.Serial); |