diff options
| author | David Seikel | 2011-05-12 20:36:22 +1000 |
|---|---|---|
| committer | David Seikel | 2011-05-12 20:36:22 +1000 |
| commit | 0311187f308bf24077f0c28243d16c9da8dcf879 (patch) | |
| tree | 55dab1e4b58f114955ffb16ede8d43e73099b1e9 /linden/indra/llmessage/net.cpp | |
| parent | Temporary workaround for the "TP over 4096 sims" bug. (diff) | |
| parent | Missed checkin (diff) | |
| download | meta-impy-0311187f308bf24077f0c28243d16c9da8dcf879.zip meta-impy-0311187f308bf24077f0c28243d16c9da8dcf879.tar.gz meta-impy-0311187f308bf24077f0c28243d16c9da8dcf879.tar.bz2 meta-impy-0311187f308bf24077f0c28243d16c9da8dcf879.tar.xz | |
Merge branch 'libotr' into exp
Conflicts:
linden/indra/llmessage/message.cpp
linden/indra/newview/llprefsadvanced.cpp
Diffstat (limited to 'linden/indra/llmessage/net.cpp')
0 files changed, 0 insertions, 0 deletions