aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim/Region/ClientStack/Linden/Caps/NewFileAgentInventoryVariablePriceModule.cs
diff options
context:
space:
mode:
authorMelanie2012-03-20 23:39:02 +0000
committerMelanie2012-03-20 23:39:02 +0000
commit35c3124c3badfc7c6e3b0ee1957cb827be678650 (patch)
treee245c0080da5acc0b9192208d0a421be865ba2cb /OpenSim/Region/ClientStack/Linden/Caps/NewFileAgentInventoryVariablePriceModule.cs
parentMerge branch 'master' into careminster (diff)
parentAdd prim name to "[MESH]: No recognized physics mesh..." log message (diff)
downloadopensim-SC-35c3124c3badfc7c6e3b0ee1957cb827be678650.zip
opensim-SC-35c3124c3badfc7c6e3b0ee1957cb827be678650.tar.gz
opensim-SC-35c3124c3badfc7c6e3b0ee1957cb827be678650.tar.bz2
opensim-SC-35c3124c3badfc7c6e3b0ee1957cb827be678650.tar.xz
Merge branch 'master' into careminster
Conflicts: OpenSim/Region/Framework/Scenes/Scene.cs
Diffstat (limited to 'OpenSim/Region/ClientStack/Linden/Caps/NewFileAgentInventoryVariablePriceModule.cs')
0 files changed, 0 insertions, 0 deletions