Merge branch 'master' into careminster

Browse Source

Conflicts:
	OpenSim/Region/CoreModules/Framework/InventoryAccess/InventoryAccessModule.cs
	OpenSim/Region/Framework/Scenes/SceneObjectPartInventory.cs
	OpenSim/Region/ScriptEngine/Shared/Api/Implementation/LSL_Api.cs

...

This commit is contained in:

Melanie

2013-11-03 21:34:36 +00:00

parent 9800c6fa6c 4830431eb0

commit ba203ed94f

80 changed files with 17619 additions and 276 deletions

Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL

Download Patch File Download Diff File Expand all files Collapse all files

2252

OpenSim/Data/PGSQL/PGSQLSimulationData.cs Normal file

File diff suppressed because it is too large Load Diff