Commit Graph

14791 Commits (6c3eb21440a323b8669326767cfc55beda2ff35c)

Author SHA1 Message Date
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
Melanie 4f70ac018b Adapt to core changes 2010-10-03 16:40:11 +01:00
Melanie 27340f616e Addign the new / renamed files for previous commit 2010-10-03 16:34:55 +01:00
Melanie ab4be3ffdf Initial port of the Warp3D map tile renderer 2010-10-03 16:34:17 +01:00
Diva Canto 0133619af2 Attempt at fixing mantis #5057 -- CPU pinned high with HGAssetBroker. 2010-10-02 17:02:02 -07:00
Jonathan Freedman 32ccc7a9d9 * refactor refactor refactor ServerURI 4 lyfe 2010-10-02 19:17:02 -04:00
Melanie 662976b602 Merge branch 'master' into careminster-presence-refactor 2010-10-02 20:12:36 +01:00
Melanie 6fc1ceb2ee So, the client can have an old idea of the object properties for the object when it goes to buy. This can cause a problem in the buy process. Additionally Hazim mentioned that the buy packets are spoofable. The core modules are the crowing glory example of best practice :P, so therefore, setting the example here, Validate Client sent Buy Data. WebAppSecurity 101, Never trust a client. Validate Validate Validate! Or you'll have problems whether intentional or not. 2010-10-02 20:11:43 +01:00
Melanie fd56fd2ce8 Merge branch 'master' into careminster-presence-refactor 2010-10-02 19:51:43 +01:00
Melanie 87c6386884 Reapplying the parts of the prior revert that were not derived from the
original patch
2010-10-02 18:47:26 +01:00
Melanie b01020b84a Revert "Forward-port 0.6 fix"
This reverts commit 90b51dc7d6.
2010-10-02 18:45:48 +01:00
Melanie f220a2c5eb Replace CalculateMass with a more accurate version, contributed by Ubit.
Thank you.
2010-10-02 00:24:16 +01:00
Melanie b40c91777c Replace CalculateMass with a more accurate version, contributed by Ubit.
Thank you.
2010-10-02 00:19:30 +02:00
Melanie 9f7f266f58 Replace CalculateMass with a better, contributed version 2010-10-02 00:18:52 +02:00
Melanie 2427e16b42 Merge branch 'master' of melanie@opensimulator.org:/var/git/opensim 2010-10-01 05:42:42 +01:00
BlueWall ffc1123ca5 adding -logconfig to Robust.exe
Adding -logconfig to Robust.exe. will still process the
	-logfile option, as before. No options given, the value
	"Robust.log" will be written in the ./bin directory
2010-10-01 05:42:18 +01:00
Melanie 7ad1b60eca Enforce region agent limit as set in estate tools 2010-09-30 20:01:55 +02:00
Master ScienceSim 9c6a591ad0 couple fixes to enable profiles in simian connector 2010-09-30 09:59:53 -07:00