Singularity-Viewer/SingularityViewer
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'singu/master'

Browse Source 
Conflicts:
	indra/newview/llviewerwindow.cpp

c_str() dropped out (50f03d83c0).
Added it back.
This commit is contained in:
Aleric Inglewood
2013-04-20 05:18:27 +02:00
parent e12aaa3f5f 3bdeb8e8a8
commit 0b86c9eec1
63 changed files with 1111 additions and 568 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
indra/aistatemachine/aistatemachine.cpp
View File

@@ -373,7 +373,7 @@ void AIEngine::setMaxCount(F32 StateMachineMaxTime)
sMaxCount = calc_clock_frequency() * StateMachineMaxTime / 1000;
}
#ifdef CWDEBUG
#if defined(CWDEBUG) || defined(DEBUG_CURLIO)
char const* AIStateMachine::event_str(event_type event)
{
switch(event)

2
indra/aistatemachine/aistatemachine.h
View File

@@ -271,7 +271,7 @@ class AIStateMachine : public LLThreadSafeRefCount
// Return stringified state, for debugging purposes.
char const* state_str(base_state_type state);
#ifdef CWDEBUG
#if defined(CWDEBUG) || defined(DEBUG_CURLIO)
char const* event_str(event_type event);
#endif

2
indra/cmake/00-Common.cmake
View File

@@ -34,7 +34,7 @@ if (WINDOWS)
endif (MSVC10)
# Remove default /Zm1000 flag that cmake inserts
string (REPLACE "/Zm1000" " " CMAKE_CXX_FLAGS ${CMAKE_CXX_FLAGS})
string (REPLACE "/Zm1000" " " CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS}")
# Don't build DLLs.
set(BUILD_SHARED_LIBS OFF)

6
indra/cmake/Linking.cmake
View File

@@ -1,4 +1,8 @@
# -*- cmake -*-
if(NOT DEFINED ${CMAKE_CURRENT_LIST_FILE}_INCLUDED)
set(${CMAKE_CURRENT_LIST_FILE}_INCLUDED "YES")
include(Variables)
if (NOT STANDALONE)
if (WINDOWS)
@@ -45,3 +49,5 @@ else (WINDOWS)
endif (WINDOWS)
mark_as_advanced(DL_LIBRARY PTHREAD_LIBRARY WINDOWS_LIBRARIES)
endif(NOT DEFINED ${CMAKE_CURRENT_LIST_FILE}_INCLUDED)

5
indra/cmake/Prebuilt.cmake
View File

@@ -1,5 +1,8 @@
# -*- cmake -*-
if(NOT DEFINED ${CMAKE_CURRENT_LIST_FILE}_INCLUDED)
set(${CMAKE_CURRENT_LIST_FILE}_INCLUDED "YES")
macro (use_prebuilt_binary _binary)
if(NOT STANDALONE)
get_property(PREBUILT_PACKAGES TARGET prepare PROPERTY PREBUILT)
@@ -9,3 +12,5 @@ macro (use_prebuilt_binary _binary)
endif(_index LESS 0)
endif(NOT STANDALONE)
endmacro (use_prebuilt_binary _binary)
endif(NOT DEFINED ${CMAKE_CURRENT_LIST_FILE}_INCLUDED)

22
indra/cmake/Variables.cmake
View File

@@ -92,29 +92,25 @@ if (${CMAKE_SYSTEM_NAME} MATCHES "Darwin")
set(DARWIN 1)
if(${CMAKE_GENERATOR} MATCHES Xcode)
execute_process(
COMMAND sh -c "xcodebuild -version | grep Xcode | cut -d ' ' -f2 | cut -d'.' -f1-2"
OUTPUT_VARIABLE XCODE_VERSION )
# To support a different SDK update these Xcode settings:
if (XCODE_VERSION GREATER 4.2)
set(CMAKE_OSX_DEPLOYMENT_TARGET 10.6)
else (XCODE_VERSION GREATER 4.2)
#SDK Compiler and Deployment targets for XCode
if (${XCODE_VERSION} VERSION_LESS 4.0.0)
set(CMAKE_OSX_SYSROOT /Developer/SDKs/MacOSX10.5.sdk)
set(CMAKE_OSX_DEPLOYMENT_TARGET 10.5)
endif (XCODE_VERSION GREATER 4.2)
else (${XCODE_VERSION} VERSION_LESS 4.0.0)
set(CMAKE_OSX_SYSROOT /Developer/SDKs/MacOSX10.6.sdk)
set(CMAKE_OSX_DEPLOYMENT_TARGET 10.6)
endif (${XCODE_VERSION} VERSION_LESS 4.0.0)
else(${CMAKE_GENERATOR} MATCHES Xcode)
set(CMAKE_OSX_SYSROOT /Developer/SDKs/MacOSX10.6.sdk)
set(CMAKE_OSX_DEPLOYMENT_TARGET 10.6)
endif(${CMAKE_GENERATOR} MATCHES Xcode)
set(CMAKE_OSX_SYSROOT /Developer/SDKs/MacOSX10.6.sdk)
set(CMAKE_XCODE_ATTRIBUTE_GCC_VERSION "com.apple.compilers.llvmgcc42")
set(CMAKE_XCODE_ATTRIBUTE_DEBUG_INFORMATION_FORMAT dwarf-with-dsym)
# Build only for i386 by default, system default on MacOSX 10.6 is x86_64
if (NOT CMAKE_OSX_ARCHITECTURES)
set(CMAKE_OSX_ARCHITECTURES i386)
endif (NOT CMAKE_OSX_ARCHITECTURES)
set(CMAKE_OSX_ARCHITECTURES i386)
set(ARCH i386)
set(WORD_SIZE 32)

2
indra/libpathing/CMakeLists.txt
View File

@@ -3,7 +3,7 @@ cmake_minimum_required(VERSION 2.6.4)
project(ndPathingLib CXX C)
if( MSVC )
add_definitions(-D_HAS_ITERATOR_DEBUGGING=0 -D_SECURE_SCL=0 -D_CRT_SECURE_NO_WARNINGS=1)
add_definitions(-D_SECURE_SCL=0 -D_CRT_SECURE_NO_WARNINGS=1)
endif( MSVC )
file (GLOB SOURCE_FILES *.cpp )

4
indra/llcommon/llthread.cpp
View File

@@ -486,10 +486,14 @@ LLThreadSafeRefCount::LLThreadSafeRefCount() :
LLThreadSafeRefCount::~LLThreadSafeRefCount()
{
llassert(mRef == 0);
/* TEMPORARILY disable erroring out on deleting this object with
nonzero reference count until the problem in AIStateMachine is fixed
if (mRef != 0)
{
llerrs << "deleting non-zero reference" << llendl;
}
*/
}
//============================================================================

10
indra/llinventory/llpermissions.cpp
View File

@@ -1022,6 +1022,16 @@ void mask_to_string(U32 mask, char* str)
{
*str = ' ';
}
str++;
if (mask & PERM_EXPORT)
{
*str = 'E';
}
else
{
*str = ' ';
}
str++;
*str = '\0';
}

3
indra/llinventory/llpermissionsflags.h
View File

@@ -52,6 +52,9 @@ const PermissionBit PERM_MODIFY = (1 << 14); // 0x00004000
// objects, allow copy
const PermissionBit PERM_COPY = (1 << 15); // 0x00008000
// objects, allow exporting
const PermissionBit PERM_EXPORT = (1 << 16); // 0x00010000
// parcels, allow entry, deprecated
//const PermissionBit PERM_ENTER = (1 << 16); // 0x00010000

4
indra/llrender/llglstates.h
View File

@@ -110,11 +110,13 @@ protected:
LLGLEnable mBlend, mAlphaTest;
LLGLDisable mCullFace;
LLGLDepthTest mDepthTest;
LLGLDisable mMSAA;
public:
LLGLSUIDefault()
: mBlend(GL_BLEND), mAlphaTest(GL_ALPHA_TEST),
mCullFace(GL_CULL_FACE),
mDepthTest(GL_FALSE, GL_TRUE, GL_LEQUAL)
mDepthTest(GL_FALSE, GL_TRUE, GL_LEQUAL),
mMSAA(GL_MULTISAMPLE_ARB)
{}
};

12
indra/llrender/llrender.cpp
View File

@@ -1495,7 +1495,7 @@ void LLRender::translateUI(F32 x, F32 y, F32 z)
llerrs << "Need to push a UI translation frame before offsetting" << llendl;
}
LLVector4a add(x,y,x);
LLVector4a add(x,y,z);
mUIOffset.back()->add(add);
}
@@ -1564,13 +1564,13 @@ LLVector3 LLRender::getUIScale()
{
return LLVector3(1,1,1);
}
return LLVector3(mUIOffset.back()->getF32ptr());
return LLVector3(mUIScale.back()->getF32ptr());
}
void LLRender::loadUIIdentity()
{
if (mUIOffset.empty())
if (mUIOffset.empty() || mUIScale.empty())
{
llerrs << "Need to push UI translation frame before clearing offset." << llendl;
}
@@ -1730,8 +1730,10 @@ void LLRender::blendFunc(eBlendFactor color_sfactor, eBlendFactor color_dfactor,
mCurrBlendAlphaSFactor = alpha_sfactor;
mCurrBlendColorDFactor = color_dfactor;
mCurrBlendAlphaDFactor = alpha_dfactor;
blendfunc_debug[0]=blendfunc_debug[2]=color_sfactor;
blendfunc_debug[1]=blendfunc_debug[3]=alpha_sfactor;
blendfunc_debug[0]=color_sfactor;
blendfunc_debug[1]=alpha_sfactor;
blendfunc_debug[2]=color_dfactor;
blendfunc_debug[3]=alpha_dfactor;
flush();
glBlendFuncSeparateEXT(sGLBlendFactor[color_sfactor], sGLBlendFactor[color_dfactor],
sGLBlendFactor[alpha_sfactor], sGLBlendFactor[alpha_dfactor]);

157
indra/llui/llalertdialog.cpp
View File

@@ -107,7 +107,7 @@ static const LLFONT_ID FONT_NAME = LLFONT_SANSSERIF;
LLAlertDialog::LLAlertDialog( LLNotificationPtr notification, bool modal)
: LLModalDialog( notification->getLabel(), 100, 100, modal ), // dummy size. Will reshape below.
LLInstanceTracker<LLAlertDialog, LLUUID>(notification->getID()),
mDefaultOption( 0 ),
mDefaultButton( NULL ),
mCheck(NULL),
mCaution(notification->getPriority() >= NOTIFICATION_PRIORITY_HIGH),
mLabel(notification->getName()),
@@ -126,35 +126,24 @@ LLAlertDialog::LLAlertDialog( LLNotificationPtr notification, bool modal)
setBackgroundVisible(TRUE);
setBackgroundOpaque(TRUE);
typedef std::vector<std::pair<std::string, std::string> > options_t;
options_t supplied_options;
typedef std::list<ButtonData> options_t;
options_t options;
// for now, get LLSD to iterator over form elements
LLSD form_sd = form->asLLSD();
S32 option_index = 0;
for (LLSD::array_const_iterator it = form_sd.beginArray(); it != form_sd.endArray(); ++it)
{
std::string type = (*it)["type"].asString();
if (type == "button")
{
if((*it)["default"])
{
mDefaultOption = option_index;
}
supplied_options.push_back(std::make_pair((*it)["name"].asString(), (*it)["text"].asString()));
ButtonData data;
data.mSelf = this;
if (option_index == mNote->getURLOption())
{
data.mURL = mNote->getURL();
}
mButtonData.push_back(data);
option_index++;
options.push_back(ButtonData());
ButtonData& button_data = options.back();
button_data.mName = (*it)["name"].asString();
button_data.mText = (*it)["text"].asString();
button_data.mDefault = (*it)["default"].asBoolean();
if(options.size()-1 == mNote->getURLOption())
button_data.mUrl = mNote->getURL();
}
else if (type == "text")
{
@@ -168,23 +157,14 @@ LLAlertDialog::LLAlertDialog( LLNotificationPtr notification, bool modal)
is_password = true;
}
}
// Buttons
options_t options;
if (supplied_options.empty())
if (options.empty())
{
options.push_back(std::make_pair(std::string("close"), std::string("Close")));
// add data for ok button.
ButtonData ok_button;
ok_button.mSelf = this;
mButtonData.push_back(ok_button);
mDefaultOption = 0;
}
else
{
options = supplied_options;
options.push_back(ButtonData());
ButtonData& button_data = options.back();
button_data.mName = "close";
button_data.mText = "Close";
button_data.mDefault = true;
}
S32 num_options = options.size();
@@ -192,9 +172,9 @@ LLAlertDialog::LLAlertDialog( LLNotificationPtr notification, bool modal)
// Calc total width of buttons
S32 button_width = 0;
S32 sp = font->getWidth(std::string("OO"));
for( S32 i = 0; i < num_options; i++ )
for( options_t::iterator it = options.begin(); it != options.end(); it++ )
{
S32 w = S32(font->getWidth( options[i].second ) + 0.99f) + sp + 2 * LLBUTTON_H_PAD;
S32 w = S32(font->getWidth( it->mText ) + 0.99f) + sp + 2 * LLBUTTON_H_PAD;
button_width = llmax( w, button_width );
}
S32 btn_total_width = button_width;
@@ -261,33 +241,37 @@ LLAlertDialog::LLAlertDialog( LLNotificationPtr notification, bool modal)
// Buttons
S32 button_left = (getRect().getWidth() - btn_total_width) / 2;
for( S32 i = 0; i < num_options; i++ )
for( options_t::iterator it = options.begin(); it != options.end(); it++ )
{
LLRect button_rect;
button_rect.setOriginAndSize( button_left, VPAD, button_width, BTN_HEIGHT );
ButtonData& button_data = *it;
LLButton* btn = new LLButton(
options[i].first, button_rect,
button_data.mName, button_rect,
"","", "",
NULL, NULL,
font,
options[i].second,
options[i].second);
button_data.mText,
button_data.mText);
mButtonData[i].mButton = btn;
btn->setClickedCallback(&LLAlertDialog::onButtonPressed, (void*)(&mButtonData[i]));
btn->setClickedCallback(boost::bind(&LLAlertDialog::onButtonPressed, this, _1, button_data.mUrl));
addChild(btn);
if( i == mDefaultOption )
if(!mDefaultButton || button_data.mDefault)
{
btn->setFocus(TRUE);
mDefaultButton = btn;
}
button_left += button_width + BTN_HPAD;
}
llassert(mDefaultButton); //'options' map should never be empty, thus mDefaultButton should always get set in the above loop.
mDefaultButton->setFocus(TRUE);
// (Optional) Edit Box
if (!edit_text_name.empty())
{
@@ -346,7 +330,7 @@ bool LLAlertDialog::show()
mLineEditor->setFocus(TRUE);
mLineEditor->selectAll();
}
if(mDefaultOption >= 0)
if(mDefaultButton)
{
// delay before enabling default button
mDefaultBtnTimer.start(DEFAULT_BUTTON_DELAY);
@@ -385,7 +369,8 @@ bool LLAlertDialog::setCheckBox( const std::string& check_title, const std::stri
check_rect.setOriginAndSize(msg_x, VPAD+BTN_HEIGHT+LINE_HEIGHT/2,
max_msg_width, LINE_HEIGHT);
mCheck = new LLCheckboxCtrl(std::string("check"), check_rect, check_title, font, onClickIgnore, this);
mCheck = new LLCheckboxCtrl(std::string("check"), check_rect, check_title, font);
mCheck->setCommitCallback(boost::bind(&LLAlertDialog::onClickIgnore, this, _1));
addChild(mCheck);
return true;
@@ -402,8 +387,49 @@ void LLAlertDialog::setVisible( BOOL visible )
}
}
//Fixing a hole in alert logic. If the alert isn't modal, clicking 'x' to close its floater would result
//in a dangling notification. To address this we try to find the most reasonable button to emulate clicking.
//Close tends to be the best, as it's most accurate, and is the default for alerts that lack defined buttons.
//Next up is cancel, which is the correct behavior for a majority of alert notifications
//After that, try 'ok', which is the only button that exists for a few alert notifications. 'ok' for these equates to 'dismiss'.
//Finally, if none of the above are found, issue the respond procedure with the dummy button name 'close'.
void LLAlertDialog::onClose(bool app_quitting)
{
if(mNote.get() && !mNote->isRespondedTo() && !mNote->isIgnored())
{
LLButton* btn = NULL;
bool found_cancel = false;
for(child_list_const_iter_t it = beginChild(); it != endChild(); ++it)
{
LLButton* cur_btn = dynamic_cast<LLButton*>(*it);
if(!cur_btn)
continue;
if( LLStringUtil::compareInsensitive(cur_btn->getName(), "close") == 0 )//prefer 'close' over anything else.
{
btn = cur_btn;
break;
}
else if(LLStringUtil::compareInsensitive(cur_btn->getName(), "cancel") == 0 )//prefer 'cancel' over 'ok'.
{
btn = cur_btn;
found_cancel = true;
}
else if(!found_cancel && LLStringUtil::compareInsensitive(cur_btn->getName(), "ok") == 0 )//accept 'ok' as last resort.
{
btn = cur_btn;
}
}
LLSD response = mNote->getResponseTemplate();
if(btn)
response[btn->getName()] = true;
else
{ //We found no acceptable button so just feed it a fake one.
//LLNotification::getSelectedOption will return -1 in notification callbacks.
response["Close"] = true;
}
mNote->respond(response);
}
LLModalDialog::onClose(app_quitting);
}
@@ -458,7 +484,7 @@ void LLAlertDialog::draw()
if(mDefaultBtnTimer.hasExpired() && mDefaultBtnTimer.getStarted())
{
mDefaultBtnTimer.stop(); // prevent this block from being run more than once
setDefaultBtn(mButtonData[mDefaultOption].mButton);
setDefaultBtn(mDefaultButton);
}
static LLColor4 shadow_color = LLUI::sColorsGroup->getColor("ColorDropShadow");
@@ -483,44 +509,37 @@ void LLAlertDialog::setEditTextArgs(const LLSD& edit_args)
}
}
// static
void LLAlertDialog::onButtonPressed( void* userdata )
void LLAlertDialog::onButtonPressed( LLUICtrl* ctrl, const std::string url )
{
ButtonData* button_data = (ButtonData*)userdata;
LLAlertDialog* self = button_data->mSelf;
LLSD response = self->mNote->getResponseTemplate();
if (self->mLineEditor)
LLSD response = mNote->getResponseTemplate();
if (mLineEditor)
{
response[self->mLineEditor->getName()] = self->mLineEditor->getValue();
response[mLineEditor->getName()] = mLineEditor->getValue();
}
response[button_data->mButton->getName()] = true;
response[ctrl->getName()] = true;
// If we declared a URL and chose the URL option, go to the url
if (!button_data->mURL.empty() && sURLLoader != NULL)
if (!url.empty() && sURLLoader != NULL)
{
sURLLoader->load(button_data->mURL);
sURLLoader->load(url);
}
self->mNote->respond(response); // new notification reponse
self->close(); // deletes self
mNote->respond(response); // new notification reponse
close(); // deletes self
}
//static
void LLAlertDialog::onClickIgnore(LLUICtrl* ctrl, void* user_data)
void LLAlertDialog::onClickIgnore(LLUICtrl* ctrl)
{
LLAlertDialog* self = (LLAlertDialog*)user_data;
// checkbox sometimes means "hide and do the default" and
// other times means "warn me again". Yuck. JC
BOOL check = ctrl->getValue();
if (self->mNote->getForm()->getIgnoreType() == LLNotificationForm::IGNORE_SHOW_AGAIN)
if (mNote->getForm()->getIgnoreType() == LLNotificationForm::IGNORE_SHOW_AGAIN)
{
// question was "show again" so invert value to get "ignore"
check = !check;
}
self->mNote->setIgnored(check);
mNote->setIgnored(check);
}

22
indra/llui/llalertdialog.h
View File

@@ -87,8 +87,8 @@ public:
//statics
static void initClass();
static bool onNewNotification(const LLSD& notify, bool is_modal);
static void onButtonPressed(void* userdata);
static void onClickIgnore(LLUICtrl* ctrl, void* user_data);
void onButtonPressed( LLUICtrl* ctrl, const std::string url );
void onClickIgnore( LLUICtrl* ctrl );
private:
LLNotificationPtr mNote;
@@ -102,18 +102,18 @@ private:
BOOL hasTitleBar() const;
private:
struct ButtonData
{
std::string mName;
std::string mText;
bool mDefault;
std::string mUrl;
};
static URLLoader* sURLLoader;
static LLControlGroup* sSettings;
struct ButtonData
{
LLAlertDialog* mSelf;
LLButton* mButton;
std::string mURL;
};
std::vector<ButtonData> mButtonData;
S32 mDefaultOption;
LLButton* mDefaultButton;
LLCheckBoxCtrl* mCheck;
BOOL mCaution;
BOOL mUnique;

1
indra/llui/llnotifications.cpp
View File

@@ -1094,6 +1094,7 @@ LLNotificationChannelPtr LLNotifications::getChannel(const std::string& channelN
if(p == mChannels.end())
{
llerrs << "Did not find channel named " << channelName << llendl;
return LLNotificationChannelPtr();
}
return p->second;
}

2
indra/llui/lluictrl.h
View File

@@ -112,7 +112,7 @@ public:
BOOL focusNextItem(BOOL text_entry_only);
BOOL focusPrevItem(BOOL text_entry_only);
BOOL focusFirstItem(BOOL prefer_text_fields = FALSE, BOOL focus_flash = TRUE );
virtual BOOL focusFirstItem(BOOL prefer_text_fields = FALSE, BOOL focus_flash = TRUE );
BOOL focusLastItem(BOOL prefer_text_fields = FALSE);
// Non Virtuals

2
indra/lscript/lscript_byteformat.h
View File

@@ -536,6 +536,7 @@ typedef enum e_lscript_runtime_permissions
SCRIPT_PERMISSION_TRACK_CAMERA,
SCRIPT_PERMISSION_CONTROL_CAMERA,
SCRIPT_PERMISSION_TELEPORT,
SCRIPT_PERMISSION_OVERRIDE_ANIMATIONS,
SCRIPT_PERMISSION_EOF
} LSCRIPTRunTimePermissions;
@@ -553,6 +554,7 @@ const U32 LSCRIPTRunTimePermissionBits[SCRIPT_PERMISSION_EOF] =
(0x1 << 10),// SCRIPT_PERMISSION_TRACK_CAMERA
(0x1 << 11),// SCRIPT_PERMISSION_CONTROL_CAMERA
(0x1 << 12),// SCRIPT_PERMISSION_TELEPORT
(0x1 << 15),// SCRIPT_PERMISSION_OVERRIDE_ANIMATIONS
};
// http_request string constants

8
indra/lscript/lscript_library/lscript_library.cpp
View File

@@ -532,6 +532,14 @@ void LLScriptLibrary::init()
addFunction(10.f, 0.f, dummy_func, "llUpdateCharacter", NULL, "l");
addFunction(10.f, 0.f, dummy_func, "llWanderWithin", NULL, "vvl");
// Server RC LeTigre 12.10.12.265819 new function
addFunction(0.f, 0.f, dummy_func, "llGetSimStats", "f", "i");
// Server RC LeTigre 13.03.22.272565 new function
addFunction(0.f, 0.f, dummy_func, "llSetAnimationOverride", NULL, "ss");
addFunction(0.f, 0.f, dummy_func, "llGetAnimationOverride", "s", "s");
addFunction(0.f, 0.f, dummy_func, "llResetAnimationOverride", NULL, "s");
// SL-LSL Functions to be added above this line
// ---------------------------------------------
// NOTE bytecode placement no longer applies, viewers do not compile scripts anymore (confirmed with LL, also noted by Phoenix/Firestorm team.)

2
indra/newview/CMakeLists.txt
View File

@@ -97,6 +97,7 @@ set(viewer_SOURCE_FILES
hippopanelgrids.cpp
importtracker.cpp
jcfloaterareasearch.cpp
lfsimfeaturehandler.cpp
lggdicdownload.cpp
lgghunspell_wrapper.cpp
llaccountingcostmanager.cpp
@@ -597,6 +598,7 @@ set(viewer_HEADER_FILES
hippopanelgrids.h
importtracker.h
jcfloaterareasearch.h
lfsimfeaturehandler.h
lggdicdownload.h
lgghunspell_wrapper.h
llaccountingcostmanager.h

3
indra/newview/app_settings/keywords.ini
View File

@@ -52,7 +52,7 @@ changed changed( integer change ):Triggered various event change the task:(tes
remote_data remote_data(integer event_type, key channel, key message_id, string sender,integer idata, string sdata):Triggered by various XML-RPC calls (event_type will be one of REMOTE_DATA_CHANNEL, REMOTE_DATA_REQUEST, REMOTE_DATA_REPLY)
http_response http_response(key request_id, integer status, list metadata, string body):Triggered when task receives a response to one of its llHTTPRequests
http_request http_request(key id, string method, string body):Triggered when task receives an http request against a public URL
transaction_result transaction_result(key id, integer success, string data):Triggered when task receives asynchronous data.
transaction_result transaction_result(key id, integer success, string data): Triggered when currency is given to task
path_update path_update(integer type, list reserved):Triggered when the state of a pathfinder character changes. Note; "list reserved" is not currently used
# integer constants
@@ -99,6 +99,7 @@ PERMISSION_CHANGE_LINKS Passed to llRequestPermissions library function to req
PERMISSION_TRACK_CAMERA Passed to llRequestPermissions library function to request permission to track agent's camera
PERMISSION_CONTROL_CAMERA Passed to llRequestPermissions library function to request permission to change agent's camera
PERMISSION_TELEPORT Passed to llRequestPermissions library function to request permission to teleport agent
PERMISSION_OVERRIDE_ANIMATIONS Passed to llRequestPermissions library function to request permission to override agent's animations
DEBUG_CHANNEL Chat channel reserved for debug and error messages from scripts
PUBLIC_CHANNEL Chat channel that broadcasts to all nearby users

7
indra/newview/app_settings/lsl_functions_sl.xml
View File

@@ -1013,5 +1013,12 @@
<!-- Server RC LeTigre 12.10.12.265819 new function -->
<key>llGetSimStats</key>
<map/>
<!-- Server RC LeTigre 13.03.22.272565 new function -->
<key>llSetAnimationOverride</key>
<map/>
<key>llGetAnimationOverride</key>
<map/>
<key>llResetAnimationOverride</key>
<map/>
</map>
</llsd>

11
indra/newview/app_settings/settings_per_account.xml
View File

@@ -314,6 +314,17 @@
<key>Value</key>
<integer>0</integer>
</map>
<key>EveryoneExport</key>
<map>
<key>Comment</key>
<string>Whether content you upload has exportability permission by default</string>
<key>Persist</key>
<integer>1</integer>
<key>Type</key>
<string>Boolean</string>
<key>Value</key>
<integer>0</integer>
</map>
<key>RLVaLoginLastLocation</key>
<map>
<key>Comment</key>

2
indra/newview/app_settings/settings_sh.xml
View File

@@ -218,7 +218,7 @@
<key>Value</key>
<real>1</real>
</map>
<key>SHAlphaMaskMaxRMSE</key>
<key>SHAutoMaskMaxRMSE</key>
<map>
<key>Comment</key>
<string>Sets the maximum random mean square error cutoff used when detecting suitable textures for alphamasking. (SHUseRMSEAutoMask must be TRUE for this to have any effect)</string>

67
indra/newview/hippofloaterxml.cpp
View File

@@ -40,6 +40,8 @@
#include <llradiogroup.h>
#include <lluictrlfactory.h>
#include "llavatarnamecache.h"
#include "llfloateravatarpicker.h"
#include "llviewerwindow.h"
@@ -58,10 +60,12 @@ class HippoFloaterXmlImpl : public LLFloater
BOOL postBuild();
void onClose(bool quitting);
static bool execute(LLUICtrl *ctrl,
static bool execute(LLFloater *floater, LLUICtrl *ctrl,
const std::string &cmds, std::string::size_type &offset,
std::string &response);
U32 mChannel;
private:
std::string mName;
bool mIsNotifyOnClose;
@@ -160,7 +164,7 @@ void XmlData::release(const std::string &floaterName)
// create HippoFloaterXmlImpl
HippoFloaterXmlImpl::HippoFloaterXmlImpl(const std::string &name, const std::string &xml) :
mName(name), mIsNotifyOnClose(false)
mName(name), mIsNotifyOnClose(false), mChannel(CHANNEL)
{
gInstances[mName] = this;
LLUICtrlFactory::getInstance()->buildFloaterFromBuffer(this, xml);
@@ -218,7 +222,7 @@ void HippoFloaterXml::execute(const std::string &cmds)
if (token == "{") {
if (floater) {
std::string response;
if (!floater->execute(floater, cmds, offset, response))
if (!floater->execute(floater, floater, cmds, offset, response))
break;
if (!response.empty())
send_chat_from_viewer(response, CHAT_TYPE_WHISPER, CHANNEL);
@@ -265,29 +269,56 @@ void HippoFloaterXml::execute(const std::string &cmds)
// ********************************************************************
// generic notification callbacks
static void notifyCallback(void *c)
static void notifyCallback(void *c, void *f)
{
HippoFloaterXmlImpl* floaterp = (HippoFloaterXmlImpl*)f;
LLUICtrl *ctrl = (LLUICtrl *)c;
std::string msg = "NOTIFY:";
msg += ctrl->getName();
msg += ':';
msg += ctrl->getValue().asString();
send_chat_from_viewer(msg, CHAT_TYPE_WHISPER, CHANNEL);
send_chat_from_viewer(msg, CHAT_TYPE_WHISPER, floaterp->mChannel);
}
void callbackAvatarPick(void *c, void *f, const uuid_vec_t& ids, const std::vector<LLAvatarName>& names)
{
HippoFloaterXmlImpl* floaterp = (HippoFloaterXmlImpl*)f;
LLUICtrl *ctrl = (LLUICtrl *)c;
LLUUID id = ids[0];
std::string msg = "PICKER:";
msg += ctrl->getName();
msg += ':';
msg += id.asString();
msg += ':';
msg += names[0].getCompleteName();
send_chat_from_viewer(msg, CHAT_TYPE_WHISPER, floaterp->mChannel);
}
static void pickerCallback(void *c, void *f)
{
LLUICtrl *ctrl = (LLUICtrl *)c;
HippoFloaterXmlImpl* floaterp = (HippoFloaterXmlImpl*)f;
floaterp->addDependentFloater(LLFloaterAvatarPicker::show(boost::bind(&callbackAvatarPick, ctrl, floaterp, _1, _2), FALSE, TRUE));
//send_chat_from_viewer(msg, CHAT_TYPE_WHISPER, CHANNEL);
}
void HippoFloaterXmlImpl::onClose(bool quitting)
{
if (mIsNotifyOnClose)
send_chat_from_viewer("NOTIFY:" + mName + ":closed",
CHAT_TYPE_WHISPER, CHANNEL);
CHAT_TYPE_WHISPER, mChannel);
LLFloater::onClose(quitting);
}
// ********************************************************************
// execute commands on instance
bool HippoFloaterXmlImpl::execute(LLUICtrl *ctrl,
bool HippoFloaterXmlImpl::execute(LLFloater *floater, LLUICtrl *ctrl,
const std::string &cmds, std::string::size_type &offset,
std::string &response)
{
@@ -313,24 +344,36 @@ bool HippoFloaterXmlImpl::execute(LLUICtrl *ctrl,
if (!child) return false;
if (!cmdGetToken(cmds, offset, token)) return false;
if (token != "{") return false;
if (!execute(child, cmds, offset, response))
if (!execute(floater, child, cmds, offset, response))
return false;
} else if (key == "setValue") {
ctrl->setValue(value);
} else if (key == "channel") {
if (HippoFloaterXmlImpl *floater = dynamic_cast<HippoFloaterXmlImpl*>(ctrl)) {
floater->mChannel = atoi(value.c_str());
}
} else if (key == "setLabel") {
/*ctrl->setLabel(value);*/
} else if (key == "setVisible") {
ctrl->setVisible(value != "0");
} else if (key == "notify") {
bool set = (value != "0");
if (HippoFloaterXmlImpl *floater = dynamic_cast<HippoFloaterXmlImpl*>(ctrl)) {
floater->mIsNotifyOnClose = set;
if (HippoFloaterXmlImpl *floaterp = dynamic_cast<HippoFloaterXmlImpl*>(ctrl)) {
floaterp->mIsNotifyOnClose = set;
} else {
if (set)
ctrl->setCommitCallback(boost::bind(&notifyCallback, _1), ctrl);
ctrl->setCommitCallback(boost::bind(&notifyCallback, _1, floater), ctrl);
else
ctrl->setCommitCallback(0);
}
} else if (key == "picker") {
bool set = (value != "0");
if (!dynamic_cast<HippoFloaterXmlImpl*>(ctrl)) {
if (set)
ctrl->setCommitCallback(boost::bind(&pickerCallback, _1, floater), ctrl);
else
ctrl->setCommitCallback(0);
}
}
}
}

66
indra/newview/lfsimfeaturehandler.cpp Normal file
View File

@@ -0,0 +1,66 @@
/* Copyright (C) 2013 Liru Færs
*
* This library is free software; you can redistribute it and/or
* modify it under the terms of the GNU Lesser General Public
* License as published by the Free Software Foundation; either
* version 2.1 of the License, or (at your option) any later version.
*
* This library is distributed in the hope that it will be useful,
* but WITHOUT ANY WARRANTY; without even the implied warranty of
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
* Lesser General Public License for more details.
*
* You should have received a copy of the GNU Lesser General
* Public License along with this library; if not, write to the
* Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
* Boston, MA 02110-1301 USA */
#include "llviewerprecompiledheaders.h"
#include "lfsimfeaturehandler.h"
#include "llagent.h"
#include "llenvmanager.h"
#include "llviewerregion.h"
#include "hippogridmanager.h"
LFSimFeatureHandler::LFSimFeatureHandler()
: mSupportsExport(false)
{
if (!gHippoGridManager->getCurrentGrid()->isSecondLife()) // Remove this line if we ever handle SecondLife sim features
LLEnvManagerNew::instance().setRegionChangeCallback(boost::bind(&LFSimFeatureHandler::handleRegionChange, this));
}
void LFSimFeatureHandler::handleRegionChange()
{
if (LLViewerRegion* region = gAgent.getRegion())
{
if (region->getFeaturesReceived())
{
setSupportedFeatures();
}
else
{
region->setFeaturesReceivedCallback(boost::bind(&LFSimFeatureHandler::setSupportedFeatures, this));
}
}
}
void LFSimFeatureHandler::setSupportedFeatures()
{
if (LLViewerRegion* region = gAgent.getRegion())
{
LLSD info;
region->getSimulatorFeatures(info);
//if (!gHippoGridManager->getCurrentGrid()->isSecondLife()) // Non-SL specific sim features
{
mSupportsExport = info.has("ExportSupported");
}
}
}
boost::signals2::connection LFSimFeatureHandler::setSupportsExportCallback(const boost::signals2::signal<void()>::slot_type& slot)
{
return mSupportsExport.connect(slot);
}

70
indra/newview/lfsimfeaturehandler.h Normal file
View File

@@ -0,0 +1,70 @@
/* Copyright (C) 2013 Liru Færs
*
* This library is free software; you can redistribute it and/or
* modify it under the terms of the GNU Lesser General Public
* License as published by the Free Software Foundation; either
* version 2.1 of the License, or (at your option) any later version.
*
* This library is distributed in the hope that it will be useful,
* but WITHOUT ANY WARRANTY; without even the implied warranty of
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
* Lesser General Public License for more details.
*
* You should have received a copy of the GNU Lesser General
* Public License along with this library; if not, write to the
* Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
* Boston, MA 02110-1301 USA */
#ifndef LFSIMFEATUREHANDLER_H
#define LFSIMFEATUREHANDLER_H
#include "llsingleton.h"
template<typename Type>
class SignaledType
{
public:
SignaledType(Type b) : mValue(b) {}
template<typename Slot>
boost::signals2::connection connect(Slot slot) { return mSignal.connect(slot); }
SignaledType& operator =(Type val)
{
if (val != mValue)
{
mValue = val;
mSignal();
}
return *this;
}
operator Type() const { return mValue; }
private:
boost::signals2::signal<void()> mSignal;
Type mValue;
};
class LFSimFeatureHandler : public LLSingleton<LFSimFeatureHandler>
{
protected:
friend class LLSingleton<LFSimFeatureHandler>;
LFSimFeatureHandler();
public:
void handleRegionChange();
void setSupportedFeatures();
// Connection setters
boost::signals2::connection setSupportsExportCallback(const boost::signals2::signal<void()>::slot_type& slot);
// Accessors
bool simSupportsExport() const { return mSupportsExport; }
private:
// SignaledTypes
SignaledType<bool> mSupportsExport;
};
#endif //LFSIMFEATUREHANDLER_H

3
indra/newview/llestateinfomodel.h
View File

@@ -56,7 +56,8 @@ public:
const std::string& getName() const { return mName; }
const LLUUID& getOwnerID() const { return mOwnerID; }
U32 getID() const { return mID; }
F32 getSunHour() const { return getUseFixedSun() ? mSunHour : 0.f; }
F32 getSunHour() const { return mSunHour; }
bool getGlobalTime() const { return !(mSunHour || getUseFixedSun()); }
// setters
void setUseFixedSun(bool val);

4
indra/newview/llface.cpp
View File

@@ -1068,10 +1068,10 @@ bool LLFace::canRenderAsMask()
const LLTextureEntry* te = getTextureEntry();
static const LLCachedControl<bool> use_rmse_auto_mask("SHUseRMSEAutoMask",false);
static const LLCachedControl<F32> alpha_mas_max_rmse("SHAlphaMaskMaxRMSE",.09f);
static const LLCachedControl<F32> auto_mask_max_rmse("SHAutoMaskMaxRMSE",.09f);
if ((te->getColor().mV[3] == 1.0f) && // can't treat as mask if we have face alpha
(te->getGlow() == 0.f) && // glowing masks are hard to implement - don't mask
getTexture()->getIsAlphaMask(use_rmse_auto_mask ? alpha_mas_max_rmse : -1.f)) // texture actually qualifies for masking (lazily recalculated but expensive)
(!getViewerObject()->isAttachment() && getTexture()->getIsAlphaMask(use_rmse_auto_mask ? auto_mask_max_rmse : -1.f))) // texture actually qualifies for masking (lazily recalculated but expensive)
{
if (LLPipeline::sRenderDeferred)
{

27
indra/newview/llfloaterchat.cpp
View File

@@ -187,7 +187,15 @@ void LLFloaterChat::handleVisibilityChange(BOOL new_visibility)
// virtual
void LLFloaterChat::onFocusReceived()
{
gFocusMgr.setKeyboardFocus(getChildView("Chat Editor")); // Work around the chat bar no longer focusing from within the layout_stack
LLView* chat_editor = getChildView("Chat Editor");
if (getVisible() && childIsVisible("Chat Editor"))
{
gFocusMgr.setKeyboardFocus(chat_editor);
LLUICtrl * ctrl = static_cast<LLUICtrl*>(chat_editor);
ctrl->setFocus(TRUE);
}
LLFloater::onFocusReceived();
}
@@ -740,3 +748,20 @@ void LLFloaterChat::hide(LLFloater* instance, const LLSD& key)
VisibilityPolicy<LLFloater>::hide(instance, key);
}
}
BOOL LLFloaterChat::focusFirstItem(BOOL prefer_text_fields, BOOL focus_flash )
{
LLView* chat_editor = getChildView("Chat Editor");
if (getVisible() && childIsVisible("Chat Editor"))
{
gFocusMgr.setKeyboardFocus(chat_editor);
LLUICtrl * ctrl = static_cast<LLUICtrl*>(chat_editor);
ctrl->setFocus(TRUE);
return TRUE;
}
return LLUICtrl::focusFirstItem(prefer_text_fields, focus_flash);
}

2
indra/newview/llfloaterchat.h
View File

@@ -98,6 +98,8 @@ public:
LLPanelActiveSpeakers* mPanel;
BOOL mScrolledToEnd;
BOOL focusFirstItem(BOOL prefer_text_fields = FALSE, BOOL focus_flash = TRUE );
CachedUICtrl<LLButton> mToggleActiveSpeakersBtn;
CachedUICtrl<LLChatBar> mChatPanel;
};

80
indra/newview/llfloaterperms.cpp
View File

@@ -32,6 +32,7 @@
*/
#include "llviewerprecompiledheaders.h"
#include "lfsimfeaturehandler.h"
#include "llalertdialog.h"
#include "llcheckboxctrl.h"
#include "llfloaterperms.h"
@@ -40,7 +41,35 @@
#include "llviewerwindow.h"
#include "lluictrlfactory.h"
#include "llpermissions.h"
#include "hippogridmanager.h"
namespace
{
bool everyone_export;
void handle_checkboxes(LLUICtrl* ctrl, const LLSD& value)
{
LLPanel* view = static_cast<LLPanel*>(ctrl->getParent());
if (ctrl->getName() == "everyone_export")
{
view->childSetEnabled("next_owner_copy", !value);
view->childSetEnabled("next_owner_modify", !value);
view->childSetEnabled("next_owner_transfer", !value);
}
else
{
if (ctrl->getName() == "next_owner_copy")
{
if (!value) // Implements fair use
gSavedSettings.setBOOL("NextOwnerTransfer", true);
view->childSetEnabled("next_owner_transfer", value);
}
if (!value) // If any of these are unchecked, export can no longer be checked.
view->childSetEnabled("everyone_export", false);
else
view->childSetEnabled("everyone_export", LFSimFeatureHandler::instance().simSupportsExport() && (LLFloaterPerms::getNextOwnerPerms() & PERM_ITEM_UNRESTRICTED) == PERM_ITEM_UNRESTRICTED);
}
}
}
LLFloaterPerms::LLFloaterPerms(const LLSD& seed)
{
@@ -49,11 +78,35 @@ LLFloaterPerms::LLFloaterPerms(const LLSD& seed)
BOOL LLFloaterPerms::postBuild()
{
childSetEnabled("next_owner_transfer", gSavedSettings.getBOOL("NextOwnerCopy"));
//handle_checkboxes
{
bool export_support = LFSimFeatureHandler::instance().simSupportsExport();
const U32 next_owner_perms = getNextOwnerPerms();
childSetEnabled("everyone_export", export_support && (next_owner_perms & PERM_ITEM_UNRESTRICTED) == PERM_ITEM_UNRESTRICTED);
if (!gHippoGridManager->getCurrentGrid()->isSecondLife())
childSetVisible("everyone_export", false);
if (!(next_owner_perms & PERM_COPY))
{
childSetEnabled("next_owner_transfer", false);
}
else if (export_support)
{
bool export_off = !gSavedPerAccountSettings.getBOOL("EveryoneExport");
childSetEnabled("next_owner_copy", export_off);
childSetEnabled("next_owner_modify", export_off);
childSetEnabled("next_owner_transfer", export_off);
}
else // Set EveryoneExport false, just in case.
gSavedPerAccountSettings.setBOOL("EveryoneExport", false);
}
childSetAction("help", onClickHelp, this);
childSetAction("ok", onClickOK, this);
childSetAction("cancel", onClickCancel, this);
childSetCommitCallback("next_owner_copy", &onCommitCopy, this);
getChild<LLUICtrl>("next_owner_copy")->setCommitCallback(handle_checkboxes);
getChild<LLUICtrl>("next_owner_modify")->setCommitCallback(handle_checkboxes);
getChild<LLUICtrl>("next_owner_transfer")->setCommitCallback(handle_checkboxes);
getChild<LLUICtrl>("everyone_export")->setCommitCallback(handle_checkboxes);
refresh();
@@ -76,20 +129,6 @@ void LLFloaterPerms::onClickCancel(void* data)
self->close();
}
//static
void LLFloaterPerms::onCommitCopy(LLUICtrl* ctrl, void* data)
{
LLFloaterPerms* self = static_cast<LLFloaterPerms*>(data);
// Implements fair use
BOOL copyable = gSavedSettings.getBOOL("NextOwnerCopy");
if(!copyable)
{
gSavedSettings.setBOOL("NextOwnerTransfer", TRUE);
}
LLCheckBoxCtrl* xfer = self->getChild<LLCheckBoxCtrl>("next_owner_transfer");
xfer->setEnabled(copyable);
}
void LLFloaterPerms::ok()
{
refresh(); // Changes were already applied to saved settings. Refreshing internal values makes it official.
@@ -102,6 +141,7 @@ void LLFloaterPerms::cancel()
gSavedSettings.setBOOL("NextOwnerCopy", mNextOwnerCopy);
gSavedSettings.setBOOL("NextOwnerModify", mNextOwnerModify);
gSavedSettings.setBOOL("NextOwnerTransfer", mNextOwnerTransfer);
gSavedPerAccountSettings.setBOOL("EveryoneExport", everyone_export);
}
void LLFloaterPerms::refresh()
@@ -111,6 +151,7 @@ void LLFloaterPerms::refresh()
mNextOwnerCopy = gSavedSettings.getBOOL("NextOwnerCopy");
mNextOwnerModify = gSavedSettings.getBOOL("NextOwnerModify");
mNextOwnerTransfer = gSavedSettings.getBOOL("NextOwnerTransfer");
everyone_export = gSavedPerAccountSettings.getBOOL("EveryoneExport");
}
void LLFloaterPerms::onClose(bool app_quitting)
@@ -130,7 +171,12 @@ U32 LLFloaterPerms::getGroupPerms(std::string prefix)
//static
U32 LLFloaterPerms::getEveryonePerms(std::string prefix)
{
return gSavedSettings.getBOOL(prefix+"EveryoneCopy") ? PERM_COPY : PERM_NONE;
U32 flags = PERM_NONE;
if (LFSimFeatureHandler::instance().simSupportsExport() && prefix.empty() && gSavedPerAccountSettings.getBOOL("EveryoneExport")) // TODO: Bulk enable export?
flags |= PERM_EXPORT;
if (gSavedSettings.getBOOL(prefix+"EveryoneCopy"))
flags |= PERM_COPY;
return flags;
}
//static

1
indra/newview/llfloaterperms.h
View File

@@ -47,7 +47,6 @@ public:
void cancel();
static void onClickOK(void*);
static void onClickCancel(void*);
static void onCommitCopy(LLUICtrl* ctrl, void* data);
// Convenience methods to get current permission preference bitfields from saved settings:
static U32 getEveryonePerms(std::string prefix=""); // prefix + "EveryoneCopy"
static U32 getGroupPerms(std::string prefix=""); // prefix + "ShareWithGroup"

37
indra/newview/llfloaterproperties.cpp
View File

@@ -60,6 +60,7 @@
#include "lluictrlfactory.h"
#include "lfsimfeaturehandler.h"
#include "hippogridmanager.h"
@@ -67,6 +68,8 @@
#include "rlvhandler.h"
// [/RLVa:KB]
bool can_set_export(const U32& base, const U32& own, const U32& next);
//~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
// Class LLPropertiesObserver
//
@@ -197,6 +200,9 @@ LLFloaterProperties::LLFloaterProperties(const std::string& name, const LLRect&
// everyone permissions
childSetCommitCallback("CheckEveryoneCopy",&onCommitPermissions, this);
childSetCommitCallback("CheckEveryoneMove",&onCommitPermissions, this);
childSetCommitCallback("CheckExport", &onCommitPermissions, this);
if (!gHippoGridManager->getCurrentGrid()->isSecondLife())
LFSimFeatureHandler::instance().setSupportsExportCallback(boost::bind(&LLFloaterProperties::refresh, this));
// next owner permissions
childSetCommitCallback("CheckNextOwnerModify",&onCommitPermissions, this);
childSetCommitCallback("CheckNextOwnerCopy",&onCommitPermissions, this);
@@ -251,11 +257,13 @@ void LLFloaterProperties::refresh()
"CheckOwnerModify",
"CheckOwnerCopy",
"CheckOwnerTransfer",
"CheckOwnerExport",
"CheckGroupCopy",
"CheckGroupMod",
"CheckGroupMove",
"CheckEveryoneCopy",
"CheckEveryoneMove",
"CheckExport",
"CheckNextOwnerModify",
"CheckNextOwnerCopy",
"CheckNextOwnerTransfer",
@@ -437,6 +445,12 @@ void LLFloaterProperties::refreshFromItem(LLInventoryItem* item)
childSetEnabled("CheckOwnerTransfer",FALSE);
childSetValue("CheckOwnerTransfer",LLSD((BOOL)(owner_mask & PERM_TRANSFER)));
bool supports_export = LFSimFeatureHandler::instance().simSupportsExport();
childSetEnabled("CheckOwnerExport",false);
childSetValue("CheckOwnerExport", supports_export && owner_mask & PERM_EXPORT);
if (!gHippoGridManager->getCurrentGrid()->isSecondLife())
childSetVisible("CheckOwnerExport", false);
///////////////////////
// DEBUG PERMISSIONS //
///////////////////////
@@ -459,11 +473,15 @@ void LLFloaterProperties::refreshFromItem(LLInventoryItem* item)
perm_string = "B: ";
perm_string += mask_to_string(base_mask);
if (!supports_export && base_mask & PERM_EXPORT) // Hide Export when not available
perm_string.erase(perm_string.find_last_of("E"));
childSetText("BaseMaskDebug",perm_string);
childSetVisible("BaseMaskDebug",TRUE);
perm_string = "O: ";
perm_string += mask_to_string(owner_mask);
if (!supports_export && owner_mask & PERM_EXPORT) // Hide Export when not available
perm_string.erase(perm_string.find_last_of("E"));
childSetText("OwnerMaskDebug",perm_string);
childSetVisible("OwnerMaskDebug",TRUE);
@@ -476,6 +494,8 @@ void LLFloaterProperties::refreshFromItem(LLInventoryItem* item)
perm_string = "E";
perm_string += overwrite_everyone ? "*: " : ": ";
perm_string += mask_to_string(everyone_mask);
if (!supports_export && everyone_mask & PERM_EXPORT) // Hide Export when not available
perm_string.erase(perm_string.find_last_of("E"));
childSetText("EveryoneMaskDebug",perm_string);
childSetVisible("EveryoneMaskDebug",TRUE);
@@ -519,6 +539,8 @@ void LLFloaterProperties::refreshFromItem(LLInventoryItem* item)
childSetEnabled("CheckEveryoneCopy",false);
childSetEnabled("CheckEveryoneMove",false);
}
childSetEnabled("CheckExport", supports_export && item->getType() != LLAssetType::AT_OBJECT && gAgentID == item->getCreatorUUID()
&& can_set_export(base_mask, owner_mask, next_owner_mask));
// Set values.
BOOL is_group_copy = (group_mask & PERM_COPY) ? TRUE : FALSE;
@@ -531,6 +553,7 @@ void LLFloaterProperties::refreshFromItem(LLInventoryItem* item)
childSetValue("CheckEveryoneCopy",LLSD((BOOL)(everyone_mask & PERM_COPY)));
childSetValue("CheckEveryoneMove",LLSD((BOOL)(everyone_mask & PERM_MOVE)));
childSetValue("CheckExport", supports_export && everyone_mask & PERM_EXPORT);
///////////////
// SALE INFO //
@@ -545,10 +568,11 @@ void LLFloaterProperties::refreshFromItem(LLInventoryItem* item)
childSetEnabled("SaleLabel",is_complete);
childSetEnabled("CheckPurchase",is_complete);
childSetEnabled("NextOwnerLabel",TRUE);
childSetEnabled("CheckNextOwnerModify",base_mask & PERM_MODIFY);
childSetEnabled("CheckNextOwnerCopy",base_mask & PERM_COPY);
childSetEnabled("CheckNextOwnerTransfer",next_owner_mask & PERM_COPY);
bool no_export = !(everyone_mask & PERM_EXPORT); // Next owner perms can't be changed if set
childSetEnabled("NextOwnerLabel", no_export);
childSetEnabled("CheckNextOwnerModify", no_export && base_mask & PERM_MODIFY);
childSetEnabled("CheckNextOwnerCopy", no_export && base_mask & PERM_COPY);
childSetEnabled("CheckNextOwnerTransfer", no_export && next_owner_mask & PERM_COPY);
childSetEnabled("RadioSaleType",is_complete && is_for_sale);
childSetEnabled("TextPrice",is_complete && is_for_sale);
@@ -750,6 +774,11 @@ void LLFloaterProperties::onCommitPermissions(LLUICtrl* ctrl, void* data)
perm.setEveryoneBits(gAgent.getID(), gAgent.getGroupID(),
CheckEveryoneCopy->get(), PERM_COPY);
}
LLCheckBoxCtrl* CheckExport = self->getChild<LLCheckBoxCtrl>("CheckExport");
if(CheckExport)
{
perm.setEveryoneBits(gAgent.getID(), gAgent.getGroupID(), CheckExport->get(), PERM_EXPORT);
}
LLCheckBoxCtrl* CheckNextOwnerModify = self->getChild<LLCheckBoxCtrl>("CheckNextOwnerModify");
if(CheckNextOwnerModify)

127
indra/newview/llfloaterregioninfo.cpp
View File

@@ -160,6 +160,39 @@ void unpack_request_params(
*/
namespace
{
void on_caps_received(LLTabContainer* tab)
{
if (!tab) return;
const LLViewerRegion* region = gAgent.getRegion();
tab->enableTabButton(tab->getIndexForPanel(tab->getPanelByName("panel_env_info")), region && !region->getCapability("EnvironmentSettings").empty());
}
void handle_opposite(const bool& off, LLUICtrl* opposite)
{
opposite->setEnabled(!off);
if (off) opposite->setValue(false);
}
void on_change_use_other_sun(const LLSD& param, LLUICtrl* opposite, LLUICtrl* slider)
{
handle_opposite(param.asBoolean(), opposite);
slider->setEnabled(false);
}
void on_change_fixed_sun(const LLSD& param, LLUICtrl* opposite, LLUICtrl* slider)
{
bool fixed_sun = param.asBoolean();
handle_opposite(fixed_sun, opposite);
slider->setEnabled(fixed_sun);
}
const float get_sun_hour(const LLUICtrl* sun_hour)
{
return sun_hour->getEnabled() ? sun_hour->getValue().asFloat() : 0.f;
}
}
bool estate_dispatch_initialized = false;
@@ -352,6 +385,15 @@ void LLFloaterRegionInfo::processRegionInfo(LLMessageSystem* msg)
LLTrans::findString(sim_type, sim_type); // try localizing sim product name
}
// Disable Environment Tab when not supported
if (region)
{
if (region->capabilitiesReceived())
on_caps_received(tab);
else
region->setCapabilitiesReceivedCallback(boost::bind(on_caps_received, tab));
}
// GENERAL PANEL
panel = tab->getChild<LLPanel>("General");
panel->getChild<LLUICtrl>("region_text")->setValue(LLSD(sim_name));
@@ -629,6 +671,27 @@ bool LLPanelRegionGeneralInfo::refreshFromRegion(LLViewerRegion* region)
getChildView("im_btn")->setEnabled(allow_modify);
getChildView("manage_telehub_btn")->setEnabled(allow_modify);
// Support Legacy Region Environment
{
const LLRegionInfoModel& region_info = LLRegionInfoModel::instance();
bool estate_sun = region_info.mUseEstateSun;
getChild<LLUICtrl>("use_estate_sun_check")->setValue(estate_sun);
getChild<LLUICtrl>("fixed_sun_check")->setEnabled(allow_modify && !estate_sun);
getChild<LLUICtrl>("sun_hour_slider")->setEnabled(allow_modify && !estate_sun);
if (estate_sun)
{
getChild<LLUICtrl>("use_estate_sun_check")->setEnabled(allow_modify);
getChild<LLUICtrl>("fixed_sun_check")->setValue(false);
}
else
{
bool fixed_sun = region_info.getUseFixedSun();
getChild<LLUICtrl>("use_estate_sun_check")->setEnabled(allow_modify && !fixed_sun);
getChild<LLUICtrl>("fixed_sun_check")->setValue(fixed_sun);
getChild<LLUICtrl>("sun_hour_slider")->setValue(region_info.mSunHour);
}
}
// Data gets filled in by processRegionInfo
return LLPanelRegionInfo::refreshFromRegion(region);
@@ -647,6 +710,9 @@ BOOL LLPanelRegionGeneralInfo::postBuild()
initCtrl("access_combo");
initCtrl("restrict_pushobject");
initCtrl("block_parcel_search_check");
initCtrl("use_estate_sun_check");
initCtrl("fixed_sun_check");
initCtrl("sun_hour_slider");
initHelpBtn("terraform_help", "HelpRegionBlockTerraform");
initHelpBtn("fly_help", "HelpRegionBlockFly");
@@ -658,12 +724,23 @@ BOOL LLPanelRegionGeneralInfo::postBuild()
initHelpBtn("land_resell_help", "HelpRegionLandResell");
initHelpBtn("parcel_changes_help", "HelpParcelChanges");
initHelpBtn("parcel_search_help", "HelpRegionSearch");
initHelpBtn("use_estate_sun_help", "HelpRegionUseEstateSun");
initHelpBtn("fixed_sun_help", "HelpRegionFixedSun");
childSetAction("kick_btn", boost::bind(&LLPanelRegionGeneralInfo::onClickKick, this));
childSetAction("kick_all_btn", onClickKickAll, this);
childSetAction("im_btn", onClickMessage, this);
childSetAction("manage_telehub_btn", boost::bind(&LLPanelRegionGeneralInfo::onClickManageTelehub, this));
// Set up the Legacy Region Environment checkboxes
{
LLUICtrl* estate_sun = getChild<LLUICtrl>("use_estate_sun_check");
LLUICtrl* fixed_sun = getChild<LLUICtrl>("fixed_sun_check");
LLUICtrl* hour_slider = getChild<LLUICtrl>("sun_hour_slider");
estate_sun->setCommitCallback(boost::bind(on_change_use_other_sun, _2, fixed_sun, hour_slider));
fixed_sun->setCommitCallback(boost::bind(on_change_fixed_sun, _2, estate_sun, hour_slider));
}
return LLPanelRegionInfo::postBuild();
}
@@ -839,6 +916,13 @@ BOOL LLPanelRegionGeneralInfo::sendUpdate()
sendEstateOwnerMessage(gMessageSystem, "setregioninfo", invoice, strings);
}
// Send the Legacy Region Environment
LLRegionInfoModel& region_info = LLRegionInfoModel::instance();
region_info.mUseEstateSun = getChild<LLUICtrl>("use_estate_sun_check")->getValue().asBoolean();
region_info.setUseFixedSun(getChild<LLUICtrl>("fixed_sun_check")->getValue().asBoolean());
region_info.mSunHour = get_sun_hour(getChild<LLUICtrl>("sun_hour_slider"));
region_info.sendRegionTerrain(LLFloaterRegionInfo::getLastInvoice());
// if we changed access levels, tell user about it
LLViewerRegion* region = gAgent.getRegion();
if (region && (getChild<LLUICtrl>("access_combo")->getValue().asInteger() != region->getSimAccess()) )
@@ -2015,11 +2099,16 @@ BOOL LLPanelEstateInfo::postBuild()
{
// set up the callbacks for the generic controls
initCtrl("externally_visible_check");
initCtrl("use_global_time_check");
initCtrl("fixed_sun_check");
initCtrl("sun_hour_slider");
initCtrl("allow_direct_teleport");
initCtrl("limit_payment");
initCtrl("limit_age_verified");
initCtrl("voice_chat_check");
initHelpBtn("estate_manager_help", "HelpEstateEstateManager");
initHelpBtn("use_global_time_help", "HelpEstateUseGlobalTime");
initHelpBtn("fixed_sun_help", "HelpEstateFixedSun");
initHelpBtn("externally_visible_help", "HelpEstateExternallyVisible");
initHelpBtn("allow_direct_teleport_help", "HelpEstateAllowDirectTeleport");
initHelpBtn("allow_resident_help", "HelpEstateAllowResident");
@@ -2027,6 +2116,15 @@ BOOL LLPanelEstateInfo::postBuild()
initHelpBtn("ban_resident_help", "HelpEstateBanResident");
initHelpBtn("voice_chat_help", "HelpEstateVoiceChat");
// Set up the Legacy Estate Environment checkboxes
{
LLUICtrl* global_time = getChild<LLUICtrl>("use_global_time_check");
LLUICtrl* fixed_sun = getChild<LLUICtrl>("fixed_sun_check");
LLUICtrl* hour_slider = getChild<LLUICtrl>("sun_hour_slider");
global_time->setCommitCallback(boost::bind(on_change_use_other_sun, _2, fixed_sun, hour_slider));
fixed_sun->setCommitCallback(boost::bind(on_change_fixed_sun, _2, global_time, hour_slider));
}
getChild<LLUICtrl>("allowed_avatar_name_list")->setCommitCallback(boost::bind(&LLPanelEstateInfo::onChangeChildCtrl, this, _1));
LLNameListCtrl *avatar_name_list = getChild<LLNameListCtrl>("allowed_avatar_name_list");
if (avatar_name_list)
@@ -2106,14 +2204,36 @@ void LLPanelEstateInfo::refreshFromEstate()
getChild<LLUICtrl>("limit_payment")->setValue(estate_info.getDenyAnonymous());
getChild<LLUICtrl>("limit_age_verified")->setValue(estate_info.getDenyAgeUnverified());
// Ensure appriopriate state of the management UI
// Ensure appropriate state of the management UI
updateControls(gAgent.getRegion());
// Support Legacy Estate Environment
{
const LLEstateInfoModel& estate_info = LLEstateInfoModel::instance();
bool global_time = estate_info.getGlobalTime();
getChild<LLUICtrl>("use_global_time_check")->setValue(global_time);
getChild<LLUICtrl>("fixed_sun_check")->setEnabled(!global_time);
getChild<LLUICtrl>("sun_hour_slider")->setEnabled(!global_time);
if (global_time)
{
getChild<LLUICtrl>("use_global_time_check")->setEnabled(true);
getChild<LLUICtrl>("fixed_sun_check")->setValue(false);
}
else
{
bool fixed_sun = estate_info.getUseFixedSun();
getChild<LLUICtrl>("use_global_time_check")->setEnabled(!fixed_sun);
getChild<LLUICtrl>("fixed_sun_check")->setValue(fixed_sun);
F32 sun_hour = estate_info.getSunHour();
if (sun_hour < 6.0f) sun_hour += 24.0f;
getChild<LLUICtrl>("sun_hour_slider")->setValue(sun_hour);
}
}
refresh();
}
BOOL LLPanelEstateInfo::sendUpdate()
{
llinfos << "LLPanelEsateInfo::sendUpdate()" << llendl;
llinfos << "LLPanelEstateInfo::sendUpdate()" << llendl;
LLNotification::Params params("ChangeLindenEstate");
params.functor(boost::bind(&LLPanelEstateInfo::callbackChangeLindenEstate, this, _1, _2));
@@ -2141,8 +2261,9 @@ bool LLPanelEstateInfo::callbackChangeLindenEstate(const LLSD& notification, con
LLEstateInfoModel& estate_info = LLEstateInfoModel::instance();
// update model
estate_info.setUseFixedSun(false); // we don't support fixed sun estates anymore
estate_info.setIsExternallyVisible(getChild<LLUICtrl>("externally_visible_check")->getValue().asBoolean());
estate_info.setUseFixedSun(getChild<LLUICtrl>("fixed_sun_check")->getValue().asBoolean());
estate_info.setSunHour(get_sun_hour(getChild<LLUICtrl>("sun_hour_slider")));
estate_info.setAllowDirectTeleport(getChild<LLUICtrl>("allow_direct_teleport")->getValue().asBoolean());
estate_info.setDenyAnonymous(getChild<LLUICtrl>("limit_payment")->getValue().asBoolean());
estate_info.setDenyAgeUnverified(getChild<LLUICtrl>("limit_age_verified")->getValue().asBoolean());

29
indra/newview/llimpanel.cpp
View File

@@ -2606,3 +2606,32 @@ const bool LLFloaterIMPanel::isModerator(const LLUUID& speaker_id)
return FALSE;
}
BOOL LLFloaterIMPanel::focusFirstItem(BOOL prefer_text_fields, BOOL focus_flash )
{
LLView* chat_editor = getChildView("chat_editor");
if (getVisible() && childIsVisible("chat_editor"))
{
gFocusMgr.setKeyboardFocus(chat_editor);
LLUICtrl * ctrl = static_cast<LLUICtrl*>(chat_editor);
ctrl->setFocus(TRUE);
return TRUE;
}
return LLUICtrl::focusFirstItem(prefer_text_fields, focus_flash);
}
void LLFloaterIMPanel::onFocusReceived()
{
LLView* chat_editor = getChildView("chat_editor");
if (getVisible() && childIsVisible("chat_editor"))
{
gFocusMgr.setKeyboardFocus(chat_editor);
LLUICtrl * ctrl = static_cast<LLUICtrl*>(chat_editor);
ctrl->setFocus(TRUE);
}
LLFloater::onFocusReceived();
}

3
indra/newview/llimpanel.h
View File

@@ -231,6 +231,9 @@ public:
void *cargo_data, EAcceptance *accept,
std::string& tooltip_msg);
BOOL focusFirstItem(BOOL prefer_text_fields = FALSE, BOOL focus_flash = TRUE );
void onFocusReceived();
void onInputEditorFocusReceived();
void onInputEditorFocusLost();
static void onInputEditorKeystroke(LLLineEditor* caller, void* userdata);

163
indra/newview/llpaneldisplay.cpp
View File

@@ -105,7 +105,7 @@ LLPanelDisplay::LLPanelDisplay()
BOOL LLPanelDisplay::postBuild()
{
// return to default values
childSetAction("Defaults", setHardwareDefaults, NULL);
getChild<LLButton>("Defaults")->setClickedCallback(boost::bind(&LLPanelDisplay::setHardwareDefaults));
//============================================================================
// Resolution
@@ -113,8 +113,7 @@ BOOL LLPanelDisplay::postBuild()
// radio set for fullscreen size
mCtrlWindowed = getChild<LLCheckBoxCtrl>( "windowed mode");
mCtrlWindowed->setCommitCallback(&LLPanelDisplay::onCommitWindowedMode);
mCtrlWindowed->setCallbackUserData(this);
mCtrlWindowed->setCommitCallback(boost::bind(&LLPanelDisplay::onCommitWindowedMode,this));
mAspectRatioLabel1 = getChild<LLTextBox>("AspectRatioLabel1");
mDisplayResLabel = getChild<LLTextBox>("DisplayResLabel");
@@ -194,25 +193,22 @@ BOOL LLPanelDisplay::postBuild()
}
mCtrlAspectRatio = getChild<LLComboBox>( "aspect_ratio");
mCtrlAspectRatio->setTextEntryCallback(onKeystrokeAspectRatio);
mCtrlAspectRatio->setCommitCallback(onSelectAspectRatio);
mCtrlAspectRatio->setCallbackUserData(this);
mCtrlAspectRatio->setTextEntryCallback(&LLPanelDisplay::onKeystrokeAspectRatio);
mCtrlAspectRatio->setCallbackUserData(this);
mCtrlAspectRatio->setCommitCallback(boost::bind(&LLPanelDisplay::onSelectAspectRatio,this));
// add default aspect ratios
mCtrlAspectRatio->add(aspect_ratio_text, &mAspectRatio, ADD_TOP);
mCtrlAspectRatio->setCurrentByIndex(0);
mCtrlAutoDetectAspect = getChild<LLCheckBoxCtrl>( "aspect_auto_detect");
mCtrlAutoDetectAspect->setCommitCallback(onCommitAutoDetectAspect);
mCtrlAutoDetectAspect->setCallbackUserData(this);
mCtrlAutoDetectAspect->setCommitCallback(boost::bind(&LLPanelDisplay::onCommitAutoDetectAspect,this,_2));
// radio performance box
mCtrlSliderQuality = getChild<LLSliderCtrl>("QualityPerformanceSelection");
mCtrlSliderQuality->setSliderMouseUpCallback(boost::bind(&LLPanelDisplay::onChangeQuality,mCtrlSliderQuality,this));
mCtrlSliderQuality->setCallbackUserData(this);
mCtrlSliderQuality->setSliderMouseUpCallback(boost::bind(&LLPanelDisplay::onChangeQuality,this,_1));
mCtrlCustomSettings = getChild<LLCheckBoxCtrl>("CustomSettings");
mCtrlCustomSettings->setCommitCallback(onChangeCustom);
mCtrlCustomSettings->setCallbackUserData(this);
mCtrlCustomSettings->setCommitCallback(boost::bind(&LLPanelDisplay::onChangeCustom));
//mGraphicsBorder = getChild<LLViewBorder>("GraphicsBorder");
@@ -226,24 +222,19 @@ BOOL LLPanelDisplay::postBuild()
//----------------------------------------------------------------------------
// Enable Reflections
mCtrlReflectionDetail = getChild<LLComboBox>("ReflectionDetailCombo");
mCtrlReflectionDetail->setCommitCallback(&LLPanelDisplay::onVertexShaderEnable);
mCtrlReflectionDetail->setCallbackUserData(this);
mCtrlReflectionDetail->setCommitCallback(boost::bind(&LLPanelDisplay::onVertexShaderEnable));
// WindLight
mCtrlWindLight = getChild<LLCheckBoxCtrl>("WindLightUseAtmosShaders");
mCtrlWindLight->setCommitCallback(&LLPanelDisplay::onVertexShaderEnable);
mCtrlWindLight->setCallbackUserData(this);
mCtrlWindLight->setCommitCallback(boost::bind(&LLPanelDisplay::onVertexShaderEnable));
// Deferred
mCtrlDeferred = getChild<LLCheckBoxCtrl>("RenderDeferred");
mCtrlDeferred->setCommitCallback(&LLPanelDisplay::onVertexShaderEnable);
mCtrlDeferred->setCallbackUserData(this);
mCtrlDeferred->setCommitCallback(boost::bind(&LLPanelDisplay::onVertexShaderEnable));
mCtrlDeferredDoF = getChild<LLCheckBoxCtrl>("RenderDepthOfField");
mCtrlDeferredDoF->setCommitCallback(&LLPanelDisplay::onVertexShaderEnable);
mCtrlDeferredDoF->setCallbackUserData(this);
mCtrlDeferredDoF->setCommitCallback(boost::bind(&LLPanelDisplay::onVertexShaderEnable));
mCtrlShadowDetail = getChild<LLComboBox>("ShadowDetailCombo");
mCtrlShadowDetail->setCommitCallback(&LLPanelDisplay::onVertexShaderEnable);
mCtrlShadowDetail->setCallbackUserData(this);
mCtrlShadowDetail->setCommitCallback(boost::bind(&LLPanelDisplay::onVertexShaderEnable));
//----------------------------------------------------------------------------
// Terrain Scale
@@ -252,15 +243,13 @@ BOOL LLPanelDisplay::postBuild()
//----------------------------------------------------------------------------
// Enable Avatar Shaders
mCtrlAvatarVP = getChild<LLCheckBoxCtrl>("AvatarVertexProgram");
mCtrlAvatarVP->setCommitCallback(&LLPanelDisplay::onVertexShaderEnable);
mCtrlAvatarVP->setCallbackUserData(this);
mCtrlAvatarVP->setCommitCallback(boost::bind(&LLPanelDisplay::onVertexShaderEnable));
//----------------------------------------------------------------------------
// Avatar Render Mode
mCtrlAvatarCloth = getChild<LLCheckBoxCtrl>("AvatarCloth");
mCtrlAvatarImpostors = getChild<LLCheckBoxCtrl>("AvatarImpostors");
mCtrlAvatarImpostors->setCommitCallback(&LLPanelDisplay::onVertexShaderEnable);
mCtrlAvatarImpostors->setCallbackUserData(this);
mCtrlAvatarImpostors->setCommitCallback(boost::bind(&LLPanelDisplay::onVertexShaderEnable));
mCtrlNonImpostors = getChild<LLSliderCtrl>("AvatarMaxVisible");
//----------------------------------------------------------------------------
@@ -278,8 +267,7 @@ BOOL LLPanelDisplay::postBuild()
//----------------------------------------------------------------------------
// Global Shader Enable
mCtrlShaderEnable = getChild<LLCheckBoxCtrl>("BasicShaders");
mCtrlShaderEnable->setCommitCallback(&LLPanelDisplay::onVertexShaderEnable);
mCtrlShaderEnable->setCallbackUserData(this);
mCtrlShaderEnable->setCommitCallback(boost::bind(&LLPanelDisplay::onVertexShaderEnable));
//============================================================================
@@ -287,50 +275,42 @@ BOOL LLPanelDisplay::postBuild()
mCtrlDrawDistance = getChild<LLSliderCtrl>("DrawDistance");
mDrawDistanceMeterText1 = getChild<LLTextBox>("DrawDistanceMeterText1");
mDrawDistanceMeterText2 = getChild<LLTextBox>("DrawDistanceMeterText2");
mCtrlDrawDistance->setCommitCallback(&LLPanelDisplay::updateMeterText);
mCtrlDrawDistance->setCallbackUserData(this);
mCtrlDrawDistance->setCommitCallback(boost::bind(&LLPanelDisplay::updateMeterText, this));
// Object detail slider
mCtrlLODFactor = getChild<LLSliderCtrl>("ObjectMeshDetail");
mLODFactorText = getChild<LLTextBox>("ObjectMeshDetailText");
mCtrlLODFactor->setCommitCallback(&LLPanelDisplay::updateSliderText);
mCtrlLODFactor->setCallbackUserData(mLODFactorText);
mCtrlLODFactor->setCommitCallback(boost::bind(&LLPanelDisplay::updateSliderText, _1,mLODFactorText));
// Flex object detail slider
mCtrlFlexFactor = getChild<LLSliderCtrl>("FlexibleMeshDetail");
mFlexFactorText = getChild<LLTextBox>("FlexibleMeshDetailText");
mCtrlFlexFactor->setCommitCallback(&LLPanelDisplay::updateSliderText);
mCtrlFlexFactor->setCallbackUserData(mFlexFactorText);
mCtrlFlexFactor->setCommitCallback(boost::bind(&LLPanelDisplay::updateSliderText,_1, mFlexFactorText));
// Tree detail slider
mCtrlTreeFactor = getChild<LLSliderCtrl>("TreeMeshDetail");
mTreeFactorText = getChild<LLTextBox>("TreeMeshDetailText");
mCtrlTreeFactor->setCommitCallback(&LLPanelDisplay::updateSliderText);
mCtrlTreeFactor->setCallbackUserData(mTreeFactorText);
mCtrlTreeFactor->setCommitCallback(boost::bind(&LLPanelDisplay::updateSliderText, _1, mTreeFactorText));
// Avatar detail slider
mCtrlAvatarFactor = getChild<LLSliderCtrl>("AvatarMeshDetail");
mAvatarFactorText = getChild<LLTextBox>("AvatarMeshDetailText");
mCtrlAvatarFactor->setCommitCallback(&LLPanelDisplay::updateSliderText);
mCtrlAvatarFactor->setCallbackUserData(mAvatarFactorText);
mCtrlAvatarFactor->setCommitCallback(boost::bind(&LLPanelDisplay::updateSliderText, _1, mAvatarFactorText));
// Avatar physics detail slider
mCtrlAvatarPhysicsFactor = getChild<LLSliderCtrl>("AvatarPhysicsDetail");
mAvatarPhysicsFactorText = getChild<LLTextBox>("AvatarPhysicsDetailText");
mCtrlAvatarPhysicsFactor->setCommitCallback(&LLPanelDisplay::updateSliderText);
mCtrlAvatarPhysicsFactor->setCallbackUserData(mAvatarPhysicsFactorText);
mCtrlAvatarPhysicsFactor->setCommitCallback(boost::bind(&LLPanelDisplay::updateSliderText, _1, mAvatarPhysicsFactorText));
// Terrain detail slider
mCtrlTerrainFactor = getChild<LLSliderCtrl>("TerrainMeshDetail");
mTerrainFactorText = getChild<LLTextBox>("TerrainMeshDetailText");
mCtrlTerrainFactor->setCommitCallback(&LLPanelDisplay::updateSliderText);
mCtrlTerrainFactor->setCallbackUserData(mTerrainFactorText);
mCtrlTerrainFactor->setCommitCallback(boost::bind(&LLPanelDisplay::updateSliderText, _1, mTerrainFactorText));
// Terrain detail slider
mCtrlSkyFactor = getChild<LLSliderCtrl>("SkyMeshDetail");
mSkyFactorText = getChild<LLTextBox>("SkyMeshDetailText");
mCtrlSkyFactor->setCommitCallback(&LLPanelDisplay::updateSliderText);
mCtrlSkyFactor->setCallbackUserData(mSkyFactorText);
mCtrlSkyFactor->setCommitCallback(boost::bind(&LLPanelDisplay::updateSliderText, _1, mSkyFactorText));
// Particle detail slider
mCtrlMaxParticle = getChild<LLSliderCtrl>("MaxParticleCount");
@@ -338,8 +318,7 @@ BOOL LLPanelDisplay::postBuild()
// Glow detail slider
mCtrlPostProcess = getChild<LLSliderCtrl>("RenderPostProcess");
mPostProcessText = getChild<LLTextBox>("PostProcessText");
mCtrlPostProcess->setCommitCallback(&LLPanelDisplay::updateSliderText);
mCtrlPostProcess->setCallbackUserData(mPostProcessText);
mCtrlPostProcess->setCommitCallback(boost::bind(&LLPanelDisplay::updateSliderText, _1, mPostProcessText));
// Text boxes (for enabling/disabling)
mShaderText = getChild<LLTextBox>("ShadersText");
@@ -351,7 +330,11 @@ BOOL LLPanelDisplay::postBuild()
mTerrainScaleText = getChild<LLTextBox>("TerrainScaleText");
// Hardware tab
childSetCommitCallback("vbo", &LLPanelDisplay::onRenderVBOEnable, this);
mVBO = getChild<LLCheckBoxCtrl>("vbo");
mVBO->setCommitCallback(boost::bind(&LLPanelDisplay::onVertexShaderEnable));
mVBOStream = getChild<LLCheckBoxCtrl>("vbo_stream");
refresh();
@@ -598,13 +581,13 @@ void LLPanelDisplay::refreshEnabledState()
if (!LLFeatureManager::getInstance()->isFeatureAvailable("RenderVBOEnable") ||
!gGLManager.mHasVertexBufferObject)
{
childSetEnabled("vbo", false);
mVBO->setEnabled(false);
//Streaming VBOs -Shyotl
childSetEnabled("vbo_stream", false);
mVBOStream->setEnabled(false);
}
else
{
childSetEnabled("vbo_stream", LLVertexBuffer::sEnableVBOs);
mVBOStream->setEnabled(gSavedSettings.getBOOL("RenderVBOEnable"));
}
// if no windlight shaders, enable gamma, and fog distance
@@ -811,7 +794,7 @@ void LLPanelDisplay::setHiddenGraphicsState(bool isHidden)
// hide one meter text if we're making things visible
if(!isHidden)
{
updateMeterText(mCtrlDrawDistance, this);
updateMeterText();
}
mMeshDetailText->setVisible(!isHidden);
@@ -900,12 +883,11 @@ void LLPanelDisplay::apply()
}
}
void LLPanelDisplay::onChangeQuality(LLUICtrl *ctrl, void *data)
void LLPanelDisplay::onChangeQuality(LLUICtrl* caller)
{
LLSliderCtrl* sldr = static_cast<LLSliderCtrl*>(ctrl);
LLPanelDisplay* cur_panel = static_cast<LLPanelDisplay*>(data);
LLSlider* sldr = dynamic_cast<LLSlider*>(caller);
if(sldr == NULL || cur_panel == NULL)
if(sldr == NULL)
{
return;
}
@@ -914,19 +896,14 @@ void LLPanelDisplay::onChangeQuality(LLUICtrl *ctrl, void *data)
LLFeatureManager::getInstance()->setGraphicsLevel(set, true);
LLFloaterPreference::refreshEnabledGraphics();
cur_panel->refresh();
refresh();
}
void LLPanelDisplay::onChangeCustom(LLUICtrl *ctrl, void *data)
void LLPanelDisplay::onChangeCustom()
{
LLFloaterPreference::refreshEnabledGraphics();
}
void LLPanelDisplay::onApplyResolution(LLUICtrl* src, void* user_data)
{
((LLPanelDisplay*) src)->applyResolution();
}
void LLPanelDisplay::applyResolution()
{
@@ -1018,20 +995,14 @@ void LLPanelDisplay::applyWindowSize()
}
}
//static
void LLPanelDisplay::onCommitWindowedMode(LLUICtrl* ctrl, void *data)
void LLPanelDisplay::onCommitWindowedMode()
{
LLPanelDisplay *panel = (LLPanelDisplay*)data;
panel->refresh();
refresh();
}
//static
void LLPanelDisplay::onCommitAutoDetectAspect(LLUICtrl *ctrl, void *data)
void LLPanelDisplay::onCommitAutoDetectAspect(const LLSD& value)
{
LLPanelDisplay *panel = (LLPanelDisplay*)data;
BOOL auto_detect = ((LLCheckBoxCtrl*)ctrl)->get();
BOOL auto_detect = value.asBoolean();
F32 ratio;
if (auto_detect)
@@ -1053,27 +1024,23 @@ void LLPanelDisplay::onCommitAutoDetectAspect(LLUICtrl *ctrl, void *data)
aspect = llformat("%.3f", gViewerWindow->mWindow->getNativeAspectRatio());
}
panel->mCtrlAspectRatio->setLabel(aspect);
mCtrlAspectRatio->setLabel(aspect);
ratio = gViewerWindow->mWindow->getNativeAspectRatio();
gSavedSettings.setF32("FullScreenAspectRatio", ratio);
}
}
//static
void LLPanelDisplay::onKeystrokeAspectRatio(LLLineEditor* caller, void* user_data)
void LLPanelDisplay::onKeystrokeAspectRatio(LLLineEditor* caller, void *user_data)
{
LLPanelDisplay* panel = (LLPanelDisplay*)user_data;
LLPanelDisplay* panel = (LLPanelDisplay*)user_data;
panel->mCtrlAutoDetectAspect->set(FALSE);
}
//static
void LLPanelDisplay::onSelectAspectRatio(LLUICtrl*, void* user_data)
void LLPanelDisplay::onSelectAspectRatio()
{
LLPanelDisplay* panel = (LLPanelDisplay*)user_data;
panel->mCtrlAutoDetectAspect->set(FALSE);
mCtrlAutoDetectAspect->set(FALSE);
}
//static
@@ -1092,22 +1059,13 @@ void LLPanelDisplay::fractionFromDecimal(F32 decimal_val, S32& numerator, S32& d
}
}
//static
void LLPanelDisplay::onVertexShaderEnable(LLUICtrl* self, void* data)
void LLPanelDisplay::onVertexShaderEnable()
{
LLFloaterPreference::refreshEnabledGraphics();
}
//static
void LLPanelDisplay::onRenderVBOEnable(LLUICtrl* self, void* data)
{
LLPanelDisplay* panel = (LLPanelDisplay*)data;
bool enable = panel->childGetValue("vbo").asBoolean();
panel->childSetEnabled("vbo_stream", enable);
if(!enable) panel->childSetValue("vbo_stream", false);
}
void LLPanelDisplay::setHardwareDefaults(void* user_data)
void LLPanelDisplay::setHardwareDefaults()
{
LLFeatureManager::getInstance()->applyRecommendedSettings();
LLControlVariable* controlp = gSavedSettings.getControl("RenderAvatarMaxVisible");
@@ -1118,11 +1076,11 @@ void LLPanelDisplay::setHardwareDefaults(void* user_data)
LLFloaterPreference::refreshEnabledGraphics();
}
void LLPanelDisplay::updateSliderText(LLUICtrl* ctrl, void* user_data)
//static
void LLPanelDisplay::updateSliderText(LLUICtrl* ctrl, LLTextBox* text_box)
{
// get our UI widgets
LLTextBox* text_box = (LLTextBox*)user_data;
LLSliderCtrl* slider = (LLSliderCtrl*) ctrl;
LLSliderCtrl* slider = dynamic_cast<LLSliderCtrl*>(ctrl);
if(text_box == NULL || slider == NULL)
{
return;
@@ -1160,20 +1118,13 @@ void LLPanelDisplay::updateSliderText(LLUICtrl* ctrl, void* user_data)
}
}
void LLPanelDisplay::updateMeterText(LLUICtrl* ctrl, void* user_data)
void LLPanelDisplay::updateMeterText()
{
// get our UI widgets
LLPanelDisplay* panel = (LLPanelDisplay*)user_data;
LLSliderCtrl* slider = (LLSliderCtrl*) ctrl;
LLTextBox* m1 = panel->getChild<LLTextBox>("DrawDistanceMeterText1");
LLTextBox* m2 = panel->getChild<LLTextBox>("DrawDistanceMeterText2");
// toggle the two text boxes based on whether we have 2 or 3 digits
F32 val = slider->getValueF32();
F32 val = mCtrlDrawDistance->getValueF32();
bool two_digits = val < 100;
m1->setVisible(two_digits);
m2->setVisible(!two_digits);
mDrawDistanceMeterText1->setVisible(two_digits);
mDrawDistanceMeterText2->setVisible(!two_digits);
}

30
indra/newview/llpaneldisplay.h
View File

@@ -146,6 +146,9 @@ protected:
LLTextBox *mShadowDetailText;
LLTextBox *mTerrainScaleText;
LLCheckBoxCtrl *mVBO;
LLCheckBoxCtrl *mVBOStream;
BOOL mFSAutoDetectAspect;
F32 mAspectRatio;
@@ -192,31 +195,24 @@ protected:
S32 mVideoCardMem;
F32 mFogRatio;
static void setGraphicsSettings(LLControlGroup& group);
static void createGroup();
// if the quality radio buttons are changed
static void onChangeQuality(LLUICtrl *ctrl, void *data);
void onChangeQuality(LLUICtrl* caller);
// if the custom settings box is clicked
static void onChangeCustom(LLUICtrl *ctrl, void *data);
static void onChangeCustom();
static void onCommitAutoDetectAspect(LLUICtrl *ctrl, void *data);
static void onKeystrokeAspectRatio(LLLineEditor* caller, void* user_data);
static void onSelectAspectRatio(LLUICtrl*, void*);
static void onCommitWindowedMode(LLUICtrl* ctrl, void *data);
static void onApplyResolution(LLUICtrl* ctrl, void* data);
static void updateSliderText(LLUICtrl* ctrl, void* user_data);
static void updateMeterText(LLUICtrl* ctrl, void* user_data);
void onCommitAutoDetectAspect(const LLSD& value);
static void onKeystrokeAspectRatio(LLLineEditor* caller, void *user_data);
void onSelectAspectRatio();
void onCommitWindowedMode();
static void updateSliderText(LLUICtrl* ctrl, LLTextBox* text_box);
void updateMeterText();
/// callback for defaults
static void setHardwareDefaults(void *data);
static void setHardwareDefaults();
// callback for when client turns on shaders
static void onVertexShaderEnable(LLUICtrl*, void*);
// callbacks for hardware tab
static void onRenderVBOEnable(LLUICtrl*, void*);
static void onVertexShaderEnable();
// helper function
static void fractionFromDecimal(F32 decimal_val, S32& numerator, S32& denominator);

116
indra/newview/llpanelpermissions.cpp
View File

@@ -67,7 +67,9 @@
#include "lluictrlfactory.h"
#include "roles_constants.h"
#include "lltrans.h"
#include "llinventoryfunctions.h"
#include "lfsimfeaturehandler.h"
#include "hippogridmanager.h"
@@ -76,6 +78,32 @@
#include "rlvhandler.h"
// [/RLVa:KB]
// base and own must have EXPORT, next owner must be UNRESTRICTED
bool can_set_export(const U32& base, const U32& own, const U32& next)
{
return base & PERM_EXPORT && own & PERM_EXPORT && (next & PERM_ITEM_UNRESTRICTED) == PERM_ITEM_UNRESTRICTED;
}
bool perms_allow_export(const LLPermissions& perms)
{
return perms.getMaskBase() & PERM_EXPORT && perms.getMaskEveryone() & PERM_EXPORT;
}
bool is_asset_exportable(const LLUUID& asset_id)
{
if (asset_id.isNull()) return true; // Don't permission-check null textures
LLViewerInventoryCategory::cat_array_t cats;
LLViewerInventoryItem::item_array_t items;
LLAssetIDMatches asset_id_matches(asset_id);
gInventory.collectDescendentsIf(LLUUID::null, cats, items, true, asset_id_matches, false);
for (int i = 0; i < items.count(); ++i)
{
if (perms_allow_export(items[i]->getPermissions())) return true;
}
return false;
}
///----------------------------------------------------------------------------
/// Class llpanelpermissions
///----------------------------------------------------------------------------
@@ -112,6 +140,8 @@ BOOL LLPanelPermissions::postBuild()
childSetCommitCallback("checkbox allow everyone copy",LLPanelPermissions::onCommitEveryoneCopy,this);
getChild<LLUICtrl>("checkbox allow export")->setCommitCallback(boost::bind(&LLPanelPermissions::onCommitExport, this, _2));
childSetCommitCallback("checkbox for sale",LLPanelPermissions::onCommitSaleInfo,this);
childSetCommitCallback("Edit Cost",LLPanelPermissions::onCommitSaleInfo,this);
@@ -136,6 +166,9 @@ BOOL LLPanelPermissions::postBuild()
mLabelGroupName = NULL;
}
if (!gHippoGridManager->getCurrentGrid()->isSecondLife())
LFSimFeatureHandler::instance().setSupportsExportCallback(boost::bind(&LLPanelPermissions::refresh, this));
return TRUE;
}
@@ -145,6 +178,13 @@ LLPanelPermissions::~LLPanelPermissions()
// base class will take care of everything
}
// virtual
void LLPanelPermissions::handleVisibilityChange(BOOL new_visibility)
{
if (new_visibility)
refresh();
LLPanel::handleVisibilityChange(new_visibility);
}
void LLPanelPermissions::refresh()
{
@@ -223,10 +263,13 @@ void LLPanelPermissions::refresh()
childSetEnabled("checkbox share with group",false);
childSetEnabled("button deed",false);
childSetEnabled("text anyone can", false);
childSetValue("checkbox allow everyone move",FALSE);
childSetEnabled("checkbox allow everyone move",false);
childSetValue("checkbox allow everyone copy",FALSE);
childSetEnabled("checkbox allow everyone copy",false);
childSetValue("checkbox allow export", false);
childSetEnabled("checkbox allow export", false);
//Next owner can:
childSetEnabled("Next owner can:",false);
@@ -601,6 +644,7 @@ void LLPanelPermissions::refresh()
&next_owner_mask_on,
&next_owner_mask_off);
bool supports_export = LFSimFeatureHandler::instance().simSupportsExport();
if( gSavedSettings.getBOOL("DebugPermissions") )
{
@@ -610,6 +654,8 @@ void LLPanelPermissions::refresh()
{
perm_string = "B: ";
perm_string += mask_to_string(base_mask_on);
if (!supports_export && base_mask_on & PERM_EXPORT) // Hide Export when not available
perm_string.erase(perm_string.find_last_of("E"));
if (U32 diff_mask = base_mask_on ^ owner_mask_on) // When different, show the user's potential permissions lowercase.
{
if (diff_mask & PERM_MOVE)
@@ -620,12 +666,16 @@ void LLPanelPermissions::refresh()
LLStringUtil::replaceChar(perm_string, 'C', 'c');
if (diff_mask & PERM_TRANSFER)
LLStringUtil::replaceChar(perm_string, 'T', 't');
if (diff_mask & PERM_EXPORT)
LLStringUtil::replaceChar(perm_string, 'E', 'e');
}
childSetText("B:",perm_string);
childSetVisible("B:",true);
perm_string = "O: ";
perm_string += mask_to_string(owner_mask_on);
if (!supports_export && owner_mask_on & PERM_EXPORT) // Hide Export when not available
perm_string.erase(perm_string.find_last_of("E"));
childSetText("O:",perm_string);
childSetVisible("O:",true);
@@ -636,6 +686,8 @@ void LLPanelPermissions::refresh()
perm_string = "E: ";
perm_string += mask_to_string(everyone_mask_on);
if (!supports_export && everyone_mask_on & PERM_EXPORT) // Hide Export when not available
perm_string.erase(perm_string.find_last_of("E"));
childSetText("E:",perm_string);
childSetVisible("E:",true);
@@ -688,16 +740,41 @@ void LLPanelPermissions::refresh()
if (has_change_perm_ability)
{
childSetEnabled("checkbox share with group",true);
childSetEnabled("text anyone can", true);
childSetEnabled("checkbox allow everyone move",owner_mask_on & PERM_MOVE);
childSetEnabled("checkbox allow everyone copy",owner_mask_on & PERM_COPY && owner_mask_on & PERM_TRANSFER);
}
else
{
childSetEnabled("checkbox share with group", FALSE);
childSetEnabled("text anyone can", false);
childSetEnabled("checkbox allow everyone move", FALSE);
childSetEnabled("checkbox allow everyone copy", FALSE);
}
// Is this user allowed to toggle export on this object?
if (supports_export && self_owned && mCreatorID == mOwnerID && can_set_export(base_mask_on, owner_mask_on, next_owner_mask_on))
{
bool can_export = true;
LLInventoryObject::object_list_t objects;
objectp->getInventoryContents(objects);
for (LLInventoryObject::object_list_t::iterator i = objects.begin(); can_export && i != objects.end() ; ++i) //The object's inventory must have EXPORT.
{
LLViewerInventoryItem* item = static_cast<LLViewerInventoryItem*>(i->get()); //getInventoryContents() filters out categories, static_cast.
can_export = perms_allow_export(item->getPermissions());
}
for (U8 i = 0; can_export && i < objectp->getNumTEs(); ++i) // Can the textures be exported?
if (LLTextureEntry* texture = objectp->getTE(i))
can_export = is_asset_exportable(texture->getID());
childSetEnabled("checkbox allow export", can_export);
}
else
{
childSetEnabled("checkbox allow export", false);
if (!gHippoGridManager->getCurrentGrid()->isSecondLife())
childSetVisible("checkbox allow export", false);
}
if (has_change_sale_ability && (owner_mask_on & PERM_TRANSFER))
{
childSetEnabled("checkbox for sale", can_transfer || (!can_transfer && num_for_sale));
@@ -706,10 +783,11 @@ void LLPanelPermissions::refresh()
childSetTentative("checkbox for sale", is_for_sale_mixed);
childSetEnabled("sale type",num_for_sale && can_transfer && !is_sale_price_mixed);
childSetEnabled("Next owner can:", TRUE);
childSetEnabled("checkbox next owner can modify",base_mask_on & PERM_MODIFY);
childSetEnabled("checkbox next owner can copy",base_mask_on & PERM_COPY);
childSetEnabled("checkbox next owner can transfer",next_owner_mask_on & PERM_COPY);
bool no_export = everyone_mask_off & PERM_EXPORT; // Next owner perms can't be changed if set
childSetEnabled("Next owner can:", no_export);
childSetEnabled("checkbox next owner can modify", no_export && base_mask_on & PERM_MODIFY);
childSetEnabled("checkbox next owner can copy", no_export && base_mask_on & PERM_COPY);
childSetEnabled("checkbox next owner can transfer", no_export && next_owner_mask_on & PERM_COPY);
}
else
{
@@ -779,6 +857,31 @@ void LLPanelPermissions::refresh()
childSetValue("checkbox allow everyone copy",TRUE);
childSetTentative("checkbox allow everyone copy",true);
}
// Export
if (supports_export)
{
if(everyone_mask_on & PERM_EXPORT)
{
childSetValue("checkbox allow export", true);
childSetTentative("checkbox allow export", false);
}
else if(everyone_mask_off & PERM_EXPORT)
{
childSetValue("checkbox allow export", false);
childSetTentative("checkbox allow export", false);
}
else
{
childSetValue("checkbox allow export", true);
childSetTentative("checkbox allow export", true);
}
}
else
{
childSetValue("checkbox allow export", false);
childSetTentative("checkbox allow export", false);
}
}
if(valid_next_perms)
@@ -1064,6 +1167,11 @@ void LLPanelPermissions::onCommitEveryoneCopy(LLUICtrl *ctrl, void *data)
onCommitPerm(ctrl, data, PERM_EVERYONE, PERM_COPY);
}
void LLPanelPermissions::onCommitExport(const LLSD& param)
{
LLSelectMgr::getInstance()->selectionSetObjectPermissions(PERM_EVERYONE, param, PERM_EXPORT);
}
// static
void LLPanelPermissions::onCommitNextOwnerModify(LLUICtrl* ctrl, void* data)
{

2
indra/newview/llpanelpermissions.h
View File

@@ -57,6 +57,7 @@ public:
virtual ~LLPanelPermissions();
virtual BOOL postBuild();
virtual void handleVisibilityChange(BOOL new_visibility);
// MANIPULATORS
void refresh(); // refresh all labels as needed
@@ -86,6 +87,7 @@ protected:
static void onCommitEveryoneMove(LLUICtrl *ctrl, void *data);
static void onCommitEveryoneCopy(LLUICtrl *ctrl, void *data);
//static void onCommitEveryoneModify(LLUICtrl *ctrl, void *data);
void onCommitExport(const LLSD& param);
static void onCommitNextOwnerModify(LLUICtrl* ctrl, void* data);
static void onCommitNextOwnerCopy(LLUICtrl* ctrl, void* data);

4
indra/newview/llpreviewtexture.cpp
View File

@@ -283,8 +283,8 @@ void LLPreviewTexture::draw()
mImage);
static const LLCachedControl<bool> use_rmse_auto_mask("SHUseRMSEAutoMask",false);
static const LLCachedControl<F32> alpha_mas_max_rmse("SHAlphaMaskMaxRMSE",.09f);
if (mAlphaMaskResult != mImage->getIsAlphaMask(use_rmse_auto_mask ? alpha_mas_max_rmse : -1.f))
static const LLCachedControl<F32> auto_mask_max_rmse("SHAutoMaskMaxRMSE",.09f);
if (mAlphaMaskResult != mImage->getIsAlphaMask(use_rmse_auto_mask ? auto_mask_max_rmse : -1.f))
{
mAlphaMaskResult = !mAlphaMaskResult;
if (!mAlphaMaskResult)

12
indra/newview/llregioninfomodel.cpp
View File

@@ -35,6 +35,7 @@
// viewer
#include "llagent.h"
#include "llviewerregion.h"
#include "llestateinfomodel.h" // For supporting legacy environment
void LLRegionInfoModel::reset()
{
@@ -107,6 +108,17 @@ void LLRegionInfoModel::sendRegionTerrain(const LLUUID& invoice) const
strings.push_back(buffer);
buffer = llformat("%f", mSunHour);
strings.push_back(buffer);
if (mUseEstateSun)
{
// Grab estate info, the user decided to set the region back to estate time. JC
LLEstateInfoModel& estate_info = LLEstateInfoModel::instance();
estate_global_time = estate_info.getGlobalTime();
if (!estate_global_time)
{
estate_fixed_sun = estate_info.getUseFixedSun();
estate_sun_hour = estate_info.getSunHour();
}
}
buffer = llformat("%s", (estate_global_time ? "Y" : "N") );
strings.push_back(buffer);
buffer = llformat("%s", (estate_fixed_sun ? "Y" : "N") );

2
indra/newview/lltexturefetch.cpp
View File

@@ -1329,7 +1329,7 @@ bool LLTextureFetchWorker::doWork(S32 param)
}
LLHTTPClient::request(mUrl, LLHTTPClient::HTTP_GET, NULL,
new HTTPGetResponder(mFetcher, mID, LLTimer::getTotalTime(), mRequestedSize, mRequestedOffset, true),
headers/*,*/ DEBUG_CURLIO_PARAM(false), keep_alive, no_does_authentication, allow_compressed_reply, NULL, 0, NULL);
headers/*,*/ DEBUG_CURLIO_PARAM(debug_off), keep_alive, no_does_authentication, allow_compressed_reply, NULL, 0, NULL);
res = true;
}
if (!res)

2
indra/newview/llviewercontrol.cpp
View File

@@ -675,7 +675,7 @@ void settings_setup_listeners()
gSavedSettings.getControl("RenderAutoMaskAlphaDeferred")->getSignal()->connect(boost::bind(&handleResetVertexBuffersChanged, _2));
gSavedSettings.getControl("RenderAutoMaskAlphaNonDeferred")->getSignal()->connect(boost::bind(&handleResetVertexBuffersChanged, _2));
gSavedSettings.getControl("SHUseRMSEAutoMask")->getSignal()->connect(boost::bind(&handleResetVertexBuffersChanged, _2));
gSavedSettings.getControl("SHAlphaMaskMaxRMSE")->getSignal()->connect(boost::bind(&handleResetVertexBuffersChanged, _2));
gSavedSettings.getControl("SHAutoMaskMaxRMSE")->getSignal()->connect(boost::bind(&handleResetVertexBuffersChanged, _2));
gSavedSettings.getControl("RenderObjectBump")->getSignal()->connect(boost::bind(&handleResetVertexBuffersChanged, _2));
gSavedSettings.getControl("RenderMaxVBOSize")->getSignal()->connect(boost::bind(&handleResetVertexBuffersChanged, _2));
//See LL jira VWR-3258 comment section. Implemented by LL in 2.1 -Shyotl

46
indra/newview/llviewerparcelmedia.cpp
View File

@@ -123,7 +123,7 @@ void LLViewerParcelMedia::update(LLParcel* parcel)
if( ! mediaUrl.empty() && gSavedSettings.getWarning("FirstStreamingVideo") )
{
LLNotificationsUtil::add("ParcelCanPlayMedia", LLSD(), LLSD(),
boost::bind(callback_play_media, _1, _2, parcel));
boost::bind(&callback_play_media, _1, _2, parcel));
return;
}
@@ -903,35 +903,43 @@ void callback_media_alert(const LLSD &notification, const LLSD &response, LLParc
LLViewerParcelMedia::playStreamingMusic(parcel, false);
}
}
else if (option == 1 || option == 2) // Deny or Blacklist
else
{
LLViewerParcelMedia::sDeniedMedia.insert(domain);
if (ip != domain && domain.find('/') == std::string::npos)
{
LLViewerParcelMedia::sDeniedMedia.insert(ip);
}
if (type == 1)
{
LLViewerParcelMedia::stopStreamingMusic();
}
if (option == 1) // Deny
else
{
LLNotificationsUtil::add("MediaBlocked", args);
LLViewerParcelMedia::stopStreamingMusic();
}
else // Blacklist
if (option == 1 || option == 2) // Deny or Blacklist
{
LLSD newmedia;
newmedia["domain"] = domain;
newmedia["action"] = "deny";
LLViewerParcelMedia::sMediaFilterList.append(newmedia);
LLViewerParcelMedia::sDeniedMedia.insert(domain);
if (ip != domain && domain.find('/') == std::string::npos)
{
newmedia["domain"] = ip;
LLViewerParcelMedia::sMediaFilterList.append(newmedia);
LLViewerParcelMedia::sDeniedMedia.insert(ip);
}
if (option == 1) // Deny
{
LLNotificationsUtil::add("MediaBlocked", args);
}
else // Blacklist
{
LLSD newmedia;
newmedia["domain"] = domain;
newmedia["action"] = "deny";
LLViewerParcelMedia::sMediaFilterList.append(newmedia);
if (ip != domain && domain.find('/') == std::string::npos)
{
newmedia["domain"] = ip;
LLViewerParcelMedia::sMediaFilterList.append(newmedia);
}
LLViewerParcelMedia::saveDomainFilterList();
args["LISTED"] = "blacklisted";
LLNotificationsUtil::add("MediaListed", args);
}
LLViewerParcelMedia::saveDomainFilterList();
args["LISTED"] = "blacklisted";
LLNotificationsUtil::add("MediaListed", args);
}
}

4
indra/newview/llviewerwindow.cpp
View File

@@ -370,8 +370,8 @@ public:
}
}
static const LLCachedControl<bool> use_rmse_auto_mask("SHUseRMSEAutoMask",false);
static const LLCachedControl<F32> alpha_mas_max_rmse("SHAlphaMaskMaxRMSE",.09f);
addText(xpos, ypos, llformat("Mask: %s", imagep->getIsAlphaMask(use_rmse_auto_mask ? alpha_mas_max_rmse : -1.f) ? "TRUE":"FALSE")); ypos += y_inc;
static const LLCachedControl<F32> auto_mask_max_rmse("SHAutoMaskMaxRMSE",.09f);
addText(xpos, ypos, llformat("Mask: %s", imagep->getIsAlphaMask(use_rmse_auto_mask ? auto_mask_max_rmse : -1.f) ? "TRUE":"FALSE")); ypos += y_inc;
addText(xpos, ypos, llformat("ID: %s", imagep->getID().asString().c_str())); ypos += y_inc;
}
}

8
indra/newview/pipeline.cpp
View File

@@ -2404,6 +2404,14 @@ BOOL LLPipeline::updateDrawableGeom(LLDrawable* drawablep, BOOL priority)
if (update_complete && assertInitialized())
{
drawablep->setState(LLDrawable::BUILT);
//Workaround for 'missing prims' until it's fixed upstream by LL.
//Sometimes clearing CLEAR_INVISIBLE and FORCE_INVISIBLE in LLPipeline::stateSort was too late. Do it here instead, before
//the rebuild state is picked up on and LLVolumeGeometryManager::rebuildGeom is called.
//If the FORCE_INVISIBLE isn't cleared before the rebuildGeom call, the geometry will NOT BE REBUILT!
if(drawablep->isState(LLDrawable::CLEAR_INVISIBLE))
{
drawablep->clearState(LLDrawable::FORCE_INVISIBLE|LLDrawable::CLEAR_INVISIBLE);
}
mGeometryChanges++;
}
return update_complete;

3
indra/newview/skins/apollo/keywords.ini
View File

@@ -52,7 +52,7 @@ changed changed( integer change ):Triggered various event change the task:(tes
remote_data remote_data(integer event_type, key channel, key message_id, string sender,integer idata, string sdata):Triggered by various XML-RPC calls (event_type will be one of REMOTE_DATA_CHANNEL, REMOTE_DATA_REQUEST, REMOTE_DATA_REPLY)
http_response http_response(key request_id, integer status, list metadata, string body):Triggered when task receives a response to one of its llHTTPRequests
http_request http_request(key id, string method, string body):Triggered when task receives an http request against a public URL
transaction_result transaction_result(key id, integer success, string data):Triggered when task receives asynchronous data.
transaction_result transaction_result(key id, integer success, string data): Triggered when currency is given to task
path_update path_update(integer type, list reserved):Triggered when the state of a pathfinder character changes. Note; "list reserved" is not currently used
# integer constants
@@ -99,6 +99,7 @@ PERMISSION_CHANGE_LINKS Passed to llRequestPermissions library function to req
PERMISSION_TRACK_CAMERA Passed to llRequestPermissions library function to request permission to track agent's camera
PERMISSION_CONTROL_CAMERA Passed to llRequestPermissions library function to request permission to change agent's camera
PERMISSION_TELEPORT Passed to llRequestPermissions library function to request permission to teleport agent
PERMISSION_OVERRIDE_ANIMATIONS Passed to llRequestPermissions library function to request permission to override agent's animations
DEBUG_CHANNEL Chat channel reserved for debug and error messages from scripts
PUBLIC_CHANNEL Chat channel that broadcasts to all nearby users

BIN
indra/newview/skins/default/textures/inv_reset.tga Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 1.0 KiB

2
indra/newview/skins/default/xui/en-us/floater_inventory.xml
View File

@@ -12,7 +12,7 @@
label="" image_overlay="inv_expand_all.tga" name="Inventory.ExpandAll" mouse_opaque="true" font="SansSerif"
tool_tip="Expand All"/>
<button left="50" bottom_delta="0" height="22" width="22" follows="left|top" label="" scale_image="true"
image_selected="UIImgBtnClosePressedUUID" image_unselected="UIImgBtnCloseActiveUUID" name="Inventory.ResetAll" tool_tip="Reset inventory: clear filters and collapse all folders."/>
image_overlay="inv_reset.tga" name="Inventory.ResetAll" tool_tip="Reset inventory: clear filters and collapse all folders."/>
<text name="group_titles_textbox" halign="right" font="SansSerifSmall" follows="left|top"
height="16" left="43" bottom_delta="2" right="108">Type:</text>
<!-- Inventory Type Filter Labels -->

6
indra/newview/skins/default/xui/en-us/floater_inventory_item_properties.xml
View File

@@ -80,9 +80,10 @@
initial_value="false" label="Copy" left_delta="78" mouse_opaque="true"
name="CheckOwnerCopy" radio_style="false" width="88" />
<check_box bottom="-155" follows="left|top" font="SansSerifSmall" height="16"
initial_value="false" label="Resell/Give away" left_delta="88"
initial_value="false" label="Transfer" left_delta="88"
mouse_opaque="true" name="CheckOwnerTransfer" radio_style="false"
width="106" />
<check_box name="CheckOwnerExport" label="Export" bottom_delta="0" follows="left|top" left_delta="88" enabled="false"/>
<text bg_visible="false" border_drop_shadow_visible="false" border_visible="false"
bottom="-165" drop_shadow_visible="true" follows="left|top"
font="SansSerifSmall" h_pad="0" halign="left" height="10" left="10"
@@ -140,6 +141,7 @@
<check_box bottom_delta="0" follows="left|top" font="SansSerifSmall" height="16"
initial_value="false" label="Move" left_delta="88" mouse_opaque="true"
name="CheckEveryoneMove" radio_style="false" width="88" />
<check_box name="CheckExport" label="Export" bottom_delta="0" follows="left|top" left_delta="88"/>
<text bg_visible="false" border_drop_shadow_visible="false" border_visible="false"
bottom_delta="-13" drop_shadow_visible="true" follows="left|top"
font="SansSerifSmall" h_pad="0" halign="left" height="10" left="10"
@@ -153,7 +155,7 @@
initial_value="false" label="Copy" left_delta="78" mouse_opaque="true"
name="CheckNextOwnerCopy" radio_style="false" width="88" />
<check_box bottom_delta="0" follows="left|top" font="SansSerifSmall" height="16"
initial_value="false" label="Resell/Give away" left_delta="88"
initial_value="false" label="Transfer" left_delta="88"
mouse_opaque="true" name="CheckNextOwnerTransfer" radio_style="false"
width="106" />
<text bg_visible="false" border_drop_shadow_visible="false" border_visible="false"

5
indra/newview/skins/default/xui/en-us/floater_perm_prefs.xml
View File

@@ -3,8 +3,9 @@
<panel label="Permissions" name="permissions" width="292" height="120" left="10" border="true" bottom="-140">
<button name="help" label="?" label_selected="?" bottom_delta="-25" height="18" width="22" left="260"/>
<check_box bottom_delta="0" width="106" height="16" left="10" initial_value="false" label="Share with group" name="share_with_group" control_name="ShareWithGroup"/>
<check_box bottom_delta="-32" width="130" height="16" initial_value="false" label="Allow anyone to copy" name="everyone_copy" control_name="EveryoneCopy"/>
<text bottom_delta="-26" name="NextOwnerLabel" height="10">Next owner can:</text>
<check_box bottom_delta="-20" width="130" height="16" initial_value="false" label="Allow anyone to copy" name="everyone_copy" control_name="EveryoneCopy"/>
<check_box bottom_delta="-20" label="Allow exportation" name="everyone_export" control_name="EveryoneExport"/>
<text bottom_delta="-18" name="NextOwnerLabel" height="10">Next owner can:</text>
<check_box bottom_delta="-30" width="78" height="16" initial_value="false" label="Modify" name="next_owner_modify" control_name="NextOwnerModify"/>
<check_box bottom_delta="0" width="88" height="16" left_delta="78" initial_value="false" label="Copy" name="next_owner_copy" control_name="NextOwnerCopy"/>
<check_box bottom_delta="0" width="106" height="16" left_delta="88" initial_value="true" label="Resell/Give away" name="next_owner_transfer" control_name="NextOwnerTransfer"/>

10
indra/newview/skins/default/xui/en-us/floater_tools.xml
View File

@@ -429,12 +429,14 @@
mouse_opaque="true" name="button deed" scale_image="TRUE"
tool_tip="Group shared objects can be deeded by a group officer."
width="78" />
<check_box bottom_delta="-18" follows="left|top" font="SansSerifSmall" height="16"
initial_value="false" label="Allow anyone to move" left="10"
<text name="text anyone can" bottom_delta="-12" left="10" follows="left|top">Anyone can:</text>
<check_box bottom_delta="-24" follows="left|top" font="SansSerifSmall" height="16"
initial_value="false" label="Move"
mouse_opaque="true" name="checkbox allow everyone move" width="142" />
<check_box bottom_delta="-18" follows="left|top" font="SansSerifSmall" height="16"
initial_value="false" label="Allow anyone to copy" left="10"
<check_box bottom_delta="0" follows="left|top" font="SansSerifSmall" height="16"
initial_value="false" label="Copy" left_delta="60"
mouse_opaque="true" name="checkbox allow everyone copy" width="141" />
<check_box name="checkbox allow export" label="Export" bottom_delta="0" left_delta="60" follows="left|top"/>
<check_box bottom_delta="-18" follows="left|top" font="SansSerifSmall" height="16"
initial_value="false" label="Show in search" left="10" name="search_check"
tool_tip="Let people see this object in search results" width="78" />

45
indra/newview/skins/default/xui/en-us/panel_region_estate.xml
View File

@@ -82,10 +82,10 @@
<view_border
bevel_style="none"
follows="top|left"
height="95"
height="110"
layout="topleft"
left="10"
bottom_delta="-100"
bottom_delta="-115"
width="460" />
<check_box
@@ -95,7 +95,7 @@
layout="topleft"
left="20"
name="externally_visible_check"
bottom_delta="70"
bottom_delta="90"
width="200" />
<button
bottom_delta="0"
@@ -112,9 +112,9 @@
height="20"
label="Allow Voice Chat"
layout="topleft"
left="250"
left_delta="-200"
name="voice_chat_check"
bottom_delta="0"
bottom_delta="-18"
width="200" />
<button
bottom_delta="0"
@@ -133,7 +133,7 @@
layout="topleft"
left_delta="-200"
name="allow_direct_teleport"
bottom_delta="-20"
bottom_delta="-18"
width="80" />
<button
bottom_delta="0"
@@ -144,6 +144,13 @@
name="allow_direct_teleport_help"
left_delta="200"
width="18" />
<check_box bottom_delta="36" follows="left|top" height="20" label="Use Global Time" left="250" name="use_global_time_check" width="200" />
<button bottom_delta="0" follows="left|top" font="SansSerifSmall" height="18" label="?" name="use_global_time_help" left_delta="200" width="18" />
<check_box bottom_delta="-18" follows="left|top" height="20" label="Fixed Sun" left_delta="-200" name="fixed_sun_check" width="100" />
<button bottom_delta="0" follows="left|top" font="SansSerifSmall" height="18" label="?" name="fixed_sun_help" left_delta="200" width="18" />
<icon bottom_delta="-27" follows="left|top" height="20" image_name="icon_day_cycle.tga" left_delta="-160" name="daycycle" width="160"/>
<slider bottom_delta="-16" follows="left|top" height="20" increment="0.001"
label="Phase" left_delta="-35" max_val="30" min_val="6" name="sun_hour_slider" show_text="false" width="200" />
<button
enabled="false"
follows="left|top"
@@ -151,9 +158,9 @@
label="Apply"
layout="topleft"
name="apply_btn"
bottom_delta="-38"
left_delta="-200"
width="97" />
bottom_delta="-23"
left_delta="90"
width="120" />
<text
type="string"
@@ -164,7 +171,7 @@
layout="topleft"
left="20"
name="Only Allow"
bottom_delta="38"
bottom_delta="28"
width="278">
Allow access only to Residents who:
</text>
@@ -177,7 +184,7 @@
left_delta="0"
name="limit_payment"
tool_tip="Residents must have payment information on file to access this estate."
bottom_delta="-18"
bottom_delta="-16"
width="278" />
<check_box
follows="top|left"
@@ -188,7 +195,7 @@
left_delta="0"
name="limit_age_verified"
tool_tip="Residents must be age 18 or older to access this estate. See support.secondlife.com for more information."
bottom_delta="-18"
bottom_delta="-16"
width="278" />
<text
@@ -198,7 +205,7 @@
height="20"
layout="topleft"
name="estate_manager_label"
bottom_delta="-40"
bottom_delta="-28"
left="10"
width="200">
Estate Managers:
@@ -220,7 +227,7 @@
layout="topleft"
left="250"
name="allow_resident_label"
bottom_delta="0"
bottom_delta="-4"
width="200">
Allowed Residents:
</text>
@@ -241,7 +248,7 @@
height="71"
layout="topleft"
left="10"
bottom_delta="-76"
bottom_delta="-72"
width="220" />
<name_list
follows="left|top"
@@ -320,7 +327,7 @@
layout="topleft"
left="10"
name="allow_group_label"
bottom_delta="-30"
bottom_delta="-28"
width="200">
Allowed Groups:
</text>
@@ -341,7 +348,7 @@
layout="topleft"
left="250"
name="ban_resident_label"
bottom_delta="0"
bottom_delta="-4"
width="200">
Banned Residents:
</text>
@@ -362,7 +369,7 @@
height="71"
layout="topleft"
left="10"
bottom_delta="-76"
bottom_delta="-72"
width="220" />
<name_list
follows="left|top"
@@ -440,7 +447,7 @@
layout="topleft"
left="10"
name="message_estate_btn"
bottom_delta="-43"
bottom_delta="-28"
width="220" />
<button
follows="left|top"

9
indra/newview/skins/default/xui/en-us/panel_region_general.xml
View File

@@ -85,7 +85,14 @@
</combo_box>
<button bottom_delta="0" follows="left|top" font="SansSerifSmall" height="18" label="?"
left="205" name="access_help" width="18" />
<button bottom_delta="-30" enabled="false" follows="left|top" height="20" label="Apply"
<check_box bottom_delta="52" follows="left|top" height="20" label="Use Estate Sun" left="250" name="use_estate_sun_check" width="200" />
<button bottom_delta="-2" follows="left|top" font="SansSerifSmall" height="18" label="?" name="use_estate_sun_help" left_delta="200" width="18" />
<check_box bottom_delta="-18" follows="left|top" height="20" label="Fixed Sun" left_delta="-200" name="fixed_sun_check" width="100" />
<button bottom_delta="-2" follows="left|top" font="SansSerifSmall" height="18" label="?" name="fixed_sun_help" left_delta="200" width="18" />
<icon bottom_delta="-23" follows="left|top" height="20" image_name="icon_day_cycle.tga" left_delta="-160" name="daycycle" width="160"/>
<slider bottom_delta="-15" follows="left|top" height="20" increment="0.001"
label="Phase" left_delta="-35" max_val="30" min_val="6" name="sun_hour_slider" show_text="false" width="200" />
<button bottom_delta="-20" enabled="false" follows="left|top" height="20" label="Apply"
left="108" name="apply_btn" width="100" />
<button bottom_delta="-60" follows="left|top" height="20"
label="Teleport Home One User..." left="10" name="kick_btn" width="250" />

45
indra/newview/skins/default/xui/en-us/strings.xml
View File

@@ -1828,15 +1828,15 @@ Returns a list consisting of the following three values for each hit: UUID, Link
</string>
<string name="LSLTipText_llRegionSayTo">
llRegionSayTo(key target, integer channel, string msg)
Sends msg on channel (not DEBUG_CHANNEL) directly to prim or avatar target anywhere within the region
Sends msg on channel (not DEBUG_CHANNEL) directly to prim or avatar target anywhere within the region.
</string>
<string name="LSLTipText_llGetSPMaxMemory">
integer llGetSPMaxMemory()
Returns the integer of the most bytes used while llScriptProfiler was last active.
Returns the maximum used memory for the current script. Only valid after using PROFILE_SCRIPT_MEMORY. Non-mono scripts always use 16k.
</string>
<string name="LSLTipText_llGetUsedMemory">
integer llGetUsedMemory()
Returns the integer of the number of bytes of memory currently in use by the script.
Returns the current used memory for the current script. Non-mono scripts always use 16k.
</string>
<string name="LSLTipText_llScriptProfiler">
llScriptProfiler(integer flags)
@@ -1844,11 +1844,15 @@ Enables or disables script profiling options. Currently only supports PROFILE_SC
MAY SIGNIFICANTLY REDUCE SCRIPT PERFORMANCE!
</string>
<string name="LSLTipText_llSetMemoryLimit">
integer llSetMemoryLimit(integer mem)
Request ''limit'' bytes to be reserved for this script.
integer llSetMemoryLimit(integer limit)
Request limit bytes to be reserved for this script.
Returns a success/failure flag (STATUS_OK when sucessful, another of the STATUS_* flags on failure) for whether the memory limit was set.
Only relevant for Mono-compiled scripts.
</string>
<string name="LSLTipText_llGetMemoryLimit">
integer llGetMemoryLimit()
Get the maximum memory a script can use.
Returns the integer amount of memory the script can use in bytes.
</string>
<string name="LSLTipText_llSetLinkMedia">
llSetLinkMedia(integer link, integer face, list params)
@@ -1863,11 +1867,12 @@ integer llClearLinkMedia(integer link, integer face)
Clears (deletes) the media and all params from the given face on linked prim(s).
</string>
<string name="LSLTipText_llSetContentType">
llSetContentType(key request_id, integer content_type)
llSetContentType(key id, integer content_type)
Set the Internet media type of an LSL HTTP server response.
content_type may be one of CONTENT_TYPE_TEXT (default) "text/plain", or CONTENT_TYPE_HTML "text/html", only valid for embedded browsers on content owned by the person viewing. Falls back to "text/plain" otherwise.
</string>
<string name="LSLTipText_llLinkSitTarget">
llLinkSitTarget(integer link, vector offset, rotation rot );
llLinkSitTarget(integer link, vector offset, rotation rot)
Set the sit location for the linked prim(s). The sit location is relative to the prim's position and rotation.
</string>
<string name="LSLTipText_llAvatarOnLinkSitTarget">
@@ -1876,7 +1881,8 @@ If an avatar is sitting on the sit target, return the avatar&apos;s key, NULL_KE
</string>
<string name="LSLTipText_llSetLinkCamera">
llSetLinkCamera(integer link, vector eye, vector at)
Sets the camera eye offset, and the offset that the camera is looking at, for avatars that sit on the linked prim.
Sets the camera eye offset, and the offset that camera is looking at, for avatars that sit on the linked prim.
The two vector parameters are offsets relative to the object's center and expressed in local coordinates.
</string>
<string name="LSLTipText_llSetVelocity">
llSetVelocity(vector velocity, integer local)
@@ -1897,8 +1903,8 @@ llGetPhysicsMaterial() returns the gravity multiplier, restitution, friction, an
llGetMassMKS() returns the mass of the linkset in kilograms.
</string>
<string name="LSLTipText_llGenerateKey">
llGenerateKey()
Retun a unique generated key
key llGenerateKey()
Return a unique generated key
</string>
<string name="LSLTipText_llSetKeyframedMotion">
llSetKeyframedMotion(list keyframes, list options)
@@ -1924,13 +1930,6 @@ For AI Character: Navigate to destination.
llCreateCharacter(list options)
Convert linkset to AI Character which can navigate the world.
</string>
<!-- Pathfinding -->
<string name="Pathfinding_Wiki_URL">http://wiki.secondlife.com/wiki/Pathfinding_Tools_in_the_Second_Life_Viewer</string>
<string name="Pathfinding_Object_Attr_None">None</string>
<string name="Pathfinding_Object_Attr_Permanent">Affects navmesh</string>
<string name="Pathfinding_Object_Attr_Character">Character</string>
<string name="Pathfinding_Object_Attr_MultiSelect">(Multiple)</string>
<string name="LSLTipText_llPursue">
llPursue(key target, list options)
For AI Character: Chase after a target.
@@ -2000,6 +1999,18 @@ A region's global coordinates can be retrieved using llRequestSimulatorData(regi
float llGetSimStats(integer stat_type)
Returns the value of a particular simulator statistic.
</string>
<string name="LSLTipText_llSetAnimationOverride">
llSetAnimationOverride(string anim_state, string anim)
Set the animation (anim) that will play for the given animation state (anim_state).
</string>
<string name="LSLTipText_llGetAnimationOverride">
string llGetAnimationOverride(string anim_state)
Returns a string that is the name of the animation that is being used for the specified animation state (anim_state).
</string>
<string name="LSLTipText_llResetAnimationOverride">
llResetAnimationOverride(string anim_state)
Resets the animation override of the specified animation state (anim_state) to the corresponding default value.
</string>
<!-- GOD FUNCTIONS -->
<string name="LSLTipText_llGodLikeRezObject">
llGodLikeRezObject( key inventory, vector pos )

6
indra/newview/skins/default/xui/en-us/wlfPanel_AdvSettings_expanded.xml
View File

@@ -1,7 +1,7 @@
<?xml version="1.0" encoding="utf-8" standalone="yes" ?>
<panel bg_visible="false" border="false" border_visible="false" height="200" name="Adv_Settings" use_bounding_rect="true" width="220">
<panel bottom="1" filename="panel_bg_tab.xml" height="197" width="197"/>
<slider bottom="177" left="5" control_name="RenderFarClip" decimal_digits="0" height="20" increment="8" label="Draw Dist.:" can_edit_text="true" label_width="60" max_val="1024" min_val="24" val_width="36" name="DrawDistance" width="189" tool_tip="Change your Draw Distance"/>
<panel bg_visible="false" border="false" border_visible="false" height="180" name="Adv_Settings" use_bounding_rect="true" width="220">
<panel bottom="1" filename="panel_bg_tab.xml" height="177" width="197"/>
<slider bottom="157" left="5" control_name="RenderFarClip" decimal_digits="0" height="20" increment="8" label="Draw Dist.:" can_edit_text="true" label_width="60" max_val="1024" min_val="24" val_width="36" name="DrawDistance" width="189" tool_tip="Change your Draw Distance"/>
<slider bottom_delta="-20" control_name="RenderMaxPartCount" decimal_digits="0" height="20" increment="256" label="Particles:" can_edit_text="true" label_width="60" max_val="8192" min_val="0" val_width="36" name="MaxParticleCount" width="189" tool_tip="Amount of particles to render"/>
<slider bottom_delta="-20" control_name="RenderAvatarMaxVisible" decimal_digits="0" height="20" increment="1" label="Max Avs:" can_edit_text="true" label_width="60" max_val="50" min_val="1" val_width="36" name="RenderAvatarMaxVisible" width="189" tool_tip="How many avatars to fully render on screen. Lowering this greatly improves FPS in crowded situations. Requires Avatar Impostors to be on. [Default 35]"/>
<slider bottom_delta="-20" control_name="RenderVolumeLODFactor" height="20" increment="0.125" label="Obj. Detail:" can_edit_text="true" label_width="60" max_val="4" min_val="0.5" name="Object Detail" val_width="36" width="189" tool_tip="Controls level of detail of primitives (multiplier for current screen area when calculated level of detail[0.5 to 2.0 is stable])"/>

54
indra/newview/skins/default/xui/fr/floater_about_land.xml
View File

@@ -27,21 +27,6 @@
Leyla Linden
</text>
<button label="Profil..." label_selected="Profil..." name="Profile..."/>
<string name="group_owned_text">
(Propriété du Groupe)
</string>
<string name="profile_text">
Profil...
</string>
<string name="info_text">
Infos...
</string>
<string name="public_text">
(public)
</string>
<string name="none_text">
(aucun)
</string>
<text name="Group:">
Groupe:
</text>
@@ -91,6 +76,7 @@
</text>
<button label="Acheter le terrain" label_selected="Achat du terrain" left="130" name="Buy Land..." width="125"/>
<button label="Acheter pour le groupe" label_selected="Achat du terrain pour le groupe" name="Buy For Group..."/>
<button name="Scripts..." width="110"/>
<button label="Acheter un pass" label_selected="Achat d&#x27;un pass" left="130" name="Buy Pass..." tool_tip="Un pass vous donne un accès temporaire à ce terrain." width="125"/>
<button label="Abandonner le terrain" label_selected="Abandon du terrain" name="Abandon Land..."/>
<button label="Redemander le terrain" label_selected="Redemande le terrain" name="Reclaim Land..."/>
@@ -113,6 +99,21 @@
<string name="need_tier_to_modify">
Pour modifier ce terrain, vous devez approuver votre achat.
</string>
<string name="group_owned_text">
(Propriété du Groupe)
</string>
<string name="profile_text">
Profil...
</string>
<string name="info_text">
Infos...
</string>
<string name="public_text">
(public)
</string>
<string name="none_text">
(aucun)
</string>
<string name="sale_pending_text">
(vente en cours)
</string>
@@ -290,12 +291,6 @@ Allez dans le menu Monde &gt; A propos du terrain ou sélectionnez une autre par
Options du terrain:
</text>
<check_box label="Sécurisé (pas de dégâts)" name="check safe" tool_tip="Si cette option est cochée, le terrain est sécurisé et il n'y pas de risques de dommages causés par des combats. Si elle est décochée, des dommages causés par les combats peuvent avoir lieu."/>
<string name="push_restrict_text">
Pas de bousculades
</string>
<string name="push_restrict_region_text">
Pas de bousculades (les règles de la région priment)
</string>
<check_box label="Pas de bousculades" name="PushRestrictCheck" tool_tip="Empêche l'utilisation de scripts causant des bousculades. Cette option est utile pour empêcher les comportements abusifs sur votre terrain." bottom="-140" left="14"/>
<check_box label="Afficher dans la recherche ([DIRECTORYFEE]) sous" name="ShowDirectoryCheck" tool_tip="Affiche la parcelle dans les résultats de recherche" bottom="-160"/>
<string name="search_enabled_tooltip">
@@ -444,6 +439,12 @@ Seules les parcelles de grande taille peuvent apparaître dans la recherche.
Lieu d'arrivée libre
</combo_item>
</combo_box>
<string name="push_restrict_text">
Pas de bousculades
</string>
<string name="push_restrict_region_text">
Pas de bousculades (les règles de la région priment)
</string>
</panel>
<panel label="Médias" name="land_media_panel">
<text name="with media:" width="70">
@@ -495,17 +496,6 @@ Select the thumbnail to choose a different texture.
<text name="pixels">
Pixels
</text>
<text name="Interaction:">
Interaction:
</text>
<radio_group name="radio_navigate_allow">
<radio_item name="Anyone" tool_tip="Chaque résident peut intervenir sur le média.">
Tous
</radio_item>
<radio_item name="Group" tool_tip="Les permissions du groupe contrôlent qui peux intervenir sur le média.">
Groupe
</radio_item>
</radio_group>
</panel>
<panel name="land_audio_panel">
<text name="MusicURL:">

95
indra/newview/skins/default/xui/fr/floater_inventory_item_properties.xml
View File

@@ -1,85 +1,32 @@
<?xml version="1.0" encoding="utf-8" standalone="yes"?>
<floater name="item properties" title="Propriétés de l'objet de l'inventaire">
<text name="LabelItemNameTitle">
Nom:
</text>
<text name="LabelItemDescTitle">
Description:
</text>
<text name="LabelCreatorTitle">
Créateur:
</text>
<text name="LabelCreatorName">
Nicole Linden
</text>
<button label="Profil..." label_selected="" name="BtnCreator"/>
<text name="LabelOwnerTitle">
Propriétaire:
</text>
<text name="LabelOwnerName">
Thrax Linden
</text>
<button label="Profil..." label_selected="" name="BtnOwner"/>
<text name="LabelAcquiredTitle">
Acquis:
</text>
<text name="LabelAcquiredDate">
Wed May 24 12:50:46 2006
</text>
<text name="OwnerLabel">
Vous pouvez:
</text>
<text name="LabelItemNameTitle">Nom:</text>
<text name="LabelCreatorTitle">Créateur:</text>
<text name="LabelOwnerTitle">Propriétaire:</text>
<text name="LabelAcquiredTitle">Acquis :</text>
<text name="OwnerLabel">Vous Pouvez:</text>
<check_box label="Modifier" name="CheckOwnerModify"/>
<check_box label="Copier" name="CheckOwnerCopy"/>
<check_box label="Revendre/Donner" name="CheckOwnerTransfer"/>
<text name="BaseMaskDebug">
B:
</text>
<text name="OwnerMaskDebug">
O:
</text>
<text name="GroupMaskDebug">
G:
</text>
<text name="EveryoneMaskDebug">
E:
</text>
<text name="NextMaskDebug">
N:
</text>
<check_box label="Partager avec le groupe" name="CheckShareWithGroup"/>
<check_box label="Autoriser tout le monde à copier" name="CheckEveryoneCopy"/>
<text name="NextOwnerLabel" width="192">
Le prochain propriétaire pourra :
</text>
<text bottom_delta="-1" name="GroupLabel">Les Membres du Groupe peuvent:</text>
<check_box label="Modifer" name="CheckGroupMod"/>
<check_box label="Copier" name="CheckGroupCopy"/>
<check_box label="Déplacer" name="CheckGroupMove"/>
<text bottom_delta="-10" name="EveryoneLabel">Tout le Monde peux:</text>
<check_box bottom_delta="-20" label="Copier" name="CheckEveryoneCopy"/>
<check_box label="Déplacer" name="CheckEveryoneMove"/>
<text name="NextOwnerLabel" width="150">Le Prochain Propriétaire peux:</text>
<check_box label="Modifier" name="CheckNextOwnerModify"/>
<check_box label="Copier" name="CheckNextOwnerCopy"/>
<check_box label="Revendre/Donner" name="CheckNextOwnerTransfer"/>
<text name="SaleLabel">
Marquer l'objet:
</text>
<check_box label="À vendre" name="CheckPurchase"/>
<text name="SaleLabel">Marquer l'objet:</text>
<check_box label="A Vendre" name="CheckPurchase"/>
<radio_group name="RadioSaleType">
<radio_item name="radio">
Original
</radio_item>
<radio_item name="radio2">
Copie
</radio_item>
<radio_item name="radio">Original</radio_item>
<radio_item name="radio2">Copie</radio_item>
</radio_group>
<text name="TextPrice">
Prix: [CURRENCY]
</text>
<string name="unknown">
(inconnu)
</string>
<string name="public">
(public)
</string>
<string name="you_can">
Vous pouvez:
</string>
<string name="owner_can">
Le propriétaire peut:
</string>
<text name="TextPrice">Prix: [CURRENCY]</text>
<string name="unknown">(Inconnu au Bataillon)</string>
<string name="you_can">Vous pouvez:</string>
<string name="owner_can">Le Propriétaire peux:</string>
</floater>

156
indra/newview/skins/default/xui/fr/floater_new_outfit_dialog.xml
View File

@@ -1,94 +1,80 @@
<?xml version="1.0" encoding="utf-8" standalone="yes" ?>
<floater name="modal container" width="600">
<button label="Enregistrer" label_selected="Enregistrer" name="Save" width="100"/>
<button label="Annuler" label_selected="Annuler" left="280" name="Cancel" width="100"/>
<check_box label="Silhouette" name="checkbox_Shape"/>
<check_box label="Peau" name="checkbox_Skin"/>
<check_box label="Cheveux" name="checkbox_Hair"/>
<check_box label="Yeux" name="checkbox_Eyes"/>
<check_box label="Donner le nom du dossier &#10;&#xE0; l'ensemble" name="rename"/>
<check_box name="checkbox_use_outfits" label="Utiliser un dossier Viewer 2"/>
<check_box name="checkbox_use_links" label="Utiliser des Liens pour les No Copy, No Mod ou les éléments 'multi worn'"/>
<check_box label="Chemise" name="checkbox_Shirt"/>
<check_box label="Pantalon" name="checkbox_Pants"/>
<check_box label="Chaussures" name="checkbox_Shoes"/>
<floater name="modal container" title="Cr&#xE9;er un ensemble" width="600">
<button label="Enregistrer" label_selected="Enregistrer" name="Save" width="100"/>
<button label="Annuler" label_selected="Annuler" left="280" name="Cancel" width="100"/>
<check_box label="Silhouette" name="checkbox_Shape"/>
<check_box label="Peau" name="checkbox_Skin"/>
<check_box label="Cheveux" name="checkbox_Hair"/>
<check_box label="Yeux" name="checkbox_Eyes"/>
<check_box label="Donner le nom du dossier &#10;&#xE0; l'ensemble" name="rename"/>
<check_box name="checkbox_use_outfits" label="Utiliser un dossier Viewer 2"/>
<check_box name="checkbox_use_links" label="Utiliser des Liens pour les No Copy, No Mod ou les éléments 'multi worn'"/>
<check_box label="Chemise" name="checkbox_Shirt"/>
<check_box label="Pantalon" name="checkbox_Pants"/>
<check_box label="Chaussures" name="checkbox_Shoes"/>
<check_box label="Chaussettes" name="checkbox_socks"/>
<check_box label="Veste" name="checkbox_Jacket"/>
<check_box label="Veste" name="checkbox_Jacket"/>
<check_box label="Gants" name="checkbox_gloves"/>
<check_box label="Tee Shirt" name="checkbox_Undershirt"/>
<check_box label="culotte" name="checkbox_Underpants"/>
<check_box label="Jupe" name="checkbox_Skirt"/>
<check_box label="Poitrine" left="225" name="checkbox_Chest"/>
<check_box label="Crâne" left="225" name="checkbox_Skull"/>
<check_box label="Epaule gauche" left="225" name="checkbox_Left Shoulder"/>
<check_box label="Epaule droite" left="225" name="checkbox_Right Shoulder"/>
<check_box label="Main gauche" left="225" name="checkbox_Left Hand"/>
<check_box label="Main droite" left="225" name="checkbox_Right Hand"/>
<check_box label="Pied gauche" left="225" name="checkbox_Left Foot"/>
<check_box label="Pied droit" left="225" name="checkbox_Right Foot"/>
<check_box label="Colonne" left="225" name="checkbox_Spine"/>
<check_box label="Bassin" left="225" name="checkbox_Pelvis"/>
<check_box label="Bouche" left="225" name="checkbox_Mouth"/>
<check_box label="Menton" left="225" name="checkbox_Chin"/>
<check_box label="Oreille gauche" left="225" name="checkbox_Left Ear"/>
<check_box label="Oreille droite" left="325" name="checkbox_Right Ear"/>
<check_box label="Oeil gauche" left="325" name="checkbox_Left Eyeball"/>
<check_box label="Oeil droit" left="325" name="checkbox_Right Eyeball"/>
<check_box label="Nez" left="325" name="checkbox_Nose"/>
<check_box label="Bras droit" left="325" name="checkbox_R Upper Arm"/>
<check_box label="Avant-bras droit" left="325" name="checkbox_R Forearm"/>
<check_box label="Bras gauche" left="325" name="checkbox_L Upper Arm"/>
<check_box label="Avant-bras gauche" left="325" name="checkbox_L Forearm"/>
<check_box label="Hanche droite" left="325" name="checkbox_Right Hip"/>
<check_box label="Cuisse droite" left="325" name="checkbox_R Upper Leg"/>
<check_box label="Jambe droite" left="325" name="checkbox_R Lower Leg"/>
<check_box label="Hanche gauche" left="325" name="checkbox_Left Hip"/>
<check_box label="Cuisse gauche" left="325" name="checkbox_L Upper Leg"/>
<check_box label="Jambe gauche" left="460" name="checkbox_L Lower Leg"/>
<check_box label="Estomac" left="460" name="checkbox_Stomach"/>
<check_box label="Pectoral gauche" left="460" name="checkbox_Left Pec"/>
<check_box label="Pectoral droit" left="460" name="checkbox_Right Pec"/>
<check_box label="Cou" left="460" name="checkbox_Neck"/>
<check_box label="Root" left="460" name="checkbox_Root"/>
<check_box label="Centre 2" left="460" name="checkbox_Center 2"/>
<check_box label="En haut à droite" left="460" name="checkbox_Top Right"/>
<check_box label="En haut" left="460" name="checkbox_Top"/>
<check_box label="En haut à gauche" left="460" name="checkbox_Top Left"/>
<check_box label="Centre" left="460" name="checkbox_Center"/>
<check_box label="En bas à gauche" left="460" name="checkbox_Bottom Left"/>
<check_box label="En bas" left="460" name="checkbox_Bottom"/>
<check_box label="En bas à droite" left="460" name="checkbox_Bottom Right"/>
<text name="Make New Outfit">
Cr&#xE9;er un ensemble
</text>
<text name="Outfits are folders that contain clothing and body parts. Drag an outfit folder onto your avatar to put it on. &quot;Make New Outfit&quot; makes a new folder and saves copies of the items you are now wearing into it.">
<check_box label="Tee Shirt" name="checkbox_Undershirt"/>
<check_box label="culotte" name="checkbox_Underpants"/>
<check_box label="Jupe" name="checkbox_Skirt"/>
<check_box label="Poitrine" left="225" name="checkbox_Chest"/>
<check_box label="Crâne" left="225" name="checkbox_Skull"/>
<check_box label="Epaule gauche" left="225" name="checkbox_Left Shoulder"/>
<check_box label="Epaule droite" left="225" name="checkbox_Right Shoulder"/>
<check_box label="Main gauche" left="225" name="checkbox_Left Hand"/>
<check_box label="Main droite" left="225" name="checkbox_Right Hand"/>
<check_box label="Pied gauche" left="225" name="checkbox_Left Foot"/>
<check_box label="Pied droit" left="225" name="checkbox_Right Foot"/>
<check_box label="Colonne" left="225" name="checkbox_Spine"/>
<check_box label="Bassin" left="225" name="checkbox_Pelvis"/>
<check_box label="Bouche" left="225" name="checkbox_Mouth"/>
<check_box label="Menton" left="225" name="checkbox_Chin"/>
<check_box label="Oreille gauche" left="225" name="checkbox_Left Ear"/>
<check_box label="Oreille droite" left="325" name="checkbox_Right Ear"/>
<check_box label="Oeil gauche" left="325" name="checkbox_Left Eyeball"/>
<check_box label="Oeil droit" left="325" name="checkbox_Right Eyeball"/>
<check_box label="Nez" left="325" name="checkbox_Nose"/>
<check_box label="Bras droit" left="325" name="checkbox_R Upper Arm"/>
<check_box label="Avant-bras droit" left="325" name="checkbox_R Forearm"/>
<check_box label="Bras gauche" left="325" name="checkbox_L Upper Arm"/>
<check_box label="Avant-bras gauche" left="325" name="checkbox_L Forearm"/>
<check_box label="Hanche droite" left="325" name="checkbox_Right Hip"/>
<check_box label="Cuisse droite" left="325" name="checkbox_R Upper Leg"/>
<check_box label="Jambe droite" left="325" name="checkbox_R Lower Leg"/>
<check_box label="Hanche gauche" left="325" name="checkbox_Left Hip"/>
<check_box label="Cuisse gauche" left="325" name="checkbox_L Upper Leg"/>
<check_box label="Jambe gauche" left="460" name="checkbox_L Lower Leg"/>
<check_box label="Estomac" left="460" name="checkbox_Stomach"/>
<check_box label="Pectoral gauche" left="460" name="checkbox_Left Pec"/>
<check_box label="Pectoral droit" left="460" name="checkbox_Right Pec"/>
<check_box label="Cou" left="460" name="checkbox_Neck"/>
<check_box left="460" name="checkbox_Root"/>
<check_box label="Centre 2" left="460" name="checkbox_Center 2"/>
<check_box label="En haut à droite" left="460" name="checkbox_Top Right"/>
<check_box label="En haut" left="460" name="checkbox_Top"/>
<check_box label="En haut à gauche" left="460" name="checkbox_Top Left"/>
<check_box label="Centre" left="460" name="checkbox_Center"/>
<check_box label="En bas à gauche" left="460" name="checkbox_Bottom Left"/>
<check_box label="En bas" left="460" name="checkbox_Bottom"/>
<check_box label="En bas à droite" left="460" name="checkbox_Bottom Right"/>
<!--text name="Make New Outfit">
Cr&#xE9;er un ensemble
</text-->
<text name="Outfits are folders that contain clothing and body parts. Drag an outfit folder onto your avatar to put it on. &quot;Make New Outfit&quot; makes a new folder and saves copies of the items you are now wearing into it.">
Les ensembles sont des dossiers qui contiennent des habits et des parties du corps.
Faire glisser le dossier contenant un ensemble vers l&#x27;avatar pour lui faire porter.
Le bouton Cr&#xE9;er un ensemble vous permet de cr&#xE9;er un dossier et d'y sauvegarder les copies
des articles que vous portez maintenant.
</text>
<text name="Folder name:">
Nom du dossier :
</text>
<text name="Items to include in outfit:">
Articles &#xE0; inclure &#xE0; l'ensemble  :
</text>
<button label="Sélect. TOUT" name="Check All" width="85" />
<button label="Déselect. TOUT" left_delta="110" name="Uncheck All" width="105" />
<text name="Body Parts:">
Parties du corps :
</text>
<text name="Clothes:">
Habits :
</text>
<text name="Attachments:">
Attachements  :
</text>
<text name="Options:">
Options :
</text>
<line_editor name="name ed">
Nouvelle tenue
</line_editor>
</text>
<text name="Folder name:">Nom du dossier :</text>
<text name="Items to include in outfit:">Articles &#xE0; inclure &#xE0; l'ensemble :</text>
<button label="Sélect. TOUT" name="Check All"/>
<button label="Déselect. TOUT" name="Uncheck All"/>
<text name="Body Parts:">Parties du corps :</text>
<text left="115" name="Clothes:">Habits :</text>
<text left="227" name="Attachments:">Attachements :</text>
<text name="Options:">Options :</text>
<line_editor name="name ed">Nouvelle tenue</line_editor>
</floater>

28
indra/newview/skins/default/xui/fr/panel_preferences_ascent_chat.xml
View File

@@ -1,8 +1,8 @@
<?xml version="1.0" encoding="utf-8" standalone="yes" ?>
<panel label="Chat Avanc&#xE9;" name="ascsys">
<tab_container label="Advanced Chat" name="Ascent Chat">
<panel label="Chat/IM" name="Chat/IM">
<tab_container name="Ascent Chat">
<panel label="Chat/IM" name="Chat/IM">
<check_box label="Annonce les IMs entrants" name="quickstart_im_check"/>
<check_box label="Ne pas envoyer &#x22;[Machin Truc] is typing..." name="hide_typing_check"/>
<check_box label="Montrer le nom du groupe dans le chat" name="append_group_name_check"/>
@@ -11,12 +11,11 @@
<check_box label="Permet d'utiliser &#x22;/me&#x22; aussi bien que &#x22;:&#x22;" name="allow_mu_pose_check"/>
<check_box label="Ajoute automatiquement les fins des commentaires OOC (RP mode)" tool_tip="Ajoute automatiquement &#x22;))&#x22; &#xE0; chaque message commen&#xE7;ant par &#x22;((&#x22;, et vice-versa." name="close_ooc_check"/>
<text name="objects_link_text_box3">Active un lien qui montre le nom du propri&#xE9;taire dans l'historique du chat pour :</text>
<radio_group tool_tip="Enables a link to show you the owner of the speaking object." name="objects_link">
<radio_group tool_tip="Enables a link to show you the owner of the speaking object." name="objects_link">
<radio_item name="no_object">Aucun objet</radio_item>
<radio_item name="others_objects">Les objets des autres</radio_item>
<radio_item left_delta="65" name="anyones_objects">Tous les objets</radio_item>
</radio_group>
<text name="time_format_text_box">Type d'heure :</text>
<combo_box name="time_format_combobox">
<combo_item name="24hours">Horloge 24/H</combo_item>
@@ -29,22 +28,23 @@
<combo_item name="day_first">JJ/MM/AAAA</combo_item>
<combo_item name="month_first">MM/JJ/AAA</combo_item>
</combo_box>
<check_box label="Secondes dans les horaires de log" name="seconds_in_log"/>
<check_box label="Secondes dans les horaires de log" name="seconds_in_log"/>
<!-- Auto-responder -->
<check_box label="Activer le R&#xE9;pondeur Automatique" name="AscentInstantMessageResponseAnyone"/>
<check_box label="Auto-r&#xE9;ponse aux 'non-friends'" name="AscentInstantMessageResponseFriends"/>
<check_box label="Auto-r&#xE9;ponse aux personnes 'muted'" name="AscentInstantMessageResponseMuted"/>
<check_box label="Auto-r&#xE9;ponse aux 'non-friends'" name="AscentInstantMessageResponseFriends"/>
<check_box label="Auto-r&#xE9;ponse aux personnes 'muted'" name="AscentInstantMessageResponseMuted"/>
<check_box label="Envoyer d&#xE8;s que l'on commence &#xE0; vous &#xE9;crire" name="AscentInstantMessageShowOnTyping"/>
<check_box label="Ne pas montrer les IMs auxquels vous avez r&#xE9;pondu" name="AscentInstantMessageShowResponded"/>
<check_box label="Auto-r&#xE9;ponse &#xE0; chaque message" name="AscentInstantMessageResponseRepeat"/>
<check_box label="Joindre un objet &#xE0; la r&#xE9;ponse" name="AscentInstantMessageResponseItem" tool_tip="Glissez l'objet dans la fen&#xEA;tre de r&#xE9;ponse."/>
<text left_delta="280" name="text_box1">Texte de la r&#xE9;ponse :</text>
<text bottom_delta="140" left_delta="280" name="text_box1">Texte de la r&#xE9;ponse :</text>
<text_editor bottom_delta="-130" height="130" name="im_response" width="190"/>
<text name="text_box2">
#f Pr&#xE9;nom,#l Nom,#t Dur&#xE9;e,#r SLURL,
#i Dur&#xE9;e de 'l'IDLE'. (ex. "5 mins")
</text>
</panel>
<panel label="Chat UI" name="ChatUI">
<check_box label="IMs Verticaux (Déco Reco)" name="use_vertical_ims_check"/>
<check_box label="Ouvre les nouveaux IMs séparements" name="chats_torn_off"/>
@@ -65,20 +65,19 @@
<spinner label="Multiplicateur du nombre de messages pour les sons:" name="antispamsoundmulti"/>
<spinner label="Multiplicateur du nombre de sons &#xE0; pr&#xE9;charger par spam:" name="antispamsoundpreloadmulti"/>
<spinner label="Nombre de lignes max. d'un message:" name="antispamnewlines"/>
<check_box label="Me notifier quand un spam est bloqu&#xE9;" name="Notify On Spam"/>
<check_box label="D&#xE9;sactive toutes les fen&#xEA;tres de dialogue (D&#xE9;co/Reco)" name="antispam_checkbox"/>
<text name="Block All Dialogs From">Bloquer tous les dialogues provenants de :</text>
<text name="Block All Dialogs From">Bloquer tous les dialogues provenants de :</text>
<check_box label="Alertes" name="Alerts"/>
<check_box label="Demande d'amitié" name="Friendship Offers"/>
<check_box label="Invitation de groupe" name="Group Invites"/>
<check_box label="Invit. de frais de grp" name="Group Fee Invites"/>
<check_box label="Notices de groupes" name="Group Notices"/>
<check_box label="Offre d'objets" name="Item Offers"/>
<check_box label="Scripts" name="Scripts"/>
<check_box label="Offres de TP" name="Teleport Offers"/>
<check_box label="Me notifier quand un spam est bloqu&#xE9;" name="Notify On Spam" tool_tip="When enabled, the bottom right corner may become a source of pseudo-spam whenever real spam is blocked."/>
<check_box label="Notices de groupes" name="Group Notices"/>
<check_box label="Active les sons des gestures" name="Enable Gesture Sounds"/>
</panel>
</panel>
<panel label="Options de Texte" name="TextOptions">
<check_box label="Montre les 'fot de frap' ou suppos&#xE9;es telles en ROUGE" name="SpellDisplay"/>
@@ -99,9 +98,8 @@ Clic droit sur le mot mal &#xE9;crit et choisir son remplacement.
<check_box label="Chat local" name="KeywordsInChat"/>
<check_box label="IMs" name="KeywordsInIM"/>
<check_box label="Mettre en valeur le message avec cette couleur :" name="KeywordsChangeColor"/>
<color_swatch name="KeywordsColor" tool_tip="Click to open Color Picker"/>
<check_box label="Jouer cette alerte sonore : (UUID)" name="KeywordsPlaySound"/>
</panel>
</tab_container>
</panel>
</panel>

16
indra/newview/skins/default/xui/fr/panel_preferences_general.xml
View File

@@ -19,31 +19,23 @@
<check_box label="Masquer mon nom sur mon écran" name="show_my_name_checkbox"/>
<text name="group_titles_textbox">Titres de groupe :</text>
<check_box label="Masquer tous les titres de groupe" name="show_all_title_checkbox"/>
<check_box label="Masquer mon titre de groupe" name="show_my_title_checkbox"/>
<color_swatch label="" name="effect_color_swatch" tool_tip="Cliquez pour ouvrir le sélecteur de couleurs"/>
<text name="UI Size:">Taille de l'interface :</text>
<slider name="ui_scale_slider"/>
<check_box label="Utiliser une échelle indépendante de la résolution" name="ui_auto_scale"/>
<spinner label="Absent(e) après :" name="afk_timeout_spinner"/>
<check_box label="Avertir lorsque je dépense ou reçois des L$" name="notify_money_change_checkbox"/>
<check_box label="Sans afficher dans le coin" name="no_transaction_clutter_checkbox" tool_tip="Toujours présente mais momentanément affichée en bas"/>
<text name="maturity_desired_label">Catégories :</text>
<text name="maturity_desired_prompt">Acc&#xE8;s au contenu classé :</text>
<text name="maturity_desired_prompt">Acc&#xE8;s au contenu classé :</text>
<combo_box name="maturity_desired_combobox" left="340">
<combo_item name="Desired_Adult">PG, Mature, Adulte</combo_item>
<combo_item name="Desired_Mature">PG et Mature</combo_item>
<combo_item name="Desired_PG">PG uniquement</combo_item>
</combo_box>
<text name="maturity_desired_textbox" left="340">PG uniquement</text>
<text name="start_location_textbox">Lieu de départ :</text>
<text name="show_names_textbox">Afficher les noms :</text>
<text bottom="-174" name="effects_color_textbox">
Couleur du faisceau
de sélection :
</text>
<text name="start_location_textbox">Lieu de départ :</text>
<text name="show_names_textbox">Afficher les noms :</text>
<text name="seconds_textbox">secondes</text>
<text name="crash_report_textbox">Rapports de crash :</text>
<text name="language_textbox">Langue :</text>
<text name="language_textbox">Langue :</text>
<text left_delta="313" name="language_textbox2">(redémarrage requis)</text>
<combo_box name="language_combobox" width="166">
<combo_item name="System Default Language">Choix par défaut</combo_item>

3
indra/newview/skins/gemini/keywords.ini
View File

@@ -52,7 +52,7 @@ changed changed( integer change ):Triggered various event change the task:(tes
remote_data remote_data(integer event_type, key channel, key message_id, string sender,integer idata, string sdata):Triggered by various XML-RPC calls (event_type will be one of REMOTE_DATA_CHANNEL, REMOTE_DATA_REQUEST, REMOTE_DATA_REPLY)
http_response http_response(key request_id, integer status, list metadata, string body):Triggered when task receives a response to one of its llHTTPRequests
http_request http_request(key id, string method, string body):Triggered when task receives an http request against a public URL
transaction_result transaction_result(key id, integer success, string data):Triggered when task receives asynchronous data.
transaction_result transaction_result(key id, integer success, string data): Triggered when currency is given to task
path_update path_update(integer type, list reserved):Triggered when the state of a pathfinder character changes. Note; "list reserved" is not currently used
# integer constants
@@ -99,6 +99,7 @@ PERMISSION_CHANGE_LINKS Passed to llRequestPermissions library function to req
PERMISSION_TRACK_CAMERA Passed to llRequestPermissions library function to request permission to track agent's camera
PERMISSION_CONTROL_CAMERA Passed to llRequestPermissions library function to request permission to change agent's camera
PERMISSION_TELEPORT Passed to llRequestPermissions library function to request permission to teleport agent
PERMISSION_OVERRIDE_ANIMATIONS Passed to llRequestPermissions library function to request permission to override agent's animations
DEBUG_CHANNEL Chat channel reserved for debug and error messages from scripts
PUBLIC_CHANNEL Chat channel that broadcasts to all nearby users