Melanie
fada4cb6c4
Merge branch 'master' into careminster-presence-refactor
2010-05-10 04:05:04 +01:00
Diva Canto
b233a4b2ca
* Fixed spamming the assets table with map tiles. The tile image ID is now stored in regionsettings. Upon generation of a new tile image, the old one is deleted. Tested for SQLite and MySql standalone.
...
* Fixed small bug with map search where the local sim regions weren't found.
2010-05-09 13:39:56 -07:00
Melanie
4e0d62547d
Merge branch 'master' into careminster-presence-refactor
2010-05-09 17:04:23 +01:00
Melanie
9b22393cf3
Add a field asset_flags and a corresponding enum to the asset database. This
...
CHANGES THE ASSET SERVER PROTOCOL and means you CAN NOT MIX PRIOR VERSIONS
WITH LATER ONES. It may also eat your babies, yada, yada, yada.
The usual cautions for migrations to the assets table apply.
Coding: Can not guarantee nut free.
2010-05-09 17:02:22 +01:00
Melanie
11971fb302
Merge branch 'master' into careminster-presence-refactor
2010-05-06 16:09:36 +01:00
Teravus Ovares (Dan Olivares)
4183cef409
* Fixes LandDataSerializerTests on Windows by stripping CR from the serialization result since the reference serialization has LF only.
...
* Added a bool result and then an Assert.That(result) because resharper was having a hard time with the equality compare in Assert.That.
2010-05-05 21:22:29 -04:00
Melanie
7e0d5b8665
Merge branch 'master' into careminster-presence-refactor
2010-05-05 22:50:11 +01:00
Melanie Thielker
733a07e061
Plumb the viewer version string through into AgentCircuitData. Now all that
...
is left os to figure out what black magic turns AgentCircuitData into
AgentData and then copy that into the ScenePresence, where m_Viewer is
already added with this commit and waits for the data.
2010-05-06 00:34:49 +02:00
Melanie Thielker
2ebe148266
Plumb the viewer version string through into AgentCircuitData. Now all that
...
is left os to figure out what black magic turns AgentCircuitData into
AgentData and then copy that into the ScenePresence, where m_Viewer is
already added with this commit and waits for the data.
2010-05-05 22:15:32 +01:00
Teravus Ovares (Dan Olivares)
a9db266d93
* Added an important comment to warn people not to use MockConsole for anything but testing.
2010-05-04 22:16:07 -04:00
Teravus Ovares (Dan Olivares)
f005e570aa
* This should fix the tests failing because of a MainConsole.Instance null reference
...
* Added a MockConsole that doesn't require a handle to System.Console
2010-05-04 22:13:25 -04:00
Melanie
9f8acbfe3e
Merge branch 'master' into careminster-presence-refactor
2010-05-03 01:40:24 +01:00
Melanie
45301d8a49
Defer sending of CHANGED_OWNER to make it work on rezzed objects and
...
attachments in addition to objects sold in place
2010-05-03 01:14:38 +01:00
Melanie
7dc5ebc929
Merge branch 'careminster' into careminster-presence-refactor
2010-04-30 11:49:16 +01:00
Melanie
8b70477556
Merge branch '0.6.9-post-fixes' into careminster
2010-04-30 11:48:57 +01:00
Melanie
04845c1898
Fix link security issue
2010-04-30 11:48:09 +01:00
Melanie
22b3217113
Fix link security issue
2010-04-30 11:46:50 +01:00
Melanie
08ebcdb0b8
Merge branch 'master' into careminster-presence-refactor
2010-04-29 23:33:26 +01:00
John Hurliman
59ac792e44
* Thanks cmickeyb, for a patch that corrects an invalid construction of Primitive.TextureEntry (a "blank" texture should be initialized with UUID.Zero, not null)
2010-04-27 17:11:24 -07:00
Melanie
bbffe16f13
Merge branch 'master' into careminster-presence-refactor
2010-04-27 00:27:05 +01:00
Diva Canto
31d040dc1e
Better error message.
2010-04-26 17:40:00 -07:00
John Hurliman
8692ac53f5
Merge branch 'master' of ssh://opensimulator.org/var/git/opensim
2010-04-22 18:56:06 -07:00
John Hurliman
67990ea7e4
* Better error logging for failed SimianGrid web service calls
2010-04-22 18:55:31 -07:00
Melanie
98cb4f74b2
Merge branch 'master' into careminster-presence-refactor
2010-04-19 07:00:40 +01:00
Melanie
f8d49e0a30
Merge branch '0.6.9-post-fixes' into careminster
2010-04-19 06:32:29 +01:00
Justin Clark-Casey (justincc)
48f3733963
Fix http://opensimulator.org/mantis/view.php?id=4657 where OpenSim.Grid.UserServer.exe fails on startup if no previous config
...
probably appears to occur because mono 2.4.2.3 (and possibly later) erroneously returns a value of 0 for BufferWidth and BufferHeight in some circumstances
2010-04-16 20:43:23 +01:00
Justin Clark-Casey (justincc)
c77444a821
Fix http://opensimulator.org/mantis/view.php?id=4657 where OpenSim.Grid.UserServer.exe fails on startup if no previous config
...
probably appears to occur because mono 2.4.2.3 (and possibly later) erroneously returns a value of 0 for BufferWidth and BufferHeight in some circumstances
2010-04-16 20:40:01 +01:00
Diva Canto
bdc03dbff9
* Added 32bitLauncher for Robust. Still need to test it on a 64 bit machine.
...
* PrimitiveBaseShape wants to be be committed too -- EOF.
2010-04-14 10:36:03 -07:00
John Hurliman
6892fc41f7
Applying patch from lkalif to add support for inventory links to the SimianGrid connectors
2010-04-13 18:59:05 -07:00
Melanie
9920e219dd
Merge branch 'careminster' into careminster-presence-refactor
2010-04-13 04:36:08 +01:00
dahlia
3d0860ae61
thanks lkalif for Mantis #4676 - a patch that adds support for inventory links
...
Signed-off-by: dahlia <dahliaTrimble@gmail.removeme.com >
2010-04-12 17:10:51 -07:00
dahlia
56c176f0a3
minor - add some documentation to PrimitiveBaseShape constructor with OpenMetaverse.Primitive parameter
2010-04-09 19:59:58 -07:00
John Hurliman
54cedfe432
Changed the GetTextureModule backport to work with the 0.6.9 codebase
2010-04-08 15:57:57 -07:00
John Hurliman
c4c4c3696e
Backported WebUtil.cs from master to 0.6.9-postfixes to fix the build break
2010-04-08 15:26:51 -07:00
Melanie Thielker
a573b5767b
Test commit
2010-04-05 22:31:30 +02:00
Melanie Thielker
5c04d768a6
Bump version number
2010-04-05 22:26:18 +02:00
Melanie
ba31b31ed0
Merge branch 'careminster' into careminster-presence-refactor
2010-04-05 18:22:15 +01:00
Melanie
fe034dc3e4
Merge branch 'master' into careminster-presence-refactor
2010-04-05 18:12:29 +01:00
Melanie
04a68db195
Merge branch '0.6.9-post-fixes' into careminster
2010-04-05 18:10:36 +01:00
Justin Clark-Casey (justincc)
e0eba26f7b
Merge branch 'master' of ssh://justincc@opensimulator.org/var/git/opensim
2010-04-01 23:59:00 +01:00
Diva Canto
08ba34da03
First attempt at fixing mantis #4641 . It's better but there are now some issues with permissions.
...
(looks like my commit is going to touch CM files, I'm going to let it do it - eof only)
2010-03-31 21:30:44 -07:00
Justin Clark-Casey (justincc)
2bf1761ad8
When saving an oar/iar, don't attempt to write out the data byte array if it's empty
...
On Mono 2.6 (and probably before) this causes a non-obvious IOException
2010-03-31 19:51:17 +01:00
Melanie
ec637e2b8c
Committing the LightShare code, which was developed by TomMeta of Meta7.
...
This allows scripts to set WindLight parameters for clients connecting
to a region. Currently, this is only supported by the Meta7 viewer.
2010-03-31 04:20:20 +01:00
Melanie
7d917e7c5c
Rename Meta7Windlight to LightShare
2010-03-30 23:29:03 +01:00
Melanie
5693870fe2
Merge branch 'master' into careminster-presence-refactor
2010-03-30 21:34:27 +01:00
John Hurliman
3e8cb7a9a0
Merge branch 'master' of ssh://opensimulator.org/var/git/opensim
2010-03-26 12:21:24 -07:00
John Hurliman
5a2315c68c
* Fixed a bug with null value handling in WebUtil.BuildQueryString()
...
* Changed the null check back in estate manager setup but fixed the case for an existing account being found
* Implemented SetPassword() in the SimianGrid auth connector
2010-03-26 12:21:05 -07:00
Justin Clark-Casey (justincc)
dd544f811a
switch flavor to RC1
2010-03-26 19:09:09 +00:00
Justin Clark-Casey (justincc)
4565e5dfbc
change trunk version to 0.7.Dev
2010-03-26 18:56:05 +00:00
Justin Clark-Casey (justincc)
87fe96ae2c
replace recent IModule.GetGroup() with better GetGroupRecord(string name)
2010-03-26 00:10:29 +00:00
