diff options
author | Leyla Farazha <leyla@lindenlab.com> | 2011-05-06 13:36:08 -0700 |
---|---|---|
committer | Leyla Farazha <leyla@lindenlab.com> | 2011-05-06 13:36:08 -0700 |
commit | 483ceba5f492430ddd4f3b5c8c9d0fdfe12f2a6f (patch) | |
tree | f316cccce1332aa656d91db487167014b4b932d0 /indra/newview/lllocaltextureobject.h | |
parent | 4015e6b3c7b4ff34bd679618f2231b2f53258db4 (diff) |
EXP-769: "Group call requests received in Basic mode"
fixing merge error
Diffstat (limited to 'indra/newview/lllocaltextureobject.h')
0 files changed, 0 insertions, 0 deletions