Age | Commit message (Collapse) | Author |
|
# Conflicts:
# indra/llui/lltooltip.h
# indra/newview/llinventoryfunctions.cpp
# indra/newview/llvovolume.cpp
# indra/newview/skins/default/textures/textures.xml
|
|
following promotion of DRTVWR-567
|
|
disappear when root goes off-screen
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
Merge conflict? This was fixed in SL-17752 but somehow reverted without
a commit
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
Animesh already subtracts complexity cost from the region. It's fine to
slow it down when it's far away, on low fps or when there is a bunch of
non-impostored avatars around. But slowing part of the region's
experience down point blank and permanently is just not pretty.
|
|
Shows folder's data instead of a suffix.
Will need either a new inventory window or to toggle UI debug on early.
|
|
|
|
|
|
|
|
|
|
wip
|
|
|
|
|
|
(cherry picked from commit 3d2da2b2c09fc637c2eaccac1607e3480bede145)
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
informative
|
|
|
|
|
|
|
|
|
|
|
|
|
|
# Conflicts:
# indra/newview/app_settings/settings.xml
# indra/newview/llinventoryfunctions.cpp
# indra/newview/llinventoryfunctions.h
# indra/newview/llinventorymodel.cpp
# indra/newview/llinventoryobserver.cpp
# indra/newview/llinventoryobserver.h
# indra/newview/skins/default/xui/ja/floater_inventory_item_properties.xml
|
|
|
|
following promotion of DRTVWR-582
|