summaryrefslogtreecommitdiff
path: root/indra/newview/llstatusbar.h
diff options
context:
space:
mode:
authorJosh Bell <josh@lindenlab.com>2008-01-03 19:53:12 +0000
committerJosh Bell <josh@lindenlab.com>2008-01-03 19:53:12 +0000
commitb6e2a894f524b4dab1f3bb80572920fe926ed4c2 (patch)
treeb59136b43b55cc81f307b8c51c1f48a97082d7ea /indra/newview/llstatusbar.h
parent2ec9ba8446dcdf004b6410cc6b9d641c41b4282b (diff)
svn merge -r76207:76805 svn+ssh://svn.lindenlab.com/svn/linden/branches/Branch_1-18-6-Server --> release
Pick up patches for: * DEV-7727 Simcrash caused by bots sitting on trees * DEV-8091 No-Copy can be circumvented by coalescing object with a Linden plant * QAR-173 Add content negotiation to login.cgi and transform.cgi so people can log in with llsd instead of xmlrpc
Diffstat (limited to 'indra/newview/llstatusbar.h')
0 files changed, 0 insertions, 0 deletions