Lirusaito
72fe406f64
Merge branch 'master' of git://github.com/siana/SingularityViewer
2012-02-24 18:39:25 -05:00
Lirusaito
90ac174260
Added Ctrl-D for creating a landmark
...
Most browsers use this for creating bookmarks, landmarks are pretty much
the same.
2012-02-24 14:07:58 -05:00
Siana Gearz
0bdf54e6d9
This fixes Copy+Wear from object
2012-02-24 03:27:24 +01:00
Siana Gearz
10af9d64f2
One day this will be a memory stat
2012-02-24 03:26:06 +01:00
Lirusaito
b555e02220
Merge branch 'master' of git://github.com/siana/SingularityViewer
2012-02-23 16:27:46 -05:00
Siana Gearz
a1038f3972
Merge git://github.com/LightDrake/SingularityViewer
2012-02-23 03:06:19 +01:00
Siana Gearz
e207f2e025
Fix scroll buttons on dark skin
2012-02-23 02:29:59 +01:00
Siana Gearz
be37d9b5a9
Merge branch 'master' of git://github.com/AlericInglewood/SingularityViewer
2012-02-22 18:02:04 +01:00
Siana Gearz
e39327c017
Merge branch 'master' of git://github.com/TighMacFanatic/SingularityViewer
2012-02-22 18:01:45 +01:00
Lirusaito
2699fa8cf9
Merge branch 'master' of https://github.com/LightDrake/SingularityViewer
2012-02-22 11:23:59 -05:00
Lirusaito
513002416c
Corrected text to say viewer's website, since we are not Imprudence.
2012-02-22 09:50:19 -05:00
Lirusaito
22530cd77e
Prevent snapshot resolution from going over window size, when showing UI or HUD in snapshots is enabled.
...
Otherwise snapshots do not have UI/HUD shown, despite enabling RenderUIInSnapshot or RenderHUDInSnapshot.
2012-02-22 09:23:09 -05:00
Lirusaito
81521b98fd
Added gesture_muted icon, reworked the panel_audio to look better, and have mute gesture look more like the rest of the panel.
2012-02-22 06:22:05 -05:00
Drake Arconis
edbc22961e
Revert "Further OS X changes."
...
This reverts commit 803011582c .
2012-02-22 05:49:38 -05:00
Lirusaito
73c2feee97
Merge branch 'master' of git://github.com/AlericInglewood/SingularityViewer
2012-02-21 16:46:22 -05:00
Drake Arconis
3250725aae
Annoying Crash Fix.
...
This fixes that thing where saving scripts in deleted object makes
viewer go FFFFFF.
2012-02-21 10:56:27 -05:00
Drake Arconis
803011582c
Further OS X changes.
2012-02-21 10:53:47 -05:00
Drake Arconis
6388324552
Revert "This works for now. Need to do more testing."
...
This reverts commit c6d6eed7d3 .
2012-02-21 09:27:10 -05:00
Lirusaito
d4212d390d
Merge branch 'master' of git://github.com/TighMacFanatic/SingularityViewer
2012-02-20 17:27:52 -05:00
Lirusaito
2b8a55f396
Add DisableCameraConstraints to the "Camera Options:" checkboxes on Input & Camera Preferences(panel_preferences_input.xml)
2012-02-20 17:13:35 -05:00
TighMacFanatic
89f35779b4
Fixed Windlight presets not loading user created files.
2012-02-20 16:37:34 -05:00
Lirusaito
f253da09ec
Added gesture muting feature, like phoenix has.
2012-02-20 16:02:56 -05:00
Drake Arconis
ad1e3f1d2d
Merge remote-tracking branch 'upstream/master'
2012-02-20 07:19:35 -05:00
Siana Gearz
9477a5f32f
Fix code bug making notifications unreadable colour
2012-02-20 05:38:57 +01:00
Siana Gearz
8e71cf8e6e
Revert "Replace all NotifyCautionBoxColor's and AlertCautionBoxColor's that were using tan with black, like Emerald skin's NotifyCautionBoxColor."
...
This reverts commit 0fef1407e3 .
2012-02-20 05:05:57 +01:00
Siana Gearz
ea7396d2cf
Crashfix audio panel in skin
2012-02-20 05:05:53 +01:00
Drake Arconis
c6d6eed7d3
This works for now. Need to do more testing.
2012-02-19 19:43:53 -05:00
Aleric Inglewood
39f8deb498
Merge remote-tracking branch 'siana/master'
2012-02-19 23:54:59 +01:00
Drake Arconis
19f72cf967
Merge remote-tracking branch 'upstream/master'
2012-02-19 16:16:34 -05:00
Drake Arconis
a4363de59e
Updated APR and Zlib prebuilts.
2012-02-19 15:59:47 -05:00
Siana Gearz
c3aa321d51
Fix classic skin
2012-02-19 21:43:31 +01:00
Siana Gearz
9b268c3654
Fixing the crash in grid list
2012-02-19 20:07:17 +01:00
Drake Arconis
925c42294f
OS X Builds now.
...
Fixed building on OS X.
Fixed line endings.
Need to find better way to do fmodwrapper thing.
2012-02-19 11:30:27 -05:00
Siana Gearz
f7cc9c4d33
Hopefully more correctness in grid manager editor
2012-02-19 00:42:23 +01:00
Aleric Inglewood
66ccff964b
Comment out old Google Translate support and as such remove the need for JSON.
...
Note that on standalone, json headers are installed in json/,
no idea why in the packages this isn't the case... But anyway,
it isn't used at all anymore now so it doesn't really matter.
I didn't remove the json package for non-standalone and the
downloading thereof... (I can't test non-standalone).
2012-02-18 16:45:11 +01:00
Aleric Inglewood
0c82b8bd3a
Merge remote-tracking branch 'siana/master'
2012-02-18 02:23:26 +01:00
Aleric Inglewood
4e8b69206c
LLViewerRegion: now compiles and seems to work.
2012-02-18 02:22:49 +01:00
Aleric Inglewood
787e03e821
LLViewerRegion WIP: Sync indra/llmessage/llregionflags.h with V3
...
It seems a few flags disappeared; adjusted the code accordingly.
Should do the same as V3 now.
2012-02-18 02:22:49 +01:00
Aleric Inglewood
f381b0c2dd
LLViewerRegion WIP: Use LLViewerRegion::getCapAPI
...
Viewer 3 uses this in LLAgent::setStartPosition and
copy_inventory_from_notecard; so I brought those
up to speed with V3.
The viewer now uses LLViewerRegion::getCapAPI in all
the same place as V3.
2012-02-18 02:22:49 +01:00
Aleric Inglewood
b8744b9e6a
LLViewerRegion WIP: Added all headers that are dragged in.
...
Most in particular llevents.h, which comes along with
the demand that the old events in llevent.h are put
in a namespace LLOldEvents. Made all changes necessary
to compile the rest of the code again (without changing
the actual code: it's still using the old events).
This patch also removes LLStopWhenHandled and LLStandardSignal
from indra/llui/llnotifications.h because those are
moved to llevents.h. That seems to be the only change
to indra/llui/llnotifications.h that isn't floater related,
so I left the rest of that file alone.
2012-02-18 02:22:49 +01:00
Aleric Inglewood
59ee1a1041
LLViewerRegion WIP: Initial copy of llviewerregion.cpp
...
This is basically the changes in viewer 3 to this file,
except that I left alone:
1) We still have a cloud layer (mCloudLayer)
2) LLViewerRegion::regionFlagsToString still adds comma's
and a lot more flags.
3) We still have the extra accessor LLViewerRegion::getNetDetailsForLCD()
4) The actual capabilities requested in LLViewerRegionImpl::buildCapabilityNames
have been left alone and still request the same caps as before.
5) LLViewerRegion::meshUploadEnabled and LLViewerRegion::meshRezEnabled
have been left alone. They seems to do more work in our case,
checking if we have the capability SimulatorFeatures, and doing
something smart when that is not the case.
2012-02-18 02:22:48 +01:00
Aleric Inglewood
88d0983e37
LLViewerRegion WIP: this should compile now.
2012-02-18 02:22:48 +01:00
Aleric Inglewood
3680e022fc
LLViewerRegion: WIP - header changes and anticipated compile fixes
...
Does not compile now.
llviewerregion.cpp wasn't touched.
Other changes elsewhere in the code (like in llstartup.cpp) might still be needed.
2012-02-18 02:22:27 +01:00
Siana Gearz
a642b725e0
Merge branch 'master' of git://github.com/Lirusaito/SingularityViewer
2012-02-17 16:00:00 +01:00
Siana Gearz
dbc3a8c65f
Merge branch 'master' of git://github.com/AlericInglewood/SingularityViewer
2012-02-17 15:59:16 +01:00
Siana Gearz
60ded2ad14
Initial invisiprim support in deferred
2012-02-17 05:52:41 +01:00
Lirusaito
fa560a7081
Fixed up a few settings' strings to display more correct descriptions for ascent settings in debug settings.
2012-02-16 23:10:20 -05:00
Lirusaito
5023f23cc4
Alt-H for Teleport History, like Phoenix.
2012-02-16 20:09:30 -05:00
Lirusaito
0fef1407e3
Replace all NotifyCautionBoxColor's and AlertCautionBoxColor's that were using tan with black, like Emerald skin's NotifyCautionBoxColor.
...
Black is a far better color for white text to sit on than the former
harsh tan. This will allow users to read notifications like the ones
from changing server versions.
2012-02-16 19:40:36 -05:00
Lirusaito
a09c505fa0
The search line_editor in the status bar needed to be about 20% taller.
2012-02-16 18:28:50 -05:00