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 into future

Browse Source
This commit is contained in:
Shyotl
2011-10-31 20:41:36 -05:00
parent 0fde15246b f386fc75df
commit 6964cec6f1
20 changed files with 63 additions and 35 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
indra/cmake/OpenGL.cmake
View File

@@ -1,10 +1,10 @@
# -*- cmake -*-
include(Prebuilt)
if (NOT STANDALONE)
if (NOT (STANDALONE OR DARWIN))
use_prebuilt_binary(glext)
# possible glh_linear should have its own .cmake file instead
#use_prebuilt_binary(glh_linear)
# actually... not any longer, it's now in git -SG
set(GLEXT_INCLUDE_DIR ${LIBS_PREBUILT_DIR}/include)
endif (NOT STANDALONE)
endif ()

1
indra/develop.py
View File

@@ -749,6 +749,7 @@ class CygwinSetup(WindowsSetup):
setup_platform = {
'darwin': DarwinSetup,
'linux2': LinuxSetup,
'linux3': LinuxSetup,
'win32' : WindowsSetup,
'cygwin' : CygwinSetup
}

7
indra/llcommon/llsdserialize.cpp
View File

@@ -1454,9 +1454,12 @@ S32 LLSDBinaryFormatter::format(const LLSD& data, std::ostream& ostr, U32 option
}
case LLSD::TypeUUID:
{
ostr.put('u');
ostr.write((const char*)(&(data.asUUID().mData)), UUID_BYTES);
LLUUID value = data.asUUID();
ostr.write((const char*)(&value.mData), UUID_BYTES);
break;
}
case LLSD::TypeString:
ostr.put('s');
@@ -2173,4 +2176,4 @@ bool unzip_llsd(LLSD& data, std::istream& is, S32 size)
free(result);
return true;
}
#endif //MESH_ENABLED
#endif //MESH_ENABLED

6
indra/llcommon/llversionviewer.h
View File

@@ -34,9 +34,9 @@
#define LL_LLVERSIONVIEWER_H
const S32 LL_VERSION_MAJOR = 1;
const S32 LL_VERSION_MINOR = 5;
const S32 LL_VERSION_PATCH = 10;
const S32 LL_VERSION_BUILD = 1;
const S32 LL_VERSION_MINOR = 6;
const S32 LL_VERSION_PATCH = 0;
const S32 LL_VERSION_BUILD = 2;
const char * const LL_CHANNEL = "Singularity";

2
indra/llplugin/llplugininstance.cpp
View File

@@ -90,7 +90,7 @@ int LLPluginInstance::load(std::string &plugin_file)
#if LL_LINUX && defined(LL_STANDALONE)
void *dso_handle = dlopen(plugin_file.c_str(), RTLD_NOW | RTLD_GLOBAL);
int result = (!dso_handle)?APR_EDSOOPEN:apr_os_dso_handle_put(&mDSOHandle,
dso_handle, AIAPRRootPool::get()());
dso_handle, LLAPRRootPool::get()());
#else
int result = apr_dso_load(&mDSOHandle,
plugin_file.c_str(),

4
indra/llplugin/llpluginprocessparent.cpp
View File

@@ -409,7 +409,7 @@ void LLPluginProcessParent::idle(void)
cmd << gdb_path << " -n /proc/" << mProcess.getProcessID() << "/exe " << mProcess.getProcessID();
typedef boost::tokenizer< boost::escaped_list_separator<
char>, typename std::basic_string<
char>, std::basic_string<
char>::const_iterator,
std::basic_string<char> > tokenizerT;
@@ -418,7 +418,7 @@ void LLPluginProcessParent::idle(void)
boost::escaped_list_separator< char >("\\",
" ", "'\""));
std::vector< std::basic_string<char> > tokens;
for (typename tokenizerT::iterator
for (tokenizerT::iterator
cur_token(tok.begin()), end_token(tok.end());
cur_token != end_token; ++cur_token) {
if (!cur_token->empty())

8
indra/llplugin/llpluginsharedmemory.cpp
View File

@@ -277,6 +277,14 @@ LLPluginSharedMemoryPlatformImpl::~LLPluginSharedMemoryPlatformImpl()
bool LLPluginSharedMemory::map(void)
{
llassert(mSize);
if (!mSize)
{
LL_DEBUGS("Plugin") << "Tried to mmap zero length" << LL_ENDL;
return false;
}
llassert(mImpl->mSharedMemoryFD != -1);
llassert(fcntl(mImpl->mSharedMemoryFD, F_GETFL) != -1);
mMappedAddress = ::mmap(NULL, mSize, PROT_READ | PROT_WRITE, MAP_SHARED, mImpl->mSharedMemoryFD, 0);
if(mMappedAddress == NULL)
{

2
indra/llrender/llgl.cpp
View File

@@ -68,6 +68,7 @@ BOOL gGLActive = FALSE;
std::ofstream gFailLog;
#if !LL_DARWIN //Darwin doesn't load extensions that way! -SG
void* gl_get_proc_address(const char *pStr)
{
void* pPtr = (void*)GLH_EXT_GET_PROC_ADDRESS(pStr);
@@ -77,6 +78,7 @@ void* gl_get_proc_address(const char *pStr)
}
#undef GLH_EXT_GET_PROC_ADDRESS
#define GLH_EXT_GET_PROC_ADDRESS(p) gl_get_proc_address(p)
#endif //!LL_DARWIN
void ll_init_fail_log(std::string filename)
{

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

@@ -436,7 +436,7 @@
<key>Type</key>
<string>String</string>
<key>Value</key>
<string>secondlife</string>
<string>Second Life</string>
</map>
<key>VivoxLicenseAccepted</key>

8
indra/newview/gpu_table.txt
View File

@@ -99,6 +99,14 @@ ATI Mobility Radeon HD 5500 .*ATI.*Mobility *HD *55.* 2 1
ATI Mobility Radeon HD 5600 .*ATI.*Mobility *HD *56.* 2 1
ATI Mobility Radeon HD 5700 .*ATI.*Mobility *HD *57.* 3 1
ATI Mobility Radeon HD 5800 .*ATI.*Mobility *HD *58.* 3 1
ATI Mobility Radeon HD 6200 .*ATI.*Mobility.*HD *62.* 3 1
ATI Mobility Radeon HD 6300 .*ATI.*Mobility.*HD *63.* 3 1
ATI Mobility Radeon HD 6400M .*ATI.*Mobility.*HD *64.* 3 1
ATI Mobility Radeon HD 6500M .*ATI.*Mobility.*HD *65.* 3 1
ATI Mobility Radeon HD 6600M .*ATI.*Mobility.*HD *66.* 3 1
ATI Mobility Radeon HD 6700M .*ATI.*Mobility.*HD *67.* 3 1
ATI Mobility Radeon HD 6800M .*ATI.*Mobility.*HD *68.* 3 1
ATI Mobility Radeon HD 6900M .*ATI.*Mobility.*HD *69.* 3 1
ATI Mobility Radeon X1xxx .*ATI.*Mobility.*X1.* 0 1
ATI Mobility Radeon X2xxx .*ATI.*Mobility.*X2.* 0 1
ATI Mobility Radeon X3xx .*ATI.*Mobility.*X3.* 1 1

11
indra/newview/hippopanelgrids.cpp
View File

@@ -294,12 +294,11 @@ bool HippoPanelGridsImpl::saveCurGrid()
{
HippoGridInfo *gridInfo = 0;
if (mState == NORMAL) {
gridInfo = gHippoGridManager->getGrid(mCurGrid);
gridInfo->retrieveGridInfo();
refresh();
} else if ((mState == ADD_NEW) || (mState == ADD_COPY)) {
gridInfo = gHippoGridManager->getGrid(mCurGrid);
gridInfo->retrieveGridInfo();
refresh();
if ((mState == ADD_NEW) || (mState == ADD_COPY)) {
// check nickname
std::string gridname = childGetValue("gridname");

1
indra/newview/hipporestrequest.cpp
View File

@@ -327,6 +327,7 @@ int HippoRestRequest::getBlocking(const std::string &url, std::string *result)
curl_easy_setopt(curlp, CURLOPT_NOSIGNAL, 1); // don't use SIGALRM for timeouts
curl_easy_setopt(curlp, CURLOPT_TIMEOUT, 5); // seconds
curl_easy_setopt(curlp, CURLOPT_CAINFO, gDirUtilp->getCAFile().c_str());
curl_easy_setopt(curlp, CURLOPT_WRITEFUNCTION, curlWrite);
curl_easy_setopt(curlp, CURLOPT_WRITEDATA, result);

2
indra/newview/llinventoryicon.cpp
View File

@@ -82,7 +82,7 @@ LLIconDictionary::LLIconDictionary()
addEntry(LLInventoryIcon::ICONNAME_ANIMATION, new IconEntry("inv_item_animation.tga"));
addEntry(LLInventoryIcon::ICONNAME_GESTURE, new IconEntry("inv_item_gesture.tga"));
addEntry(LLInventoryIcon::ICONNAME_CLOTHING_PHYSICS, new IconEntry("inv_item_physics.png"));
addEntry(LLInventoryIcon::ICONNAME_CLOTHING_PHYSICS, new IconEntry("inv_item_physics.tga"));
addEntry(LLInventoryIcon::ICONNAME_LINKITEM, new IconEntry("inv_link_item.tga"));
addEntry(LLInventoryIcon::ICONNAME_LINKFOLDER, new IconEntry("inv_link_folder.tga"));

2
indra/newview/llviewermenu.cpp
View File

@@ -808,7 +808,7 @@ void init_menus()
menu->appendSeparator();
menu->append(new LLMenuItemCallGL( "Fake Away Status", &handle_fake_away_status, NULL));
menu->append(new LLMenuItemCallGL( "Force Ground Sit", &handle_force_ground_sit, NULL));
menu->append(new LLMenuItemCallGL( "Phantom Avatar", &handle_phantom_avatar, NULL));
menu->append(new LLMenuItemCallGL( "Phantom Avatar", &handle_phantom_avatar, NULL, NULL, 'P', MASK_CONTROL | MASK_ALT));
menu->appendSeparator();
menu->append(new LLMenuItemCallGL( "Animation Override...",
&handle_edit_ao, NULL));

BIN
indra/newview/skins/default/textures/inv_item_physics.tga Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 1.0 KiB

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

@@ -31,7 +31,7 @@
width="400" />
</panel>
<panel border="true" left="1" bottom="-190" height="180" width="500" mouse_opaque="true"
follows="left|top|right|bottom" label="Tags\Colors" name="Tags\Colors">
follows="left|top|right|bottom" label="Tags/Colors" name="TagsColors">
<!-- Client tag options -->
<check_box bottom_delta="-25" control_name="AscentUseTag" enabled="true"
follows="left|top" font="SansSerifSmall" height="16" initial_value="true"

2
indra/newview/viewer_manifest.py
View File

@@ -801,7 +801,7 @@ class Linux_i686Manifest(LinuxManifest):
self.path("libELFIO.so")
#self.path("libopenjpeg.so.1.3.0", "libopenjpeg.so.1.3")
self.path("libalut.so")
self.path("libopenal.so", "libopenal.so.1")
self.path("libopenal.so.1")
self.path("libtcmalloc_minimal.so.0")
self.path("libtcmalloc_minimal.so.0.2.2")
self.end_prefix("lib")