Jonathan Freedman
|
84cf0ffbf1
|
Merge branch 'master' of git://opensimulator.org/git/opensim
|
2010-10-05 20:06:27 -04:00 |
|
Jonathan Freedman
|
593fc5c87a
|
Merge branch 'master' of git://opensimulator.org/git/opensim
|
2010-10-05 19:45:37 -04:00 |
|
Melanie
|
d8149373c1
|
Merge branch 'master' into careminster-presence-refactor
|
2010-10-06 00:27:10 +01:00 |
|
Melanie
|
613bdb40bd
|
Remove sirikata project
|
2010-10-06 00:22:08 +01:00 |
|
Melanie
|
7e6a047769
|
Remove defunct sirikata client stack
|
2010-10-06 00:20:41 +01:00 |
|
Melanie
|
5d61323192
|
Add the view generating method to the image generator interface
|
2010-10-05 23:49:21 +01:00 |
|
Melanie
|
b424af6187
|
Revert an accidental default value change
|
2010-10-05 23:06:29 +01:00 |
|
Melanie
|
4a171af0cc
|
Merge branch 'master' of melanie@opensimulator.org:/var/git/opensim
|
2010-10-05 22:57:05 +01:00 |
|
Melanie
|
eb491d2c36
|
Patch to allow other cam angles. Not complete. Thanks, Antont.
|
2010-10-05 22:56:20 +01:00 |
|
Jonathan Freedman
|
8f1acb890a
|
Merge branch 'master' of git://opensimulator.org/git/opensim
|
2010-10-05 14:17:18 -04:00 |
|
Jeff Ames
|
07122614d5
|
Formatting cleanup.
|
2010-10-04 22:44:22 -04:00 |
|
Melanie
|
ba0a19c228
|
Merge branch 'master' of melanie@opensimulator.org:/var/git/opensim
|
2010-10-05 02:12:35 +01:00 |
|
Jeff Ames
|
bc9f793a92
|
Formatting cleanup.
|
2010-10-04 21:28:17 -04:00 |
|
BlueWall
|
eb17d581d3
|
Make windlight set the default environment on start
|
2010-10-05 01:54:15 +01:00 |
|
Jeff Ames
|
eeca0ee009
|
Formatting cleanup.
|
2010-10-04 17:10:07 -04:00 |
|
Latif Khalifa
|
e55e93c994
|
Avoid throwing errors when adding existing meshes to the render scene
|
2010-10-04 06:02:28 +01:00 |
|
Latif Khalifa
|
cb6e4035c7
|
Avoid throwing errors when adding existing meshes to the render scene
|
2010-10-04 06:02:09 +01:00 |
|
Melanie
|
da6816c805
|
Merge branch 'master' into careminster-presence-refactor
|
2010-10-04 04:49:54 +01:00 |
|
Melanie
|
0e7e92b67f
|
Merge branch 'master' of melanie@opensimulator.org:/var/git/opensim
|
2010-10-04 04:49:09 +01:00 |
|
Diva Canto
|
37231e0941
|
Made the home agent handler check for xff if behind a proxy.
|
2010-10-03 21:21:02 -07:00 |
|
Latif Khalifa
|
67cfde3fb4
|
Added Meshmerizer rendering plugin for libomv
|
2010-10-04 04:48:42 +01:00 |
|
Latif Khalifa
|
adc3cfdcdc
|
Removed linden renderer
|
2010-10-04 04:44:33 +01:00 |
|
Latif Khalifa
|
940246f2d5
|
Use libomv 0.8.4.3445
|
2010-10-04 04:44:16 +01:00 |
|
Diva Canto
|
934ae03d44
|
Made the Gatekeeper proxy-able.
|
2010-10-03 20:35:26 -07:00 |
|
Melanie
|
78aea6239d
|
Revert "Add linden prim renderer and update libOMV"
This reverts commit 766ce9a141.
|
2010-10-04 04:25:44 +01:00 |
|
Melanie
|
f35a88663b
|
Revert "Fix a comment marker"
This reverts commit f89dd85f68.
|
2010-10-04 04:25:37 +01:00 |
|
Melanie
|
d4ba505c85
|
Revert "Add the matching PrimMesher.dll"
This reverts commit be301c5815.
|
2010-10-04 04:25:30 +01:00 |
|
Melanie
|
5715545c57
|
Revert "Replaced OpenMetaverse dlls with ones compiled in Windows."
This reverts commit eb0cde7959.
|
2010-10-04 04:25:10 +01:00 |
|
Diva Canto
|
2d5173c205
|
Merge branch 'master' of ssh://diva@opensimulator.org/var/git/opensim
|
2010-10-03 20:02:31 -07:00 |
|
Diva Canto
|
0772e19af2
|
Added viewer's channel, mac, and id0 to agent circuit data. Also moved client ip address to agent circuit data, so that it's always there.
|
2010-10-03 20:01:59 -07:00 |
|
Melanie
|
c19ac997b1
|
Merge branch 'master' into careminster-presence-refactor
|
2010-10-04 01:08:11 +01:00 |
|
Diva Canto
|
eb0cde7959
|
Replaced OpenMetaverse dlls with ones compiled in Windows.
|
2010-10-03 17:08:09 -07:00 |
|
Melanie
|
be301c5815
|
Add the matching PrimMesher.dll
|
2010-10-04 01:04:38 +01:00 |
|
Melanie
|
7bbc486c62
|
Merge branch 'master' into careminster-presence-refactor
|
2010-10-04 00:44:50 +01:00 |
|
Melanie
|
6ba7ee6b2e
|
Update libOMV
|
2010-10-04 00:44:27 +01:00 |
|
Melanie
|
f89dd85f68
|
Fix a comment marker
|
2010-10-04 00:17:48 +01:00 |
|
Melanie
|
766ce9a141
|
Add linden prim renderer and update libOMV
|
2010-10-04 00:10:08 +01:00 |
|
Melanie
|
90f9b7b7c4
|
Fix line endings
|
2010-10-04 00:37:18 +02:00 |
|
Melanie
|
50b03d08a8
|
Add linden prim renderer and update libOMV
|
2010-10-04 00:04:42 +02:00 |
|
Jonathan Freedman
|
e3099d48f9
|
Merge branch 'master' of git://opensimulator.org/git/opensim
|
2010-10-03 18:04:38 -04:00 |
|
Jonathan Freedman
|
69acf9c79b
|
* additional serveruri cleanup
|
2010-10-03 18:03:53 -04:00 |
|
Melanie
|
48988bf4e9
|
Merge branch 'master' into careminster-presence-refactor
|
2010-10-03 22:38:32 +01:00 |
|
Melanie
|
4d371b9d80
|
Merge branch 'master' of melanie@opensimulator.org:/var/git/opensim
|
2010-10-03 22:37:50 +01:00 |
|
Melanie
|
511751a733
|
I really have to say it again and again: e.Message is NOT enough data for
troubleshooting. It MUST be combined with e.StackTrace, or e.ToString() must
be used.
Fix one more instance of that cr.p
|
2010-10-03 22:36:27 +01:00 |
|
Diva Canto
|
72c1b09d57
|
Upgraded Mono.Addins.dll to 0.5, coming from here: http://monoaddins.codeplex.com/
|
2010-10-03 10:35:53 -07:00 |
|
Melanie
|
bda02da152
|
Add the Warp3D dll
|
2010-10-03 16:58:22 +01:00 |
|
Melanie
|
b4fe6da4eb
|
Add the Warp3D dll
|
2010-10-03 16:57:45 +01:00 |
|
Melanie
|
5910be236f
|
Merge branch 'master' into careminster-presence-refactor
|
2010-10-03 16:52:27 +01:00 |
|
Melanie
|
189cda1c3d
|
Merge branch 'master' of melanie@opensimulator.org:/var/git/opensim
|
2010-10-03 16:51:41 +01:00 |
|
Melanie
|
0b13cfa4dd
|
Port ExecutingDirectory from omfOS Util class.
|
2010-10-03 16:50:50 +01:00 |