mirror of
https://github.com/imprudence/imprudence.git
synced 2026-08-14 00:58:02 +00:00
Fixes http://redmine.kokuaviewer.org/issues/1000 and remove some related left over cruft.
This commit is contained in:
@@ -54,6 +54,7 @@
|
||||
#include "llviewerparcelmedia.h"
|
||||
#include "llcombobox.h"
|
||||
|
||||
#include "hippogridmanager.h"
|
||||
|
||||
// TEMP
|
||||
#include "llsdutil.h"
|
||||
@@ -157,7 +158,7 @@ void LLFloaterMediaBrowser::buildURLHistory()
|
||||
|
||||
std::string LLFloaterMediaBrowser::getSupportURL()
|
||||
{
|
||||
return getString("support_page_url");
|
||||
return gHippoGridManager->getConnectedGrid()->getSupportURL();
|
||||
}
|
||||
void LLFloaterMediaBrowser::onClose(bool app_quitting)
|
||||
{
|
||||
|
||||
@@ -4,10 +4,4 @@
|
||||
<button label="Retur" name="back_btn" />
|
||||
<button label="Frem" name="forward_btn" />
|
||||
<button label="start" name="go_btn" />
|
||||
<string name="home_page_url">
|
||||
http://www.secondlife.com
|
||||
</string>
|
||||
<string name="support_page_url">
|
||||
http://support.secondlife.com
|
||||
</string>
|
||||
</floater>
|
||||
|
||||
@@ -4,10 +4,4 @@
|
||||
<button label="Zurück" name="back_btn" />
|
||||
<button label="Weiter" name="forward_btn" />
|
||||
<button label="Los" name="go_btn" />
|
||||
<string name="home_page_url">
|
||||
http://de.secondlife.com
|
||||
</string>
|
||||
<string name="support_page_url">
|
||||
http://de.secondlife.com/support
|
||||
</string>
|
||||
</floater>
|
||||
|
||||
@@ -16,10 +16,4 @@
|
||||
select_all_on_focus_received="true" width="435" />
|
||||
<button bottom_delta="0" follows="top|right" font="SansSerifSmall" height="20"
|
||||
label="Go" left_delta="440" name="go_btn" width="70" />
|
||||
<string name="home_page_url">
|
||||
http://www.secondlife.com
|
||||
</string>
|
||||
<string name="support_page_url">
|
||||
http://support.secondlife.com
|
||||
</string>
|
||||
</floater>
|
||||
|
||||
@@ -48,10 +48,4 @@
|
||||
left="-110" name="set_home" width="104" />
|
||||
</layout_panel>
|
||||
</layout_stack>
|
||||
<string name="home_page_url">
|
||||
http://www.secondlife.com
|
||||
</string>
|
||||
<string name="support_page_url">
|
||||
http://support.secondlife.com
|
||||
</string>
|
||||
</floater>
|
||||
|
||||
@@ -4,10 +4,4 @@
|
||||
<button label="Atrás" name="back_btn"/>
|
||||
<button label="Adelante" name="forward_btn"/>
|
||||
<button label="Ir" name="go_btn"/>
|
||||
<string name="home_page_url">
|
||||
http://www.secondlife.com
|
||||
</string>
|
||||
<string name="support_page_url">
|
||||
http://support.secondlife.com
|
||||
</string>
|
||||
</floater>
|
||||
|
||||
@@ -7,10 +7,4 @@
|
||||
<button label="Arrêter" name="stop_btn" />
|
||||
<button label="Domicile" name="home_btn" />
|
||||
<button label="Aller" name="go_btn" />
|
||||
<string name="home_page_url">
|
||||
http://www.secondlife.com
|
||||
</string>
|
||||
<string name="support_page_url">
|
||||
http://support.secondlife.com
|
||||
</string>
|
||||
</floater>
|
||||
|
||||
@@ -5,9 +5,6 @@
|
||||
<button label="Kezdő helyszín" name="home_btn" />
|
||||
<button label="Előre" name="forward_btn" />
|
||||
<button label="Menj" name="go_btn" />
|
||||
<text name="home_page_url">
|
||||
http://www.google.com
|
||||
</text>
|
||||
<text name="in-world_help_title">
|
||||
In-World segítség
|
||||
</text>
|
||||
|
||||
@@ -4,10 +4,4 @@
|
||||
<button label="Indietro" name="back_btn"/>
|
||||
<button label="Avanti" name="forward_btn"/>
|
||||
<button label="Vai" name="go_btn"/>
|
||||
<string name="home_page_url">
|
||||
http://www.secondlife.com
|
||||
</string>
|
||||
<string name="support_page_url">
|
||||
http://support.secondlife.com
|
||||
</string>
|
||||
</floater>
|
||||
|
||||
@@ -5,10 +5,4 @@
|
||||
<button label="ホーム" name="home_btn" />
|
||||
<button label="進む" name="forward_btn" />
|
||||
<button label="移動" name="go_btn" />
|
||||
<string name="home_page_url">
|
||||
http://jp.secondlife.com
|
||||
</string>
|
||||
<string name="support_page_url">
|
||||
http://wiki.secondlife.com/wiki/Knowledge_Base/ja
|
||||
</string>
|
||||
</floater>
|
||||
|
||||
@@ -4,10 +4,4 @@
|
||||
<button label="Terug" name="back_btn"/>
|
||||
<button label="Vooruit" name="forward_btn"/>
|
||||
<button label="Ga" name="go_btn"/>
|
||||
<string name="home_page_url">
|
||||
http://www.secondlife.com
|
||||
</string>
|
||||
<string name="support_page_url">
|
||||
http://support.secondlife.com
|
||||
</string>
|
||||
</floater>
|
||||
|
||||
@@ -5,10 +5,4 @@
|
||||
<button label="Prześlij dalej" name="forward_btn" width="85"/>
|
||||
<line_editor left_delta="100" name="url_edit" width="420" />
|
||||
<button label="Idź" name="go_btn" left_delta="425" />
|
||||
<string name="home_page_url">
|
||||
http://www.secondlife.com
|
||||
</string>
|
||||
<string name="support_page_url">
|
||||
http://support.secondlife.com
|
||||
</string>
|
||||
</floater>
|
||||
|
||||
@@ -4,10 +4,4 @@
|
||||
<button label="Voltar" name="back_btn"/>
|
||||
<button label="Adiantar" name="forward_btn"/>
|
||||
<button label="Ir" name="go_btn"/>
|
||||
<string name="home_page_url">
|
||||
http://www.secondlife.com
|
||||
</string>
|
||||
<string name="support_page_url">
|
||||
http://support.secondlife.com
|
||||
</string>
|
||||
</floater>
|
||||
|
||||
@@ -4,7 +4,4 @@
|
||||
<button label="Назад" name="back_btn" />
|
||||
<button label="Вперед" name="forward_btn" />
|
||||
<button label="Перейти" name="go_btn" />
|
||||
<string name="home_page_url">
|
||||
http://www.secondlife.com
|
||||
</string>
|
||||
</floater>
|
||||
|
||||
@@ -4,7 +4,4 @@
|
||||
<button label="Назад" name="back_btn" />
|
||||
<button label="Вперед" name="forward_btn" />
|
||||
<button label="Перейти" name="go_btn" />
|
||||
<string name="home_page_url">
|
||||
http://www.secondlife.com
|
||||
</string>
|
||||
</floater>
|
||||
|
||||
Reference in New Issue
Block a user