Age | Commit message (Collapse) | Author |
|
|
|
|
|
|
|
Shift-dropping textures can fail if one of 'early' faces has nomod
material
|
|
|
|
|
|
|
|
|
|
|
|
PBR Terrain UI second pass
|
|
|
|
throw up a blank dialogue when that happens
|
|
Was caused by package substituting '&' with 'and' instead of '&'
|
|
|
|
reason
|
|
calls
|
|
release/materials_featurette
|
|
connects (p2p)
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
Under debug LL_ERRS will show a message as well, but release won't show
anything and will quit silently so show a notification when applicable.
|
|
|
|
|
|
# Conflicts:
# indra/llcommon/llstring.cpp
# indra/llcommon/llstring.h
|
|
into roxie/webrtc-voice
|
|
|
|
|
|
General refactoring to improve vivox spacial and p2p voice
including generalizing voice info instead of just using
sip uri and credentials. Voice server type is also passed
around in the generalized voice info blob.
|
|
set of terrain assets is preserved. Clean up enums.
|
|
correct erms..."
This reverts commit 60debe828b87c33fdbd33e3a5fcef423e544fe55.
|
|
|
|
release/materials_featurette
|
|
|
|
|
|
# Conflicts:
# indra/newview/llinventorygallery.cpp
|
|
onTopLost can result in popup being removed or potentially removing more
than one popup.
|
|
|
|
following promotion of secondlife/viewer #673
|
|
|
|
possible. Not persistent.
|
|
and update dropdown to match
|
|
|
|
all probes can benefit from the same blending functions.
|
|
|
|
|