Tonya Souther
|
cec54eddb1
|
Build fix for 64-bit. Should work on 32-bit builds too.
|
2013-07-11 11:44:25 -05:00 |
|
Tonya Souther
|
65941a5493
|
Removing unused file and fixing 64-bit -fPIC flag.
|
2013-07-11 11:40:49 -05:00 |
|
Ansariel
|
160a8bb5f7
|
Fix web profiles not loading on web tab in legacy profiles
|
2013-07-11 18:31:22 +02:00 |
|
Ansariel
|
6466f50279
|
SSR shader update
|
2013-07-11 18:00:47 +02:00 |
|
Cinders
|
047e68e2cf
|
Update mac application icon from Phoenix to Firestorm
|
2013-07-11 09:44:34 -06:00 |
|
PanteraPolnocy
|
fd0d386c51
|
Removing duplicated debug setting option
|
2013-07-11 17:36:38 +02:00 |
|
Ansariel
|
1c481f82be
|
Update SSR from Tofu Buzzard with latest version from https://bitbucket.org/tofu_linden/screen-space-reflections2
|
2013-07-11 16:24:19 +02:00 |
|
Tonya Souther
|
6424baa0e6
|
Moving OpenSim logo up in the background image a bit to clear the location bar if turned on.
|
2013-07-11 08:55:26 -05:00 |
|
Cinders
|
f85cea1a30
|
Use the variable we've already got to derive the flavor
|
2013-07-11 07:40:37 -06:00 |
|
Tonya Souther
|
24a19d988c
|
Fix installer template directory search logic.
|
2013-07-11 08:28:59 -05:00 |
|
Ansariel
|
71a973370b
|
Updated German translation
|
2013-07-11 13:13:14 +02:00 |
|
Ansariel
|
548f139cd5
|
Fix RLVa merge issue
|
2013-07-11 12:46:37 +02:00 |
|
PanteraPolnocy
|
111b39a12b
|
Connected incoming voice call sound with UI Sounds panels
|
2013-07-11 12:28:13 +02:00 |
|
PanteraPolnocy
|
7985683413
|
Connected inventory offer sound with UI Sounds panels
|
2013-07-11 12:08:45 +02:00 |
|
PanteraPolnocy
|
106f97a0c7
|
Follow up of the previous commit
|
2013-07-11 11:50:17 +02:00 |
|
PanteraPolnocy
|
1947445742
|
Removing sound tied to the "TeleportOffered" notification. Firestorm has separate "UISndTeleportOffer" UUID support for that event.
|
2013-07-11 11:35:18 +02:00 |
|
PanteraPolnocy
|
b2ed936a77
|
Minor "Do Not Disturb" notification adjustement - path to Autoresponse in prefs
|
2013-07-11 11:29:11 +02:00 |
|
Tonya Souther
|
904f5f7018
|
Background and .dmg icons for OpenSim versions.
|
2013-07-11 01:53:24 -05:00 |
|
Cinders
|
c3dc7d7a50
|
Fix generating the settings file
|
2013-07-10 23:51:23 -06:00 |
|
Cinders
|
33c2f01d60
|
Fix som tests related to grid handler
|
2013-07-10 21:57:13 -06:00 |
|
Cinders
|
71480bdf5f
|
Fixed package naming, laid groundwork to separate our two flavours of viewers.
|
2013-07-10 21:56:28 -06:00 |
|
Cinders
|
44cd20cb31
|
Add a --no-opensim flag to configure_firestorm.sh for good measure.
|
2013-07-10 21:28:17 -06:00 |
|
Tonya Souther
|
b1f474bd51
|
Fix merge breakage when building OS X distribution .dmg package.
|
2013-07-10 19:47:04 -05:00 |
|
Nicky
|
5dc1d38b1c
|
Merge.
|
2013-07-11 00:37:49 +02:00 |
|
Nicky
|
9dc9cbdb49
|
Remove --login_channel as arg to viewer_manifest (Linux only).
|
2013-07-11 00:37:30 +02:00 |
|
Ansariel
|
8696410d79
|
Remove duplicated "Invite to Group" entry in menu_people_nearby.xml
|
2013-07-10 22:51:40 +02:00 |
|
Nicky
|
2c3254431c
|
Fix breakpad stub for Mac.
|
2013-07-10 22:31:15 +02:00 |
|
Tonya Souther
|
9f3d8b9070
|
Adding file removed in merges. Ported from LL sources.
|
2013-07-10 15:20:48 -05:00 |
|
Nicky
|
8783e0f8db
|
Merge.
|
2013-07-10 22:09:56 +02:00 |
|
Nicky
|
f2e264b9c7
|
libbreakpad_client.so.0 isn't needed anymore. Linux statically links against breakpad now.
|
2013-07-10 22:08:30 +02:00 |
|
Cinders
|
d26d1484fe
|
Remove osslconstants.h It's now unused.
|
2013-07-10 13:50:47 -06:00 |
|
Cinders
|
b04e370472
|
Trivial whitespace change in configure_firestorm.sh (make stuff line up)
|
2013-07-10 13:50:19 -06:00 |
|
Nicky
|
99f664ad36
|
Correct MD5 for linux fmodex.
|
2013-07-10 21:45:29 +02:00 |
|
Nicky
|
d46efb30e9
|
Merge.
|
2013-07-10 21:28:11 +02:00 |
|
Nicky
|
0c688f0e8f
|
Reintroduce building without breakpad + fix a merge error in llapp.cpp for Linux breakpad initialization.
|
2013-07-10 21:27:55 +02:00 |
|
Ansariel
|
ea4e1eda82
|
Fix typo in configure_firestorm.sh
|
2013-07-10 21:11:39 +02:00 |
|
Nicky
|
6c5e2db29f
|
Backout e0895986ee0f to reintroduce building without breakpad.
|
2013-07-10 21:10:07 +02:00 |
|
Nicky
|
507d83b8c3
|
Merge.
|
2013-07-10 20:45:31 +02:00 |
|
Nicky
|
50364b9566
|
Add log throttling to stop log spam flooding log files.
|
2013-07-10 20:43:18 +02:00 |
|
Cinders
|
f426fba9f2
|
Support passing --opensim and --avx to build
|
2013-07-10 12:31:24 -06:00 |
|
Ansariel
|
155ea0bcb0
|
Fix colors.xml in AnsaStorm too
|
2013-07-10 20:10:22 +02:00 |
|
Cinders
|
6e866ee6b5
|
Make darwin not only build, but make it run too.
|
2013-07-10 11:29:56 -06:00 |
|
Cinders
|
3d61114776
|
Fix Installer string for mac build
|
2013-07-10 11:11:51 -06:00 |
|
Cinders
|
c05490a1e1
|
Merge fix, bad token in colors.xml
|
2013-07-10 11:10:52 -06:00 |
|
Ansariel
|
9dcaba0e13
|
Synchronize AnsaStorm color definitions with default skin
|
2013-07-10 17:59:38 +02:00 |
|
Cinders
|
d07715b5cf
|
More cleanup for mac build
|
2013-07-10 09:48:56 -06:00 |
|
Ansariel
|
fd47401e03
|
Updated German translation
|
2013-07-10 17:26:01 +02:00 |
|
Ansariel
|
38ad14bf1f
|
Fix broken XML in floater_tools.xml
|
2013-07-10 17:23:12 +02:00 |
|
Cinders
|
ebc93cc77a
|
Add Info-Firestorm.plist
|
2013-07-10 08:47:56 -06:00 |
|
Cinders
|
fcacf02582
|
More merge fixing
|
2013-07-10 08:40:00 -06:00 |