diff options
| author | Melanie | 2011-10-11 22:51:44 +0100 |
|---|---|---|
| committer | Melanie | 2011-10-11 22:51:44 +0100 |
| commit | b40157fc9b4236173c8399bbab27fb81faf94b57 (patch) | |
| tree | 9b8978674eb4ba07b65550606b4d66dad837c4f2 /OpenSim/Capabilities/LLSDTest.cs | |
| parent | Merge commit '41616cad09ad5a2936635dfca4caf38c89d00b38' into bigmerge (diff) | |
| parent | Fix avatar parameter updating for viewer 3 and maybe 2. (diff) | |
| download | opensim-SC-b40157fc9b4236173c8399bbab27fb81faf94b57.zip opensim-SC-b40157fc9b4236173c8399bbab27fb81faf94b57.tar.gz opensim-SC-b40157fc9b4236173c8399bbab27fb81faf94b57.tar.bz2 opensim-SC-b40157fc9b4236173c8399bbab27fb81faf94b57.tar.xz | |
Merge commit 'c8304b7f84b1a8d9fb978cae510f684e36419deb' into bigmerge
Conflicts:
OpenSim/Region/CoreModules/Agent/AssetTransaction/AgentAssetsTransactions.cs
Diffstat (limited to 'OpenSim/Capabilities/LLSDTest.cs')
0 files changed, 0 insertions, 0 deletions