| Age | Commit message (Collapse) | Author |
|---|
|
|
|
secondlife/viewer#1883: Terrain paint client prototype WIP code check-in
|
|
|
|
|
|
(#2518, #2519)"
This reverts commit 6af471482d6801530915c1c9ae4bdf788af52eae.
|
|
|
|
|
|
|
|
# Conflicts:
# indra/newview/skins/default/xui/en/menu_viewer.xml
|
|
|
|
|
|
* Add missing names for controls to make content localizable
* Fix labels for controls that are obviously wrong/make no sense
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
Communicate menu (#2707)
|
|
|
|
|
|
|
|
|
|
It needs a rework
|
|
Communicate menu (#2707)
|
|
for testing purposes
|
|
"Current Window" to determine correct image size and upload cost
|
|
on previously selected snapshot type and not necessarily snapshot to inventory
|
|
image size and display upload cost to user
|
|
|
|
|
|
This reverts commit 5c16ae13758bdfe8fe1f13d5f67eabbb6eaa30a1.
Fix is correct, but should wait untill server sided fix gets deployed.
|
|
|
|
# Conflicts:
# indra/newview/llfeaturemanager.cpp
# indra/newview/llviewertexturelist.cpp
# indra/newview/llvoicewebrtc.cpp
|
|
|
|
|
|
|
|
|
|
# Conflicts:
# indra/newview/llviewertexturelist.cpp
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
