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

Merge branch 'master' of https://github.com/Lirusaito/SingularityViewer.git

Browse Source
This commit is contained in:
Shyotl
2014-08-31 00:05:11 -05:00
parent 259670af85 52a80f98ed
commit f53d824e07
19 changed files with 61 additions and 138 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
indra/newview/aihttpview.cpp
View File

@@ -149,7 +149,7 @@ void AIServiceBar::draw()
start += LLFontGL::getFontMonospace()->getWidth(text);
}
start = mHTTPView->updateColumn(mc_col, start);
#if defined(CWDEBUG) || defined(DEBUG_CURLIO)
#ifdef CWDEBUG
text = llformat(" | %d,%d,%d/%d", total_added, event_polls, established_connections, concurrent_connections);
#else
text = llformat(" | %d/%d", total_added, concurrent_connections);

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

@@ -742,6 +742,17 @@
<key>Value</key>
<integer>0</integer>
</map>
<key>LiruHighlightNewInventory</key>
<map>
<key>Comment</key>
<string>When false, new inventory items will not be highlighted upon being accepted.</string>
<key>Persist</key>
<integer>1</integer>
<key>Type</key>
<string>Boolean</string>
<key>Value</key>
<boolean>1</boolean>
</map>
<key>LiruLegacyDisplayMuteds</key>
<map>
<key>Comment</key>

2
indra/newview/llmeshrepository.cpp
View File

@@ -1303,7 +1303,7 @@ void LLMeshUploadThread::preStart()
AIMeshUpload::AIMeshUpload(LLMeshUploadThread::instance_list& data, LLVector3& scale, bool upload_textures, bool upload_skin, bool upload_joints, std::string const& upload_url, bool do_upload,
LLHandle<LLWholeModelFeeObserver> const& fee_observer, LLHandle<LLWholeModelUploadObserver> const& upload_observer) :
#if defined(CWDEBUG) || defined(DEBUG_CURLIO)
#ifdef CWDEBUG
AIStateMachine(false),
#endif
mMeshUpload(new AIStateMachineThread<LLMeshUploadThread>(CWD_ONLY(false))), mWholeModelUploadURL(upload_url)

1
indra/newview/llviewermessage.cpp
View File

@@ -1261,6 +1261,7 @@ void open_inventory_offer(const uuid_vec_t& objects, const std::string& from_nam
LLInventoryView::showAgentInventory(TRUE);
}
if (!gSavedSettings.getBOOL("LiruHighlightNewInventory")) return;
////////////////////////////////////////////////////////////////////////////////
// Highlight item
LL_DEBUGS("Messaging") << "Highlighting" << obj_id << LL_ENDL;

2
indra/newview/llviewerregion.h
View File

@@ -48,7 +48,7 @@
#include "lluuid.h"
#include "llweb.h"
#include "llcapabilityprovider.h"
#include "m4math.h" // LLMatrix4
#include "llmatrix4a.h" // LLMatrix4a
#include "llhttpclient.h"
// Surface id's

14
indra/newview/skins/default/xui/fr/floater_object_weights.xml
View File

@@ -1,25 +1,25 @@
<?xml version="1.0" encoding="utf-8" standalone="yes"?>
<floater name="object_weights" title="Avanc<EFBFBD><EFBFBD>">
<floater name="object_weights" title="Mode Avancé">
<floater.string name="nothing_selected" value="--"/>
<text name="selected_text" value="SÉLECTION"/>
<text name="objects" value="--"/>
<text name="objects_label" value="Objets"/>
<text name="objects_label" value="Objet(s)"/>
<text name="prims" value="--"/>
<text name="prims_label" value="Prims"/>
<text name="prims_label" value="Prim(s)"/>
<text name="weights_of_selected_text" value="POIDS DE LA SÉLECTION"/>
<text name="download" value="--"/>
<text name="download_label" value="Téléchargement"/>
<text name="download_label" value="Chargement"/>
<text name="physics" value="--"/>
<text name="physics_label" value="Physique"/>
<text name="server" value="--"/>
<text name="server_label" value="Serveur"/>
<text name="display" value="--"/>
<text name="display_label" value="Affichage"/>
<text name="land_impacts_text" value="IMPACTS SUR LE TERRAIN"/>
<text name="land_impacts_text" value="IMPACT SUR LE TERRAIN"/>
<text name="selected" value="--"/>
<text name="selected_label" value="Sélection"/>
<text name="selected_label" value="Sélectionné(s)"/>
<text name="rezzed_on_land" value="--"/>
<text name="rezzed_on_land_label" value="Rezzés sur le terrain"/>
<text name="rezzed_on_land_label" value="Posés sur le terrain"/>
<text name="remaining_capacity" value="--"/>
<text name="remaining_capacity_label" value="Capacité restante"/>
<text name="total_capacity" value="--"/>

2
indra/newview/statemachine/aifetchinventoryfolder.h
View File

@@ -59,7 +59,7 @@ class AIFetchInventoryFolder : public AIStateMachine {
public:
AIFetchInventoryFolder(CWD_ONLY(bool debug = false)) :
#if defined(CWDEBUG) || defined(DEBUG_CURLIO)
#ifdef CWDEBUG
AIStateMachine(debug),
#endif
mCreate(false), mFetchContents(false), mExists(false), mCreated(false)

2
indra/newview/statemachine/aifilepicker.cpp
View File

@@ -61,7 +61,7 @@ char const* AIFilePicker::state_str_impl(state_type run_state) const
}
AIFilePicker::AIFilePicker(CWD_ONLY(bool debug)) :
#if defined(CWDEBUG) || defined(DEBUG_CURLIO)
#ifdef CWDEBUG
AIStateMachine(debug),
#endif
mPluginManager(NULL), mCanceled(false)