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

STORM-2031 Display issues with Top colliders/Top scripts floater 

OPEN-217 Change to media_plugin_quicktime.cpp causes Windows compile to fail
master
Jonathan Yap 2014-05-13 12:30:29 -04:00
parent d0ef02c23a
commit 4fffc8c8e4
4 changed files with 31 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
doc/contributions.txt
View File

@ -691,6 +691,7 @@ Jonathan Yap
STORM-1987
STORM-1986
STORM-1981
STORM-2031
Kadah Coba
STORM-1060
STORM-1843

28
indra/media_plugins/quicktime/media_plugin_quicktime.cpp
View File

@ -28,26 +28,26 @@
#include "linden_common.h"
#if defined(LL_DARWIN)
#include <QuickTime/QuickTime.h>
#elif defined(LL_WINDOWS)
#include "llwin32headers.h"
#include "MacTypes.h"
#include "QTML.h"
#include "Movies.h"
#include "QDoffscreen.h"
#include "FixMath.h"
#include "QTLoadLibraryUtils.h"
#endif
#include "llgl.h"
#include "llplugininstance.h"
#include "llpluginmessage.h"
#include "llpluginmessageclasses.h"
#include "media_plugin_base.h"
#if LL_QUICKTIME_ENABLED
#if defined(LL_DARWIN)
#include <QuickTime/QuickTime.h>
#elif defined(LL_WINDOWS)
#include "llwin32headers.h"
#include "MacTypes.h"
#include "QTML.h"
#include "Movies.h"
#include "QDoffscreen.h"
#include "FixMath.h"
#include "QTLoadLibraryUtils.h"
#endif

4
indra/newview/llfloatertopobjects.cpp
View File

@ -207,7 +207,7 @@ void LLFloaterTopObjects::handleReply(LLMessageSystem *msg, void** data)
columns[column_num++]["font"] = "SANSSERIF";
columns[column_num]["column"] = "location";
columns[column_num]["value"] = llformat("<%0.1f,%0.1f,%0.1f>", location_x, location_y, location_z);
columns[column_num]["value"] = llformat("<%0.f, %0.f, %0.f>", location_x, location_y, location_z);
columns[column_num++]["font"] = "SANSSERIF";
columns[column_num]["column"] = "parcel";
@ -257,6 +257,8 @@ void LLFloaterTopObjects::handleReply(LLMessageSystem *msg, void** data)
format.setArg("[COUNT]", llformat("%d", total_count));
format.setArg("[TIME]", llformat("%0.3f", mtotalScore));
getChild<LLUICtrl>("title_text")->setValue(LLSD(format));
list->setColumnLabel("URLs", getString("URLs"));
list->setColumnLabel("memory", getString("memory"));
}
else
{

14
indra/newview/skins/default/xui/en/floater_top_objects.xml
View File

@ -38,6 +38,18 @@
name="none_descriptor">
None found.
</floater.string>
<floater.string
name="URLs">
URLs
</floater.string>
<floater.string
name="memory">
Memory (KB)
</floater.string>
<text
type="string"
length="1"
@ -82,7 +94,7 @@
name="parcel"
width="120" />
<scroll_list.columns
label="Time"
label="Date"
name="time"
width="130" />
<scroll_list.columns