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

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

Browse Source
This commit is contained in:
Shyotl
2011-03-03 17:14:26 -06:00
parent b012900ac9 2cc09ca6ff
commit 77117d7463
27 changed files with 2137 additions and 127 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
indra/cmake/Boost.cmake
View File

@@ -7,9 +7,11 @@ set(Boost_FIND_REQUIRED ON)
if (STANDALONE)
include(FindBoost)
set(BOOST_FILESYSTEM_LIBRARY boost_filesystem-mt)
set(BOOST_PROGRAM_OPTIONS_LIBRARY boost_program_options-mt)
set(BOOST_REGEX_LIBRARY boost_regex-mt)
set(BOOST_SIGNALS_LIBRARY boost_signals-mt)
set(BOOST_SYSTEM_LIBRARY boost_system-mt)
else (STANDALONE)
use_prebuilt_binary(boost)
set(Boost_INCLUDE_DIRS ${LIBS_PREBUILT_DIR}/include)
@@ -42,12 +44,16 @@ else (STANDALONE)
debug libboost_signals-vc${MSVC_SUFFIX}-${BOOST_DEBUG_SUFFIX}-${BOOST_VERSION})
elseif (DARWIN)
set(BOOST_FILESYSTEM_LIBRARY boost_filesystem-mt)
set(BOOST_PROGRAM_OPTIONS_LIBRARY boost_program_options-mt)
set(BOOST_REGEX_LIBRARY boost_regex-mt)
set(BOOST_SIGNALS_LIBRARY boost_signals-mt)
set(BOOST_SYSTEM_LIBRARY boost_system-mt)
elseif (LINUX)
set(BOOST_FILESYSTEM_LIBRARY boost_filesystem-mt)
set(BOOST_PROGRAM_OPTIONS_LIBRARY boost_program_options-mt)
set(BOOST_REGEX_LIBRARY boost_regex-mt)
set(BOOST_SIGNALS_LIBRARY boost_signals-mt)
set(BOOST_SYSTEM_LIBRARY boost_system-mt)
endif (WINDOWS)
endif (STANDALONE)

3
indra/llcommon/llapr.cpp
View File

@@ -598,8 +598,11 @@ bool LLAPRFile::remove(const std::string& filename)
if (s != APR_SUCCESS)
{
if (s != APR_ENOENT) // Not an issue if the file did not exist in the first place...
{
ll_apr_warn_status(s);
LL_WARNS("APR") << " Attempting to remove filename: " << filename << LL_ENDL;
}
return false;
}
return true;

1
indra/llplugin/slplugin/CMakeLists.txt
View File

@@ -6,6 +6,7 @@ include(LLPlugin)
include(Linking)
include(PluginAPI)
include(LLMessage)
include(GooglePerfTools)
include_directories(
${LLPLUGIN_INCLUDE_DIRS}

5
indra/newview/CMakeLists.txt
View File

@@ -64,6 +64,7 @@ include_directories(
)
set(viewer_SOURCE_FILES
floaterlocalassetbrowse.cpp
aoremotectrl.cpp
floaterao.cpp
floatervoicelicense.cpp
@@ -533,6 +534,7 @@ set(viewer_HEADER_FILES
CMakeLists.txt
ViewerInstall.cmake
floaterlocalassetbrowse.h
aoremotectrl.h
floaterao.h
floatervoicelicense.h
@@ -1418,8 +1420,11 @@ target_link_libraries(${VIEWER_BINARY_NAME}
${LLCOMMON_LIBRARIES}
${NDOF_LIBRARY}
${viewer_LIBRARIES}
${BOOST_FILESYSTEM_LIBRARY}
${BOOST_PROGRAM_OPTIONS_LIBRARY}
${BOOST_REGEX_LIBRARY}
${BOOST_SIGNALS_LIBRARY}
${BOOST_SYSTEM_LIBRARY}
${DBUSGLIB_LIBRARIES}
${OPENGL_LIBRARIES}
${FMODWRAPPER_LIBRARY}

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

@@ -9,6 +9,23 @@
<string>settings_rlv.xml</string>
</array>
<key>FloaterLocalbitmapbrowserRect</key>
<map>
<key>Comment</key>
<string>LOLRectangle</string>
<key>Persist</key>
<integer>1</integer>
<key>Type</key>
<string>Rect</string>
<key>Value</key>
<array>
<integer>0</integer>
<integer>400</integer>
<integer>400</integer>
<integer>0</integer>
</array>
</map>
<!-- Begin: AO-->
<key>ShowAOSitPopup</key>
@@ -222,7 +239,7 @@
<key>Type</key>
<string>Boolean</string>
<key>Value</key>
<integer>1</integer>
<integer>0</integer>
</map>
<key>ResetFocusOnSelfClick</key>
<map>
@@ -6170,7 +6187,7 @@
<key>Type</key>
<string>F32</string>
<key>Value</key>
<real>12.0</real>
<real>11.5</real>
</map>
<key>FontSizeMedium</key>
<map>
@@ -6181,7 +6198,7 @@
<key>Type</key>
<string>F32</string>
<key>Value</key>
<real>10.0</real>
<real>9.5</real>
</map>
<key>FontSizeMonospace</key>
<map>
@@ -6192,7 +6209,7 @@
<key>Type</key>
<string>F32</string>
<key>Value</key>
<real>8.1</real>
<real>9.0</real>
</map>
<key>FontSizeSmall</key>
<map>
@@ -6203,7 +6220,7 @@
<key>Type</key>
<string>F32</string>
<key>Value</key>
<real>9.0</real>
<real>8.5</real>
</map>
<key>ForceNotecardDragCargoPermissive</key>
<map>

1030
indra/newview/floaterlocalassetbrowse.cpp Normal file
View File

File diff suppressed because it is too large Load Diff

305
indra/newview/floaterlocalassetbrowse.h Normal file
View File

@@ -0,0 +1,305 @@
/**
* @file floaterlocalassetbrowse.h
* @brief Local texture support
*
* $LicenseInfo:firstyear=2009&license=viewergpl$
*
* Copyright (c) 2010, author unknown
*
* Imprudence Viewer Source Code
* The source code in this file ("Source Code") is provided to you
* under the terms of the GNU General Public License, version 2.0
* ("GPL"). Terms of the GPL can be found in doc/GPL-license.txt in
* this distribution, or online at
* http://secondlifegrid.net/programs/open_source/licensing/gplv2
*
* There are special exceptions to the terms and conditions of the GPL as
* it is applied to this Source Code. View the full text of the exception
* in the file doc/FLOSS-exception.txt in this software distribution, or
* online at http://secondlifegrid.net/programs/open_source/licensing/flossexception
*
* By copying, modifying or distributing this software, you acknowledge
* that you have read and understood your obligations described above,
* and agree to abide by those obligations.
*
* ALL SOURCE CODE IS PROVIDED "AS IS." THE AUTHOR MAKES NO
* WARRANTIES, EXPRESS, IMPLIED OR OTHERWISE, REGARDING ITS ACCURACY,
* COMPLETENESS OR PERFORMANCE.
* $/LicenseInfo$
*/
/* Local Asset Browser: header
tag: vaa emerald local_asset_browser
*/
#ifndef VAA_LOCALBROWSER
#define VAA_LOCALBROWSER
#include "llfloater.h"
#include "llscrolllistctrl.h"
#include "lltexturectrl.h"
#include "lldrawable.h"
/*=======================================*/
/* Global structs / enums / defines */
/*=======================================*/
#define LF_FLOATER_EXPAND_WIDTH 735
#define LF_FLOATER_CONTRACT_WIDTH 415
#define LF_FLOATER_HEIGHT 260
#define LOCAL_USE_MIPMAPS true
#define LOCAL_DISCARD_LEVEL 0
#define NO_IMAGE LLUUID::null
#define TIMER_HEARTBEAT 3.0
#define SLAM_FOR_DEBUG true
enum bitmaplist_cols
{
BITMAPLIST_COL_NAME,
BITMAPLIST_COL_ID
};
/* upload & sculpt update related */
struct affected_object
{
LLViewerObject* object;
std::vector<LLFace*> face_list;
bool local_sculptmap;
};
/* texture picker defines */
#define LOCAL_TEXTURE_PICKER_NAME "texture picker"
#define LOCAL_TEXTURE_PICKER_LIST_NAME "local_name_list"
#define LOCAL_TEXTURE_PICKER_RECURSE true
#define LOCAL_TEXTURE_PICKER_CREATEIFMISSING true
/*=======================================*/
/* LocalBitmap: unit class */
/*=======================================*/
/*
The basic unit class responsible for
containing one loaded local texture.
*/
class LocalBitmap
{
public:
LocalBitmap(std::string filename);
virtual ~LocalBitmap(void);
friend class LocalAssetBrowser;
public: /* [enums, typedefs, etc] */
enum link_status
{
LINK_UNKNOWN, /* default fallback */
LINK_ON,
LINK_OFF,
LINK_BROKEN,
LINK_UPDATING /* currently redundant, but left in case necessary later. */
};
enum extension_type
{
IMG_EXTEN_BMP,
IMG_EXTEN_TGA,
IMG_EXTEN_JPG,
IMG_EXTEN_PNG
};
enum bitmap_type
{
TYPE_TEXTURE = 0,
TYPE_SCULPT = 1,
TYPE_LAYER = 2
};
public: /* [information query functions] */
std::string getShortName(void);
std::string getFileName(void);
LLUUID getID(void);
LLSD getLastModified(void);
std::string getLinkStatus(void);
bool getUpdateBool(void);
void setType( S32 );
bool getIfValidBool(void);
S32 getType(void);
void getDebugInfo(void);
private: /* [maintenence functions] */
void updateSelf(void);
bool decodeSelf(LLImageRaw* rawimg);
void setUpdateBool(void);
LocalBitmap* getThis(void);
std::vector<LLFace*> getFaceUsesThis(LLDrawable*);
std::vector<affected_object> getUsingObjects(bool seek_by_type = true,
bool seek_textures = false, bool seek_sculptmaps = false);
protected: /* [basic properties] */
std::string shortname;
std::string filename;
extension_type extension;
LLUUID id;
LLSD last_modified;
link_status linkstatus;
bool keep_updating;
bool valid;
S32 bitmap_type;
bool sculpt_dirty;
bool volume_dirty;
};
/*=======================================*/
/* LocalAssetBrowser: main class */
/*=======================================*/
/*
Responsible for internal workings.
Instantiated at the top of the source file.
Sits in memory until the viewer is closed.
*/
class LocalAssetBrowser
{
public:
LocalAssetBrowser();
virtual ~LocalAssetBrowser();
friend class FloaterLocalAssetBrowser;
friend class LocalAssetBrowserTimer;
static void UpdateTextureCtrlList(LLScrollListCtrl*);
static void setLayerUpdated(bool toggle) { mLayerUpdated = toggle; }
static void setSculptUpdated(bool toggle) { mSculptUpdated = toggle; }
static void AddBitmap(void);
static void DelBitmap( std::vector<LLScrollListItem*>, S32 column = BITMAPLIST_COL_ID );
/* UpdateTextureCtrlList was made public cause texturectrl requests it once on spawn
( added: when it's own add/remove funcs are used. )
i've made it update on spawn instead of on pressing 'local' because the former does it once,
the latter - each time the button's pressed. */
private:
static void onChangeHappened(void);
static void onUpdateBool(LLUUID);
static void onSetType(LLUUID, S32);
static LocalBitmap* GetBitmapUnit(LLUUID);
static bool IsDoingUpdates(void);
static void PingTimer(void);
static void PerformTimedActions(void);
static void PerformSculptUpdates(LocalBitmap*);
protected:
static std::vector<LocalBitmap*> loaded_bitmaps;
typedef std::vector<LocalBitmap*>::iterator local_list_iter;
static bool mLayerUpdated;
static bool mSculptUpdated;
};
/*==================================================*/
/* FloaterLocalAssetBrowser : interface class */
/*==================================================*/
/*
Responsible for talking to the user.
Instantiated by user request.
Destroyed when the floater is closed.
*/
class FloaterLocalAssetBrowser : public LLFloater
{
public:
FloaterLocalAssetBrowser();
virtual ~FloaterLocalAssetBrowser();
static void show(void*);
private:
/* Widget related callbacks */
// Button callback declarations
static void onClickAdd(void* userdata);
static void onClickDel(void* userdata);
static void onClickMore(void* userdata);
static void onClickLess(void* userdata);
static void onClickUpload(void* userdata);
// ScrollList callback declarations
static void onChooseBitmapList(LLUICtrl* ctrl, void* userdata);
// Checkbox callback declarations
static void onClickUpdateChkbox(LLUICtrl* ctrl, void* userdata);
// Combobox type select
static void onCommitTypeCombo(LLUICtrl* ctrl, void* userdata);
// Widgets
LLButton* mAddBtn;
LLButton* mDelBtn;
LLButton* mMoreBtn;
LLButton* mLessBtn;
LLButton* mUploadBtn;
LLScrollListCtrl* mBitmapList;
LLScrollListCtrl* mUsedList;
LLTextureCtrl* mTextureView;
LLCheckBoxCtrl* mUpdateChkBox;
LLLineEditor* mPathTxt;
LLLineEditor* mUUIDTxt;
LLLineEditor* mNameTxt;
LLTextBox* mLinkTxt;
LLTextBox* mTimeTxt;
LLComboBox* mTypeComboBox;
LLTextBox* mCaptionPathTxt;
LLTextBox* mCaptionUUIDTxt;
LLTextBox* mCaptionLinkTxt;
LLTextBox* mCaptionNameTxt;
LLTextBox* mCaptionTimeTxt;
/* static pointer to self, wai? oh well. */
static FloaterLocalAssetBrowser* sLFInstance;
// non-widget functions
static void FloaterResize(bool expand);
static void UpdateRightSide(void);
public:
static void UpdateBitmapScrollList(void);
};
/*==================================================*/
/* LocalAssetBrowserTimer : timer class */
/*==================================================*/
/*
A small, simple timer class inheriting from
LLEventTimer, responsible for pinging the
LocalAssetBrowser class to perform it's
updates / checks / etc.
*/
class LocalAssetBrowserTimer : public LLEventTimer
{
public:
LocalAssetBrowserTimer();
~LocalAssetBrowserTimer();
virtual BOOL tick();
void start();
void stop();
bool isRunning();
};
#endif

2
indra/newview/llappviewer.cpp
View File

@@ -3654,6 +3654,8 @@ void LLAppViewer::idleShutdown()
// close IM interface
if(gIMMgr)
{
// Save group chat ignore list -- MC
gIMMgr->saveIgnoreGroup();
gIMMgr->disconnectAllSessions();
}

21
indra/newview/llhoverview.cpp
View File

@@ -500,6 +500,27 @@ void LLHoverView::updateText()
}
mText.push_back(line);
}
line.clear();
S32 prim_count = LLSelectMgr::getInstance()->getHoverObjects()->getObjectCount();
line.append(llformat("Prims: %d", prim_count));
mText.push_back(line);
line.clear();
line.append("Position: ");
LLViewerRegion *region = gAgent.getRegion();
LLVector3 position = region->getPosRegionFromGlobal(hit_object->getPositionGlobal());//regionp->getOriginAgent();
LLVector3 mypos = region->getPosRegionFromGlobal(gAgent.getPositionGlobal());
LLVector3 delta = position - mypos;
F32 distance = (F32)delta.magVec();
line.append(llformat("<%.02f,%.02f,%.02f>",position.mV[0],position.mV[1],position.mV[2]));
mText.push_back(line);
line.clear();
line.append(llformat("Distance: %.02fm",distance));
mText.push_back(line);
// If the hover tip shouldn't be shown, delete all the object text
if (suppressObjectHoverDisplay)

130
indra/newview/llimview.cpp
View File

@@ -53,6 +53,7 @@
#include "llhttpnode.h"
#include "llimpanel.h"
#include "llresizebar.h"
#include "llsdserialize.h"
#include "lltabcontainer.h"
#include "llviewercontrol.h"
#include "llfloater.h"
@@ -605,6 +606,30 @@ void LLIMMgr::addMessage(
// create IM window as necessary
if(!floater)
{
if (gIMMgr->getIgnoreGroupListCount() > 0 && gAgent.isInGroup(session_id))
{
// Check to see if we're blocking this group's chat
LLGroupData* group_data = NULL;
// Search for this group in the agent's groups list
LLDynamicArray<LLGroupData>::iterator i;
for (i = gAgent.mGroups.begin(); i != gAgent.mGroups.end(); i++)
{
if (i->mID == session_id)
{
group_data = &*i;
break;
}
}
// If the group is in our list then return
if (group_data && gIMMgr->getIgnoreGroup(group_data->mID))
{
return;
}
}
std::string name = from;
if(!session_name.empty() && session_name.size()>1)
{
@@ -1286,6 +1311,111 @@ void LLIMMgr::updateFloaterSessionID(
}
}
void LLIMMgr::loadIgnoreGroup()
{
std::string filename = gDirUtilp->getExpandedFilename(LL_PATH_PER_SL_ACCOUNT, "ignore_groups.xml");
LLSD settings_llsd;
llifstream file;
file.open(filename);
if (file.is_open())
{
// llinfos << "loading group chat ignore from " << filename << "..." << llendl;
LLSDSerialize::fromXML(settings_llsd, file);
mIgnoreGroupList.clear();
for(LLSD::array_const_iterator iter = settings_llsd.beginArray();
iter != settings_llsd.endArray(); ++iter)
{
// llinfos << "added " << iter->asUUID()
// << " to group chat ignore list" << llendl;
mIgnoreGroupList.push_back( iter->asUUID() );
}
}
else
{
// llinfos << "can't load " << filename
// << " (probably it doesn't exist yet)" << llendl;
}
}
void LLIMMgr::saveIgnoreGroup()
{
// llinfos << "saving ignore_groups.xml" << llendl;
std::string user_dir = gDirUtilp->getLindenUserDir();
if (!user_dir.empty())
{
std::string filename = gDirUtilp->getExpandedFilename(LL_PATH_PER_SL_ACCOUNT, "ignore_groups.xml");
LLSD settings_llsd = LLSD::emptyArray();
for(std::list<LLUUID>::iterator iter = mIgnoreGroupList.begin();
iter != mIgnoreGroupList.end(); ++iter)
{
settings_llsd.append(*iter);
}
llofstream file;
file.open(filename);
LLSDSerialize::toPrettyXML(settings_llsd, file);
}
}
void LLIMMgr::updateIgnoreGroup(const LLUUID& group_id, bool ignore)
{
if (group_id.notNull())
{
std::list<LLUUID>::iterator found =
std::find( mIgnoreGroupList.begin(), mIgnoreGroupList.end(),
group_id);
if (found != mIgnoreGroupList.end() && !ignore)
{
// change from ignored to not ignored
// llinfos << "unignoring group " << group_id << llendl;
mIgnoreGroupList.remove(group_id);
}
else if (found == mIgnoreGroupList.end() && ignore)
{
// change from not ignored to ignored
// llinfos << "ignoring group " << group_id << llendl;
mIgnoreGroupList.push_back(group_id);
}
else
{
// nothing to do
// llinfos << "no change to group " << group_id << ", it is already "
// << (ignore ? "" : "not ") << "ignored" << llendl;
}
}
}
bool LLIMMgr::getIgnoreGroup(const LLUUID& group_id)
{
if (group_id.notNull())
{
std::list<LLUUID>::iterator found =
std::find( mIgnoreGroupList.begin(), mIgnoreGroupList.end(),
group_id);
if (found != mIgnoreGroupList.end())
{
// llinfos << "group " << group_id << " is ignored." << llendl;
return true;
}
}
// llinfos << "group " << group_id << " is not ignored." << llendl;
return false;
}
//////////////////////
///// ChatterBox /////
//////////////////////
LLFloaterChatterBox* LLIMMgr::getFloater()
{
return LLFloaterChatterBox::getInstance(LLSD());

12
indra/newview/llimview.h
View File

@@ -172,6 +172,12 @@ public:
//HACK: need a better way of enumerating existing session, or listening to session create/destroy events
const std::set<LLHandle<LLFloater> >& getIMFloaterHandles() { return mFloaters; }
void loadIgnoreGroup();
void saveIgnoreGroup();
void updateIgnoreGroup(const LLUUID& group_id, bool ignore);
// Returns true if group chat is ignored for the UUID, false if not
bool getIgnoreGroup(const LLUUID& group_id);
private:
// create a panel and update internal representation for
// consistency. Returns the pointer, caller (the class instance
@@ -211,6 +217,12 @@ private:
LLSD mPendingInvitations;
LLSD mPendingAgentListUpdates;
std::list<LLUUID> mIgnoreGroupList;
public:
S32 getIgnoreGroupListCount() { return mIgnoreGroupList.size(); }
};

27
indra/newview/llpanelgroupgeneral.cpp
View File

@@ -45,6 +45,7 @@
#include "llcheckboxctrl.h"
#include "llcombobox.h"
#include "lldbstrings.h"
#include "llimview.h"
#include "lllineeditor.h"
#include "llnamebox.h"
#include "llnamelistctrl.h"
@@ -91,6 +92,7 @@ LLPanelGroupGeneral::LLPanelGroupGeneral(const std::string& name,
mCtrlEnrollmentFee(NULL),
mSpinEnrollmentFee(NULL),
mCtrlReceiveNotices(NULL),
mCtrlReceiveChat(NULL),
mCtrlListGroup(NULL),
mActiveTitleLabel(NULL),
mComboActiveTitle(NULL)
@@ -219,6 +221,15 @@ BOOL LLPanelGroupGeneral::postBuild()
mCtrlReceiveNotices->set(accept_notices);
mCtrlReceiveNotices->setEnabled(data.mID.notNull());
}
mCtrlReceiveChat = getChild<LLCheckBoxCtrl>("receive_chat", recurse);
if (mCtrlReceiveChat)
{
mCtrlReceiveChat->setCommitCallback(onCommitUserOnly);
mCtrlReceiveChat->setCallbackUserData(this);
mCtrlReceiveChat->set(!gIMMgr->getIgnoreGroup(mGroupID));
mCtrlReceiveChat->setEnabled(mGroupID.notNull());
}
mCtrlListGroup = getChild<LLCheckBoxCtrl>("list_groups_in_profile", recurse);
if (mCtrlListGroup)
@@ -544,6 +555,14 @@ bool LLPanelGroupGeneral::apply(std::string& mesg)
gAgent.setUserGroupFlags(mGroupID, receive_notices, list_in_profile);
if (mCtrlReceiveChat)
{
bool receive_chat = mCtrlReceiveChat->get();
gIMMgr->updateIgnoreGroup(mGroupID, !receive_chat);
// Save here too in case we crash somewhere down the road -- MC
gIMMgr->saveIgnoreGroup();
}
mChanged = FALSE;
return true;
@@ -760,6 +779,13 @@ void LLPanelGroupGeneral::update(LLGroupChange gc)
mCtrlReceiveNotices->resetDirty();
}
if (mCtrlReceiveChat)
{
mCtrlReceiveChat->setVisible(is_member);
mCtrlReceiveChat->setEnabled(TRUE);
mCtrlReceiveChat->resetDirty();
}
if (mInsignia) mInsignia->setEnabled(mAllowEdit && can_change_ident);
if (mEditCharter) mEditCharter->setEnabled(mAllowEdit && can_change_ident);
@@ -914,6 +940,7 @@ void LLPanelGroupGeneral::updateChanged()
mCtrlEnrollmentFee,
mSpinEnrollmentFee,
mCtrlReceiveNotices,
mCtrlReceiveChat,
mCtrlListGroup,
mActiveTitleLabel,
mComboActiveTitle

1
indra/newview/llpanelgroupgeneral.h
View File

@@ -107,6 +107,7 @@ private:
LLCheckBoxCtrl *mCtrlEnrollmentFee;
LLSpinCtrl *mSpinEnrollmentFee;
LLCheckBoxCtrl *mCtrlReceiveNotices;
LLCheckBoxCtrl *mCtrlReceiveChat;
LLCheckBoxCtrl *mCtrlListGroup;
LLTextBox *mActiveTitleLabel;
LLComboBox *mComboActiveTitle;

7
indra/newview/llpanelnetwork.cpp
View File

@@ -103,7 +103,12 @@ LLPanelNetwork::~LLPanelNetwork()
void LLPanelNetwork::apply()
{
gSavedSettings.setU32("CacheSize", childGetValue("cache_size").asInteger());
U32 cache_size = (U32)childGetValue("cache_size").asInteger();
if (gSavedSettings.getU32("CacheSize") != cache_size)
{
onClickClearCache(this);
gSavedSettings.setU32("CacheSize", cache_size);
}
gSavedSettings.setF32("ThrottleBandwidthKBPS", childGetValue("max_bandwidth").asReal());
gSavedSettings.setBOOL("ConnectionPortEnabled", childGetValue("connection_port_enabled"));
gSavedSettings.setU32("ConnectionPort", childGetValue("connection_port").asInteger());

3
indra/newview/llstartup.cpp
View File

@@ -119,6 +119,7 @@
#include "llhudmanager.h"
#include "llhttpclient.h"
#include "llimagebmp.h"
#include "llimview.h" // for gIMMgr
#include "llinventorymodel.h"
#include "llinventoryview.h"
#include "llkeyboard.h"
@@ -1833,6 +1834,8 @@ bool idle_startup()
// OGPX : successful login path common to OGP and XML-RPC
if (successful_login)
{
gIMMgr->loadIgnoreGroup();
// JC: gesture loading done below, when we have an asset system
// in place. Don't delete/clear user_credentials until then.

174
indra/newview/lltexturecache.cpp
View File

@@ -53,7 +53,7 @@
//note: there is no good to define 1024 for TEXTURE_CACHE_ENTRY_SIZE while FIRST_PACKET_SIZE is 600 on sim side.
const S32 TEXTURE_CACHE_ENTRY_SIZE = FIRST_PACKET_SIZE;//1024;
const F32 TEXTURE_CACHE_PURGE_AMOUNT = .20f; // % amount to reduce the cache by when it exceeds its limit
const S64 TEXTURE_PURGED_CACHE_SIZE = 80; // % amount of cache left after a purge.
const F32 TEXTURE_CACHE_LRU_SIZE = .10f; // % amount for LRU list (low overhead to regenerate)
class LLTextureCacheWorker : public LLWorkerClass
@@ -751,7 +751,7 @@ LLTextureCache::LLTextureCache(bool threaded)
mTexturesSizeTotal(0),
mDoPurge(FALSE)
{
purgeTextures(false, true);
purgeTextureFilesTimeSliced(true);
clearDeleteList();
writeUpdatedEntries();
}
@@ -836,17 +836,15 @@ std::string LLTextureCache::getTextureFileName(const LLUUID& id)
BOOL LLTextureCache::isInCache(const LLUUID& id)
{
LLMutexLock lock(&mHeaderMutex);
id_map_t::const_iterator iter = mHeaderIDMap.find(id);
return (iter != mHeaderIDMap.end());
return (mHeaderIDMap.find(id) != mHeaderIDMap.end());
}
//debug
BOOL LLTextureCache::isInLocal(const LLUUID& id)
{
S32 local_size = 0;
std::string local_filename;
std::string filename = getLocalFileName(id);
// Is it a JPEG2000 file?
{
@@ -917,19 +915,13 @@ void LLTextureCache::purgeCache(ELLPath location)
if(LLFile::isdir(mTexturesDirName))
{
std::string file_name = gDirUtilp->getExpandedFilename(location, entries_filename);
if (LLAPRFile::isExist(file_name))
{
LLAPRFile::remove(file_name);
}
LLAPRFile::remove(file_name);
file_name = gDirUtilp->getExpandedFilename(location, cache_filename);
if (LLAPRFile::isExist(file_name))
{
LLAPRFile::remove(file_name);
}
LLAPRFile::remove(file_name);
purgeAllTextures(true);
}
}
mTexturesDirName = texture_dir;
}
@@ -1323,7 +1315,7 @@ void LLTextureCache::writeEntriesAndClose(const std::vector<Entry>& entries)
{
clearCorruptedCache(); //clear the cache.
return;
}
}
}
closeHeaderEntriesFile();
}
@@ -1555,22 +1547,16 @@ void LLTextureCache::purgeAllTextures(bool purge_directories)
llinfos << "The entire texture cache is cleared." << llendl;
}
void LLTextureCache::purgeTextures(bool validate, bool force)
void LLTextureCache::purgeTextures(bool validate)
{
static LLTimer timeout;
const S32 min_purge_count = 20;
const F32 delay_between_passes = 15.0f;
const F32 max_time_per_pass = 0.5f;
static F32 time_per_pass = 0.05f;
mDoPurge = FALSE;
if (!force && timeout.getElapsedTimeF32() <= delay_between_passes)
if (mReadOnly)
{
return;
}
mDoPurge = FALSE;
timeout.reset();
if (mReadOnly)
if (!validate && mTexturesSizeTotal < sCacheMaxTexturesSize)
{
return;
}
@@ -1583,8 +1569,6 @@ void LLTextureCache::purgeTextures(bool validate, bool force)
LLMutexLock lock(&mHeaderMutex);
llinfos << "TEXTURE CACHE: Purging." << llendl;
// Read the entries list
std::vector<Entry> entries;
U32 num_entries = openAndReadEntries(entries);
@@ -1594,9 +1578,11 @@ void LLTextureCache::purgeTextures(bool validate, bool force)
return; // nothing to purge
}
LL_INFOS("TextureCache") << "TEXTURE CACHE: Purging." << LL_ENDL;
// Use mTexturesSizeMap to collect UUIDs of textures with bodies
typedef std::set<std::pair<U32,S32> > time_idx_set_t;
std::set<std::pair<U32,S32> > time_idx_set;
time_idx_set_t time_idx_set;
for (size_map_t::iterator iter1 = mTexturesSizeMap.begin();
iter1 != mTexturesSizeMap.end(); ++iter1)
{
@@ -1629,26 +1615,12 @@ void LLTextureCache::purgeTextures(bool validate, bool force)
LL_DEBUGS("TextureCache") << "TEXTURE CACHE: Validating: " << validate_idx << LL_ENDL;
}
F32 overhead = timeout.getElapsedTimeF32();
if (2.0f * overhead > time_per_pass)
{
time_per_pass = llmin(overhead, max_time_per_pass);
}
timeout.reset();
S64 cache_size = mTexturesSizeTotal;
S64 purged_cache_size = (sCacheMaxTexturesSize * (S64)((1.f - TEXTURE_CACHE_PURGE_AMOUNT) * 100.f)) / 100;
S64 purged_cache_size = (TEXTURE_PURGED_CACHE_SIZE * sCacheMaxTexturesSize) / (S64)100;
S32 purge_count = 0;
for (time_idx_set_t::iterator iter = time_idx_set.begin();
iter != time_idx_set.end(); ++iter)
{
if (!force && !validate && purge_count >= min_purge_count && timeout.getElapsedTimeF32() > time_per_pass)
{
LL_INFOS("TextureCache") << "Texture cache purge splitted to avoid long hiccup." << LL_ENDL;
mDoPurge = TRUE;
break;
}
S32 idx = iter->second;
bool purge_entry = false;
std::string filename = getTextureFileName(entries[idx].mID);
@@ -1680,76 +1652,101 @@ void LLTextureCache::purgeTextures(bool validate, bool force)
if (purge_entry)
{
purge_count++;
removeEntry(idx, entries[idx], filename);
mFilesToDelete.insert(std::make_pair(entries[idx].mID, filename));
cache_size -= entries[idx].mBodySize;
removeEntry(idx, entries[idx], filename, false); // remove the entry but not the file
}
}
mTimeLastFileDelete.reset();
LL_DEBUGS("TextureCache") << "TEXTURE CACHE: Writing Entries: " << num_entries << LL_ENDL;
F32 purge_time = timeout.getElapsedTimeF32();
timeout.reset();
writeEntriesAndClose(entries);
overhead += timeout.getElapsedTimeF32();
time_per_pass = llmin(overhead, max_time_per_pass);
if (purge_count > 0)
{
writeEntriesAndClose(entries);
LL_INFOS("TextureCache") << "TEXTURE CACHE:"
<< " Purged: " << purge_count
<< " - Entries: " << num_entries
<< " - Cache size: " << mTexturesSizeTotal / (1024 * 1024) << " MB"
<< " - Files scheduled for deletion: " << mFilesToDelete.size()
<< LL_ENDL;
}
else
{
LL_INFOS("TextureCache") << "TEXTURE CACHE: nothing to purge." << LL_ENDL;
}
// *FIX:Mani - watchdog back on.
LLAppViewer::instance()->resumeMainloopTimeout();
LL_INFOS("TextureCache") << "TEXTURE CACHE:"
<< " Purged: " << purge_count
<< " - Entries: " << num_entries
<< " - Cache size: " << mTexturesSizeTotal / (1024 * 1024) << " MB"
<< " - Time used for this purge: " << purge_time + overhead << "s (including " << overhead << "s of overhead)."
<< LL_ENDL;
timeout.reset();
mSlicedPurgeTimer.reset();
}
void LLTextureCache::purgeTextureFilesTimeSliced(BOOL force_all)
void LLTextureCache::purgeTextureFilesTimeSliced(bool force)
{
LLMutexLock lock(&mHeaderMutex);
const F32 delay_between_passes = 2.0f; // seconds
const F32 max_time_per_pass = 0.1f; // seconds
F32 delay_between_passes = 1.0f; // seconds
F32 max_time_per_pass = 0.1f; // seconds
if (!force_all && mTimeLastFileDelete.getElapsedTimeF32() <= delay_between_passes)
if (!force && mSlicedPurgeTimer.getElapsedTimeF32() <= delay_between_passes)
{
return;
}
LLTimer timer;
S32 howmany = 0;
if (!mFilesToDelete.empty())
{
LL_INFOS("TEXTURE CACHE") << "purging time sliced with " << mFilesToDelete.size() << " files scheduled for deletion" << llendl;
LL_INFOS("TextureCache") << "time sliced purging with " << mFilesToDelete.size()
<< " files scheduled for deletion" << LL_ENDL;
for (LLTextureCache::filename_list_t::iterator iter = mFilesToDelete.begin(); iter!=mFilesToDelete.end(); )
LLMutexLock lock(&mHeaderMutex);
mSlicedPurgeTimer.reset();
U32 purged = 0;
std::string filename;
for (LLTextureCache::purge_map_t::iterator iter = mFilesToDelete.begin(); iter != mFilesToDelete.end(); )
{
LLTextureCache::purge_map_t::iterator curiter = iter++;
// Only remove files for textures that have not been cached again
// since we selected them for removal !
if (mHeaderIDMap.find(curiter->first) == mHeaderIDMap.end())
{
filename = curiter->second;
LLAPRFile::remove(filename);
}
else
{
LLTextureCache::filename_list_t::iterator iter2 = iter++;
LLAPRFile::remove(*iter2);
mFilesToDelete.erase(iter2);
howmany++;
LL_DEBUGS("TextureCache") << curiter->second
<< " selected for removal, but texture cached again since !"
<< LL_ENDL;
}
mFilesToDelete.erase(curiter);
purged++;
if (!force_all && timer.getElapsedTimeF32() > max_time_per_pass)
if (!force && mSlicedPurgeTimer.getElapsedTimeF32() > max_time_per_pass)
{
break;
}
}
}
if (!mFilesToDelete.empty())
if (mFilesToDelete.empty())
{
LL_INFOS("TextureCache") << "time sliced purge finished with " << purged
<< " files deleted in "
<< mSlicedPurgeTimer.getElapsedTimeF32()
<< "s" << LL_ENDL;
}
else
{
LL_INFOS("TEXTURE CACHE") << "purging time sliced with " << howmany << " files deleted ("
<< mFilesToDelete.size() << " files left for next pass)"
<< llendl;
LL_INFOS("TextureCache") << "time sliced purge: " << purged
<< " files deleted in "
<< mSlicedPurgeTimer.getElapsedTimeF32()
<< "s (" << mFilesToDelete.size()
<< " files left for next pass)" << LL_ENDL;
}
mTimeLastFileDelete.reset();
mSlicedPurgeTimer.reset();
}
}
//////////////////////////////////////////////////////////////////////////////
@@ -1943,23 +1940,20 @@ void LLTextureCache::addCompleted(Responder* responder, bool success)
//called after mHeaderMutex is locked.
void LLTextureCache::removeCachedTexture(const LLUUID& id)
{
if(mTexturesSizeMap.find(id) != mTexturesSizeMap.end())
if (mTexturesSizeMap.find(id) != mTexturesSizeMap.end())
{
mTexturesSizeTotal -= mTexturesSizeMap[id];
mTexturesSizeMap.erase(id);
}
mHeaderIDMap.erase(id);
std::string filename = getTextureFileName(id);
if (LLAPRFile::isExist(filename))
{
LLAPRFile::remove(filename);
}
LLAPRFile::remove(filename);
}
//called after mHeaderMutex is locked.
void LLTextureCache::removeEntry(S32 idx, Entry& entry, std::string& filename)
void LLTextureCache::removeEntry(S32 idx, Entry& entry, std::string& filename, bool remove_file)
{
if(idx >= 0) //valid entry
if (idx >= 0) //valid entry
{
entry.mImageSize = -1;
entry.mBodySize = 0;
@@ -1970,7 +1964,7 @@ void LLTextureCache::removeEntry(S32 idx, Entry& entry, std::string& filename)
mFreeList.insert(idx);
}
if (LLAPRFile::isExist(filename))
if (remove_file)
{
LLAPRFile::remove(filename);
}

13
indra/newview/lltexturecache.h
View File

@@ -151,8 +151,8 @@ private:
void readHeaderCache();
void clearCorruptedCache();
void purgeAllTextures(bool purge_directories);
void purgeTextures(bool validate, bool force = false);
void purgeTextureFilesTimeSliced(BOOL force_all = FALSE); // VWR-3878 - NB
void purgeTextures(bool validate);
void purgeTextureFilesTimeSliced(bool force = false);
LLAPRFile* openHeaderEntriesFile(bool readonly, S32 offset);
void closeHeaderEntriesFile();
void readEntriesHeader();
@@ -164,7 +164,7 @@ private:
void writeEntriesAndClose(const std::vector<Entry>& entries);
void readEntryFromHeaderImmediately(S32& idx, Entry& entry) ;
void writeEntryToHeaderImmediately(S32& idx, Entry& entry, bool write_header = false) ;
void removeEntry(S32 idx, Entry& entry, std::string& filename);
void removeEntry(S32 idx, Entry& entry, std::string& filename, bool remove_file = true);
void removeCachedTexture(const LLUUID& id) ;
S32 getHeaderCacheEntry(const LLUUID& id, Entry& entry);
S32 setHeaderCacheEntry(const LLUUID& id, Entry& entry, S32 imagesize, S32 datasize);
@@ -190,9 +190,10 @@ private:
typedef std::vector<std::pair<LLPointer<Responder>, bool> > responder_list_t;
responder_list_t mCompletedList;
typedef std::list<std::string> filename_list_t;
filename_list_t mFilesToDelete;
LLTimer mTimeLastFileDelete;
typedef std::map<LLUUID, std::string> purge_map_t;
purge_map_t mFilesToDelete;
LLTimer mSlicedPurgeTimer;
BOOL mReadOnly;
// HEADERS (Include first mip)

129
indra/newview/lltexturectrl.cpp
View File

@@ -72,6 +72,12 @@
#include "lllocalinventory.h"
// </edit>
// tag: vaa emerald local_asset_browser [begin]
#include "floaterlocalassetbrowse.h"
#include "llscrolllistctrl.h"
#include "llfilepicker.h"
#define LOCALLIST_COL_ID 1
// tag: vaa emerald local_asset_browser [end]
static const S32 CLOSE_BTN_WIDTH = 100;
const S32 PIPETTE_BTN_WIDTH = 32;
@@ -168,6 +174,18 @@ public:
static void onSearchEdit(const std::string& search_string, void* user_data );
static void onTextureSelect( const LLTextureEntry& te, void *data );
// tag: vaa emerald local_asset_browser [begin]
// static void onBtnLocal( void* userdata );
// static void onBtnServer( void* userdata );
// static void switchModes( bool localmode, void* userdata );
static void onBtnAdd( void* userdata );
static void onBtnRemove( void* userdata );
static void onBtnBrowser( void* userdata );
static void onLocalScrollCommit ( LLUICtrl* ctrl, void *userdata );
// tag: vaa emerald local_asset_browser [end]
protected:
LLPointer<LLViewerImage> mTexturep;
LLTextureCtrl* mOwner;
@@ -198,6 +216,7 @@ protected:
BOOL mNoCopyTextureSelected;
F32 mContextConeOpacity;
LLSaveFolderState mSavedFolderState;
LLScrollListCtrl* mLocalScrollCtrl; // tag: vaa emerald local_asset_browser
};
LLFloaterTexturePicker::LLFloaterTexturePicker(
@@ -243,6 +262,18 @@ LLFloaterTexturePicker::LLFloaterTexturePicker(
childSetAction("Blank", LLFloaterTexturePicker::onBtnWhite,this);
childSetAction("Invisible", LLFloaterTexturePicker::onBtnInvisible,this);
// tag: vaa emerald local_asset_browser [begin]
// childSetAction("Local", LLFloaterTexturePicker::onBtnLocal, this);
// childSetAction("Server", LLFloaterTexturePicker::onBtnServer, this);
childSetAction("Add", LLFloaterTexturePicker::onBtnAdd, this);
childSetAction("Remove", LLFloaterTexturePicker::onBtnRemove, this);
childSetAction("Browser", LLFloaterTexturePicker::onBtnBrowser, this);
mLocalScrollCtrl = getChild<LLScrollListCtrl>("local_name_list");
mLocalScrollCtrl->setCallbackUserData(this);
mLocalScrollCtrl->setCommitCallback(onLocalScrollCommit);
LocalAssetBrowser::UpdateTextureCtrlList( mLocalScrollCtrl );
// tag: vaa emerald local_asset_browser [end]
childSetCommitCallback("show_folders_check", onShowFolders, this);
childSetVisible("show_folders_check", FALSE);
@@ -779,6 +810,70 @@ void LLFloaterTexturePicker::onBtnSelect(void* userdata)
self->close();
}
// tag: vaa emerald local_asset_browser [begin]
// static, switches between showing inventory instance for global bitmaps
// to showing the scroll list for local ones and back.
/*
void LLFloaterTexturePicker::onBtnLocal(void *userdata)
{
switchModes( true, userdata );
}
void LLFloaterTexturePicker::onBtnServer(void *userdata)
{
switchModes( false, userdata );
}
void LLFloaterTexturePicker::switchModes(bool localmode, void *userdata)
{
LLFloaterTexturePicker* self = (LLFloaterTexturePicker*) userdata;
// servermode widgets
self->childSetVisible("Local", !localmode);
self->childSetVisible("Default", !localmode);
self->childSetVisible("None", !localmode);
self->childSetVisible("Blank", !localmode);
self->mSearchEdit->setVisible(!localmode);
self->mInventoryPanel->setVisible(!localmode);
// localmode widgets
self->childSetVisible("Server", localmode);
self->childSetVisible("Add", localmode);
self->childSetVisible("Remove", localmode);
self->childSetVisible("Browser", localmode);
self->mLocalScrollCtrl->setVisible(localmode);
}
*/
void LLFloaterTexturePicker::onBtnAdd(void *userdata)
{
LocalAssetBrowser::AddBitmap();
}
void LLFloaterTexturePicker::onBtnRemove(void *userdata)
{
LLFloaterTexturePicker* self = (LLFloaterTexturePicker*) userdata;
LocalAssetBrowser::DelBitmap( self->mLocalScrollCtrl->getAllSelected(), LOCALLIST_COL_ID );
}
void LLFloaterTexturePicker::onBtnBrowser(void *userdata)
{
FloaterLocalAssetBrowser::show(NULL);
}
// static, reacts to user clicking a valid field in the local scroll list.
void LLFloaterTexturePicker::onLocalScrollCommit(LLUICtrl *ctrl, void *userdata)
{
LLFloaterTexturePicker* self = (LLFloaterTexturePicker*) userdata;
LLUUID id = (LLUUID)self->mLocalScrollCtrl->getSelectedItemLabel( LOCALLIST_COL_ID );
self->mOwner->setImageAssetID( id );
if ( self->childGetValue("apply_immediate_check").asBoolean() )
{ self->mOwner->onFloaterCommit(LLTextureCtrl::TEXTURE_CHANGE, id); } // calls an overridden function.
}
// tag: vaa emerald local_asset_browser [end]
// static
void LLFloaterTexturePicker::onBtnPipette( void* userdata )
{
@@ -1322,6 +1417,40 @@ void LLTextureCtrl::onFloaterCommit(ETexturePickOp op)
}
}
// tag: vaa emerald local_asset_browser [begin]
/*
overriding onFloaterCommit to forcefeed it a uuid.
also, i still don't get the difference beween mImageItemID and mImageAssetID,
they seem to affect the same thing? using mImageAssetID.
*/
void LLTextureCtrl::onFloaterCommit(ETexturePickOp op, LLUUID id)
{
LLFloaterTexturePicker* floaterp = (LLFloaterTexturePicker*)mFloaterHandle.get();
if( floaterp && getEnabled())
{
mImageItemID = id;
mImageAssetID = id; //floaterp->getAssetID(); // using same as on above func.
// seems to work anyway.
if (op == TEXTURE_SELECT && mOnSelectCallback)
{
mOnSelectCallback(this, mCallbackUserData);
}
else if (op == TEXTURE_CANCEL && mOnCancelCallback)
{
mOnCancelCallback(this, mCallbackUserData);
}
else
{
onCommit();
}
}
}
// tag: vaa emerald local_asset_browser [end]
void LLTextureCtrl::setImageAssetID( const LLUUID& asset_id )
{
if( mImageAssetID != asset_id )

1
indra/newview/lltexturectrl.h
View File

@@ -141,6 +141,7 @@ public:
void onFloaterClose();
void onFloaterCommit(ETexturePickOp op);
void onFloaterCommit(ETexturePickOp op, LLUUID id); // tag: vaa emerald local_asset_browser
// This call is returned when a drag is detected. Your callback
// should return TRUE if the drag is acceptable.

2
indra/newview/llviewerimage.h
View File

@@ -335,6 +335,8 @@ public:
void setCanUseHTTP(bool can_use_http) {mCanUseHTTP = can_use_http;};
friend class LocalBitmap; // tag: vaa emerald local_asset_browser
private:
/*virtual*/ void cleanup(); // Cleanup the LLViewerImage (so we can reinitialize it)

2
indra/newview/llviewerobjectlist.h
View File

@@ -65,6 +65,8 @@ public:
~LLViewerObjectList();
void destroy();
friend class LocalBitmap; // tag: vaa emerald local_asset_browser
// For internal use only. Does NOT take a local id, takes an index into
// an internal dynamic array.

3
indra/newview/llvovolume.h
View File

@@ -215,6 +215,9 @@ public:
BOOL isVolumeGlobal() const;
BOOL canBeFlexible() const;
BOOL setIsFlexible(BOOL is_flexible);
// tag: vaa emerald local_asset_browser
void setSculptChanged(BOOL has_changed) { mSculptChanged = has_changed; }
protected:
S32 computeLODDetail(F32 distance, F32 radius);

4
indra/newview/pipeline.cpp
View File

@@ -330,7 +330,7 @@ void LLPipeline::init()
sDynamicLOD = gSavedSettings.getBOOL("RenderDynamicLOD");
sRenderBump = gSavedSettings.getBOOL("RenderObjectBump");
LLVertexBuffer::sUseStreamDraw = gSavedSettings.getBOOL("ShyotlRenderUseStreamVBO");
LLVertexBuffer::sUseStreamDraw = gSavedSettings.getBOOL("SianaRenderOmitBlankVBO");
LLVertexBuffer::sOmitBlank = gSavedSettings.getBOOL("SianaRenderOmitBlankVBO");
sRenderAttachedLights = gSavedSettings.getBOOL("RenderAttachedLights");
sRenderAttachedParticles = gSavedSettings.getBOOL("RenderAttachedParticles");
@@ -4931,7 +4931,7 @@ void LLPipeline::resetVertexBuffers()
{
sRenderBump = gSavedSettings.getBOOL("RenderObjectBump");
LLVertexBuffer::sUseStreamDraw = gSavedSettings.getBOOL("ShyotlRenderUseStreamVBO");
LLVertexBuffer::sUseStreamDraw = gSavedSettings.getBOOL("SianaRenderOmitBlankVBO");
LLVertexBuffer::sOmitBlank = gSavedSettings.getBOOL("SianaRenderOmitBlankVBO");
for (LLWorld::region_list_t::const_iterator iter = LLWorld::getInstance()->getRegionList().begin();
iter != LLWorld::getInstance()->getRegionList().end(); ++iter)
{

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

@@ -58,7 +58,7 @@
bottom="0"
width="446"
word_wrap="true">
Singularity Viewer is developed and maintained by Siana Gearz with contributions by Shyotl Kuhr and Narv Czervik. Singularity is based upon Ascent source code. Credits for Ascent include Hg Beeks, Charley Levenque, Hazim Gazov, Zwagoth Klaar, Qarl Fizz, and others. Ascent is based upon the Inertia source code.
Singularity Viewer is developed and maintained by Siana Gearz, Shyotl Kuhr and Narv Czervik, with contributions by Henri Beauchamp, Kitty Barnett, Thickbrick Sleaford, Wolfspirit Magic and others. Singularity is based upon Ascent source code. Credits for Ascent include Hg Beeks, Charley Levenque, Hazim Gazov, Zwagoth Klaar, Qarl Fizz, and others. Ascent is based upon the Inertia source code.
Singularity Viewer includes source code contributions of the following residents: Able Whitman, Adam Marker, Agathos Frascati, Aimee Trescothick, Alejandro Rosenthal, Aleric Inglewood, Alissa Sabre, Angus Boyd, Ann Congrejo, Argent Stonecutter, Asuka Neely, Balp Allen, Benja Kepler, Biancaluce Robbiani, Blakar Ogre, blino Nakamura, Boroondas Gupte, Bulli Schumann, bushing Spatula, Carjay McGinnis, Catherine Pfeffer, Celierra Darling, Cron Stardust, Dale Glass, Drewan Keats, Dylan Haskell, Dzonatas Sol, Eddy Stryker, EponymousDylan Ra, Eva Nowicka, Farallon Greyskin, Feep Larsson, Flemming Congrejo, Fluf Fredriksson, Fremont Cunningham, Geneko Nemeth, Gigs Taggart, Ginko Bayliss, Grazer Kline, Gudmund Shepherd, Hamncheese Omlet, HappySmurf Papp, Henri Beauchamp, Hikkoshi Sakai, Hiro Sommambulist, Hoze Menges, Ian Kas, Irene Muni, Iskar Ariantho, Jacek Antonelli, JB Kraft, Joghert LeSabre, Kage Pixel, Ken March, Kerutsen Sellery, Khyota Wulluf, Kunnis Basiat, Lisa Lowe, Lockhart Cordoso, maciek marksman, Magnus Balczo, Malwina Dollinger, march Korda, Matthew Dowd, McCabe Maxsted, Michelle2 Zenovka, Mm Alder, Mr Greggan, Nicholaz Beresford, Nounouch Hapmouche, Patric Mills, Paul Churchill, Paula Innis, Peekay Semyorka, Peter Lameth, Pf Shan, princess niven, Renault Clio, Ringo Tuxing, Robin Cornelius, Ryozu Kojima, Salahzar Stenvaag, Sammy Frederix, Scrippy Scofield, Seg Baphomet, Sergen Davies, SignpostMarv Martin, Simon Nolan, SpacedOut Frye, Sporked Friis, Stevex Janus, Still Defiant, Strife Onizuka, Tayra Dagostino, TBBle Kurosawa, Teardrops Fall, tenebrous pau, Tharax Ferraris, Thickbrick Sleaford, Thraxis Epsilon, tiamat bingyi, TraductoresAnonimos Alter, Tue Torok, Vadim Bigbear, Vixen Heron, Whoops Babii, Wilton Lundquist, Zarkonnen Decosta, Zi Ree, Zipherius Turas

261
indra/newview/skins/default/xui/en-us/floater_local_asset_browse.xml Normal file
View File

@@ -0,0 +1,261 @@
<?xml version="1.0" encoding="utf-8" standalone="yes"?>
<!-- Local Asset Browser: xui -->
<!-- floater definition start -->
<floater
name="local_bitmap_browser_floater"
title="Local Bitmap Browser"
can_resize="true"
can_minimize="true"
can_close="true"
can_drag_on_left="false"
width="415"
height="260"
min_width="415"
min_height="260"
rect_control="FloaterLocalbitmapbrowserRect"
>
<!-- floater definition end, left side begin -->
<button
name="add_btn"
label="Add"
left="12.5"
bottom="10"
width="90"
height="20"
/>
<button
name="del_btn"
label="Remove"
left_delta="100"
bottom_delta="0"
width="90"
height="20"
/>
<button
name="upload_btn"
label="Upload"
left_delta="100"
bottom_delta="0"
width="90"
height="20"
/>
<button
name="more_btn"
label="More"
left_delta="100"
bottom_delta="0"
width="90"
height="20"
/>
<button
name="less_btn"
label="Less"
left_delta="0"
bottom_delta="0"
width="90"
height="20"
visible="false"
/>
<scroll_list
name="bitmap_list"
left="10"
bottom_delta="30"
width="395"
height="200"
column_padding="0"
can_resize="false"
draw_heading="true"
multi_select="true"
search_column="1"
follows="bottom|top"
>
<column name="bitmap_name" label="Name" dynamicwidth="true" />
<column name="bitmap_uuid" label="UUID" width="240" />
</scroll_list>
<!-- left side done, right side begin -->
<line_editor
bevel_style="in"
border_style="line"
border_thickness="1"
mouse_opaque="true"
follows="top"
height="16"
bottom_delta="16"
left_delta="405"
name="path_text"
select_all_on_focus_received="true"
width="305"
visible="false"
/>
<text name="path_caption_text"
left_delta="0"
bottom_delta="20"
follows="top"
width="100"
height="16"
visible="false"
>
Local path:
</text>
<line_editor
bevel_style="in"
border_style="line"
border_thickness="1"
mouse_opaque="true"
follows="top"
height="16"
bottom_delta="20"
left_delta="0"
name="uuid_text"
select_all_on_focus_received="true"
width="305"
visible="false"
/>
<text name="uuid_caption_text"
left_delta="0"
follows="top"
bottom_delta="21"
width="260"
height="16"
visible="false"
>
Local UdddUID:
</text>
<texture_picker
allow_no_texture="false"
height="100"
width="80"
default_image_name="Default"
can_apply_immediately="true"
follows="left|top"
label="Texture"
bottom_delta="20"
left_delta="0"
mouse_opaque="true"
name="texture_view"
visible="false"
/>
<check_box
bottom_delta="15"
left_delta="100"
follows="top"
height="16"
initial_value="true"
label="Keep updating"
mouse_opaque="true"
name="keep_updating_checkbox"
tool_tip="Enable or disable periodic checks if the source bitmap on your hard drive has been updated"
width="166"
visible="false"
enabled="true"
/>
<combo_box
visible="false"
allow_text_entry="false"
bottom_delta="0"
follows="top"
height="18"
left_delta="120"
max_chars="20"
mouse_opaque="true"
name="type_combobox"
width="83"
>
<combo_item name="type_texture" value="type_texture">
Texture
</combo_item>
<combo_item name="type_sculptie" value="type_sculptie">
Sculptmap
</combo_item>
<combo_item name="type_layer" value="type_layer">
Clothing
</combo_item>
</combo_box>
<text name="time_caption_text"
left_delta="-115"
bottom_delta="25"
follows="top"
width="260"
height="16"
visible="false"
>
Time:
</text>
<text name="time_text"
left_delta="50"
bottom_delta="0"
follows="top"
width="260"
height="16"
visible="false"
>
(date here)
</text>
<text name="link_caption_text"
left_delta="-50"
bottom_delta="20"
follows="top"
width="260"
height="16"
visible="false"
>
Link:
</text>
<text name="link_text"
left_delta="50"
bottom_delta="0"
follows="top"
width="260"
height="16"
visible="false"
>
(link status)
</text>
<text name="name_caption_text"
left_delta="-50"
bottom_delta="20"
follows="top"
width="260"
height="16"
visible="false"
>
Name:
</text>
<line_editor
bevel_style="in"
border_style="line"
border_thickness="1"
mouse_opaque="true"
follows="top"
height="16"
bottom_delta="0"
left_delta="50"
name="name_text"
select_all_on_focus_received="true"
width="150"
visible="false"
/>
</floater>

88
indra/newview/skins/default/xui/en-us/floater_texture_ctrl.xml
View File

@@ -1,8 +1,8 @@
<?xml version="1.0" encoding="utf-8" standalone="yes" ?>
<floater bottom="-516" can_close="true" can_drag_on_left="false" can_minimize="false"
can_resize="true" can_tear_off="true" enabled="true" height="320"
left="478" min_height="320" min_width="410" mouse_opaque="true"
name="texture picker" title="Pick: Texture" width="410">
can_resize="true" can_tear_off="true" enabled="true" height="360"
left="478" min_height="360" min_width="460" mouse_opaque="true"
name="texture picker" title="Pick: Texture" width="460">
<string name="choose_picture">
Click to choose a picture
</string>
@@ -30,39 +30,83 @@
<button bottom="-252" enabled="false" follows="left|bottom" font="SansSerifSmall"
halign="center" height="20" label="Invisible" label_selected="Invisible" left="72"
mouse_opaque="true" name="Invisible" scale_image="true" width="64" />
<check_box bottom="-44" enabled="true" follows="left|top" font="SansSerifSmall"
height="24" initial_value="true" label="Show Folders" left="175"
<check_box bottom="-305" enabled="true" follows="left|bottom" font="SansSerifSmall"
height="20" initial_value="true" label="Show Folders" left="4"
mouse_opaque="true" name="show_folders_check" radio_style="false"
width="201" />
<search_editor bottom="-36" enabled="true" follows="left|top|right" height="16"
label="Type here to search" left="175" mouse_opaque="true"
name="inventory search editor" width="231" />
<inventory_panel allow_multi_select="false" border="true" bottom="-256" enabled="true"
follows="left|top|right|bottom" height="216" left="175" mouse_opaque="true"
name="inventory panel" sort_order="TexturePickerSortOrder" width="231" />
<check_box bottom="-282" enabled="true" follows="left|bottom" font="SansSerifSmall"
width="150" />
<check_box bottom="-322" enabled="true" follows="left|bottom" font="SansSerifSmall"
height="20" initial_value="true" label="Apply Immediately" left="4"
mouse_opaque="true" name="apply_immediate_check" radio_style="false"
width="150" />
<button bottom="-282" enabled="true" follows="left|bottom" font="SansSerif"
<button bottom="-322" enabled="true" follows="left|bottom" font="SansSerif"
halign="center" height="32" image_selected="eye_button_active.tga"
image_unselected="eye_button_inactive.tga" label="" label_selected=""
left="139" mouse_opaque="true" name="Pipette" scale_image="true" width="32" />
<button bottom="-282" enabled="true" follows="right|bottom" font="SansSerif"
<button bottom="-322" enabled="true" follows="right|bottom" font="SansSerif"
halign="center" height="20" label="Cancel" label_selected="Cancel"
left="186" mouse_opaque="true" name="Cancel" scale_image="true" width="100" />
<button bottom="-282" enabled="true" follows="right|bottom" font="SansSerif"
left="176" mouse_opaque="true" name="Cancel" scale_image="true" width="100" />
<button bottom="-322" enabled="true" follows="right|bottom" font="SansSerif"
halign="center" height="20" label="Select" label_selected="Select"
left="290" mouse_opaque="true" name="Select" scale_image="true" width="100" />
<line_editor bevel_style="in" border_style="line" border_thickness="1" bottom="10"
left="8" follows="bottom" font="SansSerif" handle_edit_keys_directly="false"
left="280" mouse_opaque="true" name="Select" scale_image="true" width="100" />
<line_editor bevel_style="in" border_style="line" border_thickness="1" bottom="-345"
left="8" follows="bottom|left" font="SansSerif" handle_edit_keys_directly="false"
height="20" max_length="36" mouse_opaque="true" name="texture_uuid"
select_all_on_focus_received="false" width="230" />
<button enabled="true" follows="top|right" font="SansSerif"
<button enabled="true" follows="left|bottom" font="SansSerif"
height="20" label="Apply UUID" label_selected="Apply UUID"
right="340" bottom_delta="0" mouse_opaque="true"
left="238" bottom="-345" mouse_opaque="true"
name="ApplyUUID" scale_image="true" width="100" />
<string name="pick title">
Pick:
</string>
<tab_container border="false" bottom_delta="20" width="410" height="300" left="175" mouse_opaque="false" name="actions_tab_container" tab_position="top" follows="left|top|right|bottom">
<panel border="false" bottom_delta="0" follows="right|top" height="300" label="Inventory" left="0" mouse_opaque="false" name="server_tab" width="410">
<search_editor bottom_delta="-20" enabled="true" follows="left|top|right" height="16"
label="Type here to search" left="0" mouse_opaque="true"
name="inventory search editor" width="271" />
<inventory_panel allow_multi_select="false" border="true" bottom="-270" enabled="true"
follows="left|top|right|bottom" height="245" left="0" mouse_opaque="true"
name="inventory panel" sort_order="TexturePickerSortOrder" width="271" />
</panel>
<panel border="false" bottom_delta="0" follows="left|top" height="300" label="Computer" left="175" mouse_opaque="false" name="local_tab" width="410">
<!-- tag: vaa emerald local_asset_browser [begin] -->
<text bg_visible="false" border_drop_shadow_visible="false" border_visible="false"
bottom_delta="-20" drop_shadow_visible="true" enabled="true" follows="left|top"
font="SansSerifSmall" h_pad="0" halign="left" height="14" left="4"
mouse_opaque="true" name="select_local" v_pad="0" width="400">
Select texture on your computer to preview inworld
</text>
<button bottom_delta="-22" enabled="true" follows="left|top"
font="SansSerifSmall" halign="center" height="20"
label="Add" left="4" mouse_opaque="true"
name="Add" scale_image="true" width="70" visible="true" />
<button bottom_delta="0" enabled="true" follows="left|top"
font="SansSerifSmall" halign="center" height="20"
label="Remove" left_delta="73" mouse_opaque="true"
name="Remove" scale_image="true" width="70" visible="true" />
<button bottom_delta="0" enabled="true" follows="left|top"
font="SansSerifSmall" halign="center" height="20"
label="Properties..." left_delta="103" mouse_opaque="true"
name="Browser" scale_image="true" width="90" visible="true" />
<scroll_list
name="local_name_list"
left="0"
bottom="-270"
width="271"
height="225"
follows="left|top|right|bottom"
column_padding="0"
can_resize="false"
draw_heading="true"
multi_select="true"
search_column="1"
visible="true"
>
<column name="unit_name" label="Name" dynamicwidth="true" />
<column name="unit_id_HIDDEN" label="ID" width="0" />
</scroll_list>
<!-- tag: vaa emerald local_asset_browser [end] -->
</panel>
</tab_container>
</floater>

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

@@ -137,6 +137,11 @@ Hover your mouse over the options for more help.
mouse_opaque="true" name="receive_notices" radio_style="false"
tool_tip="Sets whether you want to receive Notices from this group. Uncheck this box if this group is spamming you."
width="95" />
<check_box bottom_delta="-18" follows="left|top" font="SansSerifSmall" height="16"
initial_value="false" label="Join group chat" left_delta="0"
mouse_opaque="true" name="receive_chat" radio_style="false"
tool_tip="Sets whether you want to participate in group chat. Uncheck this box if this group is spamming you."
width="95" />
<check_box bottom_delta="-18" follows="left|top" font="SansSerifSmall" height="16"
initial_value="false" label="List group in my profile" left_delta="0"
mouse_opaque="true" name="list_groups_in_profile" radio_style="false"