Commit Graph

177 Commits

Author SHA1 Message Date
Siana Gearz
6d5d90bd92 Merge branch 'spamui' of git://github.com/TighMacFanatic/SingularityViewer 2011-05-12 15:16:17 +02:00
Siana Gearz
b3847fdeed Build fixes 2011-05-11 23:06:49 +02:00
Aleric Inglewood
a6cb676d4a Add AIDirPicker and use it. Remove indra/newview/ll{dir,file}picker.{h,cpp}.
Also removed some code from the Mac/windows code in
indra/plugins/filepicker/llfilepicker.cpp that shouldn't
be in there anymore (send_agent_pause/resume and updating
the LLFrameTimer stuff).
2011-05-11 03:01:34 +02:00
TighMacFanatic
107c3cb70a Merge https://github.com/TighMacFanatic/SingularityViewer
Conflicts:
	indra/newview/CMakeLists.txt
	indra/newview/app_settings/settings.xml
2011-05-09 22:06:00 -04:00
Aleric Inglewood
e89d6d9d66 Split plugin classes and derive AIFilePicker from BasicPluginBase (part 1).
This commit contains all changes, except those in indra/media_plugins
(which was renamed to indra/plugins) and indra/llplugin.

However, it does contain the (new) file
indra/plugins/filepicker/basic_plugin_filepicker.cpp
2011-05-08 17:10:38 +02:00
Aleric Inglewood
f6b57d956d Added base class AIStateMachine.
This is the skeleton needed to implement classes that can be reused and
work together, which can perform asynchronous tasks (read: need to wait
for certain events before they can continue).

An example would be the task of waiting for a given inventory folder to
be read. This could then be used to improve the builtin AO
(automatically reading that folder when a notecard is dropped, and
continuing when the whole folder is read).

It's first use will be communication with a filepicker that runs
in a plugin.
2011-05-08 17:08:48 +02:00
Aleric Inglewood
094587aefd Make viewer compile on standalone linux x86_64
This involves making libllcommon shared, a change
that was not finished for windows/Mac.
More changes are needed to indra/newview/viewer_manifest.py
for those two operating systems, as well as to
indra/copy_win_scripts.

I did not test this on linux 32bit, nor non-standalone
on that OS, either.

I did not check voice (which will very likely not work
anyway on 64bit). And currently the webkit plugin doesn't
work for me, but I'll fix that in a different commit.
2011-05-02 19:40:33 +02:00
Siana Gearz
38849c1328 Merge git://github.com/AlericInglewood/SingularityViewer
Conflicts:
	indra/newview/CMakeLists.txt
	indra/newview/app_settings/settings.xml
2011-05-01 22:55:18 +02:00
Aleric Inglewood
26c40255aa Remove CR from configuration, source and xml files. 2011-05-01 22:16:05 +02:00
TighMacFanatic
56c357911e Chat keyword highlighting 2011-05-01 02:31:05 -04:00
Shyotl
2dff12433c Avatar Physics innital commit. No edit panel. SavedSettings not plugged in yet. 2011-04-28 10:09:11 -05:00
Siana Gearz
04b3dee767 Merge remote-tracking branch 'shyotl/V2TextureSystem' 2011-04-26 00:28:58 +02:00
Siana Gearz
b6c0436c1b Merge branch 'master' of github.com:siana/SingularityViewer 2011-04-26 00:23:01 +02:00
Shyotl
5954e0d71c Merge branch 'master' into V2TextureSystem
Conflicts:
	indra/newview/llfloaterexport.cpp
2011-04-24 03:31:31 -05:00
tmac@latestevidence.com
af203533b3 Spell check added 2011-04-23 18:08:59 -04:00
Siana Gearz
955ca21298 OpenSim compatible prim backup 2011-04-19 01:33:09 +02:00
Siana Gearz
25b4452a12 Sometimes i build offline too 2011-04-18 23:39:47 +02:00
Siana Gearz
5d5231fe8c Removed Import/Export 2011-04-18 23:28:27 +02:00
Shyotl
4d4c49cd24 Merge branch 'master' into V2TextureSystem
Conflicts:
	indra/newview/llviewerimage.cpp
	indra/newview/pipeline.h
2011-04-12 22:29:49 -05:00
Siana Gearz
fd8866c411 Sione's Media Filter 2011-04-08 19:53:41 +02:00
Shyotl
e756140e1d Innitial commit of experimental v2 texture system port work. Compiles and runs on windows, at least. Fixing bugs as they come.
Need to test:
localassetbrowser
preview related floaters
hgfloatertexteditor
maps
media textures! Currently very hacky
web browser
alpha masks on avatars
bumpmaps
Are all sky components appearing?
LLViewerDynamicTexture (texture baking, browser, animated textures, anim previews, etc)
Snapshot related features
Customize avatar
vfs floater
UI textures in general
Texture priority issues
2011-03-31 03:22:01 -05:00
Siana Gearz
179f4ddabb The Octopus Feature
___
                     .-'   `'.
                    /         \
                    |         ;
                    |         |           ___.--,
           _.._     |0) ~ (0) |    _.---'`__.-( (_.
    __.--'`_.. '.__.\    '--. \_.-' ,.--'`     `""`
   ( ,.--'`   ',__ /./;   ;, '.__.'`    __
   _`) )  .---.__.' / |   |\   \__..--""  """--.,_
  `---' .'.''-._.-'`_./  /\ '.  \ _.-~~~````~~~-._`-.__.'
        | |  .' _.-' |  |  \  \  '.               `~---`
         \ \/ .'     \  \   '. '-._)
          \/ /        \  \    `=.__`~-.
     jgs  / /\         `) )    / / `"".`\
    , _.-'.'\ \        / /    ( (     / /
     `--~`   ) )    .-'.'      '.'.  | (
            (/`    ( (`          ) )  '-;
             `      '-;         (-'
2011-03-24 23:54:23 +01:00
Siana Gearz
689337eb8c Merge remote branch 'origin/unimap2' 2011-03-16 01:40:29 +01:00
Siana Gearz
34fe62ba53 Need not this any longer, it's all in git 2011-03-15 16:33:09 +01:00
Siana Gearz
e63279a692 Amazon world map 2011-03-13 02:52:56 +01:00
Siana Gearz
633b6d22f2 Emerald Local Assets 2011-03-03 03:30:58 +01:00
Siana Gearz
8d85f67757 Imprudence AO 2011-03-01 04:16:54 +01:00
Siana Gearz
f7109a0131 Ripped out Inertia AO 2011-02-27 16:34:57 +01:00
Siana Gearz
d2896a0947 OpenSim compatible world map. YUCK!!! 2011-02-24 11:31:39 +01:00
Shyotl
3deb857ba1 Disabled llcommon.dll copying build step as it's now being linked statically. 2011-02-23 01:46:29 -06:00
siana
31b3c8e755 Singularity 1.5.4(2) fixes 2011-02-21 15:15:55 +01:00
Shyotl
000f102722 Backwards compatability for pre VC9 installs lacking updated resource compiler. (Uses pre-vista icon format)
To support newer icon with VC8:
 -Replace VC/bin/rcdll.dll with newer from Windows SDK 7.0
 -Run develop.py with -DVISTA_ICON:BOOL=ON setting
2011-02-15 17:17:45 -06:00
Siana Gearz
d962b05a9e Hippo Grid Manager 2011-01-29 18:23:56 +01:00
Siana Gearz
7805feb08f Now we're Vivox license compliant 2011-01-07 17:07:00 +01:00
Siana Gearz
037593aa99 Google tcmalloc 2011-01-01 02:56:41 +01:00
Siana Gearz
f9dcb1bb09 RLVa 1.1.2 to 1.1.3 upgrade. InvLinks + COF 2010-11-25 23:47:11 +01:00
Siana Gearz
d68736da39 Put in some changes along sg1.4 dev history. 2010-11-21 15:57:44 +01:00
Siana Gearz
6866a36a5c Display names from Phoenix. Thanks Wolfspirit!
That's quite a piece of work. I have NO idea how Jess can downplay the
effort that went into this.

And it's still not complete, local chat is not affected, perhaps group
chat too.
2010-11-20 15:25:57 +01:00
Siana Gearz
e6806f3b16 Branding pt2 2010-11-15 10:45:16 +01:00
Siana Gearz
9dffb18c25 ld.gold on linux, useless spam 2010-11-13 04:45:10 +01:00
Siana Gearz
17a0d13b0c Merge shyotl, setting include broken (disabled) 2010-11-09 15:14:34 +01:00
Siana Gearz
d7a1575ad2 Merged Ascent progress - title picker 2010-11-08 22:59:46 +01:00
Siana Gearz
740b570168 Merged in RLVa. Viewer broken! 2010-11-07 05:05:47 +01:00
Beeks
395100fef6 Henri's Group Title picker.
Signed-off-by: Beeks <HgDelirium@gmail.com>
2010-10-26 22:48:00 -04:00
Beeks
537e396882 Qarl's new Align tool.
Signed-off-by: Beeks <HgDelirium@gmail.com>
2010-10-22 02:40:40 -04:00
unknown
4929460c66 COA stuff rolled into gSavedSettings.
Added common script<->client command junk.
2010-10-19 18:50:47 -05:00
Siana Gearz
3d60deaf31 Worked through rejects from sg1.5 merge. Went in smoothly O.o 2010-10-18 13:45:04 +02:00
Beeks
015bfe5bd7 Preliminary work for Day Cycle selecting.
Signed-off-by: Beeks <HgDelirium@gmail.com>
2010-10-06 14:44:29 -04:00
November
fdebf7f06a Git is hard. Let's go shopping. (Branding changes, minor cleanup, cache isolated, new Vorbis libs in install.xml) 2010-09-26 22:54:00 -07:00
Beeks
c8e5512b5c Complete removal of Export Region code - There is no reason to even leave this in commented.
Signed-off-by: Beeks <HgDelirium@gmail.com>
2010-09-14 22:41:23 -04:00