57d60a95a2
minor: make logging messages consistent in BaseHttpServer
2009-12-15 16:23:57 +00:00
f8b6bc8d11
Merge branch 'master' into careminster
2009-12-15 15:46:18 +00:00
9aea69a549
Merge branch 'master' of melanie@opensimulator.org:/var/git/opensim
2009-12-15 15:43:42 +00:00
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
ffff12f7c1
Change default grid and inventory service ports in ConfigSettings to the ROBUST default of 8003
2009-12-15 15:37:03 +00:00
0020afaf67
Merge branch 'master' into tests
2009-12-15 06:01:59 -05:00
b8b4517211
Removed excessive call to UpdateMovementAnimations which prevented GroundSit; Corrected cause of 'sit on roof'.
2009-12-15 01:49:23 -05:00
9e54e61a43
Make the HG map search recognize host names without ports.
2009-12-14 08:27:16 -08:00
824d7190c2
Merge branch 'master' into careminster
2009-12-14 00:40:56 +00:00
0813dc8c1d
Merge branch 'master' of melanie@opensimulator.org:/var/git/opensim
2009-12-14 00:32:00 +00:00
c426549f53
Add an option to exit an instance rather than restarting a region within it
2009-12-14 00:31:15 +00:00
f046457249
Tweaking the ModifyLand packet to be async. Advice from Adam
2009-12-13 04:02:18 -05:00
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
87e89efbf9
* Mistaken ThreatLevel classification on osGetSimulatorMemory - should have been MODERATE.
2009-12-13 03:49:22 +11:00
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
30d64444a0
And reverse
2009-12-12 16:01:53 +00:00
9904700dfd
Another whitespace test commit
2009-12-12 16:00:44 +00:00
49dbae65c9
Merge branch 'master' into tests
2009-12-12 10:14:06 -05:00
b056c243e4
Commit partial work because of repo change
2009-12-12 10:12:59 -05:00
c00158b238
Reverse test commit (again)
2009-12-12 14:35:12 +00:00
794419852b
Another test
2009-12-12 14:23:20 +00:00
fbafd22124
Reverse text commit whitespace change
2009-12-12 13:43:49 +00:00
b9cd66d510
test commit
2009-12-12 13:33:45 +00:00
b310efc50f
Merge branch 'master' into careminster
2009-12-12 12:54:43 +00:00
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
35961caec6
Merge branch 'master' of ssh://MyConnection/var/git/opensim
2009-12-12 01:24:25 -05:00
0fdf883cbd
Merge branch 'master' into careminster
2009-12-12 04:56:28 +00:00
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
1382dc976c
Merge branch 'master' into careminster
2009-12-12 04:14:47 +00:00
83ca7db4b8
Merge branch 'master' of melanie@opensimulator.org:/var/git/opensim
2009-12-12 04:14:12 +00:00
81debdfebe
A few more guards along the path to user server.
2009-12-11 20:20:18 -08:00
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
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
4bbe9a51ac
Added an image uuid to objects marked "Show in search". Only works for boxes.
2009-12-11 09:09:36 -08:00
5f0478c4c4
Fix to make [bad] tests happy.
2009-12-11 08:28:24 -08:00
decd51f081
Attempt at fixing mantis #4411 .
2009-12-11 08:11:26 -08:00
54e4dcf454
Merge branch 'master' into careminster
2009-12-11 02:49:41 +00:00
204c59c5ac
Refix the fix
2009-12-11 02:42:05 +00:00
d68b664243
Kill a NRE caused by an error message trying to print unavailable data
2009-12-11 02:42:00 +00:00
f6b1344722
Refix the fix
2009-12-11 02:40:33 +00:00
5ffd59e7b8
Kill a NRE caused by an error message trying to print unavailable data
2009-12-10 22:09:16 -05:00
6d7c10b2b4
* Diagnosing a connection issue.
2009-12-11 13:19:32 +11:00
0889b5aef1
Fix version number
2009-12-10 18:20:40 +00:00
59ca92b10b
Merge branch 'tests' of kitto@tor.k-grid.com:/home/kitto/opensim into careminster
2009-12-10 18:17:29 +00:00
956f337046
Merge branch 'careminster' of kitto@tor.k-grid.com:/home/kitto/opensim into careminster
2009-12-09 22:07:03 +00:00
a6a6bf007a
Move osFunctions into a new Careminster script interface
2009-12-09 23:28:00 +01:00
2e9890bbe6
Merge branch 'careminster' of kitto@tor.k-grid.com:/home/kitto/opensim into careminster
2009-12-09 16:57:35 +00:00
f2427a7320
Merge branch 'master' into careminster
2009-12-09 16:57:26 +00:00
2a6dbd068e
Last bits and bobs to clean up the Meta7WindlightModule
2009-12-09 03:58:56 +01:00
d092977f4a
Windlight configuration option in ini, and migration
2009-12-09 01:53:41 +01:00
Justin Clark-Casey (justincc)