Age | Commit message (Collapse) | Author |
|
|
|
|
|
|
|
# Conflicts:
# indra/newview/llagentwearables.cpp
# indra/newview/llvoicevivox.cpp
|
|
# Conflicts:
# autobuild.xml
# indra/newview/installers/windows/lang_pl.nsi
# indra/newview/llfloaterpreference.cpp
# indra/newview/llinventorymodel.cpp
|
|
This reverts commit 203ea3a70a775a09cbbffb1740ab7c58f1780baa, reversing
changes made to 8e3f0778863a5aa337d1148a243ea91d238a8ac5.
# Conflicts:
# indra/newview/llmachineid.cpp
|
|
another machine
|
|
# Conflicts:
# indra/newview/llappviewer.cpp
# indra/newview/llappviewerwin32.cpp
# indra/newview/llmachineid.cpp
|
|
|
|
# Conflicts:
# indra/newview/llinventorypanel.cpp
|
|
|
|
|
|
|
|
|
|
# Conflicts:
# indra/newview/llfloaterfixedenvironment.cpp
# indra/newview/skins/default/xui/en/strings.xml
|
|
|
|
|
|
|
|
|
|
This reverts commit 2d4a894b706d0dcbdc753318c2c400b0d3ee92b7.
|
|
|
|
|
|
create folders before inventory is loaded
|
|
|
|
# Conflicts:
# indra/newview/llimprocessing.cpp
|
|
button on the context menu
|
|
|
|
|
|
landmarks
|
|
|
|
location that is no longer valid
|
|
|
|
|
|
|
|
and logout without any changes to favorites.
|
|
|
|
|
|
favorite login locations
|
|
|
|
wide char paths; on other platforms they are now just typedefs to the std classes
|
|
respectively
|
|
respectively
|
|
when adding or removing a landmark from favorites
|
|
|
|
opening them for writing)
|
|
stored_favorites_<grid>.xml) for each grid.
|
|
|
|
is triggered.
|
|
|
|
|