| Commit message (Collapse) | Author | Age | Files | Lines |
|---|
| |\
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| | |
Unless otherwise stated, Imprudence changes accepted. The three images seem to be the same.
Conflicts:
.gitignore
linden/indra/develop.py
linden/indra/llcommon/llsdserialize_xml.cpp
linden/indra/newview/CMakeLists.txt
Manually combined MOAP, OTR, and WL changes from both.
linden/indra/newview/app_settings/default_grids.xml
Manually merged the grid collection.
Also updated IG info.
linden/indra/newview/hippoupdate.cpp
linden/indra/newview/llettherebelight.cpp
Just used the Imprudence copy.
linden/indra/newview/llviewermessage.cpp
Keep unbranding.
linden/indra/newview/llvoavatar.cpp
Manually merge client tags.
linden/indra/newview/res/viewerRes.rc
Manually merge version from Impy.
linden/indra/newview/skins/dark/colors_base.xml
Keep unbranding.
linden/indra/newview/skins/default/html/unabletoconnect.png
linden/indra/newview/skins/default/textures/icon_top_pick.tga
linden/indra/newview/skins/default/xui/en-us/floater_about.xml
Manual merging of contributors.
linden/indra/newview/skins/gemini/colors_base.xml
Keep unbranding.
linden/indra/newview/skins/gemini/textures/icon_top_pick.tga
linden/indra/newview/viewer_manifest.py
Manually merged boost, gstreamer, OTR, and name.
linden/indra/newview/viewerinfo.cpp
Manually merge the comment.
|
| | |
| |
| |
| |
| |
| |
| |
| | |
discussed on IRC and the mailing list, and remove some SL logos.
I know, there are two slightly different LICENSE-logos.txt files.
One that was originally in the source repo, one that was from the artwork package.
I'm a coder, not a lawyer, and not the owner of those copyrights, so left them as is.
|
| | |
| |
| |
| |
| | |
Some of them are things I would have to replace later for the meta branding.
But to stop in tree builds from bitching, for now use the ones from the pre build.
|
| | |
| |
| |
| |
| |
| | |
need to be reverted later.
Changed file names to.
|
| |/
|
|
|
| |
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.
|
| | |
|
| | |
|
| | |
|
| |
|
