CasperW
|
4b96a78039
|
Merge branch 'master' into casper
|
2009-12-27 07:11:21 +01:00 |
|
CasperW
|
19a5e606b3
|
Convert some remaining legacy lock()s for m_parts in SceneObjectGroup to ReaderWriteLockSlim, hopefully fixes a native crash
|
2009-12-27 07:08:16 +01:00 |
|
Adam Frisby
|
8a931a4e91
|
* Implements some basic Sirikata protocol work (initial handshakes).
|
2009-12-27 16:07:05 +11:00 |
|
Adam Frisby
|
8e18762e22
|
* Added prebuild for previous commit.
|
2009-12-27 15:03:26 +11:00 |
|
Adam Frisby
|
fd777cc7b9
|
* Implements Sirikata ClientStack Module
* Just a stub (imports all the sirikata protocol, and that's about it.)
|
2009-12-27 15:03:10 +11:00 |
|
Adam Frisby
|
763fa90be5
|
* Adding Google.ProtocolBuffers.dll dependency (BSD licensed)
* For some experimental work with a Sirikata clientstack.
|
2009-12-27 14:34:41 +11:00 |
|
root
|
a18f4964cf
|
Correct some issues with the last commit
|
2009-12-27 01:32:23 +01:00 |
|
root
|
b7951d5177
|
Correct some issues with the last commit
|
2009-12-26 23:57:49 +00:00 |
|
Melanie
|
f5c310d9d4
|
Merge branch 'master' into careminster
|
2009-12-26 23:39:02 +00:00 |
|
Melanie
|
0369256720
|
Close a SQL injection loophole in the new database driver
|
2009-12-26 23:38:11 +00:00 |
|
CasperW
|
a6c93ce875
|
Make sure that we're not bounds checking attachments. 'Cos otherwise your hair will end up on your bum. Seen that before?
|
2009-12-26 22:55:18 +01:00 |
|
CasperW
|
1b8f91a0db
|
Merge branch 'master' into casper
|
2009-12-26 18:17:55 +01:00 |
|
CasperW
|
7371c7662a
|
Fix for landing points. Only one scenario is not fully covered by this change, and that is people who teleport from neighbouring regions, who won't get affected by the landing point.
|
2009-12-26 18:14:12 +01:00 |
|
Melanie
|
f3a4860635
|
Merge branch 'master' into careminster
|
2009-12-26 04:13:27 +00:00 |
|
Melanie
|
88b3b98811
|
Add AvatarInterestsReply
|
2009-12-26 04:12:51 +00:00 |
|
root
|
43c303e27a
|
Make the GenericTableHandler work as intended
|
2009-12-26 03:24:46 +01:00 |
|
root
|
92be01d5e6
|
Make the GenericTableHandler work as intended
|
2009-12-26 01:50:21 +00:00 |
|
Melanie
|
e51be5f4a7
|
Merge branch 'master' into careminster
|
2009-12-26 00:21:03 +00:00 |
|
Melanie
|
9972b12812
|
Add a generic REPLACE INTO handler for put into the generic table handler
|
2009-12-26 00:19:54 +00:00 |
|
Melanie
|
59f683066a
|
Set version back to core version (base) and suffix CM. Please DO NOT CHANGE THIS
in the repo. This is the Caremninster repo and the number follows CORE. Always.
|
2009-12-25 23:23:49 +00:00 |
|
Melanie
|
b19e564317
|
Restore version suffix.
|
2009-12-25 23:20:30 +00:00 |
|
Melanie
|
e881f35fbb
|
Merge branch 'master' of ssh://melanie@3dhosting.de/var/git/careminster into careminster
|
2009-12-25 23:20:08 +00:00 |
|
Melanie
|
59a841d69c
|
Merge branch 'master' into careminster
|
2009-12-25 23:17:08 +00:00 |
|
Melanie
|
d5618fbcc3
|
Merge branch 'master' of melanie@opensimulator.org:/var/git/opensim
|
2009-12-25 23:10:44 +00:00 |
|
Melanie
|
8d36d7beed
|
Enable the profile module to be replaced completely, even for the base
profile data
|
2009-12-25 23:10:07 +00:00 |
|
Kitto Flora
|
e7439efc74
|
Recover out-of-region objects during db load.
|
2009-12-24 19:19:44 -05:00 |
|
dahlia
|
7a06ab834d
|
Clear Shape.SculptEntry if prim type is not a sculptie in llSetPrimitiveParams() - addresses Mantis #4462
|
2009-12-24 11:00:08 -08:00 |
|
Melanie
|
0054afd39b
|
Merge branch 'master' into careminster
|
2009-12-24 16:45:27 +00:00 |
|
Melanie
|
7f699fca9a
|
Add the body to the LSL List Size property
|
2009-12-24 18:18:14 +01:00 |
|
Melanie
|
0ce3d4b0a9
|
Merge branch 'master' of melanie@opensimulator.org:/var/git/opensim
|
2009-12-24 16:44:47 +00:00 |
|
Melanie
|
86a429bc44
|
Add the LSL List Size property
|
2009-12-24 16:44:12 +00:00 |
|
Diva Canto
|
2c3d7972b9
|
No-op in this commit. Just increasing the tag number due to weirdnesses.
|
2009-12-23 19:43:50 -08:00 |
|
Diva Canto
|
1fa938aab0
|
Library Module: allows adding folders/items to the Library from IAR files placed under bin/Library. This works only for standalones.
|
2009-12-23 17:31:30 -08:00 |
|
Diva Canto
|
908992a105
|
Fixes the broken build of the previous commit.
|
2009-12-23 17:10:37 -08:00 |
|
Melanie
|
e5e951d92c
|
Merge branch 'master' into careminster
|
2009-12-24 00:45:53 +00:00 |
|
Melanie
|
5a653ef96f
|
Merge branch 'master' into careminster
|
2009-12-23 23:10:34 +00:00 |
|
Melanie
|
53386b6f1f
|
Add saving assets from gestures to IAR
|
2009-12-23 23:09:41 +00:00 |
|
Melanie
|
165f193f78
|
Merge branch 'master' of ssh://melanie@3dhosting.de/var/git/careminster into careminster
|
2009-12-23 21:25:08 +00:00 |
|
Melanie
|
6eecbc95e4
|
Merge branch 'master' into careminster
|
2009-12-23 21:22:19 +00:00 |
|
Melanie
|
f2d2073f2b
|
Merge branch 'master' of melanie@opensimulator.org:/var/git/opensim
|
2009-12-23 21:21:22 +00:00 |
|
Melanie
|
c05a35cc71
|
Fix a bounds exception I came across in IAR restore
|
2009-12-23 21:20:48 +00:00 |
|
Diva Canto
|
c27aa3749c
|
Change in how the Library returns its descendant folders, so that it includes folders added after the initial load off the file system, by other mechanisms.
|
2009-12-23 11:45:39 -08:00 |
|
Charles Krinke
|
fddefff284
|
Thank you kindly, Ziah for a patch that adds the channel to the class ChatEventArgs and retrieves it's value along with the others from the OSChatMessage in HandleChatPackage. With this the MRM Script can check if a ChatEvent is coming in on a specifc Channel. The Second Part adds the Method say(string msg , int channel) to send a chat message on the specified channel. The idea behind this is to enable MRM's to communicate with regular LSL or OSSL Scripts so that they may can act as a Backend to access a Database or do business Logic for those Scripts.
Signed-off-by: Charles Krinke <cfk@pacbell.net>
|
2009-12-23 10:34:11 -08:00 |
|
dr scofield (aka dirk husemann)
|
9c294c5663
|
- commented out unused method ConvertIHttpClientContextToOSHttp
|
2009-12-23 18:33:54 +01:00 |
|
CasperW
|
a9f4d7a29c
|
Add a debugger tag to stop Visual Studio from breaking
|
2009-12-23 17:34:08 +01:00 |
|
CasperW
|
c54e0953d0
|
Merge branch 'master' of ssh://TOR/var/git/careminster
|
2009-12-23 14:15:27 +01:00 |
|
CasperW
|
b575bf2524
|
Added some null reference and deleted group checks to certain functions to fix region crash scenarios.
|
2009-12-23 14:14:20 +01:00 |
|
Diva Canto
|
f45a69821b
|
Added Close() to Inventory/Archiver/InventoryArchiveReadRequest, so that the stream can be closed.
|
2009-12-22 21:00:46 -08:00 |
|
Melanie
|
30f59370d3
|
Merge branch 'master' into careminster
|
2009-12-22 15:48:41 +00:00 |
|
Melanie
|
c11f259e15
|
Remove GetState. It is really unused and was reinstated by the revert
|
2009-12-22 15:46:55 +00:00 |