Age | Commit message (Collapse) | Author |
|
|
|
overrides
|
|
Fix builds using OpenAL
|
|
|
|
Add DEBUG log output to try to diagnose.
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
# 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
|
|
|
|
# Conflicts:
# autobuild.xml
|
|
|
|
following promotion of DRTVWR-582
|
|
Looks like a bit of code from Inventory Extensions viewer leaked into
release. This was supposed to prevent 'folder does not exist' spam as
Inventory Extensions does not create folders this way, instead it
blocked folder creation.
|
|
|
|
|
|
|
|
Probably shouldn't happen since we do not allow logins without caps, but
to be sure added validation.
|
|
|
|
Pulled in relevant parts from SL-19929
|
|
SL-20024: Fix unable to modify a no-copy material from the build floater
|
|
|
|
|
|
To make multiple parallel features possible
|
|
|
|
thumbnail copy&paste only allows square textures and wasn't allowing
none square ones despite those already being used as thumbnails
|
|
|
|
And fixed some typos
|
|
Probes' is enabled
|
|
SL-20024: Double-check object inventory is not pending when save button pressed
|
|
permission bit is unset
|
|
implementation
|
|
|
|
start(folder.first) ignored fetch request due to folder having version
|
|
|
|
SL-20024: Improve material permissions handling
|
|
|
|
w/r/t author intent and being easier to understand
|
|
|
|
materials, fix item not renamed
|
|
|
|
re-enabling after object inventory load
|
|
|
|
inventory. Check perms, keep perms.
|