| Commit message (Collapse) | Author | Age | Files | Lines |
|\
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| | |
Conflicts (manually merged):
linden/indra/llcommon/llversionviewer.h
linden/indra/llvfs/lldir.cpp
linden/indra/llvfs/lldir_mac.cpp
linden/indra/newview/CMakeLists.txt
linden/indra/newview/English.lproj/InfoPlist.strings
linden/indra/newview/Info-Imprudence.plist
linden/indra/newview/Info-meta-impy.plist
linden/indra/newview/llappviewer.cpp
linden/indra/newview/llpanellogin.cpp
linden/indra/newview/packaging/mac/Info.plist.in
linden/indra/newview/res/viewerRes.rc
linden/indra/newview/skins/default/xui/en-us/floater_about.xml
linden/indra/newview/skins/default/xui/en-us/panel_preferences_advanced.xml
linden/indra/newview/skins/default/xui/en-us/panel_preferences_graphics1.xml
linden/indra/newview/skins/default/xui/en-us/panel_preferences_im.xml
linden/indra/newview/skins/default/xui/en-us/panel_preferences_skins.xml
linden/indra/newview/skins/default/xui/en-us/panel_preferences_web.xml
linden/indra/newview/skins/default/xui/zh/menu_viewer.xml
linden/indra/newview/skins/default/xui/zh/panel_group_general.xml
linden/indra/newview/viewer_manifest.py
linden/indra/newview/viewerversion.cpp
linden/indra/newview/viewerversion.h
linden/install.xml
Also some post merge tweaks.
|
| |
| |
| |
| | |
the Open Icon Library (http://openiconlibrary.sourceforge.net)
|
| |\
| | |
| | |
| | |
| | |
| | |
| | | |
Conflicts:
linden/indra/llcommon/CMakeLists.txt
linden/indra/newview/llvoavatar.cpp
linden/indra/newview/viewer_manifest.py
|
| | | |
|
| | | |
|
| | |
| | |
| | |
| | | |
(cherry picked from commit 4f471ff939d1ad9b62280f11c5cf597cfc2c8596)
|
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | | |
libpangocairo-1.0.so* was missing. I did a complete new rebuild of the
package with, as usual, debian Lenny (stable) package. This tar ball
contains the following debian packages:
libatk1.0-0_1.22.0-1_i386.deb
libatk1.0-dev_1.22.0-1_i386.deb
libcairo2_1.6.4-7_i386.deb
libcairo2-dev_1.6.4-7_i386.deb
libpango1.0-common_1.20.5-6_all.deb
libpango1.0-0_1.20.5-6_i386.deb
libpango1.0-dev_1.20.5-6_i386.deb
libgtk2.0-0_2.12.12-1~lenny2_i386.deb
libgtk2.0-dev_2.12.12-1~lenny2_i386.deb
libpixman-1-0_0.10.0-2_i386.deb
libpixman-1-dev_0.10.0-2_i386.deb
But only the 'copyright' file from doc/*, only the include/* files and
only the lib*.so files. Most notably, not pkgconfig, resources,
configuration files and modules... (those are absent in the previous
prebuilts too).
(cherry picked from commit e8e2de0cf70dd56e8a6c41bf5a83bb71bf6d27e5)
|
| | |
| | |
| | |
| | |
| | |
| | | |
libs (linux)
(cherry picked from commit a3cffd06a0e7aa92e1b6c28e7bad655b7085296c)
|
| | | |
|
| | |
| | |
| | |
| | |
| | |
| | | |
appears to cause could not connect to DNS errors
This reverts commit 22df1e279e6f7f57c7463351d9b93927d0fd10e6.
|
| | | |
|
| | |
| | |
| | |
| | | |
Contains DejaVu Sans Condensed, Liberation Sans, and Vera Mono.
|
| | | |
|
| | | |
|
| | | |
|
| | | |
|
| | | |
|
| | | |
|
| | |
| | |
| | |
| | | |
little easter egg while I was there ;)
|
| | |
| | |
| | |
| | | |
bleh
|
| | | |
|
| | | |
|
| | | |
|
| | |
| | |
| | |
| | | |
artwork package
|
|\ \ \
| |/ /
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | | |
Conflicts: (Keeping these around as a record, there was some strangeness.
.gitignore
linden/indra/media_plugins/gstreamer010/media_plugin_gstreamer010.cpp
linden/indra/newview/llfloaterregioninfo.cpp
linden/indra/newview/llfloatertos.cpp
linden/indra/newview/llpanellogin.cpp
linden/indra/newview/skins/default/html/en-us/loading-error/index.html
linden/indra/newview/skins/default/html/en-us/loading/loading.html
linden/indra/newview/skins/default/xui/en-us/floater_about.xml
linden/install.xml
|
| | | |
|
| | | |
|
| | |
| | |
| | |
| | | |
update
|
| | | |
|
| | | |
|
| | |
| | |
| | |
| | | |
this also replaces glib, iconv, and libxml
|
| | |
| | |
| | |
| | | |
however the old reference in install.xml is kept commented for linux32 in case it causes trouble
|
| | | |
|
|\ \ \
| |/ /
|/| | |
|
| |\ \
| | | |
| | | |
| | | |
| | | |
| | | |
| | | | |
Conflicts (solved):
linden/indra/media_plugins/gstreamer010/media_plugin_gstreamer010.cpp
linden/indra/newview/llappviewer.cpp
linden/indra/newview/llappviewerwin32.cpp
|
| | | |
| | | |
| | | |
| | | |
| | | | |
My policy is to have it all in the repo. None of this downloading pre built stuff from people with no guarantee that
they will still have the files a month from now. Been burnt with that before.
|
| |/ /
|/| | |
|
| | |
| | |
| | |
| | | |
Note: only VS2005 libs currently included
|
|\ \ \
| |/ /
|/| | |
|
| | | |
|
|/ /
| |
| |
| |
| |
| |
| |
| | |
Bandaid for this compile error when linking media_plugin_webkit.dylib:
Undefined symbols:
"LLEmbeddedBrowserWindowObserver::onRequestFilePicker(LLEmbeddedBrowserWindowEvent const&)", referenced from:
vtable for MediaPluginWebKitin media_plugin_webkit.o
|
|\ \
| | |
| | |
| | |
| | |
| | |
| | | |
Conflicts:
linden/indra/newview/viewer_manifest.py
Trivial proximity collision. Resolved.
|
| | | |
|
| |\ \ |
|
| | |\ \ |
|
| | | | |
| | | | |
| | | | |
| | | | |
| | | | | |
I missed this one cause it's install in a different directory than all
the other header files.
|
| | | | |
| | | | |
| | | | |
| | | | | |
depend on libdirectfb etc.
|
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | | |
libpangocairo-1.0.so* was missing. I did a complete new rebuild of the
package with, as usual, debian Lenny (stable) package. This tar ball
contains the following debian packages:
libatk1.0-0_1.22.0-1_i386.deb
libatk1.0-dev_1.22.0-1_i386.deb
libcairo2_1.6.4-7_i386.deb
libcairo2-dev_1.6.4-7_i386.deb
libpango1.0-common_1.20.5-6_all.deb
libpango1.0-0_1.20.5-6_i386.deb
libpango1.0-dev_1.20.5-6_i386.deb
libgtk2.0-0_2.12.12-1~lenny2_i386.deb
libgtk2.0-dev_2.12.12-1~lenny2_i386.deb
libpixman-1-0_0.10.0-2_i386.deb
libpixman-1-dev_0.10.0-2_i386.deb
But only the 'copyright' file from doc/*, only the include/* files and
only the lib*.so files. Most notably, not pkgconfig, resources,
configuration files and modules... (those are absent in the previous
prebuilts too).
|
| | |/ /
| |/| |
| | | |
| | | | |
SL2.3. This includes a more stable version of llqtwebkit for Windows
|
| | | |
| | | |
| | | |
| | | | |
Required for a DSO libllcommon
|