Melanie
e6e12c2d42
Merge branch 'avination'
2012-05-02 00:32:28 +02:00
Melanie
98e9f22544
Preserve attachment rotation on objects rezzed via a script. Makes toasters
...
work right, finally.
2012-05-02 00:29:56 +02:00
Melanie
fc3cf2b5a3
Fix saving of attachment positions
2012-05-01 23:21:28 +02:00
Melanie
4b982db252
Merge branch 'master' into careminster
...
Conflicts:
OpenSim/Data/MySQL/MySQLAssetData.cs
OpenSim/Data/MySQL/MySQLSimulationData.cs
OpenSim/Data/MySQL/MySQLUserAccountData.cs
2012-04-30 19:04:38 +01:00
Justin Clark-Casey (justincc)
b678ea18b2
Create TestHelpers.EnableLogging() and DisableLogging() to turn logging on and off within tests.
...
This makes *.Tests.dll.config files no longer needed, hence deleted.
2012-04-30 18:44:22 +01:00
Justin Clark-Casey (justincc)
cc482d2d56
Add TBG Renfold to contributors
2012-04-30 17:39:11 +01:00
TBG Renfold
9c2a73b61e
llGenerateKey implementation. Creates a random UUID I.E: UUID.Random().ToString();
...
Signed-off-by: TBG Renfold <tbg.renfold@g2mv.co.uk>
2012-04-30 17:36:49 +01:00
Justin Clark-Casey (justincc)
d0598c63f3
refactor: Simplify by combining SafeSendControlsToScripts() from fe8e835
into SendControlsToScripts() (instead of SendControlToScripts()).
2012-04-30 17:33:08 +01:00
Oren Hurvitz
fe8e835bfc
Fixed: scripted controls didn't work if the avatar was sitting down
...
This fixes a bug introduced in 6473674bbf
2012-04-30 17:18:15 +01:00
Justin Clark-Casey (justincc)
4ad45934c6
If there are no new prim items to store then don't bother opening the MySqlConnection only to do nothing with it.
2012-04-30 16:00:31 +01:00
Justin Clark-Casey (justincc)
522eff6138
Consistently use using() to make sure we dispose of used MySqlCommands where this is not already being done.
2012-04-30 15:54:35 +01:00
Melanie
ad12b5df49
Merge branch 'master' into careminster
2012-04-29 02:23:54 +01:00
UbitUmarov
c7c0d5558b
remove repeated set of group rotation to physics
2012-04-29 01:00:46 +01:00
UbitUmarov
df9935273f
SOG bug fix in group rotations updates
2012-04-29 00:41:51 +01:00
Melanie
174fa4a70f
Merge branch 'avination'
2012-04-29 01:33:40 +02:00
UbitUmarov
dd745f60c2
fix llGetCenterOfMass ( checked with ubitODE only)
2012-04-28 21:36:38 +01:00
Justin Clark-Casey (justincc)
8380166251
Comment out debug [ASYNC DELETER] messages for now.
2012-04-28 00:39:40 +01:00
Justin Clark-Casey (justincc)
cd755fe598
Remove mono compiler warning. Adjust message log to error from info
2012-04-28 00:31:11 +01:00
Justin Clark-Casey (justincc)
133f05dc41
Add text about using double quotes to surround console command arguments containing spaces to "help" text.
...
e.g. show object name "My long object name"
2012-04-28 00:29:08 +01:00
Justin Clark-Casey (justincc)
2bad430ed8
Put scene object related console commands into new "Objects" help category rather than "Regions"
2012-04-28 00:08:04 +01:00
Justin Clark-Casey (justincc)
ab71779221
Revert "Revert "Implement bulk inventory update over CAPS (not recursive by design,""
...
This reverts commit a90b0e302c
.
Sorry, accidentally reverted this completely by mistake, reverting the revert.
2012-04-27 23:54:45 +01:00
Justin Clark-Casey (justincc)
737e177163
Revert "Log the full exception when errors occur in BaseHttpServer"
...
This reverts commit e31e7c68c8
.
Applied for patch assessment and accidentally committed too early.
2012-04-27 23:46:46 +01:00
Justin Clark-Casey (justincc)
a90b0e302c
Revert "Implement bulk inventory update over CAPS (not recursive by design,"
...
This reverts commit 6e7f13a72d
.
2012-04-27 23:46:33 +01:00
Justin Clark-Casey (justincc)
da29cbccfa
Merge branch 'master' of ssh://opensimulator.org/var/git/opensim
2012-04-27 23:39:13 +01:00
Justin Clark-Casey (justincc)
d25469f66e
Add flags information (phantom, physics, etc.) to "show object" and "show part" console commands
2012-04-27 23:38:25 +01:00
UbitUmarov
e48fa38ff5
Oooops don't hover underground but do hover
2012-04-27 23:18:54 +01:00
UbitUmarov
f5cb403e7e
reorder priority of vehicle hover flags
2012-04-27 22:59:57 +01:00
Melanie
dcbcbd697f
Merge branch 'master' into careminster
...
Conflicts:
OpenSim/Region/ScriptEngine/Shared/Api/Implementation/Plugins/SensorRepeat.cs
2012-04-27 22:28:09 +01:00
Oren Hurvitz
e31e7c68c8
Log the full exception when errors occur in BaseHttpServer
2012-04-27 21:52:04 +01:00
BlueWall
db566fbb09
Fix prebuild.xml
...
adding a reference to a dll requires 'path="..."'
2012-04-27 16:17:46 -04:00
Oren Hurvitz
6473674bbf
Fixed: custom walking animations didn't stop when the avatar stopped walking.
...
This happened because the scripts were notified about control changes (e.g., the user stopped pressing the Forward key) when the animation was still WALK, so the script didn't stop the walking animation. Fixing this required: a) Update the movement animation *before* notifying the script; b) Add locking to prevent clashes with the Heartbeat thread (which also updates the animations); c) Handle the case of a user who stops walking just as the avatar is in the air: the avatar should STAND in that case, not WALK.
This reverts commit feef1dd732
.
2012-04-27 20:47:02 +01:00
Oren Hurvitz
9622e8ac72
If a Grid God teleports then include the Godlike teleport flag. This can affect the starting position in the destination region.
2012-04-27 20:22:35 +01:00
Oren Hurvitz
37d770f814
Use DotNetZip to compress OARs and IARs.
...
DotNetZip provides much better compression than standard .NET.
2012-04-27 19:46:31 +01:00
Justin Clark-Casey (justincc)
9d1791def8
Add Stefan_Boom / stoehr to contributors
2012-04-27 19:42:12 +01:00
Justin Clark-Casey (justincc)
e39e4f6bfb
minor: style adjustments in SensorRepeat, mainly related to patch from stoehr
2012-04-27 19:40:19 +01:00
Stefan_Boom
b35a1d5681
Fixing wrong position of llSensor, SensePoint wasnt following the rotation of the root prim.
2012-04-27 19:31:50 +01:00
Diva Canto
9bc94c502a
MapImageService: changed the event at which the map tiles are uploaded, because they were being uploaded before the region was registered with the grid
2012-04-27 11:05:40 -07:00
Diva Canto
a9dbe39319
MapImage security issue. Compare strings instead of IPAddresses.
2012-04-27 10:39:20 -07:00
Diva Canto
292752bb78
MapImage security issue: better error messages
2012-04-27 10:22:43 -07:00
Diva Canto
ac64fe03d8
Amend to last commit: account for the existence of proxies.
2012-04-27 09:59:46 -07:00
Diva Canto
2970a18e54
Merge branch 'master' of ssh://opensimulator.org/var/git/opensim
2012-04-27 09:26:14 -07:00
Diva Canto
c84f63f4dc
Minor change in error message (HG teleport failures)
2012-04-27 09:24:50 -07:00
Diva Canto
e4e754ee93
MapImageService: added an additional security check for OSGrid and other grids like it.
2012-04-27 09:23:56 -07:00
Melanie
90305001de
Merge branch 'master' into careminster
...
Conflicts:
OpenSim/Region/CoreModules/Framework/EntityTransfer/EntityTransferModule.cs
OpenSim/Region/Framework/Scenes/Scene.Inventory.cs
OpenSim/Region/Framework/Scenes/Scene.cs
2012-04-27 17:09:49 +01:00
UbitUmarov
ee237fc5df
test
2012-04-27 12:19:22 +01:00
UbitUmarov
8ef7df5a56
test
2012-04-27 11:01:34 +01:00
UbitUmarov
2006188ee5
test
2012-04-27 10:49:32 +01:00
UbitUmarov
2419de2b6d
test
2012-04-27 10:10:31 +01:00
UbitUmarov
fedc9eb105
itest
2012-04-27 09:50:53 +01:00
UbitUmarov
1c735facee
test
2012-04-27 09:23:20 +01:00