fa0621b486
Merge branch 'master' into careminster
2009-12-22 00:41:56 +00:00
e530180c1e
Glue code for a couple of new LSL function implementations
2009-12-22 00:26:12 +00:00
84a1a0a729
Merge branch 'master' into careminster
2009-12-21 22:07:22 +00:00
1fe8a1beaf
Merge branch 'master' of melanie@opensimulator.org:/var/git/opensim
2009-12-21 22:06:17 +00:00
32904c0ce8
When a script has been loaded, remove it's state entry, so recompiling
...
doesn't pick up the old state again.
2009-12-21 22:05:43 +00:00
dcafb1dfcd
Merge branch 'master' of ssh://diva@opensimulator.org/var/git/opensim
2009-12-21 08:55:43 -08:00
4a33ee9fb9
Bug fix: set the map image upon hyperlinking regions.
2009-12-21 08:55:12 -08:00
51ecdf0148
Merge branch 'master' of melanie@opensimulator.org:/var/git/opensim
2009-12-21 15:48:46 +00:00
d04f6688e4
Fixes some incorrect values returned by llGetPrimitiveParams() and osGetLinkPrimitiveParams().
...
Signed-off-by: Melanie <melanie@t-data.com>
2009-12-21 15:48:30 +00:00
641a789bbc
Merge branch 'master' of ssh://diva@opensimulator.org/var/git/opensim
2009-12-21 07:46:33 -08:00
68187f7245
Bug fix: in standalone, HGInventoryBroker needs to get the local inventory server URL from NetworkServersInfo.
2009-12-21 07:44:17 -08:00
b891291135
Merge branch 'master' into careminster
2009-12-21 15:02:57 +00:00
86104cd45c
Merge branch 'master' of ssh://diva@opensimulator.org/var/git/opensim
2009-12-21 06:59:36 -08:00
c0a8c2e707
Making the library read the item's flag, so that clothing items can have the proper icons.
2009-12-21 06:58:21 -08:00
1e55d74c5c
Merge branch 'master' of melanie@opensimulator.org:/var/git/opensim
2009-12-21 14:47:40 +00:00
de59910758
Patch from Ziah.
...
Mantis #4456 : Patch to implement some minor MRM Functions : SitTarget,
SitTargetText, TouchText and Text
2009-12-21 14:46:07 +00:00
d8d6e8a304
Merge branch 'master' into casper
2009-12-21 13:29:48 +01:00
e3c1466047
Fixed a nasty crash in StandUp() that occurred when the part got killed with an avatar sitting on it.
2009-12-21 13:22:52 +01:00
df30b1c832
Merge branch 'master' into careminster
2009-12-21 10:28:50 +00:00
27453890d5
Script State Fix: Part 2
...
Change the reader to wrap old-style definitions in new style wrappers.
Change importer to not check irrelevant data that can't be reconstructed
This removes the last bit of knowledge of XEngine's .state files from core.
2009-12-21 10:26:52 +00:00
83d8ba5775
Remove extra checking on the itemID of saved state, since it changes during
...
rez from inventory.
2009-12-21 06:41:10 +00:00
f6ef487413
Script State Fix: Step 1
...
Add Engine=xxx attribute and check for it's presence. Ignore state data
written bby another engine
2009-12-21 06:29:23 +00:00
3d3e0ea4f3
Merge branch 'master' into careminster
2009-12-20 16:45:28 +00:00
37b07aa9ec
Fix a case where an idle sim can eat 100% of a core
2009-12-20 16:44:31 +00:00
c7a457f9ee
Merge branch 'casper'
2009-12-20 16:20:48 +01:00
31bf25d05e
Reverted my changes to jhurliman's packet stack since it currently causes more problems than it resolves. The stack DOES need a rework particularly with regards to priorities, but this is not it.
2009-12-20 16:18:43 +01:00
eecaa3d9dd
Merge branch 'tests'
2009-12-19 20:00:00 -05:00
e38e8ae987
Fix mantis #10 & #14
2009-12-19 19:54:44 -05:00
26e3a8ee4b
* Bug fix in HG: preserve the home region coordinates across multiple HG TPs.
...
* Removed unnecessary debug messages.
2009-12-19 10:16:07 -08:00
6dbe25360e
Add cmSetWindlightSceneTargeted. Add restrictions on windlight script use.
2009-12-17 18:40:34 +01:00
6483470ec5
Fix GetWorldRotation(), and a host of related Sit fixes.
2009-12-17 02:54:02 -05:00
83fad75e22
Merge branch 'tests'
2009-12-16 18:59:46 -05:00
9485f17bf9
random drive-by minor math optimization. No need for concern, bitshed was within acceptable limits
2009-12-15 19:12:24 -08:00
7cd44c1a81
Fix prim linking bug, Manis #14
2009-12-15 20:04:53 -05:00
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
668604c203
Delete obsolete AssetInventoryServer.ini.example which was for the removed cable beach component
2009-12-15 16:50:23 +00:00
6bd087a8f9
minor: remove some mono compiler warnings
2009-12-15 16:42:42 +00:00
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
00365fff02
Merge branch 'master' of ssh://justincc@opensimulator.org/var/git/opensim
2009-12-15 16:24:29 +00:00
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
Melanie