Commit Graph

11843 Commits (fd4a059e9bf0beda9907e90da8c78cc48d88eb98)

Author SHA1 Message Date
Kitto Flora 7cd44c1a81 Fix prim linking bug, Manis #14 2009-12-15 20:04:53 -05:00
Justin Clark-Casey (justincc) ba7552665c remove OpenSim.GridServer.ini.example that has been folded into ROBUST
please revert if I'm wrong
2009-12-15 18:21:10 +00:00
Justin Clark-Casey (justincc) 668604c203 Delete obsolete AssetInventoryServer.ini.example which was for the removed cable beach component 2009-12-15 16:50:23 +00:00
Justin Clark-Casey (justincc) 6bd087a8f9 minor: remove some mono compiler warnings 2009-12-15 16:42:42 +00:00
Justin Clark-Casey (justincc) 87e9062862 Make sure that we catch and display any exceptions that get right to the top of our incoming http request handling stack 2009-12-15 16:34:27 +00:00
Justin Clark-Casey (justincc) 00365fff02 Merge branch 'master' of ssh://justincc@opensimulator.org/var/git/opensim 2009-12-15 16:24:29 +00:00
Justin Clark-Casey (justincc) 57d60a95a2 minor: make logging messages consistent in BaseHttpServer 2009-12-15 16:23:57 +00:00
Melanie f8b6bc8d11 Merge branch 'master' into careminster 2009-12-15 15:46:18 +00:00
Melanie 9aea69a549 Merge branch 'master' of melanie@opensimulator.org:/var/git/opensim 2009-12-15 15:43:42 +00:00
Melanie 0f616d2ffe Prevent OSSL from crashing if the sim was loaded from a remote config and
osGetGridName, osGetGridNick or osGetGridLoginURI is used.
2009-12-15 15:42:51 +00:00
Justin Clark-Casey (justincc) ffff12f7c1 Change default grid and inventory service ports in ConfigSettings to the ROBUST default of 8003 2009-12-15 15:37:03 +00:00
Kitto Flora 0020afaf67 Merge branch 'master' into tests 2009-12-15 06:01:59 -05:00
Kitto Flora b8b4517211 Removed excessive call to UpdateMovementAnimations which prevented GroundSit; Corrected cause of 'sit on roof'. 2009-12-15 01:49:23 -05:00
Diva Canto 9e54e61a43 Make the HG map search recognize host names without ports. 2009-12-14 08:27:16 -08:00
Melanie 824d7190c2 Merge branch 'master' into careminster 2009-12-14 00:40:56 +00:00
Melanie 0813dc8c1d Merge branch 'master' of melanie@opensimulator.org:/var/git/opensim 2009-12-14 00:32:00 +00:00
Melanie c426549f53 Add an option to exit an instance rather than restarting a region within it 2009-12-14 00:31:15 +00:00
Teravus Ovares (Dan Olivares) f046457249 Tweaking the ModifyLand packet to be async. Advice from Adam 2009-12-13 04:02:18 -05:00
Teravus Ovares (Dan Olivares) 4ef8dc7d96 * Add some glue that allows LocalPacketHandlers to decide if they want the packet to be processed asynchronously or not.
* Make several packets not asynchronous (such as AgentUpdate).    In theory, all fast returning packet handling methods should not be asynchronous.   Ones that wait on an external resource or a long held lock, should be asynchronous.
2009-12-13 02:08:28 -05:00
Adam Frisby 87e89efbf9 * Mistaken ThreatLevel classification on osGetSimulatorMemory - should have been MODERATE. 2009-12-13 03:49:22 +11:00
Adam Frisby 963cf25813 * Implements OSSL function: osGetSimulatorMemory - returns the current amount of memory allocated to the simulator process (Moderate Threat Level).
* Cleans redundant information out of the Simulator Version. Versions now look like:
"OpenSimulator 0.6.9(dev) Unix/Mono"
* [Minor] additional log info for MySQLInventoryData
2009-12-13 03:04:16 +11:00
Melanie 30d64444a0 And reverse 2009-12-12 16:01:53 +00:00
Melanie 9904700dfd Another whitespace test commit 2009-12-12 16:00:44 +00:00
Kitto Flora 49dbae65c9 Merge branch 'master' into tests 2009-12-12 10:14:06 -05:00
Kitto Flora b056c243e4 Commit partial work because of repo change 2009-12-12 10:12:59 -05:00
Melanie c00158b238 Reverse test commit (again) 2009-12-12 14:35:12 +00:00
Melanie 794419852b Another test 2009-12-12 14:23:20 +00:00
Melanie fbafd22124 Reverse text commit whitespace change 2009-12-12 13:43:49 +00:00
Melanie b9cd66d510 test commit 2009-12-12 13:33:45 +00:00
Melanie b310efc50f Merge branch 'master' into careminster 2009-12-12 12:54:43 +00:00
Teravus Ovares (Dan Olivares) 0639e90f56 * Bugfix mantis 4441, "Use of Autopilot isn't playing any animations."
* Turns out the new animator used a different movement bitflag then the one used in the code to autopilot the avatar
2009-12-12 02:41:59 -05:00
Teravus Ovares (Dan Olivares) 35961caec6 Merge branch 'master' of ssh://MyConnection/var/git/opensim 2009-12-12 01:24:25 -05:00
Melanie 0fdf883cbd Merge branch 'master' into careminster 2009-12-12 04:56:28 +00:00
Kunnis d89f3e9811 Getting rid of SimpleRegionInfo and SerializableRegionInfo per Mel
Signed-off-by: Melanie <melanie@t-data.com>
2009-12-12 04:44:32 +00:00
Melanie 1382dc976c Merge branch 'master' into careminster 2009-12-12 04:14:47 +00:00
Melanie 83ca7db4b8 Merge branch 'master' of melanie@opensimulator.org:/var/git/opensim 2009-12-12 04:14:12 +00:00
Diva Canto 81debdfebe A few more guards along the path to user server. 2009-12-11 20:20:18 -08:00
Kunnis 62ec60ca76 Getting rid of a bunch of old classes, that are likely left over from the ROBUST change.
Signed-off-by: Melanie <melanie@t-data.com>
2009-12-12 04:13:39 +00:00
Diva Canto d20fe7bfdd A couple of more sanity guards, but this won't fix things when user profile fetching is borked. 2009-12-11 20:06:42 -08:00
Diva Canto 4bbe9a51ac Added an image uuid to objects marked "Show in search". Only works for boxes. 2009-12-11 09:09:36 -08:00
Diva Canto 5f0478c4c4 Fix to make [bad] tests happy. 2009-12-11 08:28:24 -08:00
Diva Canto decd51f081 Attempt at fixing mantis #4411. 2009-12-11 08:11:26 -08:00
Melanie 54e4dcf454 Merge branch 'master' into careminster 2009-12-11 02:49:41 +00:00
Melanie 204c59c5ac Refix the fix 2009-12-11 02:42:05 +00:00
grid d68b664243 Kill a NRE caused by an error message trying to print unavailable data 2009-12-11 02:42:00 +00:00
Melanie f6b1344722 Refix the fix 2009-12-11 02:40:33 +00:00
grid 5ffd59e7b8 Kill a NRE caused by an error message trying to print unavailable data 2009-12-10 22:09:16 -05:00
Adam Frisby 6d7c10b2b4 * Diagnosing a connection issue. 2009-12-11 13:19:32 +11:00
Melanie 0889b5aef1 Fix version number 2009-12-10 18:20:40 +00:00
Melanie 59ca92b10b Merge branch 'tests' of kitto@tor.k-grid.com:/home/kitto/opensim into careminster 2009-12-10 18:17:29 +00:00