| Commit message (Collapse) | Author | Age | Files | Lines |
|\
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| | |
Conflicts:
.gitignore
linden/indra/newview/English.lproj/InfoPlist.strings
linden/indra/newview/llpanellogin.cpp
linden/indra/newview/res/viewerRes.rc
linden/indra/newview/skins/default/xui/en-us/panel_login.xml
linden/install.xml
Mostly went with my originals, manually merged llpaterrogin.cpp and panel_login.xml.
|
| |
| |
| |
| | |
compiled correctly
|
|\ \
| |/
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| | |
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
|
| |\
| | |
| | |
| | |
| | | |
Conflicts:
linden/indra/newview/viewer_manifest.py
|
| | |
| | |
| | |
| | |
| | |
| | |
| | | |
Warning was because writeToLog expected a char pointer, but was being
given string constants. Exact warning message was:
deprecated conversion from string constant to ‘char*’
|
| |/ |
|
|\ \
| |/
| |
| |
| |
| |
| | |
Conflicts (solved):
linden/indra/media_plugins/gstreamer010/media_plugin_gstreamer010.cpp
linden/indra/newview/llappviewer.cpp
linden/indra/newview/llappviewerwin32.cpp
|
| | |
|
| | |
|
| | |
|
| |
| |
| |
| | |
(notes: need to add archives for iconv and gstreamer to install.xml, doesn't link yet)
|
|/
|
|
|
|
| |
need to be reverted later.
Changed file names to.
|
| |
|
|
|
|
|
|
|
|
|
|
| |
See http://jira.secondlife.com/browse/SNOW-713
This patch makes llcommon shared. It contains the following snowglobe
(SVN) changesets: 3478, 3479, 3480, 3481, 3482, 3485, 3496, 3498, 3500,
3519 and 3531, plus the fix for all rejects. Note that changes
to scripts/automated_build_scripts/opensrc-build.sh (changesets 3500
and 3625) were ignored as we don't have scripts/automated_build_scripts.
|
|
|
|
| |
can be sorted on windows
|
| |
|
|
|
|
|
| |
who ever builds a release with that needs to consider to install some
really old gstreamer at /usr/local/lib - lenny has 0.10.19
|
| |
|
| |
|
| |
|
| |
|
| |
|
|
|