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

Skip libfmodwrapper.dylib if it is not found (instead of erroring out of build); add missing enumeration values for media events to stubs

Browse Source
This commit is contained in:
Bill Barnhill
2011-08-09 00:04:34 -04:00
committed by Siana Gearz
parent ff0c7a1925
commit 851a80d266
3 changed files with 80 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

36
indra/newview/llmediactrl.cpp
View File

@@ -967,6 +967,42 @@ void LLMediaCtrl::handleMediaEvent(LLPluginClassMedia* self, EMediaEvent event)
}; };
break; break;
case MEDIA_EVENT_NAVIGATE_ERROR_PAGE:
{
LL_DEBUGS("Media") << "Media event: MEDIA_EVENT_NAVIGATE_ERROR_PAGE" << LL_ENDL;
};
break;
case MEDIA_EVENT_CLOSE_REQUEST:
{
LL_DEBUGS("Media") << "Media event: MEDIA_EVENT_CLOSE_REQUEST" << LL_ENDL;
};
break;
case MEDIA_EVENT_PICK_FILE_REQUEST:
{
LL_DEBUGS("Media") << "Media event: MEDIA_EVENT_PICK_FILE_REQUEST" << LL_ENDL;
};
break;
case MEDIA_EVENT_GEOMETRY_CHANGE:
{
LL_DEBUGS("Media") << "Media event: MEDIA_EVENT_GEOMETRY_CHANGE" << LL_ENDL;
};
break;
case MEDIA_EVENT_AUTH_REQUEST:
{
LL_DEBUGS("Media") << "Media event: MEDIA_EVENT_AUTH_REQUEST" << LL_ENDL;
};
break;
case MEDIA_EVENT_LINK_HOVERED:
{
LL_DEBUGS("Media") << "Media event: MEDIA_EVENT_LINK_HOVERED" << LL_ENDL;
};
break;
default: default:
{ {
LL_WARNS("Media") << "Media event: unknown event type" << LL_ENDL; LL_WARNS("Media") << "Media event: unknown event type" << LL_ENDL;

36
indra/newview/llviewerparcelmedia.cpp
View File

@@ -562,6 +562,42 @@ void LLViewerParcelMedia::handleMediaEvent(LLPluginClassMedia* self, EMediaEvent
}; };
break; break;
case MEDIA_EVENT_NAVIGATE_ERROR_PAGE:
{
LL_DEBUGS("Media") << "Media event: MEDIA_EVENT_NAVIGATE_ERROR_PAGE" << LL_ENDL;
};
break;
case MEDIA_EVENT_CLOSE_REQUEST:
{
LL_DEBUGS("Media") << "Media event: MEDIA_EVENT_CLOSE_REQUEST" << LL_ENDL;
};
break;
case MEDIA_EVENT_PICK_FILE_REQUEST:
{
LL_DEBUGS("Media") << "Media event: MEDIA_EVENT_PICK_FILE_REQUEST" << LL_ENDL;
};
break;
case MEDIA_EVENT_GEOMETRY_CHANGE:
{
LL_DEBUGS("Media") << "Media event: MEDIA_EVENT_GEOMETRY_CHANGE" << LL_ENDL;
};
break;
case MEDIA_EVENT_AUTH_REQUEST:
{
LL_DEBUGS("Media") << "Media event: MEDIA_EVENT_AUTH_REQUEST" << LL_ENDL;
};
break;
case MEDIA_EVENT_LINK_HOVERED:
{
LL_DEBUGS("Media") << "Media event: MEDIA_EVENT_LINK_HOVERED" << LL_ENDL;
};
break;
default: default:
{ {
LL_WARNS("Media") << "Media event: unknown event type" << LL_ENDL; LL_WARNS("Media") << "Media event: unknown event type" << LL_ENDL;

7
indra/newview/viewer_manifest.py
View File

@@ -510,8 +510,13 @@ class DarwinManifest(ViewerManifest):
"libexpat.0.5.0.dylib"): "libexpat.0.5.0.dylib"):
self.path(os.path.join(libdir, libfile), libfile) self.path(os.path.join(libdir, libfile), libfile)
#libfmodwrapper.dylib # For using FMOD for sound...but, fmod is proprietary so some might not use it...
try:
self.path(self.args['configuration'] + "/libfmodwrapper.dylib", "libfmodwrapper.dylib") self.path(self.args['configuration'] + "/libfmodwrapper.dylib", "libfmodwrapper.dylib")
pass
except:
print "Skipping libfmodwrapper.dylib - not found"
pass
# our apps # our apps
try: try: