| Age | Commit message (Collapse) | Author | 
|---|
|  |  | 
|  | # Conflicts:
#	autobuild.xml
#	indra/cmake/CMakeLists.txt
#	indra/cmake/GoogleMock.cmake
#	indra/llaudio/llaudioengine_fmodstudio.cpp
#	indra/llaudio/llaudioengine_fmodstudio.h
#	indra/llaudio/lllistener_fmodstudio.cpp
#	indra/llaudio/lllistener_fmodstudio.h
#	indra/llaudio/llstreamingaudio_fmodstudio.cpp
#	indra/llaudio/llstreamingaudio_fmodstudio.h
#	indra/llcharacter/llmultigesture.cpp
#	indra/llcharacter/llmultigesture.h
#	indra/llimage/llimage.cpp
#	indra/llimage/llimagepng.cpp
#	indra/llimage/llimageworker.cpp
#	indra/llimage/tests/llimageworker_test.cpp
#	indra/llmessage/tests/llmockhttpclient.h
#	indra/llprimitive/llgltfmaterial.h
#	indra/llrender/llfontfreetype.cpp
#	indra/llui/llcombobox.cpp
#	indra/llui/llfolderview.cpp
#	indra/llui/llfolderviewmodel.h
#	indra/llui/lllineeditor.cpp
#	indra/llui/lllineeditor.h
#	indra/llui/lltextbase.cpp
#	indra/llui/lltextbase.h
#	indra/llui/lltexteditor.cpp
#	indra/llui/lltextvalidate.cpp
#	indra/llui/lltextvalidate.h
#	indra/llui/lluictrl.h
#	indra/llui/llview.cpp
#	indra/llwindow/llwindowmacosx.cpp
#	indra/newview/app_settings/settings.xml
#	indra/newview/llappearancemgr.cpp
#	indra/newview/llappearancemgr.h
#	indra/newview/llavatarpropertiesprocessor.cpp
#	indra/newview/llavatarpropertiesprocessor.h
#	indra/newview/llbreadcrumbview.cpp
#	indra/newview/llbreadcrumbview.h
#	indra/newview/llbreastmotion.cpp
#	indra/newview/llbreastmotion.h
#	indra/newview/llconversationmodel.h
#	indra/newview/lldensityctrl.cpp
#	indra/newview/lldensityctrl.h
#	indra/newview/llface.inl
#	indra/newview/llfloatereditsky.cpp
#	indra/newview/llfloatereditwater.cpp
#	indra/newview/llfloateremojipicker.h
#	indra/newview/llfloaterimsessiontab.cpp
#	indra/newview/llfloaterprofiletexture.cpp
#	indra/newview/llfloaterprofiletexture.h
#	indra/newview/llgesturemgr.cpp
#	indra/newview/llgesturemgr.h
#	indra/newview/llimpanel.cpp
#	indra/newview/llimpanel.h
#	indra/newview/llinventorybridge.cpp
#	indra/newview/llinventorybridge.h
#	indra/newview/llinventoryclipboard.cpp
#	indra/newview/llinventoryclipboard.h
#	indra/newview/llinventoryfunctions.cpp
#	indra/newview/llinventoryfunctions.h
#	indra/newview/llinventorygallery.cpp
#	indra/newview/lllistbrowser.cpp
#	indra/newview/lllistbrowser.h
#	indra/newview/llpanelobjectinventory.cpp
#	indra/newview/llpanelprofile.cpp
#	indra/newview/llpanelprofile.h
#	indra/newview/llpreviewgesture.cpp
#	indra/newview/llsavedsettingsglue.cpp
#	indra/newview/llsavedsettingsglue.h
#	indra/newview/lltooldraganddrop.cpp
#	indra/newview/llurllineeditorctrl.cpp
#	indra/newview/llvectorperfoptions.cpp
#	indra/newview/llvectorperfoptions.h
#	indra/newview/llviewerparceloverlay.cpp
#	indra/newview/llviewertexlayer.cpp
#	indra/newview/llviewertexturelist.cpp
#	indra/newview/macmain.h
#	indra/test/test.cpp | 
|  | LF, and trim trailing whitespaces as needed | 
|  |  | 
|  |  | 
|  |  | 
|  |  | 
|  | # Conflicts:
# indra/newview/llnetmap.cpp
# indra/newview/llnetmap.h | 
|  | controls, and the mini map | 
|  | info is likely unavailable | 
|  | options
Map rotation: Split minimap "Rotate Map" context menu option into two options: "North at top" and "Camera at top"
Zoom:
- Adjust minimap context menu zoom presets: New presets are "far", "medium", "close", and "very close"
- Change default minimap zoom level from 128 to 64
- Currently selected minimap zoom level is now checked
About Land: Add "About Land" button to minimap context menu
Reword: Rearrange and adjust capitalization of the various context menu options
Code change: Remove unused zoom handling code in LLFloaterMap | 
|  | remove auto center, click button to re-center | 
|  | click to show map vs double click to teleport) | 
|  | for sale info when available. Remove "shift-drag to pan" hint. | 
|  |  | 
|  |  | 
|  | using realtive coordinates
refactored LLCoord code to be templated, ultimately to support arbitrary conversions | 
|  |  | 
|  | teleport is on, allow beacon setting if not | 
|  | Reworked, as the original version clashed with the display names merge. | 
|  | Imported from Snowglobe. | 
|  | Imported from Snowglobe. | 
|  |  | 
|  | snuck back in | 
|  | Reviewed with Kelly | 
|  |  | 
|  | problem or not, does not reliably repro for me.  Found several uninitialized variables in LLNetMap and fixed those.  Reviewed with Richard. | 
|  | tooltips to 3D avatars, 2D avatar names, and 3D objects.  Refactors tooltips and text boxes, line editors, and text editors.  Breaks LLExpandableTextBox, but a fix is coming.
Resolved conflicts in lltexteditor.cpp, llchatitemscontainerctrl.cpp, llchatmsgbox.cpp, llfloaterbuycurrency.cpp, llnearbychat.cpp, floater_buy_currency.xml, and ru/strings.xml
Merging revisions 134925-135157 of svn+ssh://svn.lindenlab.com/svn/linden/branches/gooey/gooey-4 into C:\source\viewer-2.0.0-3, respecting ancestry | 
|  | svn+ssh://svn.lindenlab.com/svn/linden/branches/gooey/gooey-1 | 
|  |  | 
|  | ignore-dead-branch | 
|  | svn merge -r 121797:121853 svn+ssh://svn.lindenlab.com/svn/linden/branches/merge-event-system-7 | 
|  | svn+ssh://svn.lindenlab.com/svn/linden/branches/featurettes/featurettes-batch5-merge
Melinda (coco): 5th and final batch of featurettes. My work here is done. | 
|  | svn+ssh://svn/svn/user/phoenix/license_2009_merge into trunk. QAR-1165 | 
|  | svn+ssh://svn/svn/linden/branches/featurettes/featurettes-batch4-merge
Resolving QAR-1051 Merge featurettes batch #4 | 
|  | dataserver-is-deprecated | 
|  | QAR-424 | 
|  | QAR-369 | 
|  |  | 
|  | QAR-369 - viewer-cleanup2-7 81916 merged into release. | 
|  | 79986 : 80178 -> release.
QAR-290 = QAR-271 + QAR-191 | 
|  | svn+ssh://svn/svn/linden/branches/new-license into release. only changes files which are not deployed or the comments section of code. | 
|  |  |