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 |
|
Melanie
|
a24d9bff03
|
Revert "Remove an insterface member that was never used"
It was used. By the API, which is dynamically loaded. So it didn't complain
until it hit Bamboo
This reverts commit 33d5018e94.
|
2009-12-22 15:45:56 +00:00 |
|
Melanie
|
73491cceed
|
Merge branch 'master' into careminster
|
2009-12-22 15:37:24 +00:00 |
|
Melanie
|
33d5018e94
|
Remove an insterface member that was never used
|
2009-12-22 15:35:39 +00:00 |
|
Melanie
|
28c7bb99bf
|
Merge branch 'master' into careminster
|
2009-12-22 09:30:50 +00:00 |
|
Melanie
|
1876ce90af
|
FINALLY! Script compile errors now appear in the script error pane,
not in a funky debug window.
|
2009-12-22 09:24:01 +00:00 |
|
Melanie
|
551727cd19
|
Merge branch 'master' of ssh://3dhosting.de/var/git/careminster
|
2009-12-22 06:43:31 +01:00 |
|
Melanie
|
bde26a8282
|
Add missing file
|
2009-12-22 06:43:03 +01:00 |
|
Kitto Flora
|
11c4a2cfd0
|
Merge branch 'master' of ssh://3dhosting.de/var/git/careminster
|
2009-12-22 00:34:06 -05:00 |
|
Kitto Flora
|
93b930b937
|
Fix conflicts
|
2009-12-22 00:33:31 -05:00 |
|
root
|
b53b871669
|
Add a data path for error messages
|
2009-12-22 06:25:32 +01:00 |
|
Kitto Flora
|
0a29842caf
|
Include ChOdePlugin
|
2009-12-22 00:20:04 -05:00 |
|
Melanie
|
e68c7a1f23
|
Add missing file
|
2009-12-22 05:08:15 +00:00 |
|
root
|
05e8b4e72c
|
Add a data path for error messages
Committed from my other box where git is not configured properly
Signed-off-by: Melanie <melanie@t-data.com>
|
2009-12-22 04:55:43 +00:00 |
|
root
|
49fbe0ddb4
|
Should not commit without compiling
|
2009-12-22 03:26:47 +01:00 |
|
root
|
46fea74726
|
Jumped the gun...
|
2009-12-22 03:25:09 +01:00 |
|
root
|
69b551c516
|
Allow 100ms for scripts to run attach(NULL_KEY) on detach
|
2009-12-22 03:22:33 +01:00 |
|
Melanie
|
fa0621b486
|
Merge branch 'master' into careminster
|
2009-12-22 00:41:56 +00:00 |
|
Melanie
|
e530180c1e
|
Glue code for a couple of new LSL function implementations
|
2009-12-22 00:26:12 +00:00 |
|
Melanie
|
84a1a0a729
|
Merge branch 'master' into careminster
|
2009-12-21 22:07:22 +00:00 |
|
Melanie
|
1fe8a1beaf
|
Merge branch 'master' of melanie@opensimulator.org:/var/git/opensim
|
2009-12-21 22:06:17 +00:00 |
|
Melanie
|
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 |
|
Diva Canto
|
dcafb1dfcd
|
Merge branch 'master' of ssh://diva@opensimulator.org/var/git/opensim
|
2009-12-21 08:55:43 -08:00 |
|
Diva Canto
|
4a33ee9fb9
|
Bug fix: set the map image upon hyperlinking regions.
|
2009-12-21 08:55:12 -08:00 |
|
Melanie
|
51ecdf0148
|
Merge branch 'master' of melanie@opensimulator.org:/var/git/opensim
|
2009-12-21 15:48:46 +00:00 |
|
Jeff Lee
|
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 |
|
Diva Canto
|
641a789bbc
|
Merge branch 'master' of ssh://diva@opensimulator.org/var/git/opensim
|
2009-12-21 07:46:33 -08:00 |
|
Diva Canto
|
68187f7245
|
Bug fix: in standalone, HGInventoryBroker needs to get the local inventory server URL from NetworkServersInfo.
|
2009-12-21 07:44:17 -08:00 |
|
Melanie
|
b891291135
|
Merge branch 'master' into careminster
|
2009-12-21 15:02:57 +00:00 |
|
Diva Canto
|
86104cd45c
|
Merge branch 'master' of ssh://diva@opensimulator.org/var/git/opensim
|
2009-12-21 06:59:36 -08:00 |
|
Diva Canto
|
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 |
|
Melanie
|
1e55d74c5c
|
Merge branch 'master' of melanie@opensimulator.org:/var/git/opensim
|
2009-12-21 14:47:40 +00:00 |
|
Melanie
|
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 |
|
CasperW
|
d8d6e8a304
|
Merge branch 'master' into casper
|
2009-12-21 13:29:48 +01:00 |