Adam Frisby
|
8df0331405
|
* Rex merge, Regions/ExtensionsScript
|
2008-02-23 04:10:30 +00:00 |
Adam Frisby
|
9559c3f6e6
|
* Rex merge, Region/Terrain
|
2008-02-23 04:07:00 +00:00 |
Adam Frisby
|
642ced53d1
|
* Rex merge, region/storage
|
2008-02-23 04:04:54 +00:00 |
Adam Frisby
|
bd57a81e76
|
* Rex merge, region/environment
|
2008-02-23 04:03:22 +00:00 |
Adam Frisby
|
dd96983915
|
* Rex merge, Environment/Scene
|
2008-02-23 04:02:11 +00:00 |
Adam Frisby
|
69c92d53cb
|
* Rex merge, SceneObjectPart - again appeared to merge OK
|
2008-02-23 04:00:26 +00:00 |
Adam Frisby
|
e22f84ee60
|
* Rex merge, SceneObjectGroup looked like it merged OK
|
2008-02-23 03:59:02 +00:00 |
Adam Frisby
|
7fdd23d249
|
* Rex merge, SceneEvents.cs did not merge smooth
|
2008-02-23 03:57:50 +00:00 |
Adam Frisby
|
26d477e32b
|
* Rex merge, Scene.cs - Did not merge smoothly.
|
2008-02-23 03:55:14 +00:00 |
Adam Frisby
|
ed9a866906
|
* Rex merge, environment/types
|
2008-02-23 03:50:35 +00:00 |
Adam Frisby
|
f62f24bb70
|
* Rex merge, environment/land
|
2008-02-23 03:48:19 +00:00 |
Adam Frisby
|
db76041e4e
|
* Rex merge, region modules.
|
2008-02-23 03:46:55 +00:00 |
Adam Frisby
|
3dfb31a49c
|
* Rex merge, Environment/Interfaces
|
2008-02-23 03:41:56 +00:00 |
Adam Frisby
|
34548a3d28
|
* Rex merge, SimpleApp
|
2008-02-23 03:38:51 +00:00 |
Adam Frisby
|
d6e571517f
|
* Rex merge, OGS1 Merged fairly cleanly.
|
2008-02-23 03:36:50 +00:00 |
Adam Frisby
|
fe50f2e6b9
|
* Rex merge, local communications -- LocalLoginService line 186 needs tweaking.
|
2008-02-23 03:34:31 +00:00 |
Adam Frisby
|
5745db2a35
|
* Rex merge, rest of clientstack. Clean merge.
|
2008-02-23 03:30:43 +00:00 |
Adam Frisby
|
726b7af464
|
* Rex merge, ClientView.cs - Nasty merge, needs cleaning.
|
2008-02-23 03:28:51 +00:00 |
Adam Frisby
|
da5f7dc959
|
* Rex merge, Region/Application - Note. Scene Constructor did not merge cleanly and needs tweaking.
|
2008-02-23 03:22:58 +00:00 |
mikkopa
|
778092e075
|
Part #2 of previous commit.
|
2008-02-20 08:25:07 +00:00 |