diff options
| author | Jacek Antonelli | 2009-09-09 12:27:11 -0500 |
|---|---|---|
| committer | Jacek Antonelli | 2009-09-10 02:26:28 -0500 |
| commit | e944c5086e47e92e7952e5a43c68f01108899656 (patch) | |
| tree | c47ff63c4dcae473cd07a0dbcbc9d52636e6061e /ChangeLog.txt | |
| parent | Commented out Linux tarball building. (diff) | |
| parent | looks like working now (diff) | |
| download | meta-impy-e944c5086e47e92e7952e5a43c68f01108899656.zip meta-impy-e944c5086e47e92e7952e5a43c68f01108899656.tar.gz meta-impy-e944c5086e47e92e7952e5a43c68f01108899656.tar.bz2 meta-impy-e944c5086e47e92e7952e5a43c68f01108899656.tar.xz | |
Merged 'armin/grid-manager5' into login-manager
Conflicts:
linden/indra/newview/CMakeLists.txt
linden/indra/newview/llpanellogin.cpp
Diffstat (limited to 'ChangeLog.txt')
| -rw-r--r-- | ChangeLog.txt | 67 |
1 files changed, 67 insertions, 0 deletions
diff --git a/ChangeLog.txt b/ChangeLog.txt index 76e06ed..54cac64 100644 --- a/ChangeLog.txt +++ b/ChangeLog.txt | |||
| @@ -1,5 +1,72 @@ | |||
| 1 | 2009-09-09 Jacek Antonelli <jacek.antonelli@gmail.com> | 1 | 2009-09-09 Jacek Antonelli <jacek.antonelli@gmail.com> |
| 2 | 2 | ||
| 3 | * Merged in Grid Manager, etc. (thanks Armin). | ||
| 4 | |||
| 5 | modified: linden/indra/llcommon/llstring.h | ||
| 6 | modified: linden/indra/newview/CMakeLists.txt | ||
| 7 | new file: linden/indra/newview/app_settings/default_grids.xml | ||
| 8 | modified: linden/indra/newview/app_settings/settings.xml | ||
| 9 | new file: linden/indra/newview/authentication_controller.cpp | ||
| 10 | new file: linden/indra/newview/authentication_controller.h | ||
| 11 | new file: linden/indra/newview/authentication_floater.cpp | ||
| 12 | new file: linden/indra/newview/authentication_floater.h | ||
| 13 | new file: linden/indra/newview/authentication_model.cpp | ||
| 14 | new file: linden/indra/newview/authentication_model.h | ||
| 15 | new file: linden/indra/newview/controllerlogin.cpp | ||
| 16 | new file: linden/indra/newview/controllerlogin.h | ||
| 17 | new file: linden/indra/newview/controllerpasswords.cpp | ||
| 18 | new file: linden/indra/newview/controllerpasswords.h | ||
| 19 | new file: linden/indra/newview/floaterlogin.cpp | ||
| 20 | new file: linden/indra/newview/floaterlogin.h | ||
| 21 | new file: linden/indra/newview/hippoGridManager.cpp | ||
| 22 | new file: linden/indra/newview/hippoGridManager.h | ||
| 23 | new file: linden/indra/newview/hippoLimits.cpp | ||
| 24 | new file: linden/indra/newview/hippoLimits.h | ||
| 25 | new file: linden/indra/newview/hippoRestRequest.cpp | ||
| 26 | new file: linden/indra/newview/hippoRestRequest.h | ||
| 27 | new file: linden/indra/newview/hippoUpdate.cpp | ||
| 28 | new file: linden/indra/newview/hippoUpdate.h | ||
| 29 | modified: linden/indra/newview/llagent.cpp | ||
| 30 | modified: linden/indra/newview/llappviewer.cpp | ||
| 31 | modified: linden/indra/newview/llappviewer.h | ||
| 32 | modified: linden/indra/newview/llappviewerlinux.h | ||
| 33 | modified: linden/indra/newview/llcallingcard.cpp | ||
| 34 | modified: linden/indra/newview/llcallingcard.h | ||
| 35 | modified: linden/indra/newview/llchatbar.cpp | ||
| 36 | modified: linden/indra/newview/lldrawable.h | ||
| 37 | modified: linden/indra/newview/llfloaterworldmap.cpp | ||
| 38 | modified: linden/indra/newview/llfloaterworldmap.h | ||
| 39 | modified: linden/indra/newview/llinventorymodel.cpp | ||
| 40 | modified: linden/indra/newview/llinventorymodel.h | ||
| 41 | modified: linden/indra/newview/llinventoryview.cpp | ||
| 42 | modified: linden/indra/newview/llpanellogin.cpp | ||
| 43 | modified: linden/indra/newview/llpanellogin.h | ||
| 44 | modified: linden/indra/newview/llprogressview.cpp | ||
| 45 | modified: linden/indra/newview/llstartup.cpp | ||
| 46 | modified: linden/indra/newview/llstartup.h | ||
| 47 | modified: linden/indra/newview/lluserauth.cpp | ||
| 48 | modified: linden/indra/newview/llviewerjointattachment.h | ||
| 49 | modified: linden/indra/newview/llviewermenu.cpp | ||
| 50 | modified: linden/indra/newview/llviewermenufile.cpp | ||
| 51 | modified: linden/indra/newview/llviewermessage.cpp | ||
| 52 | modified: linden/indra/newview/llviewermessage.h | ||
| 53 | modified: linden/indra/newview/llviewernetwork.cpp | ||
| 54 | modified: linden/indra/newview/llviewernetwork.h | ||
| 55 | modified: linden/indra/newview/llviewerobject.h | ||
| 56 | modified: linden/indra/newview/llviewerwindow.cpp | ||
| 57 | modified: linden/indra/newview/llvoavatar.cpp | ||
| 58 | modified: linden/indra/newview/llwearablelist.cpp | ||
| 59 | modified: linden/indra/newview/llworld.cpp | ||
| 60 | new file: linden/indra/newview/prefpanelpasswords.cpp | ||
| 61 | new file: linden/indra/newview/prefpanelpasswords.h | ||
| 62 | modified: linden/indra/newview/skins/default/xui/en-us/alerts.xml | ||
| 63 | new file: linden/indra/newview/skins/default/xui/en-us/floater_login.xml | ||
| 64 | modified: linden/indra/newview/skins/default/xui/en-us/floater_world_map.xml | ||
| 65 | modified: linden/indra/newview/skins/default/xui/en-us/menu_viewer.xml | ||
| 66 | modified: linden/indra/newview/skins/default/xui/en-us/panel_login.xml | ||
| 67 | modified: linden/indra/newview/skins/default/xui/en-us/panel_preferences_network.xml | ||
| 68 | |||
| 69 | |||
| 3 | * Commented out Linux tarball building. | 70 | * Commented out Linux tarball building. |
| 4 | It's a waste of time to package after every compile. | 71 | It's a waste of time to package after every compile. |
| 5 | 72 | ||