aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/nant-color
diff options
context:
space:
mode:
authorMelanie2011-10-11 22:11:44 +0100
committerMelanie2011-10-11 22:11:44 +0100
commit6978ae0a592bf357373377324bee51032aa21d3c (patch)
tree6d24c511977e38923e63492b08bad4cbd4e5829c /nant-color
parentMerge commit 'c38b25a1d21540fd5be4ae438b38ab67ba88d166' into bigmerge (diff)
parentRemove setter from SP.OffsetPosition, since all sets should flow through SP.A... (diff)
downloadopensim-SC_OLD-6978ae0a592bf357373377324bee51032aa21d3c.zip
opensim-SC_OLD-6978ae0a592bf357373377324bee51032aa21d3c.tar.gz
opensim-SC_OLD-6978ae0a592bf357373377324bee51032aa21d3c.tar.bz2
opensim-SC_OLD-6978ae0a592bf357373377324bee51032aa21d3c.tar.xz
Merge commit 'b2356340d22578143af2daab979ea4633faa93dc' into bigmerge
Conflicts: OpenSim/Region/Framework/Scenes/ScenePresence.cs
Diffstat (limited to 'nant-color')
0 files changed, 0 insertions, 0 deletions