| Age | Commit message (Collapse) | Author |
|---|
|
INTL-490 Japanese Translation Update
|
|
# Conflicts:
# indra/llui/llfolderviewitem.cpp
# indra/newview/llinventorymodel.cpp
# indra/newview/llinventorymodelbackgroundfetch.cpp
|
|
|
|
# Conflicts:
# doc/contributions.txt
# indra/llcommon/llerrorthread.cpp
|
|
following promotion of DRTVWR-580
|
|
|
|
|
|
|
|
improvements can lead to perceived inventory loss due to cache corruption"
This reverts commit cf692c40b0b9f8d0d04cd10a02a84e3f697a2e99.
|
|
Changes do not appear to add anything sans mac's line ending which triggers coding policy protection and shouldn't be present in window's installer file.
|
|
|
|
Don't try to select something if we are waiting for an item
|
|
|
|
items from
when folder was recreated into stock fodler
|
|
|
|
|
|
entry does not work
|
|
|
|
to resolve conflicts in installer_template.nsi
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
until selecting folder
|
|
|
|
|
|
|
|
|
|
|
|
Add and Replace elements aren't displayed for system folders yet take a while to look for worn items through whole inventory.
|
|
|
|
|
|
|
|
|
|
This reverts commit 94fd5bcca5723f9779bf1c719e8b2ec6016dc0e8.
Would be present in DRTVWR-582, reverting to not confuse QA
|
|
use scroll's rect instead of gallery's rect
|
|
|
|
|
|
To avoid confusion and potential inheritance issues
|
