livie
/
phoenix-firestorm
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

merge from viewer-release

meow-7.2.2
Tofu Linden 2010-08-11 13:44:35 +01:00
parent 32fe67ec2f f9a61bd30d
commit 79e767b91d
7 changed files with 28 additions and 26 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
indra/newview/lloutfitslist.cpp
View File

@ -1044,14 +1044,7 @@ void LLOutfitsList::wearSelectedItems()
return;
}
uuid_vec_t::const_iterator it;
// Wear items from all selected lists(if possible- add, else replace)
for (it = selected_uuids.begin(); it != selected_uuids.end()-1; ++it)
{
LLAppearanceMgr::getInstance()->wearItemOnAvatar(*it, false, false);
}
// call update only when wearing last item
LLAppearanceMgr::getInstance()->wearItemOnAvatar(*it, true, false);
wear_multiple(selected_uuids, false);
}
void LLOutfitsList::onWearableItemsListRightClick(LLUICtrl* ctrl, S32 x, S32 y)

8
indra/newview/lltexturefetch.cpp
View File

@ -855,9 +855,9 @@ bool LLTextureFetchWorker::doWork(S32 param)
// but probably not for Textures.
// Set the throttle to the entire bandwidth, assuming UDP packets will get priority
// when they are needed
F32 max_bandwidth = mFetcher->mMaxBandwidth;
if (mFetcher->isHTTPThrottled(mDesiredSize) ||
mFetcher->getTextureBandwidth() > max_bandwidth)
//F32 max_bandwidth = mFetcher->mMaxBandwidth;
if (mFetcher->isHTTPThrottled(mDesiredSize))// ||
//mFetcher->getTextureBandwidth() > max_bandwidth)
{
// Make normal priority and return (i.e. wait until there is room in the queue)
setPriority(LLWorkerThread::PRIORITY_NORMAL | mWorkPriority);
@ -899,7 +899,7 @@ bool LLTextureFetchWorker::doWork(S32 param)
mGetReason.clear();
LL_DEBUGS("Texture") << "HTTP GET: " << mID << " Offset: " << offset
<< " Bytes: " << mRequestedSize
<< " Bandwidth(kbps): " << mFetcher->getTextureBandwidth() << "/" << max_bandwidth
<< " Bandwidth(kbps): " << mFetcher->getTextureBandwidth() << "/" << mFetcher->mMaxBandwidth
<< LL_ENDL;
setPriority(LLWorkerThread::PRIORITY_LOW | mWorkPriority);
mState = WAIT_HTTP_REQ;

16
indra/newview/llviewertexturelist.cpp
View File

@ -853,14 +853,14 @@ F32 LLViewerTextureList::updateImagesFetchTextures(F32 max_time)
}
min_count--;
}
if (fetch_count == 0)
{
gDebugTimers[0].pause();
}
else
{
gDebugTimers[0].unpause();
}
//if (fetch_count == 0)
//{
// gDebugTimers[0].pause();
//}
//else
//{
// gDebugTimers[0].unpause();
//}
return image_op_timer.getElapsedTimeF32();
}

1
indra/newview/skins/default/xui/de/floater_preview_gesture.xml
View File

@ -64,6 +64,7 @@
</radio_group>
<check_box label="bis alle Animationen beendet sind" name="wait_anim_check"/>
<check_box label="Zeit in Sekunden:" name="wait_time_check"/>
<line_editor name="wait_time_editor"/>
<text name="help_label">
Alle Schritte werden gleichzeitig ausgeführt, wenn keine Pausen hinzugefügt wurden.
</text>

2
indra/newview/skins/default/xui/en/floater_preview_gesture.xml
View File

@ -310,7 +310,7 @@
left_delta="0"
name="wait_time_check"
top_delta="20"
width="100" />
width="115" />
<line_editor
follows="top|left"
height="20"

10
indra/newview/skins/default/xui/it/floater_preview_gesture.xml
View File

@ -30,15 +30,15 @@
<text name="trigger_label">
Parole chiave:
</text>
<text left="208" name="replace_text" tool_tip="Sostituisci le parole chiave con questi termini. Per esempio, sostituire la parola chiave &apos;salve&apos; con &apos;ciao&apos; modificherà la chat &apos;Volevo solo dire salve&apos; in &apos;Volevo solo dire ciao&apos; e avvierà la gesture!">
<text name="replace_text" tool_tip="Sostituisci le parole chiave con questi termini. Per esempio, sostituire la parola chiave &apos;salve&apos; con &apos;ciao&apos; modificherà la chat &apos;Volevo solo dire salve&apos; in &apos;Volevo solo dire ciao&apos; e avvierà la gesture!">
Sostituisci con:
</text>
<line_editor name="replace_editor" tool_tip="Sostituisci le parole chiave con questi termini. Per esempio, sostituire la parola chiave &apos;salve&apos; con &apos;ciao&apos; modificherà la chat &apos;Volevo solo dire salve&apos; in &apos;Volevo solo dire ciao&apos; e avvierà la gesture!"/>
<text name="key_label">
Scorciatoia da tastiera:
</text>
<combo_box label="Nessuno" left="156" name="modifier_combo" width="76"/>
<combo_box label="Nessuno" left_delta="80" name="key_combo" width="76"/>
<combo_box label="Nessuno" name="modifier_combo" />
<combo_box label="Nessuno" name="key_combo" />
<text name="library_label">
Libreria:
</text>
@ -62,9 +62,9 @@
<radio_item label="Attiva" name="start"/>
<radio_item label="Ferma" name="stop"/>
</radio_group>
<check_box label="finché le animazioni sono eseguite" left="226" name="wait_anim_check"/>
<check_box label="finché le animazioni sono eseguite" name="wait_anim_check"/>
<check_box label="durata in secondi:" name="wait_time_check"/>
<line_editor left_delta="114" name="wait_time_editor"/>
<line_editor name="wait_time_editor"/>
<text name="help_label">
Tutte le fasi avvengono contemporaneamente, a meno che non aggiungi fasi di attesa.
</text>

8
indra/newview/skins/default/xui/pl/panel_login.xml
View File

@ -12,19 +12,27 @@
Użytkownik:
</text>
<line_editor label="Użytkownik" name="username_edit" tool_tip="[SECOND_LIFE] Użytkownik"/>
<text name="password_text">
Hasło:
</text>
<check_box label="Zapamiętaj Hasło" name="remember_check"/>
<button label="Połącz" name="connect_btn"/>
<text name="start_location_text">
Rozpocznij w:
</text>
<combo_box name="start_location_combo">
<combo_box.item label="Ostatnie Miejsce" name="MyLastLocation"/>
<combo_box.item label="Moje Miejsce Startu" name="MyHome"/>
<combo_box.item label="&lt;Wpisz Region&gt;" name="Typeregionname"/>
</combo_box>
</layout_panel>
<layout_panel name="links">
<text name="create_new_account_text">
Utwórz nowe konto
</text>
<text name="forgot_password_text">
Nie pamiętasz hasła?
</text>
<text name="login_help">
Potrzebujesz pomocy z logowaniem się?
</text>